diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt index 7a5e1d65e8a..4712e84e4ab 100644 --- a/source/blender/compositor/CMakeLists.txt +++ b/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) diff --git a/source/blender/compositor/realtime_compositor/COM_compile_state.hh b/source/blender/compositor/COM_compile_state.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_compile_state.hh rename to source/blender/compositor/COM_compile_state.hh diff --git a/source/blender/compositor/realtime_compositor/COM_context.hh b/source/blender/compositor/COM_context.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_context.hh rename to source/blender/compositor/COM_context.hh diff --git a/source/blender/compositor/realtime_compositor/COM_conversion_operation.hh b/source/blender/compositor/COM_conversion_operation.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_conversion_operation.hh rename to source/blender/compositor/COM_conversion_operation.hh diff --git a/source/blender/compositor/realtime_compositor/COM_domain.hh b/source/blender/compositor/COM_domain.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_domain.hh rename to source/blender/compositor/COM_domain.hh diff --git a/source/blender/compositor/realtime_compositor/COM_evaluator.hh b/source/blender/compositor/COM_evaluator.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_evaluator.hh rename to source/blender/compositor/COM_evaluator.hh diff --git a/source/blender/compositor/realtime_compositor/COM_input_descriptor.hh b/source/blender/compositor/COM_input_descriptor.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_input_descriptor.hh rename to source/blender/compositor/COM_input_descriptor.hh diff --git a/source/blender/compositor/realtime_compositor/COM_input_single_value_operation.hh b/source/blender/compositor/COM_input_single_value_operation.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_input_single_value_operation.hh rename to source/blender/compositor/COM_input_single_value_operation.hh diff --git a/source/blender/compositor/realtime_compositor/COM_meta_data.hh b/source/blender/compositor/COM_meta_data.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_meta_data.hh rename to source/blender/compositor/COM_meta_data.hh diff --git a/source/blender/compositor/realtime_compositor/COM_multi_function_procedure_operation.hh b/source/blender/compositor/COM_multi_function_procedure_operation.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_multi_function_procedure_operation.hh rename to source/blender/compositor/COM_multi_function_procedure_operation.hh diff --git a/source/blender/compositor/realtime_compositor/COM_node_operation.hh b/source/blender/compositor/COM_node_operation.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_node_operation.hh rename to source/blender/compositor/COM_node_operation.hh diff --git a/source/blender/compositor/realtime_compositor/COM_operation.hh b/source/blender/compositor/COM_operation.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_operation.hh rename to source/blender/compositor/COM_operation.hh diff --git a/source/blender/compositor/realtime_compositor/COM_pixel_operation.hh b/source/blender/compositor/COM_pixel_operation.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_pixel_operation.hh rename to source/blender/compositor/COM_pixel_operation.hh diff --git a/source/blender/compositor/realtime_compositor/COM_profiler.hh b/source/blender/compositor/COM_profiler.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_profiler.hh rename to source/blender/compositor/COM_profiler.hh diff --git a/source/blender/compositor/realtime_compositor/COM_realize_on_domain_operation.hh b/source/blender/compositor/COM_realize_on_domain_operation.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_realize_on_domain_operation.hh rename to source/blender/compositor/COM_realize_on_domain_operation.hh diff --git a/source/blender/compositor/realtime_compositor/COM_reduce_to_single_value_operation.hh b/source/blender/compositor/COM_reduce_to_single_value_operation.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_reduce_to_single_value_operation.hh rename to source/blender/compositor/COM_reduce_to_single_value_operation.hh diff --git a/source/blender/compositor/realtime_compositor/COM_render_context.hh b/source/blender/compositor/COM_render_context.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_render_context.hh rename to source/blender/compositor/COM_render_context.hh diff --git a/source/blender/compositor/realtime_compositor/COM_result.hh b/source/blender/compositor/COM_result.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_result.hh rename to source/blender/compositor/COM_result.hh diff --git a/source/blender/compositor/realtime_compositor/COM_scheduler.hh b/source/blender/compositor/COM_scheduler.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_scheduler.hh rename to source/blender/compositor/COM_scheduler.hh diff --git a/source/blender/compositor/realtime_compositor/COM_shader_node.hh b/source/blender/compositor/COM_shader_node.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_shader_node.hh rename to source/blender/compositor/COM_shader_node.hh diff --git a/source/blender/compositor/realtime_compositor/COM_shader_operation.hh b/source/blender/compositor/COM_shader_operation.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_shader_operation.hh rename to source/blender/compositor/COM_shader_operation.hh diff --git a/source/blender/compositor/realtime_compositor/COM_simple_operation.hh b/source/blender/compositor/COM_simple_operation.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_simple_operation.hh rename to source/blender/compositor/COM_simple_operation.hh diff --git a/source/blender/compositor/realtime_compositor/COM_static_cache_manager.hh b/source/blender/compositor/COM_static_cache_manager.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_static_cache_manager.hh rename to source/blender/compositor/COM_static_cache_manager.hh diff --git a/source/blender/compositor/realtime_compositor/COM_texture_pool.hh b/source/blender/compositor/COM_texture_pool.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_texture_pool.hh rename to source/blender/compositor/COM_texture_pool.hh diff --git a/source/blender/compositor/realtime_compositor/COM_utilities.hh b/source/blender/compositor/COM_utilities.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/COM_utilities.hh rename to source/blender/compositor/COM_utilities.hh diff --git a/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_compute_preview.hh b/source/blender/compositor/algorithms/COM_algorithm_compute_preview.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_compute_preview.hh rename to source/blender/compositor/algorithms/COM_algorithm_compute_preview.hh diff --git a/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_deriche_gaussian_blur.hh b/source/blender/compositor/algorithms/COM_algorithm_deriche_gaussian_blur.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_deriche_gaussian_blur.hh rename to source/blender/compositor/algorithms/COM_algorithm_deriche_gaussian_blur.hh diff --git a/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_extract_alpha.hh b/source/blender/compositor/algorithms/COM_algorithm_extract_alpha.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_extract_alpha.hh rename to source/blender/compositor/algorithms/COM_algorithm_extract_alpha.hh diff --git a/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_gamma_correct.hh b/source/blender/compositor/algorithms/COM_algorithm_gamma_correct.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_gamma_correct.hh rename to source/blender/compositor/algorithms/COM_algorithm_gamma_correct.hh diff --git a/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_jump_flooding.hh b/source/blender/compositor/algorithms/COM_algorithm_jump_flooding.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_jump_flooding.hh rename to source/blender/compositor/algorithms/COM_algorithm_jump_flooding.hh diff --git a/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_morphological_blur.hh b/source/blender/compositor/algorithms/COM_algorithm_morphological_blur.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_morphological_blur.hh rename to source/blender/compositor/algorithms/COM_algorithm_morphological_blur.hh diff --git a/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_morphological_distance.hh b/source/blender/compositor/algorithms/COM_algorithm_morphological_distance.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_morphological_distance.hh rename to source/blender/compositor/algorithms/COM_algorithm_morphological_distance.hh diff --git a/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_morphological_distance_feather.hh b/source/blender/compositor/algorithms/COM_algorithm_morphological_distance_feather.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_morphological_distance_feather.hh rename to source/blender/compositor/algorithms/COM_algorithm_morphological_distance_feather.hh diff --git a/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_parallel_reduction.hh b/source/blender/compositor/algorithms/COM_algorithm_parallel_reduction.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_parallel_reduction.hh rename to source/blender/compositor/algorithms/COM_algorithm_parallel_reduction.hh diff --git a/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_realize_on_domain.hh b/source/blender/compositor/algorithms/COM_algorithm_realize_on_domain.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_realize_on_domain.hh rename to source/blender/compositor/algorithms/COM_algorithm_realize_on_domain.hh diff --git a/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_recursive_gaussian_blur.hh b/source/blender/compositor/algorithms/COM_algorithm_recursive_gaussian_blur.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_recursive_gaussian_blur.hh rename to source/blender/compositor/algorithms/COM_algorithm_recursive_gaussian_blur.hh diff --git a/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_smaa.hh b/source/blender/compositor/algorithms/COM_algorithm_smaa.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_smaa.hh rename to source/blender/compositor/algorithms/COM_algorithm_smaa.hh diff --git a/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_summed_area_table.hh b/source/blender/compositor/algorithms/COM_algorithm_summed_area_table.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_summed_area_table.hh rename to source/blender/compositor/algorithms/COM_algorithm_summed_area_table.hh diff --git a/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_symmetric_separable_blur.hh b/source/blender/compositor/algorithms/COM_algorithm_symmetric_separable_blur.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_symmetric_separable_blur.hh rename to source/blender/compositor/algorithms/COM_algorithm_symmetric_separable_blur.hh diff --git a/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_symmetric_separable_blur_variable_size.hh b/source/blender/compositor/algorithms/COM_algorithm_symmetric_separable_blur_variable_size.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_symmetric_separable_blur_variable_size.hh rename to source/blender/compositor/algorithms/COM_algorithm_symmetric_separable_blur_variable_size.hh diff --git a/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_transform.hh b/source/blender/compositor/algorithms/COM_algorithm_transform.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_transform.hh rename to source/blender/compositor/algorithms/COM_algorithm_transform.hh diff --git a/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_van_vliet_gaussian_blur.hh b/source/blender/compositor/algorithms/COM_algorithm_van_vliet_gaussian_blur.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_van_vliet_gaussian_blur.hh rename to source/blender/compositor/algorithms/COM_algorithm_van_vliet_gaussian_blur.hh diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/compute_preview.cc b/source/blender/compositor/algorithms/intern/compute_preview.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/intern/compute_preview.cc rename to source/blender/compositor/algorithms/intern/compute_preview.cc diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/deriche_gaussian_blur.cc b/source/blender/compositor/algorithms/intern/deriche_gaussian_blur.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/intern/deriche_gaussian_blur.cc rename to source/blender/compositor/algorithms/intern/deriche_gaussian_blur.cc diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/extract_alpha.cc b/source/blender/compositor/algorithms/intern/extract_alpha.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/intern/extract_alpha.cc rename to source/blender/compositor/algorithms/intern/extract_alpha.cc diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/gamma_correct.cc b/source/blender/compositor/algorithms/intern/gamma_correct.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/intern/gamma_correct.cc rename to source/blender/compositor/algorithms/intern/gamma_correct.cc diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/jump_flooding.cc b/source/blender/compositor/algorithms/intern/jump_flooding.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/intern/jump_flooding.cc rename to source/blender/compositor/algorithms/intern/jump_flooding.cc diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/morphological_blur.cc b/source/blender/compositor/algorithms/intern/morphological_blur.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/intern/morphological_blur.cc rename to source/blender/compositor/algorithms/intern/morphological_blur.cc diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/morphological_distance.cc b/source/blender/compositor/algorithms/intern/morphological_distance.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/intern/morphological_distance.cc rename to source/blender/compositor/algorithms/intern/morphological_distance.cc diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/morphological_distance_feather.cc b/source/blender/compositor/algorithms/intern/morphological_distance_feather.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/intern/morphological_distance_feather.cc rename to source/blender/compositor/algorithms/intern/morphological_distance_feather.cc diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/parallel_reduction.cc b/source/blender/compositor/algorithms/intern/parallel_reduction.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/intern/parallel_reduction.cc rename to source/blender/compositor/algorithms/intern/parallel_reduction.cc diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/realize_on_domain.cc b/source/blender/compositor/algorithms/intern/realize_on_domain.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/intern/realize_on_domain.cc rename to source/blender/compositor/algorithms/intern/realize_on_domain.cc diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/recursive_gaussian_blur.cc b/source/blender/compositor/algorithms/intern/recursive_gaussian_blur.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/intern/recursive_gaussian_blur.cc rename to source/blender/compositor/algorithms/intern/recursive_gaussian_blur.cc diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/smaa.cc b/source/blender/compositor/algorithms/intern/smaa.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/intern/smaa.cc rename to source/blender/compositor/algorithms/intern/smaa.cc diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/summed_area_table.cc b/source/blender/compositor/algorithms/intern/summed_area_table.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/intern/summed_area_table.cc rename to source/blender/compositor/algorithms/intern/summed_area_table.cc diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/symmetric_separable_blur.cc b/source/blender/compositor/algorithms/intern/symmetric_separable_blur.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/intern/symmetric_separable_blur.cc rename to source/blender/compositor/algorithms/intern/symmetric_separable_blur.cc diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/symmetric_separable_blur_variable_size.cc b/source/blender/compositor/algorithms/intern/symmetric_separable_blur_variable_size.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/intern/symmetric_separable_blur_variable_size.cc rename to source/blender/compositor/algorithms/intern/symmetric_separable_blur_variable_size.cc diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/transform.cc b/source/blender/compositor/algorithms/intern/transform.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/intern/transform.cc rename to source/blender/compositor/algorithms/intern/transform.cc diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/van_vliet_gaussian_blur.cc b/source/blender/compositor/algorithms/intern/van_vliet_gaussian_blur.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/algorithms/intern/van_vliet_gaussian_blur.cc rename to source/blender/compositor/algorithms/intern/van_vliet_gaussian_blur.cc diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_bokeh_kernel.hh b/source/blender/compositor/cached_resources/COM_bokeh_kernel.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/COM_bokeh_kernel.hh rename to source/blender/compositor/cached_resources/COM_bokeh_kernel.hh diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_image.hh b/source/blender/compositor/cached_resources/COM_cached_image.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/COM_cached_image.hh rename to source/blender/compositor/cached_resources/COM_cached_image.hh diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_mask.hh b/source/blender/compositor/cached_resources/COM_cached_mask.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/COM_cached_mask.hh rename to source/blender/compositor/cached_resources/COM_cached_mask.hh diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_resource.hh b/source/blender/compositor/cached_resources/COM_cached_resource.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/COM_cached_resource.hh rename to source/blender/compositor/cached_resources/COM_cached_resource.hh diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_shader.hh b/source/blender/compositor/cached_resources/COM_cached_shader.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/COM_cached_shader.hh rename to source/blender/compositor/cached_resources/COM_cached_shader.hh diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_texture.hh b/source/blender/compositor/cached_resources/COM_cached_texture.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/COM_cached_texture.hh rename to source/blender/compositor/cached_resources/COM_cached_texture.hh diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_deriche_gaussian_coefficients.hh b/source/blender/compositor/cached_resources/COM_deriche_gaussian_coefficients.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/COM_deriche_gaussian_coefficients.hh rename to source/blender/compositor/cached_resources/COM_deriche_gaussian_coefficients.hh diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_distortion_grid.hh b/source/blender/compositor/cached_resources/COM_distortion_grid.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/COM_distortion_grid.hh rename to source/blender/compositor/cached_resources/COM_distortion_grid.hh diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_fog_glow_kernel.hh b/source/blender/compositor/cached_resources/COM_fog_glow_kernel.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/COM_fog_glow_kernel.hh rename to source/blender/compositor/cached_resources/COM_fog_glow_kernel.hh diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_keying_screen.hh b/source/blender/compositor/cached_resources/COM_keying_screen.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/COM_keying_screen.hh rename to source/blender/compositor/cached_resources/COM_keying_screen.hh diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_morphological_distance_feather_weights.hh b/source/blender/compositor/cached_resources/COM_morphological_distance_feather_weights.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/COM_morphological_distance_feather_weights.hh rename to source/blender/compositor/cached_resources/COM_morphological_distance_feather_weights.hh diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_ocio_color_space_conversion_shader.hh b/source/blender/compositor/cached_resources/COM_ocio_color_space_conversion_shader.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/COM_ocio_color_space_conversion_shader.hh rename to source/blender/compositor/cached_resources/COM_ocio_color_space_conversion_shader.hh diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_smaa_precomputed_textures.hh b/source/blender/compositor/cached_resources/COM_smaa_precomputed_textures.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/COM_smaa_precomputed_textures.hh rename to source/blender/compositor/cached_resources/COM_smaa_precomputed_textures.hh diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_symmetric_blur_weights.hh b/source/blender/compositor/cached_resources/COM_symmetric_blur_weights.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/COM_symmetric_blur_weights.hh rename to source/blender/compositor/cached_resources/COM_symmetric_blur_weights.hh diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_symmetric_separable_blur_weights.hh b/source/blender/compositor/cached_resources/COM_symmetric_separable_blur_weights.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/COM_symmetric_separable_blur_weights.hh rename to source/blender/compositor/cached_resources/COM_symmetric_separable_blur_weights.hh diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_van_vliet_gaussian_coefficients.hh b/source/blender/compositor/cached_resources/COM_van_vliet_gaussian_coefficients.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/COM_van_vliet_gaussian_coefficients.hh rename to source/blender/compositor/cached_resources/COM_van_vliet_gaussian_coefficients.hh diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/bokeh_kernel.cc b/source/blender/compositor/cached_resources/intern/bokeh_kernel.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/intern/bokeh_kernel.cc rename to source/blender/compositor/cached_resources/intern/bokeh_kernel.cc diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_image.cc b/source/blender/compositor/cached_resources/intern/cached_image.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/intern/cached_image.cc rename to source/blender/compositor/cached_resources/intern/cached_image.cc diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_mask.cc b/source/blender/compositor/cached_resources/intern/cached_mask.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/intern/cached_mask.cc rename to source/blender/compositor/cached_resources/intern/cached_mask.cc diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_shader.cc b/source/blender/compositor/cached_resources/intern/cached_shader.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/intern/cached_shader.cc rename to source/blender/compositor/cached_resources/intern/cached_shader.cc diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_texture.cc b/source/blender/compositor/cached_resources/intern/cached_texture.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/intern/cached_texture.cc rename to source/blender/compositor/cached_resources/intern/cached_texture.cc diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/deriche_gaussian_coefficients.cc b/source/blender/compositor/cached_resources/intern/deriche_gaussian_coefficients.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/intern/deriche_gaussian_coefficients.cc rename to source/blender/compositor/cached_resources/intern/deriche_gaussian_coefficients.cc diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/distortion_grid.cc b/source/blender/compositor/cached_resources/intern/distortion_grid.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/intern/distortion_grid.cc rename to source/blender/compositor/cached_resources/intern/distortion_grid.cc diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/fog_glow_kernel.cc b/source/blender/compositor/cached_resources/intern/fog_glow_kernel.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/intern/fog_glow_kernel.cc rename to source/blender/compositor/cached_resources/intern/fog_glow_kernel.cc diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/keying_screen.cc b/source/blender/compositor/cached_resources/intern/keying_screen.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/intern/keying_screen.cc rename to source/blender/compositor/cached_resources/intern/keying_screen.cc diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/morphological_distance_feather_weights.cc b/source/blender/compositor/cached_resources/intern/morphological_distance_feather_weights.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/intern/morphological_distance_feather_weights.cc rename to source/blender/compositor/cached_resources/intern/morphological_distance_feather_weights.cc diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc b/source/blender/compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc rename to source/blender/compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/smaa_precomputed_textures.cc b/source/blender/compositor/cached_resources/intern/smaa_precomputed_textures.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/intern/smaa_precomputed_textures.cc rename to source/blender/compositor/cached_resources/intern/smaa_precomputed_textures.cc diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/symmetric_blur_weights.cc b/source/blender/compositor/cached_resources/intern/symmetric_blur_weights.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/intern/symmetric_blur_weights.cc rename to source/blender/compositor/cached_resources/intern/symmetric_blur_weights.cc diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/symmetric_separable_blur_weights.cc b/source/blender/compositor/cached_resources/intern/symmetric_separable_blur_weights.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/intern/symmetric_separable_blur_weights.cc rename to source/blender/compositor/cached_resources/intern/symmetric_separable_blur_weights.cc diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/van_vliet_gaussian_coefficients.cc b/source/blender/compositor/cached_resources/intern/van_vliet_gaussian_coefficients.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/cached_resources/intern/van_vliet_gaussian_coefficients.cc rename to source/blender/compositor/cached_resources/intern/van_vliet_gaussian_coefficients.cc diff --git a/source/blender/compositor/realtime_compositor/intern/compile_state.cc b/source/blender/compositor/intern/compile_state.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/compile_state.cc rename to source/blender/compositor/intern/compile_state.cc diff --git a/source/blender/compositor/realtime_compositor/intern/context.cc b/source/blender/compositor/intern/context.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/context.cc rename to source/blender/compositor/intern/context.cc diff --git a/source/blender/compositor/realtime_compositor/intern/conversion_operation.cc b/source/blender/compositor/intern/conversion_operation.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/conversion_operation.cc rename to source/blender/compositor/intern/conversion_operation.cc diff --git a/source/blender/compositor/realtime_compositor/intern/domain.cc b/source/blender/compositor/intern/domain.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/domain.cc rename to source/blender/compositor/intern/domain.cc diff --git a/source/blender/compositor/realtime_compositor/intern/evaluator.cc b/source/blender/compositor/intern/evaluator.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/evaluator.cc rename to source/blender/compositor/intern/evaluator.cc diff --git a/source/blender/compositor/realtime_compositor/intern/input_single_value_operation.cc b/source/blender/compositor/intern/input_single_value_operation.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/input_single_value_operation.cc rename to source/blender/compositor/intern/input_single_value_operation.cc diff --git a/source/blender/compositor/realtime_compositor/intern/meta_data.cc b/source/blender/compositor/intern/meta_data.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/meta_data.cc rename to source/blender/compositor/intern/meta_data.cc diff --git a/source/blender/compositor/realtime_compositor/intern/multi_function_procedure_operation.cc b/source/blender/compositor/intern/multi_function_procedure_operation.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/multi_function_procedure_operation.cc rename to source/blender/compositor/intern/multi_function_procedure_operation.cc diff --git a/source/blender/compositor/realtime_compositor/intern/node_operation.cc b/source/blender/compositor/intern/node_operation.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/node_operation.cc rename to source/blender/compositor/intern/node_operation.cc diff --git a/source/blender/compositor/realtime_compositor/intern/operation.cc b/source/blender/compositor/intern/operation.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/operation.cc rename to source/blender/compositor/intern/operation.cc diff --git a/source/blender/compositor/realtime_compositor/intern/pixel_operation.cc b/source/blender/compositor/intern/pixel_operation.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/pixel_operation.cc rename to source/blender/compositor/intern/pixel_operation.cc diff --git a/source/blender/compositor/realtime_compositor/intern/profiler.cc b/source/blender/compositor/intern/profiler.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/profiler.cc rename to source/blender/compositor/intern/profiler.cc diff --git a/source/blender/compositor/realtime_compositor/intern/realize_on_domain_operation.cc b/source/blender/compositor/intern/realize_on_domain_operation.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/realize_on_domain_operation.cc rename to source/blender/compositor/intern/realize_on_domain_operation.cc diff --git a/source/blender/compositor/realtime_compositor/intern/reduce_to_single_value_operation.cc b/source/blender/compositor/intern/reduce_to_single_value_operation.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/reduce_to_single_value_operation.cc rename to source/blender/compositor/intern/reduce_to_single_value_operation.cc diff --git a/source/blender/compositor/realtime_compositor/intern/render_context.cc b/source/blender/compositor/intern/render_context.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/render_context.cc rename to source/blender/compositor/intern/render_context.cc diff --git a/source/blender/compositor/realtime_compositor/intern/result.cc b/source/blender/compositor/intern/result.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/result.cc rename to source/blender/compositor/intern/result.cc diff --git a/source/blender/compositor/realtime_compositor/intern/scheduler.cc b/source/blender/compositor/intern/scheduler.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/scheduler.cc rename to source/blender/compositor/intern/scheduler.cc diff --git a/source/blender/compositor/realtime_compositor/intern/shader_node.cc b/source/blender/compositor/intern/shader_node.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/shader_node.cc rename to source/blender/compositor/intern/shader_node.cc diff --git a/source/blender/compositor/realtime_compositor/intern/shader_operation.cc b/source/blender/compositor/intern/shader_operation.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/shader_operation.cc rename to source/blender/compositor/intern/shader_operation.cc diff --git a/source/blender/compositor/realtime_compositor/intern/simple_operation.cc b/source/blender/compositor/intern/simple_operation.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/simple_operation.cc rename to source/blender/compositor/intern/simple_operation.cc diff --git a/source/blender/compositor/realtime_compositor/intern/static_cache_manager.cc b/source/blender/compositor/intern/static_cache_manager.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/static_cache_manager.cc rename to source/blender/compositor/intern/static_cache_manager.cc diff --git a/source/blender/compositor/realtime_compositor/intern/texture_pool.cc b/source/blender/compositor/intern/texture_pool.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/texture_pool.cc rename to source/blender/compositor/intern/texture_pool.cc diff --git a/source/blender/compositor/realtime_compositor/intern/utilities.cc b/source/blender/compositor/intern/utilities.cc similarity index 100% rename from source/blender/compositor/realtime_compositor/intern/utilities.cc rename to source/blender/compositor/intern/utilities.cc diff --git a/source/blender/compositor/realtime_compositor/CMakeLists.txt b/source/blender/compositor/realtime_compositor/CMakeLists.txt deleted file mode 100644 index ab700f7f22e..00000000000 --- a/source/blender/compositor/realtime_compositor/CMakeLists.txt +++ /dev/null @@ -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}") diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_alpha_crop.glsl b/source/blender/compositor/shaders/compositor_alpha_crop.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_alpha_crop.glsl rename to source/blender/compositor/shaders/compositor_alpha_crop.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_bilateral_blur.glsl b/source/blender/compositor/shaders/compositor_bilateral_blur.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_bilateral_blur.glsl rename to source/blender/compositor/shaders/compositor_bilateral_blur.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_bokeh_blur.glsl b/source/blender/compositor/shaders/compositor_bokeh_blur.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_bokeh_blur.glsl rename to source/blender/compositor/shaders/compositor_bokeh_blur.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_bokeh_blur_variable_size.glsl b/source/blender/compositor/shaders/compositor_bokeh_blur_variable_size.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_bokeh_blur_variable_size.glsl rename to source/blender/compositor/shaders/compositor_bokeh_blur_variable_size.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_bokeh_image.glsl b/source/blender/compositor/shaders/compositor_bokeh_image.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_bokeh_image.glsl rename to source/blender/compositor/shaders/compositor_bokeh_image.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_box_mask.glsl b/source/blender/compositor/shaders/compositor_box_mask.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_box_mask.glsl rename to source/blender/compositor/shaders/compositor_box_mask.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_compute_preview.glsl b/source/blender/compositor/shaders/compositor_compute_preview.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_compute_preview.glsl rename to source/blender/compositor/shaders/compositor_compute_preview.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_convert.glsl b/source/blender/compositor/shaders/compositor_convert.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_convert.glsl rename to source/blender/compositor/shaders/compositor_convert.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_cryptomatte_image.glsl b/source/blender/compositor/shaders/compositor_cryptomatte_image.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_cryptomatte_image.glsl rename to source/blender/compositor/shaders/compositor_cryptomatte_image.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_cryptomatte_matte.glsl b/source/blender/compositor/shaders/compositor_cryptomatte_matte.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_cryptomatte_matte.glsl rename to source/blender/compositor/shaders/compositor_cryptomatte_matte.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_cryptomatte_pick.glsl b/source/blender/compositor/shaders/compositor_cryptomatte_pick.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_cryptomatte_pick.glsl rename to source/blender/compositor/shaders/compositor_cryptomatte_pick.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_defocus_blur.glsl b/source/blender/compositor/shaders/compositor_defocus_blur.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_defocus_blur.glsl rename to source/blender/compositor/shaders/compositor_defocus_blur.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_defocus_radius_from_depth.glsl b/source/blender/compositor/shaders/compositor_defocus_radius_from_depth.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_defocus_radius_from_depth.glsl rename to source/blender/compositor/shaders/compositor_defocus_radius_from_depth.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_defocus_radius_from_scale.glsl b/source/blender/compositor/shaders/compositor_defocus_radius_from_scale.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_defocus_radius_from_scale.glsl rename to source/blender/compositor/shaders/compositor_defocus_radius_from_scale.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_deriche_gaussian_blur.glsl b/source/blender/compositor/shaders/compositor_deriche_gaussian_blur.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_deriche_gaussian_blur.glsl rename to source/blender/compositor/shaders/compositor_deriche_gaussian_blur.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_deriche_gaussian_blur_sum.glsl b/source/blender/compositor/shaders/compositor_deriche_gaussian_blur_sum.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_deriche_gaussian_blur_sum.glsl rename to source/blender/compositor/shaders/compositor_deriche_gaussian_blur_sum.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_despeckle.glsl b/source/blender/compositor/shaders/compositor_despeckle.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_despeckle.glsl rename to source/blender/compositor/shaders/compositor_despeckle.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_directional_blur.glsl b/source/blender/compositor/shaders/compositor_directional_blur.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_directional_blur.glsl rename to source/blender/compositor/shaders/compositor_directional_blur.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_displace.glsl b/source/blender/compositor/shaders/compositor_displace.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_displace.glsl rename to source/blender/compositor/shaders/compositor_displace.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_double_edge_mask_compute_boundary.glsl b/source/blender/compositor/shaders/compositor_double_edge_mask_compute_boundary.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_double_edge_mask_compute_boundary.glsl rename to source/blender/compositor/shaders/compositor_double_edge_mask_compute_boundary.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_double_edge_mask_compute_gradient.glsl b/source/blender/compositor/shaders/compositor_double_edge_mask_compute_gradient.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_double_edge_mask_compute_gradient.glsl rename to source/blender/compositor/shaders/compositor_double_edge_mask_compute_gradient.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_edge_filter.glsl b/source/blender/compositor/shaders/compositor_edge_filter.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_edge_filter.glsl rename to source/blender/compositor/shaders/compositor_edge_filter.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_ellipse_mask.glsl b/source/blender/compositor/shaders/compositor_ellipse_mask.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_ellipse_mask.glsl rename to source/blender/compositor/shaders/compositor_ellipse_mask.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_filter.glsl b/source/blender/compositor/shaders/compositor_filter.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_filter.glsl rename to source/blender/compositor/shaders/compositor_filter.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_flip.glsl b/source/blender/compositor/shaders/compositor_flip.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_flip.glsl rename to source/blender/compositor/shaders/compositor_flip.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_gamma_correct.glsl b/source/blender/compositor/shaders/compositor_gamma_correct.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_gamma_correct.glsl rename to source/blender/compositor/shaders/compositor_gamma_correct.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_glare_bloom_downsample.glsl b/source/blender/compositor/shaders/compositor_glare_bloom_downsample.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_glare_bloom_downsample.glsl rename to source/blender/compositor/shaders/compositor_glare_bloom_downsample.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_glare_bloom_upsample.glsl b/source/blender/compositor/shaders/compositor_glare_bloom_upsample.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_glare_bloom_upsample.glsl rename to source/blender/compositor/shaders/compositor_glare_bloom_upsample.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_glare_ghost_accumulate.glsl b/source/blender/compositor/shaders/compositor_glare_ghost_accumulate.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_glare_ghost_accumulate.glsl rename to source/blender/compositor/shaders/compositor_glare_ghost_accumulate.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_glare_ghost_base.glsl b/source/blender/compositor/shaders/compositor_glare_ghost_base.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_glare_ghost_base.glsl rename to source/blender/compositor/shaders/compositor_glare_ghost_base.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_glare_highlights.glsl b/source/blender/compositor/shaders/compositor_glare_highlights.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_glare_highlights.glsl rename to source/blender/compositor/shaders/compositor_glare_highlights.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_glare_mix.glsl b/source/blender/compositor/shaders/compositor_glare_mix.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_glare_mix.glsl rename to source/blender/compositor/shaders/compositor_glare_mix.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_glare_simple_star_anti_diagonal_pass.glsl b/source/blender/compositor/shaders/compositor_glare_simple_star_anti_diagonal_pass.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_glare_simple_star_anti_diagonal_pass.glsl rename to source/blender/compositor/shaders/compositor_glare_simple_star_anti_diagonal_pass.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_glare_simple_star_diagonal_pass.glsl b/source/blender/compositor/shaders/compositor_glare_simple_star_diagonal_pass.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_glare_simple_star_diagonal_pass.glsl rename to source/blender/compositor/shaders/compositor_glare_simple_star_diagonal_pass.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_glare_simple_star_horizontal_pass.glsl b/source/blender/compositor/shaders/compositor_glare_simple_star_horizontal_pass.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_glare_simple_star_horizontal_pass.glsl rename to source/blender/compositor/shaders/compositor_glare_simple_star_horizontal_pass.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_glare_simple_star_vertical_pass.glsl b/source/blender/compositor/shaders/compositor_glare_simple_star_vertical_pass.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_glare_simple_star_vertical_pass.glsl rename to source/blender/compositor/shaders/compositor_glare_simple_star_vertical_pass.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_glare_streaks_accumulate.glsl b/source/blender/compositor/shaders/compositor_glare_streaks_accumulate.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_glare_streaks_accumulate.glsl rename to source/blender/compositor/shaders/compositor_glare_streaks_accumulate.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_glare_streaks_filter.glsl b/source/blender/compositor/shaders/compositor_glare_streaks_filter.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_glare_streaks_filter.glsl rename to source/blender/compositor/shaders/compositor_glare_streaks_filter.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_id_mask.glsl b/source/blender/compositor/shaders/compositor_id_mask.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_id_mask.glsl rename to source/blender/compositor/shaders/compositor_id_mask.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_image_crop.glsl b/source/blender/compositor/shaders/compositor_image_crop.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_image_crop.glsl rename to source/blender/compositor/shaders/compositor_image_crop.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_inpaint_compute_boundary.glsl b/source/blender/compositor/shaders/compositor_inpaint_compute_boundary.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_inpaint_compute_boundary.glsl rename to source/blender/compositor/shaders/compositor_inpaint_compute_boundary.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_inpaint_compute_region.glsl b/source/blender/compositor/shaders/compositor_inpaint_compute_region.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_inpaint_compute_region.glsl rename to source/blender/compositor/shaders/compositor_inpaint_compute_region.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_inpaint_fill_region.glsl b/source/blender/compositor/shaders/compositor_inpaint_fill_region.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_inpaint_fill_region.glsl rename to source/blender/compositor/shaders/compositor_inpaint_fill_region.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_jump_flooding.glsl b/source/blender/compositor/shaders/compositor_jump_flooding.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_jump_flooding.glsl rename to source/blender/compositor/shaders/compositor_jump_flooding.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_keying_compute_image.glsl b/source/blender/compositor/shaders/compositor_keying_compute_image.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_keying_compute_image.glsl rename to source/blender/compositor/shaders/compositor_keying_compute_image.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_keying_compute_matte.glsl b/source/blender/compositor/shaders/compositor_keying_compute_matte.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_keying_compute_matte.glsl rename to source/blender/compositor/shaders/compositor_keying_compute_matte.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_keying_extract_chroma.glsl b/source/blender/compositor/shaders/compositor_keying_extract_chroma.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_keying_extract_chroma.glsl rename to source/blender/compositor/shaders/compositor_keying_extract_chroma.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_keying_replace_chroma.glsl b/source/blender/compositor/shaders/compositor_keying_replace_chroma.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_keying_replace_chroma.glsl rename to source/blender/compositor/shaders/compositor_keying_replace_chroma.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_keying_screen.glsl b/source/blender/compositor/shaders/compositor_keying_screen.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_keying_screen.glsl rename to source/blender/compositor/shaders/compositor_keying_screen.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_keying_tweak_matte.glsl b/source/blender/compositor/shaders/compositor_keying_tweak_matte.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_keying_tweak_matte.glsl rename to source/blender/compositor/shaders/compositor_keying_tweak_matte.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_kuwahara_anisotropic.glsl b/source/blender/compositor/shaders/compositor_kuwahara_anisotropic.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_kuwahara_anisotropic.glsl rename to source/blender/compositor/shaders/compositor_kuwahara_anisotropic.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_kuwahara_anisotropic_compute_structure_tensor.glsl b/source/blender/compositor/shaders/compositor_kuwahara_anisotropic_compute_structure_tensor.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_kuwahara_anisotropic_compute_structure_tensor.glsl rename to source/blender/compositor/shaders/compositor_kuwahara_anisotropic_compute_structure_tensor.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_kuwahara_classic.glsl b/source/blender/compositor/shaders/compositor_kuwahara_classic.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_kuwahara_classic.glsl rename to source/blender/compositor/shaders/compositor_kuwahara_classic.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_map_uv_anisotropic.glsl b/source/blender/compositor/shaders/compositor_map_uv_anisotropic.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_map_uv_anisotropic.glsl rename to source/blender/compositor/shaders/compositor_map_uv_anisotropic.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_map_uv_nearest_neighbour.glsl b/source/blender/compositor/shaders/compositor_map_uv_nearest_neighbour.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_map_uv_nearest_neighbour.glsl rename to source/blender/compositor/shaders/compositor_map_uv_nearest_neighbour.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_morphological_blur.glsl b/source/blender/compositor/shaders/compositor_morphological_blur.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_morphological_blur.glsl rename to source/blender/compositor/shaders/compositor_morphological_blur.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_morphological_distance.glsl b/source/blender/compositor/shaders/compositor_morphological_distance.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_morphological_distance.glsl rename to source/blender/compositor/shaders/compositor_morphological_distance.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_morphological_distance_feather.glsl b/source/blender/compositor/shaders/compositor_morphological_distance_feather.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_morphological_distance_feather.glsl rename to source/blender/compositor/shaders/compositor_morphological_distance_feather.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_morphological_distance_threshold.glsl b/source/blender/compositor/shaders/compositor_morphological_distance_threshold.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_morphological_distance_threshold.glsl rename to source/blender/compositor/shaders/compositor_morphological_distance_threshold.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_morphological_step.glsl b/source/blender/compositor/shaders/compositor_morphological_step.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_morphological_step.glsl rename to source/blender/compositor/shaders/compositor_morphological_step.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_motion_blur.glsl b/source/blender/compositor/shaders/compositor_motion_blur.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_motion_blur.glsl rename to source/blender/compositor/shaders/compositor_motion_blur.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_motion_blur_max_velocity_dilate.glsl b/source/blender/compositor/shaders/compositor_motion_blur_max_velocity_dilate.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_motion_blur_max_velocity_dilate.glsl rename to source/blender/compositor/shaders/compositor_motion_blur_max_velocity_dilate.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_movie_distortion.glsl b/source/blender/compositor/shaders/compositor_movie_distortion.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_movie_distortion.glsl rename to source/blender/compositor/shaders/compositor_movie_distortion.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_normalize.glsl b/source/blender/compositor/shaders/compositor_normalize.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_normalize.glsl rename to source/blender/compositor/shaders/compositor_normalize.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_parallel_reduction.glsl b/source/blender/compositor/shaders/compositor_parallel_reduction.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_parallel_reduction.glsl rename to source/blender/compositor/shaders/compositor_parallel_reduction.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_pixelate.glsl b/source/blender/compositor/shaders/compositor_pixelate.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_pixelate.glsl rename to source/blender/compositor/shaders/compositor_pixelate.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_plane_deform.glsl b/source/blender/compositor/shaders/compositor_plane_deform.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_plane_deform.glsl rename to source/blender/compositor/shaders/compositor_plane_deform.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_plane_deform_mask.glsl b/source/blender/compositor/shaders/compositor_plane_deform_mask.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_plane_deform_mask.glsl rename to source/blender/compositor/shaders/compositor_plane_deform_mask.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_plane_deform_motion_blur.glsl b/source/blender/compositor/shaders/compositor_plane_deform_motion_blur.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_plane_deform_motion_blur.glsl rename to source/blender/compositor/shaders/compositor_plane_deform_motion_blur.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_plane_deform_motion_blur_mask.glsl b/source/blender/compositor/shaders/compositor_plane_deform_motion_blur_mask.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_plane_deform_motion_blur_mask.glsl rename to source/blender/compositor/shaders/compositor_plane_deform_motion_blur_mask.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_premultiply_alpha.glsl b/source/blender/compositor/shaders/compositor_premultiply_alpha.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_premultiply_alpha.glsl rename to source/blender/compositor/shaders/compositor_premultiply_alpha.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_projector_lens_distortion.glsl b/source/blender/compositor/shaders/compositor_projector_lens_distortion.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_projector_lens_distortion.glsl rename to source/blender/compositor/shaders/compositor_projector_lens_distortion.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_read_input.glsl b/source/blender/compositor/shaders/compositor_read_input.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_read_input.glsl rename to source/blender/compositor/shaders/compositor_read_input.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_realize_on_domain.glsl b/source/blender/compositor/shaders/compositor_realize_on_domain.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_realize_on_domain.glsl rename to source/blender/compositor/shaders/compositor_realize_on_domain.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_scale_variable.glsl b/source/blender/compositor/shaders/compositor_scale_variable.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_scale_variable.glsl rename to source/blender/compositor/shaders/compositor_scale_variable.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_screen_lens_distortion.glsl b/source/blender/compositor/shaders/compositor_screen_lens_distortion.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_screen_lens_distortion.glsl rename to source/blender/compositor/shaders/compositor_screen_lens_distortion.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_smaa_blending_weight_calculation.glsl b/source/blender/compositor/shaders/compositor_smaa_blending_weight_calculation.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_smaa_blending_weight_calculation.glsl rename to source/blender/compositor/shaders/compositor_smaa_blending_weight_calculation.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_smaa_edge_detection.glsl b/source/blender/compositor/shaders/compositor_smaa_edge_detection.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_smaa_edge_detection.glsl rename to source/blender/compositor/shaders/compositor_smaa_edge_detection.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_smaa_neighborhood_blending.glsl b/source/blender/compositor/shaders/compositor_smaa_neighborhood_blending.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_smaa_neighborhood_blending.glsl rename to source/blender/compositor/shaders/compositor_smaa_neighborhood_blending.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_split.glsl b/source/blender/compositor/shaders/compositor_split.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_split.glsl rename to source/blender/compositor/shaders/compositor_split.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_summed_area_table_compute_complete_blocks.glsl b/source/blender/compositor/shaders/compositor_summed_area_table_compute_complete_blocks.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_summed_area_table_compute_complete_blocks.glsl rename to source/blender/compositor/shaders/compositor_summed_area_table_compute_complete_blocks.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_summed_area_table_compute_complete_x_prologues.glsl b/source/blender/compositor/shaders/compositor_summed_area_table_compute_complete_x_prologues.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_summed_area_table_compute_complete_x_prologues.glsl rename to source/blender/compositor/shaders/compositor_summed_area_table_compute_complete_x_prologues.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_summed_area_table_compute_complete_y_prologues.glsl b/source/blender/compositor/shaders/compositor_summed_area_table_compute_complete_y_prologues.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_summed_area_table_compute_complete_y_prologues.glsl rename to source/blender/compositor/shaders/compositor_summed_area_table_compute_complete_y_prologues.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_summed_area_table_compute_incomplete_prologues.glsl b/source/blender/compositor/shaders/compositor_summed_area_table_compute_incomplete_prologues.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_summed_area_table_compute_incomplete_prologues.glsl rename to source/blender/compositor/shaders/compositor_summed_area_table_compute_incomplete_prologues.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_sun_beams.glsl b/source/blender/compositor/shaders/compositor_sun_beams.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_sun_beams.glsl rename to source/blender/compositor/shaders/compositor_sun_beams.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_symmetric_blur.glsl b/source/blender/compositor/shaders/compositor_symmetric_blur.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_symmetric_blur.glsl rename to source/blender/compositor/shaders/compositor_symmetric_blur.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_symmetric_blur_variable_size.glsl b/source/blender/compositor/shaders/compositor_symmetric_blur_variable_size.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_symmetric_blur_variable_size.glsl rename to source/blender/compositor/shaders/compositor_symmetric_blur_variable_size.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_symmetric_separable_blur.glsl b/source/blender/compositor/shaders/compositor_symmetric_separable_blur.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_symmetric_separable_blur.glsl rename to source/blender/compositor/shaders/compositor_symmetric_separable_blur.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_symmetric_separable_blur_variable_size.glsl b/source/blender/compositor/shaders/compositor_symmetric_separable_blur_variable_size.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_symmetric_separable_blur_variable_size.glsl rename to source/blender/compositor/shaders/compositor_symmetric_separable_blur_variable_size.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_tone_map_photoreceptor.glsl b/source/blender/compositor/shaders/compositor_tone_map_photoreceptor.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_tone_map_photoreceptor.glsl rename to source/blender/compositor/shaders/compositor_tone_map_photoreceptor.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_tone_map_simple.glsl b/source/blender/compositor/shaders/compositor_tone_map_simple.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_tone_map_simple.glsl rename to source/blender/compositor/shaders/compositor_tone_map_simple.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_van_vliet_gaussian_blur.glsl b/source/blender/compositor/shaders/compositor_van_vliet_gaussian_blur.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_van_vliet_gaussian_blur.glsl rename to source/blender/compositor/shaders/compositor_van_vliet_gaussian_blur.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_van_vliet_gaussian_blur_sum.glsl b/source/blender/compositor/shaders/compositor_van_vliet_gaussian_blur_sum.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_van_vliet_gaussian_blur_sum.glsl rename to source/blender/compositor/shaders/compositor_van_vliet_gaussian_blur_sum.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_write_output.glsl b/source/blender/compositor/shaders/compositor_write_output.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_write_output.glsl rename to source/blender/compositor/shaders/compositor_write_output.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_z_combine_compute_mask.glsl b/source/blender/compositor/shaders/compositor_z_combine_compute_mask.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_z_combine_compute_mask.glsl rename to source/blender/compositor/shaders/compositor_z_combine_compute_mask.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_z_combine_from_mask.glsl b/source/blender/compositor/shaders/compositor_z_combine_from_mask.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_z_combine_from_mask.glsl rename to source/blender/compositor/shaders/compositor_z_combine_from_mask.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_z_combine_simple.glsl b/source/blender/compositor/shaders/compositor_z_combine_simple.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/compositor_z_combine_simple.glsl rename to source/blender/compositor/shaders/compositor_z_combine_simple.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_alpha_crop_info.hh b/source/blender/compositor/shaders/infos/compositor_alpha_crop_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_alpha_crop_info.hh rename to source/blender/compositor/shaders/infos/compositor_alpha_crop_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_bilateral_blur_info.hh b/source/blender/compositor/shaders/infos/compositor_bilateral_blur_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_bilateral_blur_info.hh rename to source/blender/compositor/shaders/infos/compositor_bilateral_blur_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_bokeh_blur_info.hh b/source/blender/compositor/shaders/infos/compositor_bokeh_blur_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_bokeh_blur_info.hh rename to source/blender/compositor/shaders/infos/compositor_bokeh_blur_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_bokeh_blur_variable_size_info.hh b/source/blender/compositor/shaders/infos/compositor_bokeh_blur_variable_size_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_bokeh_blur_variable_size_info.hh rename to source/blender/compositor/shaders/infos/compositor_bokeh_blur_variable_size_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_bokeh_image_info.hh b/source/blender/compositor/shaders/infos/compositor_bokeh_image_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_bokeh_image_info.hh rename to source/blender/compositor/shaders/infos/compositor_bokeh_image_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_box_mask_info.hh b/source/blender/compositor/shaders/infos/compositor_box_mask_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_box_mask_info.hh rename to source/blender/compositor/shaders/infos/compositor_box_mask_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_compute_preview_info.hh b/source/blender/compositor/shaders/infos/compositor_compute_preview_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_compute_preview_info.hh rename to source/blender/compositor/shaders/infos/compositor_compute_preview_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_convert_info.hh b/source/blender/compositor/shaders/infos/compositor_convert_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_convert_info.hh rename to source/blender/compositor/shaders/infos/compositor_convert_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_cryptomatte_info.hh b/source/blender/compositor/shaders/infos/compositor_cryptomatte_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_cryptomatte_info.hh rename to source/blender/compositor/shaders/infos/compositor_cryptomatte_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_defocus_info.hh b/source/blender/compositor/shaders/infos/compositor_defocus_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_defocus_info.hh rename to source/blender/compositor/shaders/infos/compositor_defocus_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_deriche_gaussian_blur_info.hh b/source/blender/compositor/shaders/infos/compositor_deriche_gaussian_blur_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_deriche_gaussian_blur_info.hh rename to source/blender/compositor/shaders/infos/compositor_deriche_gaussian_blur_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_despeckle_info.hh b/source/blender/compositor/shaders/infos/compositor_despeckle_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_despeckle_info.hh rename to source/blender/compositor/shaders/infos/compositor_despeckle_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_directional_blur_info.hh b/source/blender/compositor/shaders/infos/compositor_directional_blur_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_directional_blur_info.hh rename to source/blender/compositor/shaders/infos/compositor_directional_blur_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_displace_info.hh b/source/blender/compositor/shaders/infos/compositor_displace_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_displace_info.hh rename to source/blender/compositor/shaders/infos/compositor_displace_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_double_edge_mask_info.hh b/source/blender/compositor/shaders/infos/compositor_double_edge_mask_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_double_edge_mask_info.hh rename to source/blender/compositor/shaders/infos/compositor_double_edge_mask_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_edge_filter_info.hh b/source/blender/compositor/shaders/infos/compositor_edge_filter_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_edge_filter_info.hh rename to source/blender/compositor/shaders/infos/compositor_edge_filter_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_ellipse_mask_info.hh b/source/blender/compositor/shaders/infos/compositor_ellipse_mask_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_ellipse_mask_info.hh rename to source/blender/compositor/shaders/infos/compositor_ellipse_mask_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_filter_info.hh b/source/blender/compositor/shaders/infos/compositor_filter_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_filter_info.hh rename to source/blender/compositor/shaders/infos/compositor_filter_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_flip_info.hh b/source/blender/compositor/shaders/infos/compositor_flip_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_flip_info.hh rename to source/blender/compositor/shaders/infos/compositor_flip_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_gamma_correct_info.hh b/source/blender/compositor/shaders/infos/compositor_gamma_correct_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_gamma_correct_info.hh rename to source/blender/compositor/shaders/infos/compositor_gamma_correct_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_glare_info.hh b/source/blender/compositor/shaders/infos/compositor_glare_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_glare_info.hh rename to source/blender/compositor/shaders/infos/compositor_glare_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_id_mask_info.hh b/source/blender/compositor/shaders/infos/compositor_id_mask_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_id_mask_info.hh rename to source/blender/compositor/shaders/infos/compositor_id_mask_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_image_crop_info.hh b/source/blender/compositor/shaders/infos/compositor_image_crop_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_image_crop_info.hh rename to source/blender/compositor/shaders/infos/compositor_image_crop_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_inpaint_info.hh b/source/blender/compositor/shaders/infos/compositor_inpaint_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_inpaint_info.hh rename to source/blender/compositor/shaders/infos/compositor_inpaint_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_jump_flooding_info.hh b/source/blender/compositor/shaders/infos/compositor_jump_flooding_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_jump_flooding_info.hh rename to source/blender/compositor/shaders/infos/compositor_jump_flooding_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_keying_info.hh b/source/blender/compositor/shaders/infos/compositor_keying_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_keying_info.hh rename to source/blender/compositor/shaders/infos/compositor_keying_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_keying_screen_info.hh b/source/blender/compositor/shaders/infos/compositor_keying_screen_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_keying_screen_info.hh rename to source/blender/compositor/shaders/infos/compositor_keying_screen_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_kuwahara_info.hh b/source/blender/compositor/shaders/infos/compositor_kuwahara_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_kuwahara_info.hh rename to source/blender/compositor/shaders/infos/compositor_kuwahara_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_map_uv_info.hh b/source/blender/compositor/shaders/infos/compositor_map_uv_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_map_uv_info.hh rename to source/blender/compositor/shaders/infos/compositor_map_uv_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_morphological_blur_info.hh b/source/blender/compositor/shaders/infos/compositor_morphological_blur_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_morphological_blur_info.hh rename to source/blender/compositor/shaders/infos/compositor_morphological_blur_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_morphological_distance_feather_info.hh b/source/blender/compositor/shaders/infos/compositor_morphological_distance_feather_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_morphological_distance_feather_info.hh rename to source/blender/compositor/shaders/infos/compositor_morphological_distance_feather_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_morphological_distance_info.hh b/source/blender/compositor/shaders/infos/compositor_morphological_distance_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_morphological_distance_info.hh rename to source/blender/compositor/shaders/infos/compositor_morphological_distance_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_morphological_distance_threshold_info.hh b/source/blender/compositor/shaders/infos/compositor_morphological_distance_threshold_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_morphological_distance_threshold_info.hh rename to source/blender/compositor/shaders/infos/compositor_morphological_distance_threshold_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_morphological_step_info.hh b/source/blender/compositor/shaders/infos/compositor_morphological_step_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_morphological_step_info.hh rename to source/blender/compositor/shaders/infos/compositor_morphological_step_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_motion_blur_info.hh b/source/blender/compositor/shaders/infos/compositor_motion_blur_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_motion_blur_info.hh rename to source/blender/compositor/shaders/infos/compositor_motion_blur_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_movie_distortion_info.hh b/source/blender/compositor/shaders/infos/compositor_movie_distortion_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_movie_distortion_info.hh rename to source/blender/compositor/shaders/infos/compositor_movie_distortion_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_normalize_info.hh b/source/blender/compositor/shaders/infos/compositor_normalize_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_normalize_info.hh rename to source/blender/compositor/shaders/infos/compositor_normalize_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_parallel_reduction_info.hh b/source/blender/compositor/shaders/infos/compositor_parallel_reduction_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_parallel_reduction_info.hh rename to source/blender/compositor/shaders/infos/compositor_parallel_reduction_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_pixelate_info.hh b/source/blender/compositor/shaders/infos/compositor_pixelate_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_pixelate_info.hh rename to source/blender/compositor/shaders/infos/compositor_pixelate_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_plane_deform_info.hh b/source/blender/compositor/shaders/infos/compositor_plane_deform_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_plane_deform_info.hh rename to source/blender/compositor/shaders/infos/compositor_plane_deform_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_premultiply_alpha_info.hh b/source/blender/compositor/shaders/infos/compositor_premultiply_alpha_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_premultiply_alpha_info.hh rename to source/blender/compositor/shaders/infos/compositor_premultiply_alpha_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_projector_lens_distortion_info.hh b/source/blender/compositor/shaders/infos/compositor_projector_lens_distortion_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_projector_lens_distortion_info.hh rename to source/blender/compositor/shaders/infos/compositor_projector_lens_distortion_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_read_input_info.hh b/source/blender/compositor/shaders/infos/compositor_read_input_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_read_input_info.hh rename to source/blender/compositor/shaders/infos/compositor_read_input_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_realize_on_domain_info.hh b/source/blender/compositor/shaders/infos/compositor_realize_on_domain_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_realize_on_domain_info.hh rename to source/blender/compositor/shaders/infos/compositor_realize_on_domain_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_scale_variable_info.hh b/source/blender/compositor/shaders/infos/compositor_scale_variable_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_scale_variable_info.hh rename to source/blender/compositor/shaders/infos/compositor_scale_variable_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_screen_lens_distortion_info.hh b/source/blender/compositor/shaders/infos/compositor_screen_lens_distortion_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_screen_lens_distortion_info.hh rename to source/blender/compositor/shaders/infos/compositor_screen_lens_distortion_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_smaa_info.hh b/source/blender/compositor/shaders/infos/compositor_smaa_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_smaa_info.hh rename to source/blender/compositor/shaders/infos/compositor_smaa_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_split_info.hh b/source/blender/compositor/shaders/infos/compositor_split_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_split_info.hh rename to source/blender/compositor/shaders/infos/compositor_split_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_summed_area_table_info.hh b/source/blender/compositor/shaders/infos/compositor_summed_area_table_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_summed_area_table_info.hh rename to source/blender/compositor/shaders/infos/compositor_summed_area_table_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_sun_beams_info.hh b/source/blender/compositor/shaders/infos/compositor_sun_beams_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_sun_beams_info.hh rename to source/blender/compositor/shaders/infos/compositor_sun_beams_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_symmetric_blur_info.hh b/source/blender/compositor/shaders/infos/compositor_symmetric_blur_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_symmetric_blur_info.hh rename to source/blender/compositor/shaders/infos/compositor_symmetric_blur_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_symmetric_blur_variable_size_info.hh b/source/blender/compositor/shaders/infos/compositor_symmetric_blur_variable_size_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_symmetric_blur_variable_size_info.hh rename to source/blender/compositor/shaders/infos/compositor_symmetric_blur_variable_size_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_symmetric_separable_blur_info.hh b/source/blender/compositor/shaders/infos/compositor_symmetric_separable_blur_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_symmetric_separable_blur_info.hh rename to source/blender/compositor/shaders/infos/compositor_symmetric_separable_blur_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_symmetric_separable_blur_variable_size_info.hh b/source/blender/compositor/shaders/infos/compositor_symmetric_separable_blur_variable_size_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_symmetric_separable_blur_variable_size_info.hh rename to source/blender/compositor/shaders/infos/compositor_symmetric_separable_blur_variable_size_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_tone_map_photoreceptor_info.hh b/source/blender/compositor/shaders/infos/compositor_tone_map_photoreceptor_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_tone_map_photoreceptor_info.hh rename to source/blender/compositor/shaders/infos/compositor_tone_map_photoreceptor_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_tone_map_simple_info.hh b/source/blender/compositor/shaders/infos/compositor_tone_map_simple_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_tone_map_simple_info.hh rename to source/blender/compositor/shaders/infos/compositor_tone_map_simple_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_van_vliet_gaussian_blur_info.hh b/source/blender/compositor/shaders/infos/compositor_van_vliet_gaussian_blur_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_van_vliet_gaussian_blur_info.hh rename to source/blender/compositor/shaders/infos/compositor_van_vliet_gaussian_blur_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_write_output_info.hh b/source/blender/compositor/shaders/infos/compositor_write_output_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_write_output_info.hh rename to source/blender/compositor/shaders/infos/compositor_write_output_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/infos/compositor_z_combine_info.hh b/source/blender/compositor/shaders/infos/compositor_z_combine_info.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/infos/compositor_z_combine_info.hh rename to source/blender/compositor/shaders/infos/compositor_z_combine_info.hh diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_alpha_over.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_alpha_over.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_alpha_over.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_alpha_over.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_bright_contrast.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_bright_contrast.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_bright_contrast.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_bright_contrast.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_channel_matte.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_channel_matte.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_channel_matte.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_channel_matte.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_chroma_matte.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_chroma_matte.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_chroma_matte.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_chroma_matte.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_color_balance.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_color_balance.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_color_balance.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_color_balance.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_color_correction.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_color_correction.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_color_correction.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_color_correction.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_color_matte.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_color_matte.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_color_matte.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_color_matte.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_color_spill.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_color_spill.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_color_spill.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_color_spill.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_color_to_luminance.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_color_to_luminance.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_color_to_luminance.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_color_to_luminance.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_difference_matte.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_difference_matte.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_difference_matte.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_difference_matte.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_distance_matte.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_distance_matte.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_distance_matte.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_distance_matte.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_exposure.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_exposure.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_exposure.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_exposure.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_gamma.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_gamma.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_gamma.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_gamma.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_hue_correct.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_hue_correct.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_hue_correct.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_hue_correct.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_hue_saturation_value.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_hue_saturation_value.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_hue_saturation_value.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_hue_saturation_value.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_image_diagonals.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_image_diagonals.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_image_diagonals.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_image_diagonals.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_invert.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_invert.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_invert.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_invert.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_jump_flooding_lib.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_jump_flooding_lib.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_jump_flooding_lib.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_jump_flooding_lib.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_luminance_matte.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_luminance_matte.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_luminance_matte.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_luminance_matte.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_main.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_main.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_main.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_main.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_map_value.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_map_value.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_map_value.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_map_value.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_motion_blur_lib.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_motion_blur_lib.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_motion_blur_lib.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_motion_blur_lib.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_normal.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_normal.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_normal.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_normal.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_ocio_processor.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_ocio_processor.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_ocio_processor.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_ocio_processor.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_posterize.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_posterize.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_posterize.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_posterize.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_separate_combine.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_separate_combine.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_separate_combine.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_separate_combine.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_set_alpha.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_set_alpha.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_set_alpha.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_set_alpha.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_store_output.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_store_output.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_store_output.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_store_output.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_summed_area_table_lib.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_summed_area_table_lib.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_summed_area_table_lib.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_summed_area_table_lib.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_texture_utilities.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_texture_utilities.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_texture_utilities.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_texture_utilities.glsl diff --git a/source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_type_conversion.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_type_conversion.glsl similarity index 100% rename from source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_type_conversion.glsl rename to source/blender/compositor/shaders/library/gpu_shader_compositor_type_conversion.glsl diff --git a/source/blender/compositor/realtime_compositor/utilities/COM_utilities_diagonals.hh b/source/blender/compositor/utilities/COM_utilities_diagonals.hh similarity index 100% rename from source/blender/compositor/realtime_compositor/utilities/COM_utilities_diagonals.hh rename to source/blender/compositor/utilities/COM_utilities_diagonals.hh diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index 0b1e4227611..3203677577c 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/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 diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt index 74ea10fa999..63bd2623590 100644 --- a/source/blender/editors/space_node/CMakeLists.txt +++ b/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 ) diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 042c9998490..2637094f8f1 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/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 diff --git a/source/blender/nodes/composite/CMakeLists.txt b/source/blender/nodes/composite/CMakeLists.txt index 4e2009aae15..90e41117ae7 100644 --- a/source/blender/nodes/composite/CMakeLists.txt +++ b/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) diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index 66dd95a9d14..657dd973c3a 100644 --- a/source/blender/render/CMakeLists.txt +++ b/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 )