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
This commit is contained in:
parent
a9121640be
commit
3059853732
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
* \{ */
|
||||
|
@ -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)
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -21,10 +21,10 @@
|
||||
* \ingroup draw
|
||||
*/
|
||||
|
||||
#include "draw_cache_extract_mesh_private.h"
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
||||
#include "extract_mesh.h"
|
||||
|
||||
namespace blender::draw {
|
||||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
|
@ -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 {
|
||||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
|
@ -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
|
||||
|
@ -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 {
|
||||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
|
@ -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)
|
||||
|
@ -25,7 +25,7 @@
|
||||
|
||||
#include "GPU_capabilities.h"
|
||||
|
||||
#include "draw_cache_extract_mesh_private.h"
|
||||
#include "extract_mesh.h"
|
||||
|
||||
namespace blender::draw {
|
||||
|
||||
|
@ -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 {
|
||||
|
@ -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 {
|
||||
|
@ -25,7 +25,7 @@
|
||||
|
||||
#include "BKE_mesh.h"
|
||||
|
||||
#include "draw_cache_extract_mesh_private.h"
|
||||
#include "extract_mesh.h"
|
||||
|
||||
namespace blender::draw {
|
||||
|
||||
|
@ -25,7 +25,7 @@
|
||||
|
||||
#include "BKE_mesh.h"
|
||||
|
||||
#include "draw_cache_extract_mesh_private.h"
|
||||
#include "extract_mesh.h"
|
||||
|
||||
namespace blender::draw {
|
||||
|
||||
|
@ -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 {
|
||||
|
@ -21,7 +21,7 @@
|
||||
* \ingroup draw
|
||||
*/
|
||||
|
||||
#include "draw_cache_extract_mesh_private.h"
|
||||
#include "extract_mesh.h"
|
||||
|
||||
namespace blender::draw {
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
* \ingroup draw
|
||||
*/
|
||||
|
||||
#include "draw_cache_extract_mesh_private.h"
|
||||
#include "extract_mesh.h"
|
||||
|
||||
namespace blender::draw {
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
* \ingroup draw
|
||||
*/
|
||||
|
||||
#include "draw_cache_extract_mesh_private.h"
|
||||
#include "extract_mesh.h"
|
||||
|
||||
namespace blender::draw {
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
* \ingroup draw
|
||||
*/
|
||||
|
||||
#include "draw_cache_extract_mesh_private.h"
|
||||
#include "extract_mesh.h"
|
||||
|
||||
namespace blender::draw {
|
||||
|
||||
|
@ -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 {
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
* \ingroup draw
|
||||
*/
|
||||
|
||||
#include "draw_cache_extract_mesh_private.h"
|
||||
#include "extract_mesh.h"
|
||||
|
||||
namespace blender::draw {
|
||||
|
||||
|
@ -23,7 +23,7 @@
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
||||
#include "draw_cache_extract_mesh_private.h"
|
||||
#include "extract_mesh.h"
|
||||
|
||||
namespace blender::draw {
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
||||
|
||||
#include "BKE_paint.h"
|
||||
|
||||
#include "draw_cache_extract_mesh_private.h"
|
||||
#include "extract_mesh.h"
|
||||
|
||||
namespace blender::draw {
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
* \ingroup draw
|
||||
*/
|
||||
|
||||
#include "draw_cache_extract_mesh_private.h"
|
||||
#include "extract_mesh.h"
|
||||
|
||||
namespace blender::draw {
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
* \ingroup draw
|
||||
*/
|
||||
|
||||
#include "draw_cache_extract_mesh_private.h"
|
||||
#include "extract_mesh.h"
|
||||
|
||||
namespace blender::draw {
|
||||
|
||||
|
@ -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 {
|
||||
|
||||
|
@ -23,7 +23,7 @@
|
||||
|
||||
#include "BLI_string.h"
|
||||
|
||||
#include "draw_cache_extract_mesh_private.h"
|
||||
#include "extract_mesh.h"
|
||||
|
||||
namespace blender::draw {
|
||||
|
||||
|
@ -25,7 +25,7 @@
|
||||
|
||||
#include "BLI_string.h"
|
||||
|
||||
#include "draw_cache_extract_mesh_private.h"
|
||||
#include "extract_mesh.h"
|
||||
|
||||
namespace blender::draw {
|
||||
|
||||
|
@ -25,7 +25,7 @@
|
||||
|
||||
#include "BKE_deform.h"
|
||||
|
||||
#include "draw_cache_extract_mesh_private.h"
|
||||
#include "extract_mesh.h"
|
||||
|
||||
namespace blender::draw {
|
||||
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit c8579c5cf43229843df505da9644b5b0b7201974
|
||||
Subproject commit 2afbb8ec472cac5102eb239f57b006f8c9387685
|
Loading…
Reference in New Issue
Block a user