diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2022-07-11 17:45:07 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2022-07-11 17:45:07 +0300 |
| commit | 8ca09e6c5eb6ac5401f7e7d89185e341921e7d3a (patch) | |
| tree | 0f94de8a5a261f3b3263359f0475f1664b317d82 | |
| parent | 76d86142367e0eb67e7a423ae5a4884bbd21d6ac (diff) | |
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.
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| m--------- | release/datafiles/locale | 0 | ||||
| m--------- | release/scripts/addons | 0 | ||||
| -rw-r--r-- | source/blender/gpu/CMakeLists.txt | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 22f31d6af48..6b7ee7f1887 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject 055bc5223c1cd249e32ccbc8e8796ba9925c8c3 +Subproject a2eb507891449a0b67582be9561840075513661 diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 7ea2e74fc41b2eabdbf639b812082e73823b09d +Subproject 7a8502871c34db0343cc7de52d6b49b15a84238 diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 0f539d4b30a..1c883f7fa41 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -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 |