Cleanup: move compositor files out of realtime_compositor folder

By now it is just a "compositor", so move the files one folder up.
Things that were under realtime_compositor/intern move into
already existing intern folder.

Pull Request: https://projects.blender.org/blender/blender/pulls/132004

source/blender/compositor/CMakeLists.txt

@@ -1,26 +1,22 @@
-# SPDX-FileCopyrightText: 2011 Blender Authors
+# SPDX-FileCopyrightText: 2011-2024 Blender Authors
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-add_subdirectory(realtime_compositor)
-
 set(INC
   .
-  intern
-  realtime_compositor
+  algorithms
+  cached_resources
+  utilities
   ../blenkernel
   ../blentranslation
+  ../functions
+  ../gpu
+  ../gpu/intern
   ../imbuf
   ../makesrna
   ../nodes
-  ../windowmanager
-  ../nodes/composite
-  ../nodes/intern
   ../render
   ../render/intern
-
-  # RNA_prototypes.hh
-  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
 set(INC_SYS
@@ -28,22 +24,297 @@ set(INC_SYS
 )
 
 set(SRC
+  COM_compile_state.hh
   COM_compositor.hh
+  COM_context.hh
+  COM_conversion_operation.hh
+  COM_domain.hh
+  COM_evaluator.hh
+  COM_input_descriptor.hh
+  COM_input_single_value_operation.hh
+  COM_meta_data.hh
+  COM_multi_function_procedure_operation.hh
+  COM_node_operation.hh
+  COM_operation.hh
+  COM_pixel_operation.hh
+  COM_profiler.hh
+  COM_realize_on_domain_operation.hh
+  COM_reduce_to_single_value_operation.hh
+  COM_render_context.hh
+  COM_result.hh
+  COM_scheduler.hh
+  COM_shader_node.hh
+  COM_shader_operation.hh
+  COM_simple_operation.hh
+  COM_static_cache_manager.hh
+  COM_texture_pool.hh
+  COM_utilities.hh  
 
   intern/COM_compositor.cc
+  intern/compile_state.cc
+  intern/context.cc
+  intern/conversion_operation.cc
+  intern/domain.cc
+  intern/evaluator.cc
+  intern/input_single_value_operation.cc
+  intern/meta_data.cc
+  intern/multi_function_procedure_operation.cc
+  intern/node_operation.cc
+  intern/operation.cc
+  intern/pixel_operation.cc
+  intern/profiler.cc
+  intern/realize_on_domain_operation.cc
+  intern/reduce_to_single_value_operation.cc
+  intern/render_context.cc
+  intern/result.cc
+  intern/scheduler.cc
+  intern/shader_node.cc
+  intern/shader_operation.cc
+  intern/simple_operation.cc
+  intern/static_cache_manager.cc
+  intern/texture_pool.cc
+  intern/utilities.cc
+
+  algorithms/intern/compute_preview.cc
+  algorithms/intern/deriche_gaussian_blur.cc
+  algorithms/intern/extract_alpha.cc
+  algorithms/intern/gamma_correct.cc
+  algorithms/intern/jump_flooding.cc
+  algorithms/intern/morphological_blur.cc
+  algorithms/intern/morphological_distance.cc
+  algorithms/intern/morphological_distance_feather.cc
+  algorithms/intern/parallel_reduction.cc
+  algorithms/intern/realize_on_domain.cc
+  algorithms/intern/recursive_gaussian_blur.cc
+  algorithms/intern/smaa.cc
+  algorithms/intern/summed_area_table.cc
+  algorithms/intern/symmetric_separable_blur.cc
+  algorithms/intern/symmetric_separable_blur_variable_size.cc
+  algorithms/intern/transform.cc
+  algorithms/intern/van_vliet_gaussian_blur.cc
+
+  algorithms/COM_algorithm_compute_preview.hh
+  algorithms/COM_algorithm_deriche_gaussian_blur.hh
+  algorithms/COM_algorithm_extract_alpha.hh
+  algorithms/COM_algorithm_gamma_correct.hh
+  algorithms/COM_algorithm_jump_flooding.hh
+  algorithms/COM_algorithm_morphological_blur.hh
+  algorithms/COM_algorithm_morphological_distance.hh
+  algorithms/COM_algorithm_morphological_distance_feather.hh
+  algorithms/COM_algorithm_parallel_reduction.hh
+  algorithms/COM_algorithm_realize_on_domain.hh
+  algorithms/COM_algorithm_recursive_gaussian_blur.hh
+  algorithms/COM_algorithm_smaa.hh
+  algorithms/COM_algorithm_summed_area_table.hh
+  algorithms/COM_algorithm_symmetric_separable_blur.hh
+  algorithms/COM_algorithm_symmetric_separable_blur_variable_size.hh
+  algorithms/COM_algorithm_transform.hh
+  algorithms/COM_algorithm_van_vliet_gaussian_blur.hh
+
+  cached_resources/intern/bokeh_kernel.cc
+  cached_resources/intern/cached_image.cc
+  cached_resources/intern/cached_mask.cc
+  cached_resources/intern/cached_shader.cc
+  cached_resources/intern/cached_texture.cc
+  cached_resources/intern/deriche_gaussian_coefficients.cc
+  cached_resources/intern/distortion_grid.cc
+  cached_resources/intern/fog_glow_kernel.cc
+  cached_resources/intern/keying_screen.cc
+  cached_resources/intern/morphological_distance_feather_weights.cc
+  cached_resources/intern/ocio_color_space_conversion_shader.cc
+  cached_resources/intern/smaa_precomputed_textures.cc
+  cached_resources/intern/symmetric_blur_weights.cc
+  cached_resources/intern/symmetric_separable_blur_weights.cc
+  cached_resources/intern/van_vliet_gaussian_coefficients.cc
+
+  cached_resources/COM_bokeh_kernel.hh
+  cached_resources/COM_cached_image.hh
+  cached_resources/COM_cached_mask.hh
+  cached_resources/COM_cached_resource.hh
+  cached_resources/COM_cached_shader.hh
+  cached_resources/COM_cached_texture.hh
+  cached_resources/COM_deriche_gaussian_coefficients.hh
+  cached_resources/COM_distortion_grid.hh
+  cached_resources/COM_fog_glow_kernel.hh
+  cached_resources/COM_keying_screen.hh
+  cached_resources/COM_morphological_distance_feather_weights.hh
+  cached_resources/COM_ocio_color_space_conversion_shader.hh
+  cached_resources/COM_smaa_precomputed_textures.hh
+  cached_resources/COM_symmetric_blur_weights.hh
+  cached_resources/COM_symmetric_separable_blur_weights.hh
+  cached_resources/COM_van_vliet_gaussian_coefficients.hh
+
+  utilities/COM_utilities_diagonals.hh  
 )
 
 set(LIB
   bf_blenkernel
+  bf_functions
+  bf_gpu
+  bf_imbuf
+  bf_render
   PRIVATE bf::blenlib
-  PRIVATE bf::depsgraph
   PRIVATE bf::dna
-  PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
-  bf_realtime_compositor
-  PRIVATE bf::intern::atomic
 )
 
+set(GLSL_SRC
+  shaders/compositor_alpha_crop.glsl
+  shaders/compositor_bilateral_blur.glsl
+  shaders/compositor_bokeh_blur.glsl
+  shaders/compositor_bokeh_blur_variable_size.glsl
+  shaders/compositor_bokeh_image.glsl
+  shaders/compositor_box_mask.glsl
+  shaders/compositor_compute_preview.glsl
+  shaders/compositor_convert.glsl
+  shaders/compositor_cryptomatte_image.glsl
+  shaders/compositor_cryptomatte_matte.glsl
+  shaders/compositor_cryptomatte_pick.glsl
+  shaders/compositor_defocus_blur.glsl
+  shaders/compositor_defocus_radius_from_depth.glsl
+  shaders/compositor_defocus_radius_from_scale.glsl
+  shaders/compositor_despeckle.glsl
+  shaders/compositor_deriche_gaussian_blur.glsl
+  shaders/compositor_deriche_gaussian_blur_sum.glsl
+  shaders/compositor_directional_blur.glsl
+  shaders/compositor_displace.glsl
+  shaders/compositor_double_edge_mask_compute_boundary.glsl
+  shaders/compositor_double_edge_mask_compute_gradient.glsl
+  shaders/compositor_edge_filter.glsl
+  shaders/compositor_ellipse_mask.glsl
+  shaders/compositor_filter.glsl
+  shaders/compositor_flip.glsl
+  shaders/compositor_gamma_correct.glsl
+  shaders/compositor_glare_bloom_downsample.glsl
+  shaders/compositor_glare_bloom_upsample.glsl
+  shaders/compositor_glare_ghost_accumulate.glsl
+  shaders/compositor_glare_ghost_base.glsl
+  shaders/compositor_glare_highlights.glsl
+  shaders/compositor_glare_mix.glsl
+  shaders/compositor_glare_simple_star_anti_diagonal_pass.glsl
+  shaders/compositor_glare_simple_star_diagonal_pass.glsl
+  shaders/compositor_glare_simple_star_horizontal_pass.glsl
+  shaders/compositor_glare_simple_star_vertical_pass.glsl
+  shaders/compositor_glare_streaks_accumulate.glsl
+  shaders/compositor_glare_streaks_filter.glsl
+  shaders/compositor_id_mask.glsl
+  shaders/compositor_image_crop.glsl
+  shaders/compositor_inpaint_compute_boundary.glsl
+  shaders/compositor_inpaint_compute_region.glsl
+  shaders/compositor_inpaint_fill_region.glsl
+  shaders/compositor_jump_flooding.glsl
+  shaders/compositor_keying_compute_image.glsl
+  shaders/compositor_keying_compute_matte.glsl
+  shaders/compositor_keying_extract_chroma.glsl
+  shaders/compositor_keying_replace_chroma.glsl
+  shaders/compositor_keying_screen.glsl
+  shaders/compositor_keying_tweak_matte.glsl
+  shaders/compositor_kuwahara_anisotropic.glsl
+  shaders/compositor_kuwahara_anisotropic_compute_structure_tensor.glsl
+  shaders/compositor_kuwahara_classic.glsl
+  shaders/compositor_map_uv_anisotropic.glsl
+  shaders/compositor_map_uv_nearest_neighbour.glsl
+  shaders/compositor_morphological_blur.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_motion_blur.glsl
+  shaders/compositor_motion_blur_max_velocity_dilate.glsl
+  shaders/compositor_movie_distortion.glsl
+  shaders/compositor_normalize.glsl
+  shaders/compositor_parallel_reduction.glsl
+  shaders/compositor_pixelate.glsl
+  shaders/compositor_plane_deform.glsl
+  shaders/compositor_plane_deform_mask.glsl
+  shaders/compositor_plane_deform_motion_blur.glsl
+  shaders/compositor_plane_deform_motion_blur_mask.glsl
+  shaders/compositor_premultiply_alpha.glsl
+  shaders/compositor_projector_lens_distortion.glsl
+  shaders/compositor_read_input.glsl
+  shaders/compositor_realize_on_domain.glsl
+  shaders/compositor_scale_variable.glsl
+  shaders/compositor_screen_lens_distortion.glsl
+  shaders/compositor_smaa_blending_weight_calculation.glsl
+  shaders/compositor_smaa_edge_detection.glsl
+  shaders/compositor_smaa_neighborhood_blending.glsl
+  shaders/compositor_split.glsl
+  shaders/compositor_summed_area_table_compute_complete_blocks.glsl
+  shaders/compositor_summed_area_table_compute_complete_x_prologues.glsl
+  shaders/compositor_summed_area_table_compute_complete_y_prologues.glsl
+  shaders/compositor_summed_area_table_compute_incomplete_prologues.glsl
+  shaders/compositor_sun_beams.glsl
+  shaders/compositor_symmetric_blur.glsl
+  shaders/compositor_symmetric_blur_variable_size.glsl
+  shaders/compositor_symmetric_separable_blur.glsl
+  shaders/compositor_symmetric_separable_blur_variable_size.glsl
+  shaders/compositor_tone_map_photoreceptor.glsl
+  shaders/compositor_tone_map_simple.glsl
+  shaders/compositor_van_vliet_gaussian_blur.glsl
+  shaders/compositor_van_vliet_gaussian_blur_sum.glsl
+  shaders/compositor_write_output.glsl
+  shaders/compositor_z_combine_compute_mask.glsl
+  shaders/compositor_z_combine_from_mask.glsl
+  shaders/compositor_z_combine_simple.glsl
+
+  shaders/library/gpu_shader_compositor_alpha_over.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_image_diagonals.glsl
+  shaders/library/gpu_shader_compositor_invert.glsl
+  shaders/library/gpu_shader_compositor_jump_flooding_lib.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_motion_blur_lib.glsl
+  shaders/library/gpu_shader_compositor_normal.glsl
+  shaders/library/gpu_shader_compositor_ocio_processor.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_summed_area_table_lib.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})
+  glsl_to_c(${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})
+
 if(WITH_TBB)
   if(WIN32)
     # TBB includes Windows.h which will define min/max macros
@@ -65,6 +336,20 @@ if(WITH_OPENIMAGEDENOISE)
   )
 endif()
 
