Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2021-06-25 17:01:05 +0300
committerJeroen Bakker <jeroen@blender.org>2021-06-25 17:01:05 +0300
commit79346fd72eefd4f81422c73239fe99224681f0cc (patch)
treec99ecf44acf65da4e410e2e39d01540e0fc8c2e8 /CMakeLists.txt
parent44c875f59aab63081c56b94cba46c6fe1e49f148 (diff)
Moved shader compilation flag to cmake.
Migration of the shaders can take a long time. During this time it you won't be able to start most GPU tests or Blender. This switch will enable the compilation of the shader to other developments can still happen. `WITH_VULKAN_SHADER_COMPILATION` Default is OFF. Enable when migrating shaders.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae8fc500e33..3e39c5b561f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -468,7 +468,8 @@ endif()
# Vulkan
-option(WITH_VULKAN "Enable Vulkan backend (Experimental)" OFF)
+option(WITH_VULKAN "Enable Vulkan backend (Experimental)" OFF)
+option(WITH_VULKAN_SHADER_COMPILATION "Temporary flag to enable vulkan shader compilation needed to continue development during the migration of GLSL to Vulkan." OFF)
# OpenGL
@@ -482,6 +483,7 @@ mark_as_advanced(
WITH_GLEW_ES
WITH_GL_EGL
WITH_GL_PROFILE_ES20
+ WITH_VULKAN_SHADER_COMPILATION
)
if(WIN32)
@@ -1086,6 +1088,9 @@ if(WITH_VULKAN)
list(APPEND BLENDER_GL_LIBRARIES ${Vulkan_LIBRARY})
add_definitions(-DWITH_VULKAN)
+ if(WITH_VULKAN_SHADER_COMPILATION)
+ add_definitions(-DWITH_VULKAN_SHADER_COMPILATION)
+ endif()
endif()
#-----------------------------------------------------------------------------