Merge pull request #263 from ukari/master

support more shader stages
expipiplus1 · Mar 1, 2021 · 74dc6b4 · 74dc6b4
2 parents 4f163a3 + ede03ec
commit 74dc6b4
Show file tree

Hide file tree

Showing 24 changed files with 1,327 additions and 549 deletions.
diff --git a/examples/compute/Main.hs b/examples/compute/Main.hs
@@ -44,7 +44,7 @@ import           Vulkan.Core10                 as Vk
 import           Vulkan.Extensions.VK_EXT_debug_utils
 import           Vulkan.Extensions.VK_EXT_validation_features
 import           Vulkan.Utils.Debug
-import           Vulkan.Utils.ShaderQQ
+import           Vulkan.Utils.ShaderQQ.GLSL.Glslang
 import           Vulkan.Zero
 import           VulkanMemoryAllocator         as VMA
                                          hiding ( getPhysicalDeviceProperties )

diff --git a/examples/hlsl/Pipeline.hs b/examples/hlsl/Pipeline.hs
@@ -9,15 +9,16 @@ module Pipeline
 
 import           Control.Monad.Trans.Resource
 import           Data.Bits
-import           Data.Foldable                  ( traverse_ )
-import qualified Data.Vector                   as V
+import           Data.Foldable                      ( traverse_ )
+import qualified Data.Vector                       as V
 import           MonadVulkan
 import           Vulkan.CStruct.Extends
-import           Vulkan.Core10                 as Vk
-                                         hiding ( withBuffer
-                                                , withImage
-                                                )
-import           Vulkan.Utils.ShaderQQ.Shaderc
+import           Vulkan.Core10                     as Vk
+                                             hiding ( withBuffer
+                                                    , withImage
+                                                    )
+import           Vulkan.Utils.ShaderQQ.HLSL.Shaderc ( vert
+                                                    , frag )
 import           Vulkan.Zero
 
 -- Create the most vanilla rendering pipeline

diff --git a/examples/offscreen/Main.hs b/examples/offscreen/Main.hs
@@ -49,7 +49,7 @@ import           Vulkan.Core10                 as Vk
 import           Vulkan.Extensions.VK_EXT_debug_utils
 import           Vulkan.Extensions.VK_EXT_validation_features
 import           Vulkan.Utils.Debug
-import           Vulkan.Utils.ShaderQQ
+import           Vulkan.Utils.ShaderQQ.GLSL.Glslang
 import           Vulkan.Zero
 import           VulkanMemoryAllocator         as VMA
                                          hiding ( getPhysicalDeviceProperties )

diff --git a/examples/rays/Pipeline.hs b/examples/rays/Pipeline.hs
@@ -14,27 +14,29 @@ module Pipeline
 import           Control.Monad.IO.Class
 import           Control.Monad.Trans.Resource
 import           Data.Bits
-import           Data.Foldable                  ( for_
-                                                , traverse_
-                                                )
-import qualified Data.Vector                   as V
-import           Data.Vector                    ( Vector )
+import           Data.Foldable                       ( for_
+                                                     , traverse_
+                                                     )
+import qualified Data.Vector                        as V
+import           Data.Vector                         ( Vector )
 import           Data.Word
-import           Foreign                        ( nullPtr )
-import           Foreign.Marshal.Utils          ( moveBytes )
-import           Foreign.Ptr                    ( Ptr
-                                                , plusPtr
-                                                )
+import           Foreign                             ( nullPtr )
+import           Foreign.Marshal.Utils               ( moveBytes )
+import           Foreign.Ptr                         ( Ptr
+                                                     , plusPtr
+                                                     )
 import           MonadVulkan
 import           Say
 import           Vulkan.CStruct.Extends
