From 68164eafbf809a42768a7d0f966cc9ed0f4c3abe Mon Sep 17 00:00:00 2001 From: mklefrancois <38076163+mklefrancois@users.noreply.github.com> Date: Wed, 10 Jun 2020 12:06:46 +0200 Subject: [PATCH] Targeting Vulkan 1.2 and Spir-V 1.5 for the glsl shaders --- ray_tracing__advance/CMakeLists.txt | 2 ++ ray_tracing__simple/CMakeLists.txt | 2 ++ ray_tracing_animation/CMakeLists.txt | 2 ++ ray_tracing_anyhit/CMakeLists.txt | 2 ++ ray_tracing_callable/CMakeLists.txt | 2 ++ ray_tracing_instances/CMakeLists.txt | 2 ++ ray_tracing_intersection/CMakeLists.txt | 2 ++ ray_tracing_jitter_cam/CMakeLists.txt | 2 ++ ray_tracing_manyhits/CMakeLists.txt | 2 ++ ray_tracing_rayquery/CMakeLists.txt | 2 ++ ray_tracing_reflections/CMakeLists.txt | 2 ++ 11 files changed, 22 insertions(+) diff --git a/ray_tracing__advance/CMakeLists.txt b/ray_tracing__advance/CMakeLists.txt index ea6d867..4a1c58b 100644 --- a/ray_tracing__advance/CMakeLists.txt +++ b/ray_tracing__advance/CMakeLists.txt @@ -24,6 +24,8 @@ include_directories("../common") # more than one file can be given: _compile_GLSL("GLSL_mesh.vert;GLSL_mesh.frag" "GLSL_mesh.spv" GLSL_SOURCES) # the SpirV validator is fine as long as files are for different pipeline stages (entry points still need to be main()) #_compile_GLSL( ) +SET(VULKAN_TARGET_ENV vulkan1.2) + UNSET(GLSL_SOURCES) UNSET(SPV_OUTPUT) file(GLOB_RECURSE GLSL_HEADER_FILES "shaders/*.h" "shaders/*.glsl") diff --git a/ray_tracing__simple/CMakeLists.txt b/ray_tracing__simple/CMakeLists.txt index 1ca7679..f2c44ad 100644 --- a/ray_tracing__simple/CMakeLists.txt +++ b/ray_tracing__simple/CMakeLists.txt @@ -25,6 +25,8 @@ include_directories("../common") # more than one file can be given: _compile_GLSL("GLSL_mesh.vert;GLSL_mesh.frag" "GLSL_mesh.spv" GLSL_SOURCES) # the SpirV validator is fine as long as files are for different pipeline stages (entry points still need to be main()) #_compile_GLSL( ) +SET(VULKAN_TARGET_ENV vulkan1.2) + UNSET(GLSL_SOURCES) UNSET(SPV_OUTPUT) file(GLOB_RECURSE GLSL_HEADER_FILES "shaders/*.h" "shaders/*.glsl") diff --git a/ray_tracing_animation/CMakeLists.txt b/ray_tracing_animation/CMakeLists.txt index 1ca7679..f2c44ad 100644 --- a/ray_tracing_animation/CMakeLists.txt +++ b/ray_tracing_animation/CMakeLists.txt @@ -25,6 +25,8 @@ include_directories("../common") # more than one file can be given: _compile_GLSL("GLSL_mesh.vert;GLSL_mesh.frag" "GLSL_mesh.spv" GLSL_SOURCES) # the SpirV validator is fine as long as files are for different pipeline stages (entry points still need to be main()) #_compile_GLSL( ) +SET(VULKAN_TARGET_ENV vulkan1.2) + UNSET(GLSL_SOURCES) UNSET(SPV_OUTPUT) file(GLOB_RECURSE GLSL_HEADER_FILES "shaders/*.h" "shaders/*.glsl") diff --git a/ray_tracing_anyhit/CMakeLists.txt b/ray_tracing_anyhit/CMakeLists.txt index 1ca7679..f2c44ad 100644 --- a/ray_tracing_anyhit/CMakeLists.txt +++ b/ray_tracing_anyhit/CMakeLists.txt @@ -25,6 +25,8 @@ include_directories("../common") # more than one file can be given: _compile_GLSL("GLSL_mesh.vert;GLSL_mesh.frag" "GLSL_mesh.spv" GLSL_SOURCES) # the SpirV validator is fine as long as files are for different pipeline stages (entry points still need to be main()) #_compile_GLSL( ) +SET(VULKAN_TARGET_ENV vulkan1.2) + UNSET(GLSL_SOURCES) UNSET(SPV_OUTPUT) file(GLOB_RECURSE GLSL_HEADER_FILES "shaders/*.h" "shaders/*.glsl") diff --git a/ray_tracing_callable/CMakeLists.txt b/ray_tracing_callable/CMakeLists.txt index c5bedc0..590ec4f 100644 --- a/ray_tracing_callable/CMakeLists.txt +++ b/ray_tracing_callable/CMakeLists.txt @@ -25,6 +25,8 @@ include_directories("../common") # more than one file can be given: _compile_GLSL("GLSL_mesh.vert;GLSL_mesh.frag" "GLSL_mesh.spv" GLSL_SOURCES) # the SpirV validator is fine as long as files are for different pipeline stages (entry points still need to be main()) #_compile_GLSL( ) +SET(VULKAN_TARGET_ENV vulkan1.2) + UNSET(GLSL_SOURCES) UNSET(SPV_OUTPUT) file(GLOB_RECURSE GLSL_HEADER_FILES "shaders/*.h" "shaders/*.glsl") diff --git a/ray_tracing_instances/CMakeLists.txt b/ray_tracing_instances/CMakeLists.txt index 1ca7679..f2c44ad 100644 --- a/ray_tracing_instances/CMakeLists.txt +++ b/ray_tracing_instances/CMakeLists.txt @@ -25,6 +25,8 @@ include_directories("../common") # more than one file can be given: _compile_GLSL("GLSL_mesh.vert;GLSL_mesh.frag" "GLSL_mesh.spv" GLSL_SOURCES) # the SpirV validator is fine as long as files are for different pipeline stages (entry points still need to be main()) #_compile_GLSL( ) +SET(VULKAN_TARGET_ENV vulkan1.2) + UNSET(GLSL_SOURCES) UNSET(SPV_OUTPUT) file(GLOB_RECURSE GLSL_HEADER_FILES "shaders/*.h" "shaders/*.glsl") diff --git a/ray_tracing_intersection/CMakeLists.txt b/ray_tracing_intersection/CMakeLists.txt index 14b48f8..36119de 100644 --- a/ray_tracing_intersection/CMakeLists.txt +++ b/ray_tracing_intersection/CMakeLists.txt @@ -25,6 +25,8 @@ include_directories("../common") # more than one file can be given: _compile_GLSL("GLSL_mesh.vert;GLSL_mesh.frag" "GLSL_mesh.spv" GLSL_SOURCES) # the SpirV validator is fine as long as files are for different pipeline stages (entry points still need to be main()) #_compile_GLSL( ) +SET(VULKAN_TARGET_ENV vulkan1.2) + UNSET(GLSL_SOURCES) UNSET(SPV_OUTPUT) file(GLOB_RECURSE GLSL_HEADER_FILES "shaders/*.h" "shaders/*.glsl") diff --git a/ray_tracing_jitter_cam/CMakeLists.txt b/ray_tracing_jitter_cam/CMakeLists.txt index 1ca7679..f2c44ad 100644 --- a/ray_tracing_jitter_cam/CMakeLists.txt +++ b/ray_tracing_jitter_cam/CMakeLists.txt @@ -25,6 +25,8 @@ include_directories("../common") # more than one file can be given: _compile_GLSL("GLSL_mesh.vert;GLSL_mesh.frag" "GLSL_mesh.spv" GLSL_SOURCES) # the SpirV validator is fine as long as files are for different pipeline stages (entry points still need to be main()) #_compile_GLSL( ) +SET(VULKAN_TARGET_ENV vulkan1.2) + UNSET(GLSL_SOURCES) UNSET(SPV_OUTPUT) file(GLOB_RECURSE GLSL_HEADER_FILES "shaders/*.h" "shaders/*.glsl") diff --git a/ray_tracing_manyhits/CMakeLists.txt b/ray_tracing_manyhits/CMakeLists.txt index 1ca7679..f2c44ad 100644 --- a/ray_tracing_manyhits/CMakeLists.txt +++ b/ray_tracing_manyhits/CMakeLists.txt @@ -25,6 +25,8 @@ include_directories("../common") # more than one file can be given: _compile_GLSL("GLSL_mesh.vert;GLSL_mesh.frag" "GLSL_mesh.spv" GLSL_SOURCES) # the SpirV validator is fine as long as files are for different pipeline stages (entry points still need to be main()) #_compile_GLSL( ) +SET(VULKAN_TARGET_ENV vulkan1.2) + UNSET(GLSL_SOURCES) UNSET(SPV_OUTPUT) file(GLOB_RECURSE GLSL_HEADER_FILES "shaders/*.h" "shaders/*.glsl") diff --git a/ray_tracing_rayquery/CMakeLists.txt b/ray_tracing_rayquery/CMakeLists.txt index 1ca7679..f2c44ad 100644 --- a/ray_tracing_rayquery/CMakeLists.txt +++ b/ray_tracing_rayquery/CMakeLists.txt @@ -25,6 +25,8 @@ include_directories("../common") # more than one file can be given: _compile_GLSL("GLSL_mesh.vert;GLSL_mesh.frag" "GLSL_mesh.spv" GLSL_SOURCES) # the SpirV validator is fine as long as files are for different pipeline stages (entry points still need to be main()) #_compile_GLSL( ) +SET(VULKAN_TARGET_ENV vulkan1.2) + UNSET(GLSL_SOURCES) UNSET(SPV_OUTPUT) file(GLOB_RECURSE GLSL_HEADER_FILES "shaders/*.h" "shaders/*.glsl") diff --git a/ray_tracing_reflections/CMakeLists.txt b/ray_tracing_reflections/CMakeLists.txt index 1ca7679..f2c44ad 100644 --- a/ray_tracing_reflections/CMakeLists.txt +++ b/ray_tracing_reflections/CMakeLists.txt @@ -25,6 +25,8 @@ include_directories("../common") # more than one file can be given: _compile_GLSL("GLSL_mesh.vert;GLSL_mesh.frag" "GLSL_mesh.spv" GLSL_SOURCES) # the SpirV validator is fine as long as files are for different pipeline stages (entry points still need to be main()) #_compile_GLSL( ) +SET(VULKAN_TARGET_ENV vulkan1.2) + UNSET(GLSL_SOURCES) UNSET(SPV_OUTPUT) file(GLOB_RECURSE GLSL_HEADER_FILES "shaders/*.h" "shaders/*.glsl")