From 7a3ef6a8ab24f4a2dffcfe7604214a3e1c824bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Tue, 18 Feb 2025 12:50:25 +0100 Subject: [PATCH] Cleanup: DRW: Remove draw_manager_c from DRW_gpu_wrapper.hh dependencies This makes dependency on the draw manager clearer and improve build time. --- source/blender/draw/engines/eevee_next/eevee_film.hh | 1 + source/blender/draw/engines/eevee_next/eevee_gbuffer.hh | 1 + source/blender/draw/engines/eevee_next/eevee_instance.cc | 1 + source/blender/draw/engines/eevee_next/eevee_lightcache.cc | 1 + source/blender/draw/engines/eevee_next/eevee_shadow.cc | 1 + source/blender/draw/engines/gpencil/gpencil_antialiasing.cc | 1 + source/blender/draw/engines/overlay/overlay_armature.cc | 1 + .../blender/draw/engines/workbench/workbench_effect_cavity.cc | 1 + source/blender/draw/engines/workbench/workbench_engine.cc | 1 + source/blender/draw/engines/workbench/workbench_shadow.cc | 1 + source/blender/draw/intern/DRW_gpu_wrapper.hh | 1 - source/blender/draw/intern/draw_cache_impl_particles.cc | 1 + source/blender/draw/intern/draw_command.hh | 1 + source/blender/draw/intern/draw_hair.cc | 2 ++ source/blender/draw/intern/draw_pass.hh | 3 ++- source/blender/draw/intern/draw_sculpt.cc | 2 ++ source/blender/draw/intern/draw_view.cc | 2 ++ source/blender/draw/intern/draw_view.hh | 1 + source/blender/draw/tests/draw_pass_test.cc | 1 + source/blender/draw/tests/eevee_test.cc | 1 + 20 files changed, 23 insertions(+), 2 deletions(-) diff --git a/source/blender/draw/engines/eevee_next/eevee_film.hh b/source/blender/draw/engines/eevee_next/eevee_film.hh index 57b0c966091..b26044b3e1b 100644 --- a/source/blender/draw/engines/eevee_next/eevee_film.hh +++ b/source/blender/draw/engines/eevee_next/eevee_film.hh @@ -33,6 +33,7 @@ #include "BLI_math_vector.hh" #include "BLI_set.hh" +#include "DNA_scene_types.h" #include "DRW_render.hh" #include "eevee_shader_shared.hh" diff --git a/source/blender/draw/engines/eevee_next/eevee_gbuffer.hh b/source/blender/draw/engines/eevee_next/eevee_gbuffer.hh index 21c79bfd848..66464bb2105 100644 --- a/source/blender/draw/engines/eevee_next/eevee_gbuffer.hh +++ b/source/blender/draw/engines/eevee_next/eevee_gbuffer.hh @@ -13,6 +13,7 @@ #include "DRW_render.hh" #include "GPU_capabilities.hh" +#include "GPU_platform.hh" #include "eevee_material.hh" #include "eevee_shader_shared.hh" diff --git a/source/blender/draw/engines/eevee_next/eevee_instance.cc b/source/blender/draw/engines/eevee_next/eevee_instance.cc index 8a568c1e8c9..20b7901fea2 100644 --- a/source/blender/draw/engines/eevee_next/eevee_instance.cc +++ b/source/blender/draw/engines/eevee_next/eevee_instance.cc @@ -22,6 +22,7 @@ #include "DNA_lightprobe_types.h" #include "DNA_modifier_types.h" +#include "GPU_context.hh" #include "IMB_imbuf_types.hh" #include "RE_pipeline.h" diff --git a/source/blender/draw/engines/eevee_next/eevee_lightcache.cc b/source/blender/draw/engines/eevee_next/eevee_lightcache.cc index bc36ec19577..c26dabfc089 100644 --- a/source/blender/draw/engines/eevee_next/eevee_lightcache.cc +++ b/source/blender/draw/engines/eevee_next/eevee_lightcache.cc @@ -10,6 +10,7 @@ #include +#include "DRW_engine.hh" #include "DRW_render.hh" #include "BKE_global.hh" diff --git a/source/blender/draw/engines/eevee_next/eevee_shadow.cc b/source/blender/draw/engines/eevee_next/eevee_shadow.cc index 07a00a177c1..4bd80b788e8 100644 --- a/source/blender/draw/engines/eevee_next/eevee_shadow.cc +++ b/source/blender/draw/engines/eevee_next/eevee_shadow.cc @@ -12,6 +12,7 @@ #include "GPU_batch_utils.hh" #include "GPU_compute.hh" +#include "GPU_context.hh" #include "eevee_instance.hh" #include "GPU_debug.hh" diff --git a/source/blender/draw/engines/gpencil/gpencil_antialiasing.cc b/source/blender/draw/engines/gpencil/gpencil_antialiasing.cc index 9081faec4c5..3ed9b4863be 100644 --- a/source/blender/draw/engines/gpencil/gpencil_antialiasing.cc +++ b/source/blender/draw/engines/gpencil/gpencil_antialiasing.cc @@ -6,6 +6,7 @@ * \ingroup draw */ +#include "DNA_scene_types.h" #include "DRW_render.hh" #include "gpencil_engine.h" diff --git a/source/blender/draw/engines/overlay/overlay_armature.cc b/source/blender/draw/engines/overlay/overlay_armature.cc index 00389486c3b..7ccee45f359 100644 --- a/source/blender/draw/engines/overlay/overlay_armature.cc +++ b/source/blender/draw/engines/overlay/overlay_armature.cc @@ -42,6 +42,7 @@ #include "draw_cache.hh" #include "draw_common_c.hh" +#include "draw_manager_c.hh" #include "draw_manager_text.hh" #include "overlay_next_armature.hh" diff --git a/source/blender/draw/engines/workbench/workbench_effect_cavity.cc b/source/blender/draw/engines/workbench/workbench_effect_cavity.cc index 614e0dc71ae..359c533844e 100644 --- a/source/blender/draw/engines/workbench/workbench_effect_cavity.cc +++ b/source/blender/draw/engines/workbench/workbench_effect_cavity.cc @@ -14,6 +14,7 @@ */ #include "BLI_rand.h" +#include "DNA_scene_types.h" #include "workbench_private.hh" namespace blender::workbench { diff --git a/source/blender/draw/engines/workbench/workbench_engine.cc b/source/blender/draw/engines/workbench/workbench_engine.cc index cd0715fd8b3..0c17ddf17f3 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.cc +++ b/source/blender/draw/engines/workbench/workbench_engine.cc @@ -22,6 +22,7 @@ #include "BLT_translation.hh" +#include "GPU_context.hh" #include "IMB_imbuf_types.hh" #include "RE_engine.h" diff --git a/source/blender/draw/engines/workbench/workbench_shadow.cc b/source/blender/draw/engines/workbench/workbench_shadow.cc index 2257230064d..f8b1907758d 100644 --- a/source/blender/draw/engines/workbench/workbench_shadow.cc +++ b/source/blender/draw/engines/workbench/workbench_shadow.cc @@ -16,6 +16,7 @@ */ #include "BKE_object.hh" +#include "DNA_scene_types.h" #include "DRW_render.hh" #include "GPU_compute.hh" diff --git a/source/blender/draw/intern/DRW_gpu_wrapper.hh b/source/blender/draw/intern/DRW_gpu_wrapper.hh index 81338fdb8d8..4568d9a0870 100644 --- a/source/blender/draw/intern/DRW_gpu_wrapper.hh +++ b/source/blender/draw/intern/DRW_gpu_wrapper.hh @@ -59,7 +59,6 @@ #include "MEM_guardedalloc.h" -#include "draw_manager_c.hh" #include "BKE_global.hh" #include "BLI_math_vector_types.hh" diff --git a/source/blender/draw/intern/draw_cache_impl_particles.cc b/source/blender/draw/intern/draw_cache_impl_particles.cc index 3920a42fdca..027e719c303 100644 --- a/source/blender/draw/intern/draw_cache_impl_particles.cc +++ b/source/blender/draw/intern/draw_cache_impl_particles.cc @@ -8,6 +8,7 @@ * \brief Particle API for render engines */ +#include "DNA_scene_types.h" #include "DRW_render.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/draw/intern/draw_command.hh b/source/blender/draw/intern/draw_command.hh index 2a24c123c61..0e3ecd8d87a 100644 --- a/source/blender/draw/intern/draw_command.hh +++ b/source/blender/draw/intern/draw_command.hh @@ -18,6 +18,7 @@ #include "BLI_math_base.h" #include "DRW_gpu_wrapper.hh" +#include "GPU_index_buffer.hh" #include "draw_command_shared.hh" #include "draw_handle.hh" #include "draw_state.hh" diff --git a/source/blender/draw/intern/draw_hair.cc b/source/blender/draw/intern/draw_hair.cc index b39680afa81..0c8ee10cb53 100644 --- a/source/blender/draw/intern/draw_hair.cc +++ b/source/blender/draw/intern/draw_hair.cc @@ -8,6 +8,7 @@ * \brief Contains procedural GPU hair drawing methods. */ +#include "DNA_scene_types.h" #include "DRW_render.hh" #include "BLI_math_matrix.h" @@ -30,6 +31,7 @@ #include "draw_common_c.hh" #include "draw_hair_private.hh" #include "draw_manager.hh" +#include "draw_manager_c.hh" #include "draw_shader.hh" #include "draw_shader_shared.hh" diff --git a/source/blender/draw/intern/draw_pass.hh b/source/blender/draw/intern/draw_pass.hh index c8c361fc71a..3b9fc1ef4a6 100644 --- a/source/blender/draw/intern/draw_pass.hh +++ b/source/blender/draw/intern/draw_pass.hh @@ -46,7 +46,9 @@ #include "BKE_image.hh" +#include "GPU_batch.hh" #include "GPU_debug.hh" +#include "GPU_index_buffer.hh" #include "GPU_material.hh" #include "DRW_gpu_wrapper.hh" @@ -54,7 +56,6 @@ #include "draw_command.hh" #include "draw_handle.hh" #include "draw_manager.hh" -#include "draw_pass.hh" #include "draw_shader_shared.hh" #include "draw_state.hh" diff --git a/source/blender/draw/intern/draw_sculpt.cc b/source/blender/draw/intern/draw_sculpt.cc index 52e2d289b86..c378b9da1da 100644 --- a/source/blender/draw/intern/draw_sculpt.cc +++ b/source/blender/draw/intern/draw_sculpt.cc @@ -9,7 +9,9 @@ #include "draw_sculpt.hh" #include "DNA_mesh_types.h" +#include "DNA_scene_types.h" #include "draw_attributes.hh" +#include "draw_manager_c.hh" #include "draw_view.hh" #include "BKE_attribute.hh" diff --git a/source/blender/draw/intern/draw_view.cc b/source/blender/draw/intern/draw_view.cc index ae4cf88294c..4223d110702 100644 --- a/source/blender/draw/intern/draw_view.cc +++ b/source/blender/draw/intern/draw_view.cc @@ -10,9 +10,11 @@ #include "BLI_math_matrix.h" #include "BLI_math_matrix.hh" +#include "DRW_render.hh" #include "GPU_compute.hh" #include "GPU_debug.hh" +#include "draw_manager_c.hh" #include "draw_shader.hh" #include "draw_view.hh" diff --git a/source/blender/draw/intern/draw_view.hh b/source/blender/draw/intern/draw_view.hh index ebb9636d2ba..b16896194ba 100644 --- a/source/blender/draw/intern/draw_view.hh +++ b/source/blender/draw/intern/draw_view.hh @@ -17,6 +17,7 @@ * setting `drw_view_id` accordingly. */ +#include "DNA_view3d_types.h" #include "DRW_gpu_wrapper.hh" #include "GPU_matrix.hh" diff --git a/source/blender/draw/tests/draw_pass_test.cc b/source/blender/draw/tests/draw_pass_test.cc index 2587bb01a11..25074c841d2 100644 --- a/source/blender/draw/tests/draw_pass_test.cc +++ b/source/blender/draw/tests/draw_pass_test.cc @@ -6,6 +6,7 @@ #include "BLI_math_geom.h" #include "BLI_math_matrix.hh" +#include "GPU_context.hh" #include "draw_cache.hh" #include "draw_manager.hh" diff --git a/source/blender/draw/tests/eevee_test.cc b/source/blender/draw/tests/eevee_test.cc index ebc6b19490d..91a51c481ae 100644 --- a/source/blender/draw/tests/eevee_test.cc +++ b/source/blender/draw/tests/eevee_test.cc @@ -5,6 +5,7 @@ #include "testing/testing.h" #include "GPU_batch.hh" +#include "GPU_context.hh" #include "draw_shader.hh" #include "draw_testing.hh" #include "engines/eevee_next/eevee_lut.hh"