diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2022-02-19 00:28:05 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2022-02-19 00:28:05 +0300 |
commit | 93cc892470109ab505f00f0b9d2bddb1a0a8179d (patch) | |
tree | 60f08236193506069c085b5c934ddbf93c0f8ece /source/blender/gpu | |
parent | 32660382f54819b5b21d3279ca0540d2df17b252 (diff) |
Revert "OCIO: Port shader creation logic to use GPUShaderCreateInfo"
This reverts commit 7f7c614ecddbcb66de0bff1657366970dede99be.
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/CMakeLists.txt | 9 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_shader_dependency.cc | 6 |
2 files changed, 0 insertions, 15 deletions
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index bb0b8640767..2b6b28bd649 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -469,21 +469,12 @@ if(WITH_IMAGE_DDS) add_definitions(-DWITH_DDS) endif() -if(WITH_OPENCOLORIO) - add_definitions(-DWITH_OCIO) -endif() - blender_add_lib(bf_gpu "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") target_link_libraries(bf_gpu PUBLIC bf_draw_shaders bf_gpu_shaders ) -if(WITH_OPENCOLORIO) - target_link_libraries(bf_gpu PUBLIC bf_ocio_shaders) -endif() - - if(CXX_WARN_NO_SUGGEST_OVERRIDE) target_compile_options(bf_gpu PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-Wsuggest-override>) endif() diff --git a/source/blender/gpu/intern/gpu_shader_dependency.cc b/source/blender/gpu/intern/gpu_shader_dependency.cc index 15ca7d0c3b1..5e03f7d0767 100644 --- a/source/blender/gpu/intern/gpu_shader_dependency.cc +++ b/source/blender/gpu/intern/gpu_shader_dependency.cc @@ -37,9 +37,6 @@ extern "C" { #define SHADER_SOURCE(datatoc, filename, filepath) extern char datatoc[]; #include "glsl_draw_source_list.h" #include "glsl_gpu_source_list.h" -#ifdef WITH_OCIO -# include "glsl_ocio_source_list.h" -#endif #undef SHADER_SOURCE } @@ -363,9 +360,6 @@ void gpu_shader_dependency_init() g_sources->add_new(filename, new GPUSource(filepath, filename, datatoc)); #include "glsl_draw_source_list.h" #include "glsl_gpu_source_list.h" -#ifdef WITH_OCIO -# include "glsl_ocio_source_list.h" -#endif #undef SHADER_SOURCE int errors = 0; |