Merge branch 'blender-v3.1-release'

# Conflicts:
#	intern/opencolorio/ocio_shader_shared.hh

1 files changed, 2 insertions, 34 deletions

diff --git a/intern/opencolorio/CMakeLists.txt b/intern/opencolorio/CMakeLists.txt
index be6ccc5c2c5..dfccb9301ac 100644
--- a/intern/opencolorio/CMakeLists.txt
+++ b/intern/opencolorio/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../guardedalloc
   ../../source/blender/blenlib
   ../../source/blender/gpu
-  ../../source/blender/gpu/intern
   ../../source/blender/makesdna
 )
 
@@ -21,7 +20,6 @@ set(SRC
 
   ocio_capi.h
   ocio_impl.h
-  ocio_shader_shared.hh
 )
 
 set(LIB
@@ -58,38 +56,8 @@ if(WITH_OPENCOLORIO)
     )
   endif()
 
-  set(GLSL_SRC
-    gpu_shader_display_transform_vert.glsl
-    gpu_shader_display_transform_frag.glsl
-
-    ocio_shader_shared.hh
-  )
-
-  set(GLSL_C)
-  foreach(GLSL_FILE ${GLSL_SRC})
-    data_to_c_simple(${GLSL_FILE} GLSL_C)
-  endforeach()
-
-  blender_add_lib(bf_ocio_shaders "${GLSL_C}" "" "" "")
-
-  list(APPEND LIB
-    bf_ocio_shaders
-  )
-
-  set(GLSL_SOURCE_CONTENT "")
-  foreach(GLSL_FILE ${GLSL_SRC})
-    get_filename_component(GLSL_FILE_NAME ${GLSL_FILE} NAME)
-    string(REPLACE "." "_" GLSL_FILE_NAME_UNDERSCORES ${GLSL_FILE_NAME})
-    string(APPEND GLSL_SOURCE_CONTENT "SHADER_SOURCE\(datatoc_${GLSL_FILE_NAME_UNDERSCORES}, \"${GLSL_FILE_NAME}\", \"${GLSL_FILE}\"\)\n")
-  endforeach()
-
-  set(glsl_source_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_ocio_source_list.h")
-  file(GENERATE OUTPUT ${glsl_source_list_file} CONTENT "${GLSL_SOURCE_CONTENT}")
-  list(APPEND SRC ${glsl_source_list_file})
-  list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR})
-
-  target_include_directories(bf_ocio_shaders PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
-
+  data_to_c_simple(gpu_shader_display_transform.glsl SRC)
+  data_to_c_simple(gpu_shader_display_transform_vertex.glsl SRC)
 endif()