blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

GPU: add BUIDTIME to WITH_GPU_SHADER_BUILDER 

Adds a better name that describes when it is used.
The GPU_SHADER_BUILDER is a buildtime tool for developers
to pre-validate GLSL (and in the overseen future pre-compile to
SpirV). We don't see that this needs to become a required
step in the future so WITH_GPU_BUILDTIME_SHADER_BUILDER
is more descriptive name.
This commit is contained in:
Jeroen Bakker 2022-07-11 16:45:07 +02:00
parent 76d8614236
commit 8ca09e6c5e
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -565,13 +565,13 @@ endif()
option(WITH_OPENGL "When off limits visibility of the opengl headers to just bf_gpu and gawain (temporary option for development purposes)" ON)
option(WITH_GLEW_ES "Switches to experimental copy of GLEW that has support for OpenGL ES. (temporary option for development purposes)" OFF)
option(WITH_GL_PROFILE_ES20 "Support using OpenGL ES 2.0. (through either EGL or the AGL/WGL/XGL 'es20' profile)" OFF)
option(WITH_GPU_SHADER_BUILDER "Shader builder is a developer option enabling linting on GLSL during compilation" OFF)
option(WITH_GPU_BUILDTIME_SHADER_BUILDER "Shader builder is a developer option enabling linting on GLSL during compilation" OFF)
mark_as_advanced(
WITH_OPENGL
WITH_GLEW_ES
WITH_GL_PROFILE_ES20
WITH_GPU_SHADER_BUILDER
WITH_GPU_BUILDTIME_SHADER_BUILDER
)
# Metal
@ -1340,9 +1340,9 @@ else()
list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_CORE)
endif()
if (WITH_GPU_SHADER_BUILDER AND WITH_USD)
if (WITH_GPU_BUILDTIME_SHADER_BUILDER AND WITH_USD)
message(FATAL_ERROR
"Unable to compile WITH_GPU_SHADER_BUILDER and WITH_USD."
"Unable to compile WITH_GPU_BUILDTIME_SHADER_BUILDER and WITH_USD."
)
endif()

2
release/datafiles/locale

@ -1 +1 @@
Subproject commit 055bc5223c1cd249e32ccbc8e8796ba9925c8c33
Subproject commit a2eb507891449a0b67582be9561840075513661d

2
release/scripts/addons

@ -1 +1 @@
Subproject commit 7ea2e74fc41b2eabdbf639b812082e73823b09d7
Subproject commit 7a8502871c34db0343cc7de52d6b49b15a84238a

2
source/blender/gpu/CMakeLists.txt
View File

@ -561,7 +561,7 @@ endif()
if(WITH_GPU_SHADER_BUILDER)
if(WITH_GPU_BUILDTIME_SHADER_BUILDER)
# TODO(@fclem) Fix this mess.
if(APPLE)
add_executable(shader_builder