Cleanup: Rearrange mesh extraction files

In the draw module, it's not easy to identify what its header is, and
where the shared functions are.

So move `draw_cache_extract_mesh_extractors.c` and
`draw_cache_extract_mesh_private.h` to the same folder as the extractors
and rename these files to make them more identifiable.

Reviewed By: jbakker

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

source/blender/draw/CMakeLists.txt

@@ -52,8 +52,8 @@ set(INC
 set(SRC
   intern/draw_cache.c
   intern/draw_cache_extract_mesh.cc
-  intern/draw_cache_extract_mesh_extractors.c
   intern/draw_cache_extract_mesh_render_data.c
+  intern/mesh_extractors/extract_mesh.c
   intern/mesh_extractors/extract_mesh_ibo_edituv.cc
   intern/mesh_extractors/extract_mesh_ibo_fdots.cc
   intern/mesh_extractors/extract_mesh_ibo_lines.cc
@@ -193,7 +193,6 @@ set(SRC
   intern/DRW_render.h
   intern/draw_cache.h
   intern/draw_cache_extract.h
-  intern/draw_cache_extract_mesh_private.h
   intern/draw_cache_impl.h
   intern/draw_cache_inline.h
   intern/draw_color_management.h
@@ -207,6 +206,7 @@ set(SRC
   intern/draw_manager_text.h
   intern/draw_shader.h
   intern/draw_view.h
+  intern/mesh_extractors/extract_mesh.h
   intern/smaa_textures.h
   engines/basic/basic_engine.h
   engines/eevee/eevee_engine.h

source/blender/draw/intern/draw_cache_extract_mesh.cc

@@ -41,9 +41,10 @@
 #include "GPU_capabilities.h"
 
 #include "draw_cache_extract.h"
-#include "draw_cache_extract_mesh_private.h"
 #include "draw_cache_inline.h"
 
+#include "mesh_extractors/extract_mesh.h"
+
 // #define DEBUG_TIME
 
 #ifdef DEBUG_TIME

source/blender/draw/intern/draw_cache_extract_mesh_render_data.c

@@ -38,7 +38,7 @@
 
 #include "ED_mesh.h"
 
-#include "draw_cache_extract_mesh_private.h"
+#include "mesh_extractors/extract_mesh.h"
 
 /* ---------------------------------------------------------------------- */
 /** \name Update Loose Geometry

source/blender/draw/intern/draw_cache_impl_mesh.c

@@ -67,11 +67,12 @@
 #include "ED_uvedit.h"
 
 #include "draw_cache_extract.h"
-#include "draw_cache_extract_mesh_private.h"
 #include "draw_cache_inline.h"
 
 #include "draw_cache_impl.h" /* own include */
 
+#include "mesh_extractors/extract_mesh.h"
+
 /* ---------------------------------------------------------------------- */
 /** \name Dependencies between buffer and batch
  * \{ */

source/blender/draw/intern/mesh_extractors/extract_mesh.c

@@ -29,7 +29,8 @@
 
 #include "ED_uvedit.h"
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
+
 #include "draw_cache_impl.h"
 
 void *mesh_extract_buffer_get(const MeshExtract *extractor, MeshBufferCache *mbc)

source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc

@@ -21,12 +21,12 @@
  * \ingroup draw
  */
 
-#include "draw_cache_extract_mesh_private.h"
-
 #include "BLI_vector.hh"
 
 #include "MEM_guardedalloc.h"
 
+#include "extract_mesh.h"
+
 namespace blender::draw {
 /* ---------------------------------------------------------------------- */
 /** \name Extract Edit UV Triangles Indices

source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc

@@ -21,12 +21,12 @@
  * \ingroup draw
  */
 
-#include "draw_cache_extract_mesh_private.h"
-
 #include "BLI_vector.hh"
 
 #include "MEM_guardedalloc.h"
 
+#include "extract_mesh.h"
+
 namespace blender::draw {
 /* ---------------------------------------------------------------------- */
 /** \name Extract Face-dots Indices

source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc

@@ -21,10 +21,10 @@
  * \ingroup draw
  */
 
-#include "draw_cache_extract_mesh_private.h"
-
 #include "MEM_guardedalloc.h"
 
+#include "extract_mesh.h"
+
 namespace blender::draw {
 
 /* ---------------------------------------------------------------------- */

source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc

@@ -21,13 +21,13 @@
  * \ingroup draw
  */
 
-#include "draw_cache_extract_mesh_private.h"
-
 #include "BLI_edgehash.h"
 #include "BLI_vector.hh"
 
 #include "MEM_guardedalloc.h"
 
+#include "extract_mesh.h"
+
 namespace blender::draw {
 
 /* ---------------------------------------------------------------------- */

source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc

@@ -21,14 +21,14 @@
  * \ingroup draw
  */
 
-#include "draw_cache_extract_mesh_private.h"
-
 #include "BLI_bitmap.h"
 #include "BLI_vector.hh"
 #include "atomic_ops.h"
 
 #include "MEM_guardedalloc.h"
 
+#include "extract_mesh.h"
+
 namespace blender::draw {
 /* ---------------------------------------------------------------------- */
 /** \name Extract Paint Mask Line Indices

source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc

@@ -21,12 +21,12 @@
  * \ingroup draw
  */
 
-#include "draw_cache_extract_mesh_private.h"
-
 #include "BLI_vector.hh"
 
 #include "MEM_guardedalloc.h"
 
+#include "extract_mesh.h"
+
 namespace blender::draw {
 
 /* ---------------------------------------------------------------------- */

source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc

@@ -21,10 +21,10 @@
  * \ingroup draw
  */
 
-#include "draw_cache_extract_mesh_private.h"
-
 #include "MEM_guardedalloc.h"
 
+#include "extract_mesh.h"
+
 namespace blender::draw {
 
 static void extract_tris_mat_task_reduce(void *_userdata_to, void *_userdata_from)

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc

@@ -25,7 +25,7 @@
 
 #include "GPU_capabilities.h"
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc

@@ -21,7 +21,8 @@
  * \ingroup draw
  */
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
+
 #include "draw_cache_impl.h"
 
 namespace blender::draw {

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_data.cc

@@ -21,7 +21,8 @@
  * \ingroup draw
  */
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
+
 #include "draw_cache_impl.h"
 
 namespace blender::draw {

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc

@@ -25,7 +25,7 @@
 
 #include "BKE_mesh.h"
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc

@@ -25,7 +25,7 @@
 
 #include "BKE_mesh.h"
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_edituv_data.cc

@@ -21,7 +21,8 @@
  * \ingroup draw
  */
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
+
 #include "draw_cache_impl.h"
 
 namespace blender::draw {

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_nor.cc

@@ -21,7 +21,7 @@
  * \ingroup draw
  */
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc

@@ -21,7 +21,7 @@
  * \ingroup draw
  */
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_uv.cc

@@ -21,7 +21,7 @@
  * \ingroup draw
  */
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_lnor.cc

@@ -21,7 +21,7 @@
  * \ingroup draw
  */
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc

@@ -30,7 +30,7 @@
 #include "BKE_editmesh_bvh.h"
 #include "BKE_editmesh_cache.h"
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_orco.cc

@@ -21,7 +21,7 @@
  * \ingroup draw
  */
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc

@@ -23,7 +23,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc

@@ -27,7 +27,7 @@
 
 #include "BKE_paint.h"
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_select_idx.cc

@@ -21,7 +21,7 @@
  * \ingroup draw
  */
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_skin_roots.cc

@@ -21,7 +21,7 @@
  * \ingroup draw
  */
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc

@@ -30,7 +30,7 @@
 #include "BKE_mesh.h"
 #include "BKE_mesh_tangent.h"
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc

@@ -23,7 +23,7 @@
 
 #include "BLI_string.h"
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_vcol.cc

@@ -25,7 +25,7 @@
 
 #include "BLI_string.h"
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_weights.cc

@@ -25,7 +25,7 @@
 
 #include "BKE_deform.h"
 
-#include "draw_cache_extract_mesh_private.h"
+#include "extract_mesh.h"
 
 namespace blender::draw {
 

source/tools

@@ -1 +1 @@
-Subproject commit c8579c5cf43229843df505da9644b5b0b7201974
+Subproject commit 2afbb8ec472cac5102eb239f57b006f8c9387685