Cleanup: Overlay: Remove _next in overlay filename

These are not needed anymore since the legacy codebase
is gone.

source/blender/draw/CMakeLists.txt

@@ -144,10 +144,10 @@ set(SRC
   engines/select/select_engine.cc
   engines/select/select_instance.cc
   engines/overlay/overlay_armature.cc
-  engines/overlay/overlay_next_engine.cc
-  engines/overlay/overlay_next_instance.cc
-  engines/overlay/overlay_next_shader.cc
-  engines/overlay/overlay_next_shape.cc
+  engines/overlay/overlay_engine.cc
+  engines/overlay/overlay_instance.cc
+  engines/overlay/overlay_shader.cc
+  engines/overlay/overlay_shape.cc
 
   DRW_engine.hh
   DRW_pbvh.hh
@@ -239,48 +239,47 @@ set(SRC
   engines/image/image_texture_info.hh
   engines/image/image_usage.hh
   engines/overlay/overlay_engine.h
-  engines/overlay/overlay_next_antialiasing.hh
-  engines/overlay/overlay_next_armature.hh
-  engines/overlay/overlay_next_attribute_text.hh
-  engines/overlay/overlay_next_attribute_viewer.hh
-  engines/overlay/overlay_next_axes.hh
-  engines/overlay/overlay_next_background.hh
-  engines/overlay/overlay_next_base.hh
-  engines/overlay/overlay_next_bounds.hh
-  engines/overlay/overlay_next_camera.hh
-  engines/overlay/overlay_next_cursor.hh
-  engines/overlay/overlay_next_curve.hh
-  engines/overlay/overlay_next_edit_text.hh
-  engines/overlay/overlay_next_empty.hh
-  engines/overlay/overlay_next_facing.hh
-  engines/overlay/overlay_next_fade.hh
-  engines/overlay/overlay_next_fluid.hh
-  engines/overlay/overlay_next_force_field.hh
-  engines/overlay/overlay_next_grease_pencil.hh
-  engines/overlay/overlay_next_grid.hh
-  engines/overlay/overlay_next_image.hh
-  engines/overlay/overlay_next_instance.hh
-  engines/overlay/overlay_next_lattice.hh
-  engines/overlay/overlay_next_light.hh
-  engines/overlay/overlay_next_lightprobe.hh
-  engines/overlay/overlay_next_mesh.hh
-  engines/overlay/overlay_next_metaball.hh
-  engines/overlay/overlay_next_mode_transfer.hh
-  engines/overlay/overlay_next_motion_path.hh
-  engines/overlay/overlay_next_name.hh
-  engines/overlay/overlay_next_origin.hh
-  engines/overlay/overlay_next_outline.hh
-  engines/overlay/overlay_next_paint.hh
-  engines/overlay/overlay_next_particle.hh
-  engines/overlay/overlay_next_pointcloud.hh
-  engines/overlay/overlay_next_prepass.hh
-  engines/overlay/overlay_next_private.hh
-  engines/overlay/overlay_next_relation.hh
-  engines/overlay/overlay_next_sculpt.hh
-  engines/overlay/overlay_next_speaker.hh
-  engines/overlay/overlay_next_wireframe.hh
-  engines/overlay/overlay_next_xray_fade.hh
+  engines/overlay/overlay_antialiasing.hh
+  engines/overlay/overlay_armature.hh
+  engines/overlay/overlay_attribute_text.hh
+  engines/overlay/overlay_attribute_viewer.hh
+  engines/overlay/overlay_axes.hh
+  engines/overlay/overlay_background.hh
+  engines/overlay/overlay_base.hh
+  engines/overlay/overlay_bounds.hh
+  engines/overlay/overlay_camera.hh
+  engines/overlay/overlay_cursor.hh
+  engines/overlay/overlay_curve.hh
+  engines/overlay/overlay_edit_text.hh
+  engines/overlay/overlay_empty.hh
+  engines/overlay/overlay_facing.hh
+  engines/overlay/overlay_fade.hh
+  engines/overlay/overlay_fluid.hh
+  engines/overlay/overlay_force_field.hh
+  engines/overlay/overlay_grease_pencil.hh
+  engines/overlay/overlay_grid.hh
+  engines/overlay/overlay_image.hh
+  engines/overlay/overlay_instance.hh
+  engines/overlay/overlay_lattice.hh
+  engines/overlay/overlay_light.hh
+  engines/overlay/overlay_lightprobe.hh
+  engines/overlay/overlay_mesh.hh
+  engines/overlay/overlay_metaball.hh
+  engines/overlay/overlay_mode_transfer.hh
+  engines/overlay/overlay_motion_path.hh
+  engines/overlay/overlay_name.hh
+  engines/overlay/overlay_origin.hh
+  engines/overlay/overlay_outline.hh
+  engines/overlay/overlay_paint.hh
+  engines/overlay/overlay_particle.hh
+  engines/overlay/overlay_pointcloud.hh
+  engines/overlay/overlay_prepass.hh
   engines/overlay/overlay_private.hh
+  engines/overlay/overlay_relation.hh
+  engines/overlay/overlay_sculpt.hh
+  engines/overlay/overlay_speaker.hh
+  engines/overlay/overlay_wireframe.hh
+  engines/overlay/overlay_xray_fade.hh
   engines/select/select_defines.hh
   engines/select/select_engine.hh
   engines/select/select_instance.hh

source/blender/draw/engines/overlay/overlay_antialiasing.hh

@@ -42,7 +42,7 @@
 
 #pragma once
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 #include "DNA_userdef_types.h"
 

source/blender/draw/engines/overlay/overlay_armature.cc

@@ -45,7 +45,7 @@
 #include "draw_context_private.hh"
 #include "draw_manager_text.hh"
 
-#include "overlay_next_armature.hh"
+#include "overlay_armature.hh"
 
 #include "draw_cache_impl.hh"
 

source/blender/draw/engines/overlay/overlay_armature.hh

@@ -14,7 +14,7 @@
 
 #include "DRW_render.hh"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 #include "overlay_shader_shared.hh"
 
 namespace blender::draw::overlay {

source/blender/draw/engines/overlay/overlay_attribute_text.hh

@@ -26,7 +26,7 @@
 
 #include "draw_manager_text.hh"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_attribute_viewer.hh

@@ -16,7 +16,7 @@
 
 #include "draw_cache.hh"
 #include "draw_cache_impl.hh"
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_axes.hh

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_background.hh

@@ -12,7 +12,7 @@
 
 #include "draw_cache.hh"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_base.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "overlay_next_private.hh"
+#include "overlay_private.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_bounds.hh

@@ -15,7 +15,7 @@
 
 #include "DNA_rigidbody_types.h"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_camera.hh

@@ -17,8 +17,8 @@
 #include "ED_view3d.hh"
 
 #include "draw_manager_text.hh"
-#include "overlay_next_base.hh"
-#include "overlay_next_empty.hh"
+#include "overlay_base.hh"
+#include "overlay_empty.hh"
 
 namespace blender::draw::overlay {
 struct CameraInstanceData : public ExtraInstanceData {

source/blender/draw/engines/overlay/overlay_cursor.hh

@@ -16,7 +16,7 @@
 #include "ED_view3d.hh"
 #include "UI_view2d.hh"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_curve.hh

@@ -17,7 +17,7 @@
 #include "draw_cache.hh"
 #include "draw_cache_impl.hh"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_edit_text.hh

@@ -11,7 +11,7 @@
 #include "BKE_vfont.hh"
 #include "BLI_math_matrix.hh"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_empty.hh

@@ -9,8 +9,8 @@
 #pragma once
 
 #include "DRW_render.hh"
-#include "overlay_next_base.hh"
-#include "overlay_next_image.hh"
+#include "overlay_base.hh"
+#include "overlay_image.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_engine.cc

@@ -8,7 +8,7 @@
  * Engine for drawing a selection map where the pixels indicate the selection indices.
  */
 
-#include "overlay_next_instance.hh"
+#include "overlay_instance.hh"
 
 #include "overlay_engine.h"
 

source/blender/draw/engines/overlay/overlay_facing.hh

@@ -12,7 +12,7 @@
 
 #include "draw_sculpt.hh"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_fade.hh

@@ -11,8 +11,8 @@
 #include "BKE_modifier.hh"
 #include "BKE_paint.hh"
 
-#include "overlay_next_armature.hh"
-#include "overlay_next_base.hh"
+#include "overlay_armature.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_fluid.hh

@@ -13,7 +13,7 @@
 
 #include "BKE_modifier.hh"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_force_field.hh

@@ -14,7 +14,7 @@
 
 #include "DNA_object_force_types.h"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_grease_pencil.hh

@@ -24,7 +24,7 @@
 #include "draw_cache.hh"
 #include "draw_manager_text.hh"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_grid.hh

@@ -19,7 +19,7 @@
 #include "GPU_texture.hh"
 
 #include "draw_shader_shared.hh"
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_instance.cc

@@ -14,7 +14,7 @@
 #include "BKE_paint.hh"
 
 #include "draw_debug.hh"
-#include "overlay_next_instance.hh"
+#include "overlay_instance.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_instance.hh

@@ -8,45 +8,45 @@
 
 #pragma once
 
-#include "overlay_next_private.hh"
+#include "overlay_private.hh"
 
-#include "overlay_next_antialiasing.hh"
-#include "overlay_next_armature.hh"
-#include "overlay_next_attribute_text.hh"
-#include "overlay_next_attribute_viewer.hh"
-#include "overlay_next_axes.hh"
-#include "overlay_next_background.hh"
-#include "overlay_next_bounds.hh"
-#include "overlay_next_camera.hh"
-#include "overlay_next_cursor.hh"
-#include "overlay_next_curve.hh"
-#include "overlay_next_edit_text.hh"
-#include "overlay_next_empty.hh"
-#include "overlay_next_facing.hh"
-#include "overlay_next_fade.hh"
-#include "overlay_next_fluid.hh"
-#include "overlay_next_force_field.hh"
-#include "overlay_next_grease_pencil.hh"
-#include "overlay_next_grid.hh"
-#include "overlay_next_lattice.hh"
-#include "overlay_next_light.hh"
-#include "overlay_next_lightprobe.hh"
-#include "overlay_next_mesh.hh"
-#include "overlay_next_metaball.hh"
-#include "overlay_next_mode_transfer.hh"
-#include "overlay_next_motion_path.hh"
-#include "overlay_next_name.hh"
-#include "overlay_next_origin.hh"
-#include "overlay_next_outline.hh"
-#include "overlay_next_paint.hh"
-#include "overlay_next_particle.hh"
-#include "overlay_next_pointcloud.hh"
-#include "overlay_next_prepass.hh"
-#include "overlay_next_relation.hh"
-#include "overlay_next_sculpt.hh"
-#include "overlay_next_speaker.hh"
-#include "overlay_next_wireframe.hh"
-#include "overlay_next_xray_fade.hh"
+#include "overlay_antialiasing.hh"
+#include "overlay_armature.hh"
+#include "overlay_attribute_text.hh"
+#include "overlay_attribute_viewer.hh"
+#include "overlay_axes.hh"
+#include "overlay_background.hh"
+#include "overlay_bounds.hh"
+#include "overlay_camera.hh"
+#include "overlay_cursor.hh"
+#include "overlay_curve.hh"
+#include "overlay_edit_text.hh"
+#include "overlay_empty.hh"
+#include "overlay_facing.hh"
+#include "overlay_fade.hh"
+#include "overlay_fluid.hh"
+#include "overlay_force_field.hh"
+#include "overlay_grease_pencil.hh"
+#include "overlay_grid.hh"
+#include "overlay_lattice.hh"
+#include "overlay_light.hh"
+#include "overlay_lightprobe.hh"
+#include "overlay_mesh.hh"
+#include "overlay_metaball.hh"
+#include "overlay_mode_transfer.hh"
+#include "overlay_motion_path.hh"
+#include "overlay_name.hh"
+#include "overlay_origin.hh"
+#include "overlay_outline.hh"
+#include "overlay_paint.hh"
+#include "overlay_particle.hh"
+#include "overlay_pointcloud.hh"
+#include "overlay_prepass.hh"
+#include "overlay_relation.hh"
+#include "overlay_sculpt.hh"
+#include "overlay_speaker.hh"
+#include "overlay_wireframe.hh"
+#include "overlay_xray_fade.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_lattice.hh

@@ -11,7 +11,7 @@
 #include "draw_cache.hh"
 #include "draw_cache_impl.hh"
 #include "draw_common_c.hh"
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_light.hh

@@ -12,7 +12,7 @@
 
 #include "BLI_math_matrix.h"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_lightprobe.hh

@@ -10,7 +10,7 @@
 
 #include "DNA_lightprobe_types.h"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_mesh.hh

@@ -31,7 +31,7 @@
 #include "draw_cache.hh"
 #include "draw_cache_impl.hh"
 #include "draw_manager_text.hh"
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_metaball.hh

@@ -10,7 +10,7 @@
 
 #include "ED_mball.hh"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_mode_transfer.hh

@@ -15,7 +15,7 @@
 #include "draw_cache.hh"
 #include "draw_sculpt.hh"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_motion_path.hh

@@ -14,8 +14,8 @@
 
 #include "draw_manager_text.hh"
 
-#include "overlay_next_armature.hh"
-#include "overlay_next_base.hh"
+#include "overlay_armature.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_name.hh

@@ -10,7 +10,7 @@
 
 #include "draw_manager_text.hh"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_origin.hh

@@ -10,7 +10,7 @@
 
 #include "BKE_layer.hh"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_outline.hh

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "overlay_next_base.hh"
-#include "overlay_next_grease_pencil.hh"
+#include "overlay_base.hh"
+#include "overlay_grease_pencil.hh"
 
 #include "draw_common.hh"
 

source/blender/draw/engines/overlay/overlay_paint.hh

@@ -17,7 +17,7 @@
 #include "draw_cache.hh"
 #include "draw_cache_impl.hh"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_particle.hh

@@ -17,7 +17,7 @@
 #include "ED_particle.hh"
 
 #include "draw_cache.hh"
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_pointcloud.hh

@@ -11,7 +11,7 @@
 #include "draw_cache.hh"
 #include "draw_cache_impl.hh"
 #include "draw_common_c.hh"
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_prepass.hh

@@ -14,9 +14,9 @@
 
 #include "draw_sculpt.hh"
 
-#include "overlay_next_base.hh"
-#include "overlay_next_grease_pencil.hh"
-#include "overlay_next_particle.hh"
+#include "overlay_base.hh"
+#include "overlay_grease_pencil.hh"
+#include "overlay_particle.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_relation.hh

@@ -15,7 +15,7 @@
 #include "DNA_modifier_types.h"
 #include "DNA_rigidbody_types.h"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_sculpt.hh

@@ -22,7 +22,7 @@
 #include "draw_cache_impl.hh"
 #include "draw_sculpt.hh"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_shader.cc

@@ -6,7 +6,7 @@
  * \ingroup overlay
  */
 
-#include "overlay_next_private.hh"
+#include "overlay_private.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_shape.cc

@@ -9,7 +9,7 @@
 #include "GPU_batch_utils.hh"
 #include "draw_cache.hh"
 
-#include "overlay_next_private.hh"
+#include "overlay_private.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_speaker.hh

@@ -10,7 +10,7 @@
 
 #include "DNA_speaker_types.h"
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_wireframe.hh

@@ -15,8 +15,8 @@
 #include "draw_common.hh"
 #include "draw_sculpt.hh"
 
-#include "overlay_next_base.hh"
-#include "overlay_next_mesh.hh"
+#include "overlay_base.hh"
+#include "overlay_mesh.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/overlay/overlay_xray_fade.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "overlay_next_base.hh"
+#include "overlay_base.hh"
 
 namespace blender::draw::overlay {
 

source/blender/draw/engines/select/select_engine.cc

@@ -30,7 +30,7 @@
 #include "draw_pass.hh"
 #include "draw_view_data.hh"
 
-#include "../overlay/overlay_next_private.hh"
+#include "../overlay/overlay_private.hh"
 
 #include "select_engine.hh"
 

source/blender/draw/engines/select/select_instance.cc

@@ -10,7 +10,7 @@
 
 #include "select_engine.hh"
 
-#include "../overlay/overlay_next_instance.hh"
+#include "../overlay/overlay_instance.hh"
 #include "select_instance.hh"
 
 namespace blender::draw::select {