[Bf-blender-cvs] [eb0c50ac786] master: Cleanup: rename 'MeshBufferExtractionCache' to 'MeshBufferCache'
Germano Cavalcante
noreply at git.blender.org
Mon Aug 23 19:05:11 CEST 2021
Commit: eb0c50ac7866046f4c528a2a71874ee137aa9564
Author: Germano Cavalcante
Date: Mon Aug 23 12:35:43 2021 -0300
Branches: master
https://developer.blender.org/rBeb0c50ac7866046f4c528a2a71874ee137aa9564
Cleanup: rename 'MeshBufferExtractionCache' to 'MeshBufferCache'
Matches the existing `MeshBatchCache`.
===================================================================
M source/blender/draw/intern/draw_cache_extract.h
M source/blender/draw/intern/draw_cache_extract_mesh.cc
M source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
M source/blender/draw/intern/draw_cache_impl_mesh.c
M source/blender/draw/intern/mesh_extractors/extract_mesh.h
===================================================================
diff --git a/source/blender/draw/intern/draw_cache_extract.h b/source/blender/draw/intern/draw_cache_extract.h
index 246a2a6ee7e..0d730058ba4 100644
--- a/source/blender/draw/intern/draw_cache_extract.h
+++ b/source/blender/draw/intern/draw_cache_extract.h
@@ -159,7 +159,7 @@ typedef struct MeshBufferList {
*
* - Loose geometry.
*/
-typedef struct MeshBufferExtractionCache {
+typedef struct MeshBufferCache {
struct {
int edge_len;
int vert_len;
@@ -172,7 +172,7 @@ typedef struct MeshBufferExtractionCache {
int *mat_tri_len;
int visible_tri_len;
} poly_sorted;
-} MeshBufferExtractionCache;
+} MeshBufferCache;
#define FOREACH_MESH_BUFFER_CACHE(batch_cache, mbuflist) \
for (MeshBufferList *mbuflist = &batch_cache->final; \
@@ -185,9 +185,9 @@ typedef struct MeshBufferExtractionCache {
typedef struct MeshBatchCache {
MeshBufferList final, cage, uv_cage;
- MeshBufferExtractionCache final_extraction_cache;
- MeshBufferExtractionCache cage_extraction_cache;
- MeshBufferExtractionCache uv_cage_extraction_cache;
+ MeshBufferCache final_extraction_cache;
+ MeshBufferCache cage_extraction_cache;
+ MeshBufferCache uv_cage_extraction_cache;
struct {
/* Surfaces / Render */
@@ -309,7 +309,7 @@ BLI_STATIC_ASSERT(MBC_BATCH_INDEX(surface_per_mat) < 32,
void mesh_buffer_cache_create_requested(struct TaskGraph *task_graph,
MeshBatchCache *cache,
MeshBufferList *mbuflist,
- MeshBufferExtractionCache *extraction_cache,
+ MeshBufferCache *extraction_cache,
Mesh *me,
const bool is_editmode,
const bool is_paint_mode,
diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.cc b/source/blender/draw/intern/draw_cache_extract_mesh.cc
index 82ce4087ff8..5bdcf615e22 100644
--- a/source/blender/draw/intern/draw_cache_extract_mesh.cc
+++ b/source/blender/draw/intern/draw_cache_extract_mesh.cc
@@ -497,12 +497,12 @@ static struct TaskNode *extract_task_node_create(struct TaskGraph *task_graph,
* \{ */
struct MeshRenderDataUpdateTaskData {
MeshRenderData *mr = nullptr;
- MeshBufferExtractionCache *cache = nullptr;
+ MeshBufferCache *cache = nullptr;
eMRIterType iter_type;
eMRDataType data_flag;
MeshRenderDataUpdateTaskData(MeshRenderData *mr,
- MeshBufferExtractionCache *cache,
+ MeshBufferCache *cache,
eMRIterType iter_type,
eMRDataType data_flag)
: mr(mr), cache(cache), iter_type(iter_type), data_flag(data_flag)
@@ -542,7 +542,7 @@ static void mesh_extract_render_data_node_exec(void *__restrict task_data)
static struct TaskNode *mesh_extract_render_data_node_create(struct TaskGraph *task_graph,
MeshRenderData *mr,
- MeshBufferExtractionCache *cache,
+ MeshBufferCache *cache,
const eMRIterType iter_type,
const eMRDataType data_flag)
{
@@ -566,7 +566,7 @@ static struct TaskNode *mesh_extract_render_data_node_create(struct TaskGraph *t
static void mesh_buffer_cache_create_requested(struct TaskGraph *task_graph,
MeshBatchCache *cache,
MeshBufferList *mbuflist,
- MeshBufferExtractionCache *extraction_cache,
+ MeshBufferCache *extraction_cache,
Mesh *me,
const bool is_editmode,
@@ -780,7 +780,7 @@ extern "C" {
void mesh_buffer_cache_create_requested(struct TaskGraph *task_graph,
MeshBatchCache *cache,
MeshBufferList *mbuflist,
- MeshBufferExtractionCache *extraction_cache,
+ MeshBufferCache *extraction_cache,
Mesh *me,
const bool is_editmode,
diff --git a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
index 27fd6ca9134..abfbeabef6b 100644
--- a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
+++ b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
@@ -45,17 +45,15 @@
* \{ */
static void mesh_render_data_lverts_bm(const MeshRenderData *mr,
- MeshBufferExtractionCache *cache,
+ MeshBufferCache *cache,
BMesh *bm);
static void mesh_render_data_ledges_bm(const MeshRenderData *mr,
- MeshBufferExtractionCache *cache,
+ MeshBufferCache *cache,
BMesh *bm);
-static void mesh_render_data_loose_geom_mesh(const MeshRenderData *mr,
- MeshBufferExtractionCache *cache);
-static void mesh_render_data_loose_geom_build(const MeshRenderData *mr,
- MeshBufferExtractionCache *cache);
+static void mesh_render_data_loose_geom_mesh(const MeshRenderData *mr, MeshBufferCache *cache);
+static void mesh_render_data_loose_geom_build(const MeshRenderData *mr, MeshBufferCache *cache);
-static void mesh_render_data_loose_geom_load(MeshRenderData *mr, MeshBufferExtractionCache *cache)
+static void mesh_render_data_loose_geom_load(MeshRenderData *mr, MeshBufferCache *cache)
{
mr->ledges = cache->loose_geom.edges;
mr->lverts = cache->loose_geom.verts;
@@ -65,8 +63,7 @@ static void mesh_render_data_loose_geom_load(MeshRenderData *mr, MeshBufferExtra
mr->loop_loose_len = mr->vert_loose_len + (mr->edge_loose_len * 2);
}
-static void mesh_render_data_loose_geom_ensure(const MeshRenderData *mr,
- MeshBufferExtractionCache *cache)
+static void mesh_render_data_loose_geom_ensure(const MeshRenderData *mr, MeshBufferCache *cache)
{
/* Early exit: Are loose geometry already available.
* Only checking for loose verts as loose edges and verts are calculated at the same time. */
@@ -76,8 +73,7 @@ static void mesh_render_data_loose_geom_ensure(const MeshRenderData *mr,
mesh_render_data_loose_geom_build(mr, cache);
}
-static void mesh_render_data_loose_geom_build(const MeshRenderData *mr,
- MeshBufferExtractionCache *cache)
+static void mesh_render_data_loose_geom_build(const MeshRenderData *mr, MeshBufferCache *cache)
{
cache->loose_geom.vert_len = 0;
cache->loose_geom.edge_len = 0;
@@ -94,8 +90,7 @@ static void mesh_render_data_loose_geom_build(const MeshRenderData *mr,
}
}
-static void mesh_render_data_loose_geom_mesh(const MeshRenderData *mr,
- MeshBufferExtractionCache *cache)
+static void mesh_render_data_loose_geom_mesh(const MeshRenderData *mr, MeshBufferCache *cache)
{
BLI_bitmap *lvert_map = BLI_BITMAP_NEW(mr->vert_len, __func__);
@@ -128,9 +123,7 @@ static void mesh_render_data_loose_geom_mesh(const MeshRenderData *mr,
MEM_freeN(lvert_map);
}
-static void mesh_render_data_lverts_bm(const MeshRenderData *mr,
- MeshBufferExtractionCache *cache,
- BMesh *bm)
+static void mesh_render_data_lverts_bm(const MeshRenderData *mr, MeshBufferCache *cache, BMesh *bm)
{
int elem_id;
BMIter iter;
@@ -147,9 +140,7 @@ static void mesh_render_data_lverts_bm(const MeshRenderData *mr,
}
}
-static void mesh_render_data_ledges_bm(const MeshRenderData *mr,
- MeshBufferExtractionCache *cache,
- BMesh *bm)
+static void mesh_render_data_ledges_bm(const MeshRenderData *mr, MeshBufferCache *cache, BMesh *bm)
{
int elem_id;
BMIter iter;
@@ -167,7 +158,7 @@ static void mesh_render_data_ledges_bm(const MeshRenderData *mr,
}
void mesh_render_data_update_loose_geom(MeshRenderData *mr,
- MeshBufferExtractionCache *cache,
+ MeshBufferCache *cache,
const eMRIterType iter_type,
const eMRDataType data_flag)
{
@@ -185,16 +176,13 @@ void mesh_render_data_update_loose_geom(MeshRenderData *mr,
* Contains polygon indices sorted based on their material.
*
* \{ */
-static void mesh_render_data_polys_sorted_load(MeshRenderData *mr,
- const MeshBufferExtractionCache *cache);
-static void mesh_render_data_polys_sorted_ensure(MeshRenderData *mr,
- MeshBufferExtractionCache *cache);
-static void mesh_render_data_polys_sorted_build(MeshRenderData *mr,
- MeshBufferExtractionCache *cache);
+static void mesh_render_data_polys_sorted_load(MeshRenderData *mr, const MeshBufferCache *cache);
+static void mesh_render_data_polys_sorted_ensure(MeshRenderData *mr, MeshBufferCache *cache);
+static void mesh_render_data_polys_sorted_build(MeshRenderData *mr, MeshBufferCache *cache);
static int *mesh_render_data_mat_tri_len_build(MeshRenderData *mr);
void mesh_render_data_update_polys_sorted(MeshRenderData *mr,
- MeshBufferExtractionCache *cache,
+ MeshBufferCache *cache,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list