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:
@@ -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()
|
||||
|
||||
|
||||
Submodule release/datafiles/locale updated: 055bc5223c...a2eb507891
Submodule release/scripts/addons updated: 7ea2e74fc4...7a8502871c
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user