+if(WITH_OPENCOLORIO)
+  add_definitions(
+    -DWITH_OCIO
+  )
+
+  list(APPEND INC_SYS
+    ${OPENCOLORIO_INCLUDE_DIRS}
+  )
+
+  list(APPEND LIB
+    ${OPENCOLORIO_LIBRARIES}
+  )
+endif()
+
 if(WITH_FFTW3)
   list(APPEND INC_SYS
     ${FFTW3_INCLUDE_DIRS}
@@ -77,11 +362,6 @@ endif()
 
 blender_add_lib(bf_compositor "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-blender_set_target_unity_build(bf_compositor 10)
-
 if(CXX_WARN_NO_SUGGEST_OVERRIDE)
   target_compile_options(bf_compositor PRIVATE "-Wsuggest-override")
 endif()
-
-# RNA_prototypes.hh
-add_dependencies(bf_compositor bf_rna)

source/blender/compositor/realtime_compositor/CMakeLists.txt

@@ -1,349 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Blender Authors
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(INC
-  .
-  algorithms
-  cached_resources
-  utilities
-  ../../blenkernel
-  ../../blentranslation
-  ../../draw
-  ../../functions
-  ../../gpu
-  ../../imbuf
-  ../../makesrna
-  ../../nodes
-  ../../render
-  ../../gpu/intern
-
-)
-
-set(INC_SYS
-)
-
-set(SRC
-  intern/compile_state.cc
-  intern/context.cc
-  intern/conversion_operation.cc
-  intern/domain.cc
-  intern/evaluator.cc
-  intern/input_single_value_operation.cc
-  intern/meta_data.cc
-  intern/multi_function_procedure_operation.cc
-  intern/node_operation.cc
-  intern/operation.cc
-  intern/pixel_operation.cc
-  intern/profiler.cc
-  intern/realize_on_domain_operation.cc
-  intern/reduce_to_single_value_operation.cc
-  intern/render_context.cc
-  intern/result.cc
-  intern/scheduler.cc
-  intern/shader_node.cc
-  intern/shader_operation.cc
-  intern/simple_operation.cc
-  intern/static_cache_manager.cc
-  intern/texture_pool.cc
-  intern/utilities.cc
-
-  COM_compile_state.hh
-  COM_context.hh
-  COM_conversion_operation.hh
-  COM_domain.hh
-  COM_evaluator.hh
-  COM_input_descriptor.hh
-  COM_input_single_value_operation.hh
-  COM_meta_data.hh
-  COM_multi_function_procedure_operation.hh
-  COM_node_operation.hh
-  COM_operation.hh
-  COM_pixel_operation.hh
-  COM_profiler.hh
-  COM_realize_on_domain_operation.hh
-  COM_reduce_to_single_value_operation.hh
-  COM_render_context.hh
-  COM_result.hh
-  COM_scheduler.hh
-  COM_shader_node.hh
-  COM_shader_operation.hh
-  COM_simple_operation.hh
-  COM_static_cache_manager.hh
-  COM_texture_pool.hh
-  COM_utilities.hh
-
-  algorithms/intern/compute_preview.cc
-  algorithms/intern/deriche_gaussian_blur.cc
-  algorithms/intern/extract_alpha.cc
-  algorithms/intern/gamma_correct.cc
-  algorithms/intern/jump_flooding.cc
-  algorithms/intern/morphological_blur.cc
-  algorithms/intern/morphological_distance.cc
-  algorithms/intern/morphological_distance_feather.cc
-  algorithms/intern/parallel_reduction.cc
-  algorithms/intern/realize_on_domain.cc
-  algorithms/intern/recursive_gaussian_blur.cc
-  algorithms/intern/smaa.cc
-  algorithms/intern/summed_area_table.cc
-  algorithms/intern/symmetric_separable_blur.cc
-  algorithms/intern/symmetric_separable_blur_variable_size.cc
-  algorithms/intern/transform.cc
-  algorithms/intern/van_vliet_gaussian_blur.cc
-
-  algorithms/COM_algorithm_compute_preview.hh
-  algorithms/COM_algorithm_deriche_gaussian_blur.hh
-  algorithms/COM_algorithm_extract_alpha.hh
-  algorithms/COM_algorithm_gamma_correct.hh
-  algorithms/COM_algorithm_jump_flooding.hh
-  algorithms/COM_algorithm_morphological_blur.hh
-  algorithms/COM_algorithm_morphological_distance.hh
-  algorithms/COM_algorithm_morphological_distance_feather.hh
-  algorithms/COM_algorithm_parallel_reduction.hh
-  algorithms/COM_algorithm_realize_on_domain.hh
-  algorithms/COM_algorithm_recursive_gaussian_blur.hh
-  algorithms/COM_algorithm_smaa.hh
-  algorithms/COM_algorithm_summed_area_table.hh
-  algorithms/COM_algorithm_symmetric_separable_blur.hh
-  algorithms/COM_algorithm_symmetric_separable_blur_variable_size.hh
-  algorithms/COM_algorithm_transform.hh
-  algorithms/COM_algorithm_van_vliet_gaussian_blur.hh
-
-  cached_resources/intern/bokeh_kernel.cc
-  cached_resources/intern/cached_image.cc
-  cached_resources/intern/cached_mask.cc
-  cached_resources/intern/cached_shader.cc
-  cached_resources/intern/cached_texture.cc
-  cached_resources/intern/deriche_gaussian_coefficients.cc
-  cached_resources/intern/distortion_grid.cc
-  cached_resources/intern/fog_glow_kernel.cc
-  cached_resources/intern/keying_screen.cc
-  cached_resources/intern/morphological_distance_feather_weights.cc
-  cached_resources/intern/ocio_color_space_conversion_shader.cc
-  cached_resources/intern/smaa_precomputed_textures.cc
-  cached_resources/intern/symmetric_blur_weights.cc
-  cached_resources/intern/symmetric_separable_blur_weights.cc
-  cached_resources/intern/van_vliet_gaussian_coefficients.cc
-
-  cached_resources/COM_bokeh_kernel.hh
-  cached_resources/COM_cached_image.hh
-  cached_resources/COM_cached_mask.hh
-  cached_resources/COM_cached_resource.hh
-  cached_resources/COM_cached_shader.hh
-  cached_resources/COM_cached_texture.hh
-  cached_resources/COM_deriche_gaussian_coefficients.hh
-  cached_resources/COM_distortion_grid.hh
-  cached_resources/COM_fog_glow_kernel.hh
-  cached_resources/COM_keying_screen.hh
-  cached_resources/COM_morphological_distance_feather_weights.hh
-  cached_resources/COM_ocio_color_space_conversion_shader.hh
-  cached_resources/COM_smaa_precomputed_textures.hh
-  cached_resources/COM_symmetric_blur_weights.hh
-  cached_resources/COM_symmetric_separable_blur_weights.hh
-  cached_resources/COM_van_vliet_gaussian_coefficients.hh
-
-  utilities/COM_utilities_diagonals.hh
-)
-
-set(LIB
-  PRIVATE bf::dna
-  bf_gpu
-  PRIVATE bf::intern::guardedalloc
-  bf_nodes
-  bf_imbuf
-  bf_render
-  PRIVATE bf::blenlib
-  bf_blenkernel
-  bf_functions
-)
-
-set(GLSL_SRC
-  shaders/compositor_alpha_crop.glsl
-  shaders/compositor_bilateral_blur.glsl
-  shaders/compositor_bokeh_blur.glsl
-  shaders/compositor_bokeh_blur_variable_size.glsl
-  shaders/compositor_bokeh_image.glsl
-  shaders/compositor_box_mask.glsl
-  shaders/compositor_compute_preview.glsl
-  shaders/compositor_convert.glsl
-  shaders/compositor_cryptomatte_image.glsl
-  shaders/compositor_cryptomatte_matte.glsl
-  shaders/compositor_cryptomatte_pick.glsl
-  shaders/compositor_defocus_blur.glsl
-  shaders/compositor_defocus_radius_from_depth.glsl
-  shaders/compositor_defocus_radius_from_scale.glsl
-  shaders/compositor_despeckle.glsl
-  shaders/compositor_deriche_gaussian_blur.glsl
-  shaders/compositor_deriche_gaussian_blur_sum.glsl
-  shaders/compositor_directional_blur.glsl
-  shaders/compositor_displace.glsl
-  shaders/compositor_double_edge_mask_compute_boundary.glsl
-  shaders/compositor_double_edge_mask_compute_gradient.glsl
-  shaders/compositor_edge_filter.glsl
-  shaders/compositor_ellipse_mask.glsl
-  shaders/compositor_filter.glsl
-  shaders/compositor_flip.glsl
-  shaders/compositor_gamma_correct.glsl
-  shaders/compositor_glare_bloom_downsample.glsl
-  shaders/compositor_glare_bloom_upsample.glsl
-  shaders/compositor_glare_ghost_accumulate.glsl
-  shaders/compositor_glare_ghost_base.glsl
-  shaders/compositor_glare_highlights.glsl
-  shaders/compositor_glare_mix.glsl
-  shaders/compositor_glare_simple_star_anti_diagonal_pass.glsl
-  shaders/compositor_glare_simple_star_diagonal_pass.glsl
-  shaders/compositor_glare_simple_star_horizontal_pass.glsl
-  shaders/compositor_glare_simple_star_vertical_pass.glsl
-  shaders/compositor_glare_streaks_accumulate.glsl
-  shaders/compositor_glare_streaks_filter.glsl
-  shaders/compositor_id_mask.glsl
-  shaders/compositor_image_crop.glsl
-  shaders/compositor_inpaint_compute_boundary.glsl
-  shaders/compositor_inpaint_compute_region.glsl
-  shaders/compositor_inpaint_fill_region.glsl
-  shaders/compositor_jump_flooding.glsl
-  shaders/compositor_keying_compute_image.glsl
-  shaders/compositor_keying_compute_matte.glsl
-  shaders/compositor_keying_extract_chroma.glsl
-  shaders/compositor_keying_replace_chroma.glsl
-  shaders/compositor_keying_screen.glsl
-  shaders/compositor_keying_tweak_matte.glsl
-  shaders/compositor_kuwahara_anisotropic.glsl
-  shaders/compositor_kuwahara_anisotropic_compute_structure_tensor.glsl
-  shaders/compositor_kuwahara_classic.glsl
-  shaders/compositor_map_uv_anisotropic.glsl
-  shaders/compositor_map_uv_nearest_neighbour.glsl
-  shaders/compositor_morphological_blur.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_motion_blur.glsl
-  shaders/compositor_motion_blur_max_velocity_dilate.glsl
-  shaders/compositor_movie_distortion.glsl
-  shaders/compositor_normalize.glsl
-  shaders/compositor_parallel_reduction.glsl
-  shaders/compositor_pixelate.glsl
-  shaders/compositor_plane_deform.glsl
-  shaders/compositor_plane_deform_mask.glsl
-  shaders/compositor_plane_deform_motion_blur.glsl
-  shaders/compositor_plane_deform_motion_blur_mask.glsl
-  shaders/compositor_premultiply_alpha.glsl
-  shaders/compositor_projector_lens_distortion.glsl
-  shaders/compositor_read_input.glsl
-  shaders/compositor_realize_on_domain.glsl
-  shaders/compositor_scale_variable.glsl
-  shaders/compositor_screen_lens_distortion.glsl
-  shaders/compositor_smaa_blending_weight_calculation.glsl
-  shaders/compositor_smaa_edge_detection.glsl
-  shaders/compositor_smaa_neighborhood_blending.glsl
-  shaders/compositor_split.glsl
-  shaders/compositor_summed_area_table_compute_complete_blocks.glsl
-  shaders/compositor_summed_area_table_compute_complete_x_prologues.glsl
-  shaders/compositor_summed_area_table_compute_complete_y_prologues.glsl
-  shaders/compositor_summed_area_table_compute_incomplete_prologues.glsl
-  shaders/compositor_sun_beams.glsl
-  shaders/compositor_symmetric_blur.glsl
-  shaders/compositor_symmetric_blur_variable_size.glsl
-  shaders/compositor_symmetric_separable_blur.glsl
-  shaders/compositor_symmetric_separable_blur_variable_size.glsl
-  shaders/compositor_tone_map_photoreceptor.glsl
-  shaders/compositor_tone_map_simple.glsl
-  shaders/compositor_van_vliet_gaussian_blur.glsl
-  shaders/compositor_van_vliet_gaussian_blur_sum.glsl
-  shaders/compositor_write_output.glsl
-  shaders/compositor_z_combine_compute_mask.glsl
-  shaders/compositor_z_combine_from_mask.glsl
-  shaders/compositor_z_combine_simple.glsl
-
-  shaders/library/gpu_shader_compositor_alpha_over.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_image_diagonals.glsl
-  shaders/library/gpu_shader_compositor_invert.glsl
-  shaders/library/gpu_shader_compositor_jump_flooding_lib.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_motion_blur_lib.glsl
-  shaders/library/gpu_shader_compositor_normal.glsl
-  shaders/library/gpu_shader_compositor_ocio_processor.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_summed_area_table_lib.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})
-  glsl_to_c(${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})
-
-if(WITH_TBB)
-  if(WIN32)
-    # TBB includes Windows.h which will define min/max macros
-    # that will collide with the STL versions.
-    add_definitions(-DNOMINMAX)
-  endif()
-endif()
-
-if(WITH_OPENCOLORIO)
-  add_definitions(
-    -DWITH_OCIO
-  )
-
-  list(APPEND INC_SYS
-    ${OPENCOLORIO_INCLUDE_DIRS}
-  )
-
-  list(APPEND LIB
-    ${OPENCOLORIO_LIBRARIES}
-  )
-endif()
-
-if(WITH_FFTW3)
-  list(APPEND INC_SYS
-    ${FFTW3_INCLUDE_DIRS}
-  )
-  list(APPEND LIB
-    ${FFTW3_LIBRARIES}
-  )
-  add_definitions(-DWITH_FFTW3)
-endif()
-
-blender_add_lib(bf_realtime_compositor "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/draw/CMakeLists.txt

@@ -20,9 +20,9 @@ set(INC
   ../nodes
   ../render
   ../render/intern
-  ../compositor/realtime_compositor
-  ../compositor/realtime_compositor/algorithms
-  ../compositor/realtime_compositor/cached_resources
+  ../compositor
+  ../compositor/algorithms
+  ../compositor/cached_resources
   ../windowmanager
 
   ../../../intern/opensubdiv
@@ -311,7 +311,7 @@ set(LIB
   PRIVATE bf::dna
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
-  bf_realtime_compositor
+  bf_compositor
   bf_windowmanager
   PRIVATE bf::intern::atomic
   PRIVATE bf::extern::fmtlib

source/blender/editors/space_node/CMakeLists.txt

@@ -10,7 +10,6 @@ set(INC
   ../../blenloader
   ../../blentranslation
   ../../compositor
-  ../../compositor/realtime_compositor
   ../../draw
   ../../functions
   ../../geometry
@@ -60,7 +59,7 @@ set(LIB
   PRIVATE bf::dna
   bf_editor_screen
   PRIVATE bf::intern::guardedalloc
-  bf_realtime_compositor
+  bf_compositor
   PRIVATE bf::extern::fmtlib
 )
 

source/blender/gpu/CMakeLists.txt

@@ -19,7 +19,7 @@ set(INC
   ../editors/include
 
   # For `*_info.hh` includes.
-  ../compositor/realtime_compositor/shaders/infos
+  ../compositor/shaders/infos
   ../draw/engines/eevee_next
   ../draw/engines/eevee_next/shaders/infos
   ../draw/engines/gpencil

source/blender/nodes/composite/CMakeLists.txt

@@ -16,10 +16,9 @@ set(INC
   ../../render
   ../../windowmanager
   ../../compositor
-  ../../compositor/realtime_compositor
-  ../../compositor/realtime_compositor/algorithms
-  ../../compositor/realtime_compositor/cached_resources
-  ../../compositor/realtime_compositor/utilities
+  ../../compositor/algorithms
+  ../../compositor/cached_resources
+  ../../compositor/utilities
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -134,7 +133,7 @@ set(LIB
   bf_functions
   PRIVATE bf::intern::guardedalloc
   PRIVATE bf::extern::fmtlib
-  bf_realtime_compositor
+  bf_compositor
 )
 
 if(WITH_OPENCOLORIO)

source/blender/render/CMakeLists.txt

@@ -8,8 +8,8 @@ set(INC
   intern
   ../blenkernel
   ../blentranslation
-  ../compositor/realtime_compositor
-  ../compositor/realtime_compositor/cached_resources
+  ../compositor
+  ../compositor/cached_resources
   ../draw
   ../draw/intern
   ../gpu
@@ -65,7 +65,7 @@ set(LIB
   PRIVATE bf::dna
   PRIVATE bf::extern::fmtlib
   PRIVATE bf::intern::guardedalloc
-  bf_realtime_compositor
+  bf_compositor
   PRIVATE bf::intern::atomic
 )