[Bf-blender-cvs] [bc8b15f1a53] master: Realtime Compositor: Move shaders to compositor module

Wed Nov 2 12:56:06 CET 2022

Commit: bc8b15f1a532b078fcc4072295c442d140cdbc06
Author: Omar Emara
Date:   Wed Nov 2 13:55:23 2022 +0200
Branches: master
https://developer.blender.org/rBbc8b15f1a532b078fcc4072295c442d140cdbc06

Realtime Compositor: Move shaders to compositor module

This patch moves the GLSL shaders and their infos to the compositor
module as decided by the EEVEE & Viewport module. This is a non
functional change.

Differential Revision: https://developer.blender.org/D16360

Reviewed By: Clement Foucault

===================================================================

M	source/blender/compositor/realtime_compositor/CMakeLists.txt
R100	source/blender/gpu/shaders/compositor/compositor_alpha_crop.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_alpha_crop.glsl
R100	source/blender/gpu/shaders/compositor/compositor_bilateral_blur.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_bilateral_blur.glsl
R100	source/blender/gpu/shaders/compositor/compositor_blur.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_blur.glsl
R100	source/blender/gpu/shaders/compositor/compositor_blur_variable_size.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_blur_variable_size.glsl
R100	source/blender/gpu/shaders/compositor/compositor_bokeh_image.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_bokeh_image.glsl
R100	source/blender/gpu/shaders/compositor/compositor_box_mask.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_box_mask.glsl
R100	source/blender/gpu/shaders/compositor/compositor_convert.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_convert.glsl
R100	source/blender/gpu/shaders/compositor/compositor_despeckle.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_despeckle.glsl
R100	source/blender/gpu/shaders/compositor/compositor_directional_blur.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_directional_blur.glsl
R100	source/blender/gpu/shaders/compositor/compositor_edge_filter.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_edge_filter.glsl
R100	source/blender/gpu/shaders/compositor/compositor_ellipse_mask.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_ellipse_mask.glsl
R100	source/blender/gpu/shaders/compositor/compositor_filter.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_filter.glsl
R100	source/blender/gpu/shaders/compositor/compositor_flip.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_flip.glsl
R100	source/blender/gpu/shaders/compositor/compositor_image_crop.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_image_crop.glsl
R100	source/blender/gpu/shaders/compositor/compositor_morphological_distance.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_morphological_distance.glsl
R100	source/blender/gpu/shaders/compositor/compositor_morphological_distance_feather.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_morphological_distance_feather.glsl
R100	source/blender/gpu/shaders/compositor/compositor_morphological_distance_threshold.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_morphological_distance_threshold.glsl
R100	source/blender/gpu/shaders/compositor/compositor_morphological_step.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_morphological_step.glsl
R100	source/blender/gpu/shaders/compositor/compositor_normalize.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_normalize.glsl
R100	source/blender/gpu/shaders/compositor/compositor_parallel_reduction.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_parallel_reduction.glsl
R100	source/blender/gpu/shaders/compositor/compositor_projector_lens_distortion.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_projector_lens_distortion.glsl
R100	source/blender/gpu/shaders/compositor/compositor_realize_on_domain.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_realize_on_domain.glsl
R100	source/blender/gpu/shaders/compositor/compositor_screen_lens_distortion.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_screen_lens_distortion.glsl
R100	source/blender/gpu/shaders/compositor/compositor_set_alpha.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_set_alpha.glsl
R100	source/blender/gpu/shaders/compositor/compositor_split_viewer.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_split_viewer.glsl
R100	source/blender/gpu/shaders/compositor/compositor_symmetric_blur.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_symmetric_blur.glsl
R100	source/blender/gpu/shaders/compositor/compositor_symmetric_separable_blur.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_symmetric_separable_blur.glsl
R100	source/blender/gpu/shaders/compositor/compositor_tone_map_photoreceptor.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_tone_map_photoreceptor.glsl
R100	source/blender/gpu/shaders/compositor/compositor_tone_map_simple.glsl	source/blender/compositor/realtime_compositor/shaders/compositor_tone_map_simple.glsl
R100	source/blender/gpu/shaders/compositor/infos/compositor_alpha_crop_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_alpha_crop_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_bilateral_blur_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_bilateral_blur_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_blur_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_blur_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_blur_variable_size_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_blur_variable_size_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_bokeh_image_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_bokeh_image_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_box_mask_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_box_mask_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_convert_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_convert_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_despeckle_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_despeckle_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_directional_blur_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_directional_blur_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_edge_filter_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_edge_filter_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_ellipse_mask_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_ellipse_mask_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_filter_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_filter_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_flip_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_flip_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_image_crop_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_image_crop_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_morphological_distance_feather_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_morphological_distance_feather_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_morphological_distance_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_morphological_distance_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_morphological_distance_threshold_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_morphological_distance_threshold_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_morphological_step_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_morphological_step_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_normalize_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_normalize_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_parallel_reduction_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_parallel_reduction_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_projector_lens_distortion_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_projector_lens_distortion_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_realize_on_domain_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_realize_on_domain_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_screen_lens_distortion_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_screen_lens_distortion_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_set_alpha_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_set_alpha_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_split_viewer_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_split_viewer_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_symmetric_blur_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_symmetric_blur_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_symmetric_separable_blur_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_symmetric_separable_blur_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_tone_map_photoreceptor_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_tone_map_photoreceptor_info.hh
R100	source/blender/gpu/shaders/compositor/infos/compositor_tone_map_simple_info.hh	source/blender/compositor/realtime_compositor/shaders/infos/compositor_tone_map_simple_info.hh
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_alpha_over.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_alpha_over.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_blur_common.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_blur_common.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_bright_contrast.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_bright_contrast.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_channel_matte.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_channel_matte.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_chroma_matte.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_chroma_matte.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_color_balance.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_color_balance.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_color_correction.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_color_correction.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_color_matte.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_color_matte.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_color_spill.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_color_spill.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_color_to_luminance.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_color_to_luminance.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_difference_matte.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_difference_matte.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_distance_matte.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_distance_matte.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_exposure.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_exposure.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_gamma.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_gamma.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_hue_correct.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_hue_correct.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_hue_saturation_value.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_hue_saturation_value.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_invert.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_invert.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_luminance_matte.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_luminance_matte.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_main.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_main.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_map_value.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_map_value.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_normal.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_normal.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_posterize.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_posterize.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_separate_combine.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_separate_combine.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_set_alpha.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_set_alpha.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_store_output.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_store_output.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_texture_utilities.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_texture_utilities.glsl
R100	source/blender/gpu/shaders/compositor/library/gpu_shader_compositor_type_conversion.glsl	source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_type_conversion.glsl
M	source/blender/gpu/CMakeLists.txt
M	source/blender/gpu/intern/gpu_shader_create_info.cc
M	source/blender/gpu/intern/gpu_shader_dependency.cc