-import           Vulkan.Core10                 as Vk
-                                         hiding ( withBuffer
-                                                , withImage
-                                                )
+import           Vulkan.Core10                      as Vk
+                                              hiding ( withBuffer
+                                                     , withImage
+                                                     )
 import           Vulkan.Extensions.VK_KHR_acceleration_structure
 import           Vulkan.Extensions.VK_KHR_ray_tracing_pipeline
-import           Vulkan.Utils.ShaderQQ
+
+import           Vulkan.Utils.ShaderQQ.GLSL.Glslang ( glsl
+                                                    , compileShaderQ )
 import           Vulkan.Zero
 import           VulkanMemoryAllocator
 import Scene
@@ -186,7 +188,7 @@ createRTDescriptorSets descriptorSetLayout tlas SceneBuffers {..} numDescriptorS
 createRayGenerationShader
   :: V (ReleaseKey, SomeStruct PipelineShaderStageCreateInfo)
 createRayGenerationShader = do
-  let code = $(compileShaderQ (Just "spirv1.4") "rgen" [glsl|
+  let code = $(compileShaderQ (Just "spirv1.4") "rgen" Nothing [glsl|
         #version 460
         #extension GL_EXT_ray_tracing : require
 
@@ -238,7 +240,7 @@ createRayGenerationShader = do
 
 createRayHitShader :: V (ReleaseKey, SomeStruct PipelineShaderStageCreateInfo)
 createRayHitShader = do
-  let code = $(compileShaderQ (Just "spirv1.4") "rchit" [glsl|
+  let code = $(compileShaderQ (Just "spirv1.4") "rchit" Nothing [glsl|
         #version 460
         #extension GL_EXT_ray_tracing : require
 
@@ -269,7 +271,7 @@ createRayHitShader = do
 
 createRayIntShader :: V (ReleaseKey, SomeStruct PipelineShaderStageCreateInfo)
 createRayIntShader = do
-  let code = $(compileShaderQ (Just "spirv1.4") "rint" [glsl|
+  let code = $(compileShaderQ (Just "spirv1.4") "rint" Nothing [glsl|
         #version 460
         #extension GL_EXT_ray_tracing : require
 
@@ -311,7 +313,7 @@ createRayIntShader = do
 
 createRayMissShader :: V (ReleaseKey, SomeStruct PipelineShaderStageCreateInfo)
 createRayMissShader = do
-  let code = $(compileShaderQ (Just "spirv1.4") "rmiss" [glsl|
+  let code = $(compileShaderQ (Just "spirv1.4") "rmiss" Nothing [glsl|
         #version 460
         #extension GL_EXT_ray_tracing : require
 

diff --git a/examples/resize/Julia.hs b/examples/resize/Julia.hs
@@ -17,7 +17,7 @@ import           Data.Vector                    ( Vector )
 
 import           Vulkan.CStruct.Extends
 import           Vulkan.Core10
-import           Vulkan.Utils.ShaderQQ
+import           Vulkan.Utils.ShaderQQ.GLSL.Glslang
 import           Vulkan.Zero
 
 import           Julia.Constants
@@ -100,7 +100,7 @@ juliaDescriptorSet descriptorSetLayout imageViews = do
 
 juliaShader :: V (ReleaseKey, SomeStruct PipelineShaderStageCreateInfo)
 juliaShader = do
-  let compCode = $(compileShaderQ (Just "vulkan1.0") "comp" [glsl|
+  let compCode = $(compileShaderQ (Just "vulkan1.0") "comp" Nothing [glsl|
         #version 450
         #extension GL_ARB_separate_shader_objects : enable
 

diff --git a/examples/resize/Pipeline.hs b/examples/resize/Pipeline.hs
@@ -17,7 +17,7 @@ import           Vulkan.Core10                 as Vk
                                          hiding ( withBuffer
                                                 , withImage
                                                 )
-import           Vulkan.Utils.ShaderQQ
+import           Vulkan.Utils.ShaderQQ.GLSL.Glslang
 import           Vulkan.Zero
 
 import           MonadVulkan

diff --git a/examples/sdl-triangle/Main.hs b/examples/sdl-triangle/Main.hs
@@ -11,24 +11,24 @@ import           Control.Monad.IO.Class
 import           Control.Monad.Managed
 import           Control.Monad.Trans.Maybe
 import           Data.Bits
-import qualified Data.ByteString               as BS
+import qualified Data.ByteString                   as BS
 import           Data.Foldable
-import           Data.List                      ( nub
-                                                , partition
-                                                )
+import           Data.List                          ( nub
+                                                    , partition
+                                                    )
 import           Data.Ord
-import           Data.String                    ( IsString )
-import           Data.Text               hiding ( maximum
-                                                , partition
-                                                )
-import qualified Data.Text                     as T
+import           Data.String                        ( IsString )
+import           Data.Text                   hiding ( maximum
+                                                    , partition
+                                                    )
+import qualified Data.Text                         as T
 import           Data.Text.Encoding
 import           Data.Traversable
-import qualified Data.Vector                   as V
+import qualified Data.Vector                       as V
 import           Data.Word
-import           Foreign.Ptr                    ( castPtr )
+import           Foreign.Ptr                        ( castPtr )
 import qualified SDL
-import qualified SDL.Video.Vulkan              as SDL
+import qualified SDL.Video.Vulkan                  as SDL
 import           Say
 import           System.Exit
 import           Vulkan.CStruct.Extends
@@ -38,7 +38,8 @@ import           Vulkan.Extensions.VK_EXT_validation_features
 import           Vulkan.Extensions.VK_KHR_surface
 import           Vulkan.Extensions.VK_KHR_swapchain
 import           Vulkan.Utils.Debug
-import           Vulkan.Utils.ShaderQQ
+import           Vulkan.Utils.ShaderQQ.GLSL.Glslang ( vert
+                                                    , frag )
 import           Vulkan.Zero
 
 main :: IO ()

diff --git a/utils/changelog.md b/utils/changelog.md
@@ -2,6 +2,22 @@
 
 ## WIP
 
+## [0.5.0] - 2021-02-24
+- Refactor module `Vulkan.Utils.ShaderQQ`
+  - Remove `Vulkan.Utils.ShaderQQ`
+  - Remove `Vulkan.Utils.ShaderQQ.Shaderc`
+  - Provide `glsl`/`hlsl`, `vert` .. `comp`, `rgen` .. `rcall`, `mesh`, `task`, `compileShaderQ`, `compileShader` in each ShaderQQ provider module under `Vulkan.Utils.ShaderQQ` for help compile shaders
+  - Add `Vulkan.Utils.ShaderQQ.Backend.Glslang`to help process warning & error messages for glslangValidator
+  - Add `Vulkan.Utils.ShaderQQ.Backend.Shaderc`to help process warning & error messages for glslc
+  - Add `Vulkan.Utils.ShaderQQ.GLSL.Glslang` to compile glsl shaders for glslangValidator
+  - Add `Vulkan.Utils.ShaderQQ.GLSL.Shaderc` to compile glsl shaders for glslc
+  - Add `Vulkan.Utils.ShaderQQ.HLSL.Glslang` to compile hlsl shaders for glslangValidator
+  - Add `Vulkan.Utils.ShaderQQ.HLSL.Shaderc` to compile hlsl shaders for glslc
+- specify `--target-spv` for shaderc ray tracing shaders
+- specify `--target-env` for glslang ray tracing shaders
+- support pass hlsl entry point to glslangValidator and shaderc
+- support pass glsl entry point to glslangValidator
+
 ## [0.4.2] - 2021-02-18
 - Relax bounds on `vulkan`
 

diff --git a/utils/package.yaml b/utils/package.yaml
@@ -1,5 +1,5 @@
 name: vulkan-utils
-version: "0.4.2"
+version: "0.5.0"
 synopsis: Utils for the vulkan package
 category: Graphics
 maintainer: Joe Hermaszewski <[email protected]>