===================================================================

diff --git a/source/blender/compositor/realtime_compositor/CMakeLists.txt b/source/blender/compositor/realtime_compositor/CMakeLists.txt
index bab0b5385ec..2402adcadaf 100644
--- a/source/blender/compositor/realtime_compositor/CMakeLists.txt
+++ b/source/blender/compositor/realtime_compositor/CMakeLists.txt
@@ -68,4 +68,129 @@ set(LIB
   bf_blenkernel
 )
 
+set(GLSL_SRC
+  shaders/compositor_alpha_crop.glsl
+  shaders/compositor_bilateral_blur.glsl
+  shaders/compositor_blur.glsl
+  shaders/compositor_blur_variable_size.glsl
+  shaders/compositor_bokeh_image.glsl
+  shaders/compositor_box_mask.glsl
+  shaders/compositor_convert.glsl
+  shaders/compositor_despeckle.glsl
+  shaders/compositor_directional_blur.glsl
+  shaders/compositor_edge_filter.glsl
+  shaders/compositor_ellipse_mask.glsl
+  shaders/compositor_filter.glsl
+  shaders/compositor_flip.glsl
+  shaders/compositor_image_crop.glsl
+  shaders/compositor_morphological_distance.glsl
+  shaders/compositor_morphological_distance_feather.glsl
+  shaders/compositor_morphological_distance_threshold.glsl
+  shaders/compositor_morphological_step.glsl
+  shaders/compositor_normalize.glsl
+  shaders/compositor_parallel_reduction.glsl
+  shaders/compositor_projector_lens_distortion.glsl
+  shaders/compositor_realize_on_domain.glsl
+  shaders/compositor_screen_lens_distortion.glsl
+  shaders/compositor_set_alpha.glsl
+  shaders/compositor_split_viewer.glsl
+  shaders/compositor_symmetric_blur.glsl
+  shaders/compositor_symmetric_separable_blur.glsl
+  shaders/compositor_tone_map_photoreceptor.glsl
+  shaders/compositor_tone_map_simple.glsl
+
+  shaders/library/gpu_shader_compositor_alpha_over.glsl
+  shaders/library/gpu_shader_compositor_blur_common.glsl
+  shaders/library/gpu_shader_compositor_bright_contrast.glsl
+  shaders/library/gpu_shader_compositor_channel_matte.glsl
+  shaders/library/gpu_shader_compositor_chroma_matte.glsl
+  shaders/library/gpu_shader_compositor_color_balance.glsl
+  shaders/library/gpu_shader_compositor_color_correction.glsl
+  shaders/library/gpu_shader_compositor_color_matte.glsl
+  shaders/library/gpu_shader_compositor_color_spill.glsl
+  shaders/library/gpu_shader_compositor_color_to_luminance.glsl
+  shaders/library/gpu_shader_compositor_difference_matte.glsl
+  shaders/library/gpu_shader_compositor_distance_matte.glsl
+  shaders/library/gpu_shader_compositor_exposure.glsl
+  shaders/library/gpu_shader_compositor_gamma.glsl
+  shaders/library/gpu_shader_compositor_hue_correct.glsl
+  shaders/library/gpu_shader_compositor_hue_saturation_value.glsl
+  shaders/library/gpu_shader_compositor_invert.glsl
+  shaders/library/gpu_shader_compositor_luminance_matte.glsl
+  shaders/library/gpu_shader_compositor_main.glsl
+  shaders/library/gpu_shader_compositor_map_value.glsl
+  shaders/library/gpu_shader_compositor_normal.glsl
+  shaders/library/gpu_shader_compositor_posterize.glsl
+  shaders/library/gpu_shader_compositor_separate_combine.glsl
+  shaders/library/gpu_shader_compositor_set_alpha.glsl
+  shaders/library/gpu_shader_compositor_store_output.glsl
+  shaders/library/gpu_shader_compositor_texture_utilities.glsl
+  shaders/library/gpu_shader_compositor_type_conversion.glsl
+)
+
+set(GLSL_C)
+foreach(GLSL_FILE ${GLSL_SRC})
+  data_to_c_simple(${GLSL_FILE} GLSL_C)
+endforeach()
+
+blender_add_lib(bf_compositor_shaders "${GLSL_C}" "" "" "")
+
+list(APPEND LIB
+  bf_compositor_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_compositor_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_compositor_shaders PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
+
+set(SRC_SHADER_CREATE_INFOS
+  shaders/infos/compositor_alpha_crop_info.hh
+  shaders/infos/compositor_bilateral_blur_info.hh
+  shaders/infos/compositor_blur_info.hh
+  shaders/infos/compositor_blur_variable_size_info.hh
+  shaders/infos/compositor_bokeh_image_info.hh
+  shaders/infos/compositor_box_mask_info.hh
+  shaders/infos/compositor_convert_info.hh
+  shaders/infos/compositor_despeckle_info.hh
+  shaders/infos/compositor_directional_blur_info.hh
+  shaders/infos/compositor_edge_filter_info.hh
+  shaders/infos/compositor_ellipse_mask_info.hh
+  shaders/infos/compositor_filter_info.hh
+  shaders/infos/compositor_flip_info.hh
+  shaders/infos/compositor_image_crop_info.hh
+  shaders/infos/compositor_morphological_distance_feather_info.hh
+  shaders/infos/compositor_morphological_distance_info.hh
+  shaders/infos/compositor_morphological_distance_threshold_info.hh
+  shaders/infos/compositor_morphological_step_info.hh
+  shaders/infos/compositor_normalize_info.hh
+  shaders/infos/compositor_parallel_reduction_info.hh
+  shaders/infos/compositor_projector_lens_distortion_info.hh
+  shaders/infos/compositor_realize_on_domain_info.hh
+  shaders/infos/compositor_screen_lens_distortion_info.hh
+  shaders/infos/compositor_set_alpha_info.hh
+  shaders/infos/compositor_split_viewer_info.hh
+  shaders/infos/compositor_symmetric_blur_info.hh
+  shaders/infos/compositor_symmetric_separable_blur_info.hh
+  shaders/infos/compositor_tone_map_photoreceptor_info.hh
+  shaders/infos/compositor_tone_map_simple_info.hh
+)
+
+set(SHADER_CREATE_INFOS_CONTENT "")
+foreach(DESCRIPTOR_FILE ${SRC_SHADER_CREATE_INFOS})
+  string(APPEND SHADER_CREATE_INFOS_CONTENT "#include \"${DESCRIPTOR_FILE}\"\n")
+endforeach()
+
+set(shader_create_info_list_file "${CMAKE_CURRENT_BINARY_DIR}/compositor_shader_create_info_list.hh")
+file(GENERATE OUTPUT ${shader_create_info_list_file} CONTENT "${SHADER_CREATE_INFOS_CONTENT}")
+
 blender_add_lib(bf_realtime_compositor "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/gpu/shaders/compositor/compositor_alpha_crop.glsl b/source/blender/compositor/realtime_compositor/shaders/compositor_alpha_crop.glsl
similarity index 100%
rename from source/blender/gpu/shaders/compositor/compositor_alpha_crop.glsl
rename to source/blender/compositor/realtime_compositor/shaders/compositor_alpha_crop.glsl
diff --git a/source/blender/gpu/shaders/compositor/compositor_bilateral_blur.glsl b/source/blender/compositor/realtime_compositor/shaders/compositor_bilateral_blur.glsl
similarity index 100%
rename from source/blender/gpu/shaders/compositor/compositor_bilateral_blur.glsl
rename to source/blender/compositor/realtime_compositor/shaders/compositor_bilateral_blur.glsl
diff --git a/source/blender/gpu/shaders/compositor/compositor_blur.glsl b/source/blender/compositor/realtime_compositor/shaders/compositor_blur.glsl
similarity index 100%
rename from source/blender/gpu/shaders/compositor/compositor_blur.glsl
rename to source/blender/compositor/realtime_compositor/shaders/compositor_blur.glsl
diff --git a/source/blender/gpu/shaders/compositor/compositor_blur_variable_size.glsl b/source/blender/compositor/realtime_compositor/shaders/compositor_blur_variable_size.glsl
similarity index 100%
rename from source/blender/gpu/shaders/compositor/compositor_blur_variable_size.glsl
rename to source/blender/compositor/realtime_compositor/shaders/compositor_blur_variable_size.glsl
diff --git a/source/blender/gpu/shaders/compositor/compositor_bokeh_image.glsl b/source/blender/compositor/realtime_compositor/shaders/compositor_bokeh_image.glsl
similarity index 100%
rename from source/blender/gpu/shaders/compositor/compositor_bokeh_image.glsl
rename to source/blender/compositor/realtime_compositor/shaders/compositor_bokeh_image.glsl
diff --git a/source/blender/gpu/shaders/compositor/compositor_box_mask.glsl b/source/blender/compositor/realtime_compositor/shaders/compositor_box_mask.glsl
similarity index 100%
rename from source/blender/gpu/shaders/compositor/compositor_box_mask.glsl
rename to source/blender/compositor/realtime_compositor/shaders/compositor_box_mask.glsl
diff --git a/source/blender/gpu/shaders/compositor/compositor_convert.glsl b/source/blender/compositor/realtime_compositor/shaders/compositor_convert.glsl
similarity index 100%
rename from source/blender/gpu/shaders/compositor/compositor_convert.glsl
rename to source/blender/compositor/realtime_compositor/shaders/compositor_convert.glsl
diff --git a/source/blender/gpu/shaders/compositor/compositor_despeckle.glsl b/source/blender/compositor/realtime_compositor/shaders/compositor_despeckle.glsl
similarity index 100%
rename from source/blender/gpu/shaders/compositor/compositor_despeckle.glsl
rename to source/blender/compositor/realtime_compositor/shaders/compositor_despeckle.glsl
diff --git a/source/blender/gpu/shaders/compositor/compositor_directional_blur.glsl b/source/blender/compositor/realtime_compositor/shaders/compositor_directional_blur.glsl
similarity index 100%
rename from source/blender/gpu/shaders/compositor/compositor_directional_blur.glsl
rename to source/blender/compositor/realtime_compositor/shaders/compositor_directional_blur.glsl
diff --git a/source/blender/gpu/shaders/compositor/compositor_edge_filter.glsl b/source/blender/compositor/realtime_compositor/shaders/compositor_edge_filter.glsl
similarity index 100%
rename from source/blender/gpu/shaders/compositor/compositor_edge_filter.glsl
rename to source/blender/compositor/realtime_compositor/shaders/compositor_edge_filter.glsl
diff --git a/source/blender/gpu/shaders/compositor/compositor_ellipse_mask.glsl b/source/blender/compositor/realtime_compositor/shaders/compositor_ellipse_mask.glsl
similarity index 100%
rename from source/blender/gpu/shaders/compositor/compositor_ellipse_mask.glsl
rename to source/blender/compositor/realtime_compositor/shaders/compositor_ellipse_mask.glsl
diff --git a/source/blender/gpu/shaders/compositor/compositor_filter.glsl b/source/blender/compositor/realtime_compositor/shaders/compositor_filter.glsl
similarity index 100%
rename from source/blender/gpu/shaders/

@@ Diff output truncated at 10240 characters. @@

