[Bf-blender-cvs] [e517aaa1364] master: Cleanup: move extract points into own compile unit.
Jeroen Bakker
noreply at git.blender.org
Mon Jun 7 13:37:20 CEST 2021
Commit: e517aaa13648d4e690fb723cc9ab7c61c5b6ae79
Author: Jeroen Bakker
Date: Mon Jun 7 13:27:38 2021 +0200
Branches: master
https://developer.blender.org/rBe517aaa13648d4e690fb723cc9ab7c61c5b6ae79
Cleanup: move extract points into own compile unit.
===================================================================
M source/blender/draw/CMakeLists.txt
M source/blender/draw/intern/draw_cache_extract.h
M source/blender/draw/intern/draw_cache_extract_mesh_extractors.c
M source/blender/draw/intern/draw_cache_extract_mesh_private.h
A source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc
===================================================================
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index ee5b2c549a5..b8dc6b775e3 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -54,6 +54,7 @@ set(SRC
intern/draw_cache_extract_mesh_extractors.c
intern/draw_cache_extract_mesh_render_data.c
intern/draw_cache_extract_mesh.cc
+ intern/mesh_extractors/extract_mesh_ibo_points.cc
intern/draw_cache_impl_curve.cc
intern/draw_cache_impl_displist.c
intern/draw_cache_impl_gpencil.c
diff --git a/source/blender/draw/intern/draw_cache_extract.h b/source/blender/draw/intern/draw_cache_extract.h
index 810deaec349..0b6dffa9073 100644
--- a/source/blender/draw/intern/draw_cache_extract.h
+++ b/source/blender/draw/intern/draw_cache_extract.h
@@ -77,6 +77,7 @@ typedef enum eMRIterType {
ENUM_OPERATORS(eMRIterType, MR_ITER_LVERT)
typedef enum eMRDataType {
+ MR_DATA_NONE = 0,
MR_DATA_POLY_NOR = 1 << 1,
MR_DATA_LOOP_NOR = 1 << 2,
MR_DATA_LOOPTRI = 1 << 3,
diff --git a/source/blender/draw/intern/draw_cache_extract_mesh_extractors.c b/source/blender/draw/intern/draw_cache_extract_mesh_extractors.c
index 0a3945291bb..31ddf625336 100644
--- a/source/blender/draw/intern/draw_cache_extract_mesh_extractors.c
+++ b/source/blender/draw/intern/draw_cache_extract_mesh_extractors.c
@@ -434,136 +434,6 @@ const MeshExtract extract_lines_loose_only = {
/** \} */
-/* ---------------------------------------------------------------------- */
-/** \name Extract Point Indices
- * \{ */
-
-static void *extract_points_init(const MeshRenderData *mr,
- struct MeshBatchCache *UNUSED(cache),
- void *UNUSED(buf))
-{
- GPUIndexBufBuilder *elb = MEM_mallocN(sizeof(*elb), __func__);
- GPU_indexbuf_init(elb, GPU_PRIM_POINTS, mr->vert_len, mr->loop_len + mr->loop_loose_len);
- return elb;
-}
-
-BLI_INLINE void vert_set_bm(GPUIndexBufBuilder *elb, BMVert *eve, int l_index)
-{
- const int v_index = BM_elem_index_get(eve);
- if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
- GPU_indexbuf_set_point_vert(elb, v_index, l_index);
- }
- else {
- GPU_indexbuf_set_point_restart(elb, v_index);
- }
-}
-
-BLI_INLINE void vert_set_mesh(GPUIndexBufBuilder *elb,
- const MeshRenderData *mr,
- const int v_index,
- const int l_index)
-{
- const MVert *mv = &mr->mvert[v_index];
- if (!((mr->use_hide && (mv->flag & ME_HIDE)) ||
- ((mr->extract_type == MR_EXTRACT_MAPPED) && (mr->v_origindex) &&
- (mr->v_origindex[v_index] == ORIGINDEX_NONE)))) {
- GPU_indexbuf_set_point_vert(elb, v_index, l_index);
- }
- else {
- GPU_indexbuf_set_point_restart(elb, v_index);
- }
-}
-
-static void extract_points_iter_poly_bm(const MeshRenderData *UNUSED(mr),
- BMFace *f,
- const int UNUSED(f_index),
- void *elb)
-{
- BMLoop *l_iter, *l_first;
- l_iter = l_first = BM_FACE_FIRST_LOOP(f);
- do {
- const int l_index = BM_elem_index_get(l_iter);
-
- vert_set_bm(elb, l_iter->v, l_index);
- } while ((l_iter = l_iter->next) != l_first);
-}
-
-static void extract_points_iter_poly_mesh(const MeshRenderData *mr,
- const MPoly *mp,
- const int UNUSED(mp_index),
- void *elb)
-{
- const MLoop *mloop = mr->mloop;
- const int ml_index_end = mp->loopstart + mp->totloop;
- for (int ml_index = mp->loopstart; ml_index < ml_index_end; ml_index += 1) {
- const MLoop *ml = &mloop[ml_index];
- vert_set_mesh(elb, mr, ml->v, ml_index);
- }
-}
-
-static void extract_points_iter_ledge_bm(const MeshRenderData *mr,
- BMEdge *eed,
- const int ledge_index,
- void *elb)
-{
- vert_set_bm(elb, eed->v1, mr->loop_len + (ledge_index * 2));
- vert_set_bm(elb, eed->v2, mr->loop_len + (ledge_index * 2) + 1);
-}
-
-static void extract_points_iter_ledge_mesh(const MeshRenderData *mr,
- const MEdge *med,
- const uint ledge_index,
- void *elb)
-{
- vert_set_mesh(elb, mr, med->v1, mr->loop_len + (ledge_index * 2));
- vert_set_mesh(elb, mr, med->v2, mr->loop_len + (ledge_index * 2) + 1);
-}
-
-static void extract_points_iter_lvert_bm(const MeshRenderData *mr,
- BMVert *eve,
- const int lvert_index,
- void *elb)
-{
- const int offset = mr->loop_len + (mr->edge_loose_len * 2);
- vert_set_bm(elb, eve, offset + lvert_index);
-}
-
-static void extract_points_iter_lvert_mesh(const MeshRenderData *mr,
- const MVert *UNUSED(mv),
- const int lvert_index,
- void *elb)
-{
- const int offset = mr->loop_len + (mr->edge_loose_len * 2);
-
- vert_set_mesh(elb, mr, mr->lverts[lvert_index], offset + lvert_index);
-}
-
-static void extract_points_finish(const MeshRenderData *UNUSED(mr),
- struct MeshBatchCache *UNUSED(cache),
- void *buf,
- void *elb)
-{
- GPUIndexBuf *ibo = buf;
- GPU_indexbuf_build_in_place(elb, ibo);
- MEM_freeN(elb);
-}
-
-const MeshExtract extract_points = {
- .init = extract_points_init,
- .iter_poly_bm = extract_points_iter_poly_bm,
- .iter_poly_mesh = extract_points_iter_poly_mesh,
- .iter_ledge_bm = extract_points_iter_ledge_bm,
- .iter_ledge_mesh = extract_points_iter_ledge_mesh,
- .iter_lvert_bm = extract_points_iter_lvert_bm,
- .iter_lvert_mesh = extract_points_iter_lvert_mesh,
- .finish = extract_points_finish,
- .data_type = 0,
- .use_threading = false,
- .mesh_buffer_offset = offsetof(MeshBufferCache, ibo.points),
-};
-
-/** \} */
-
/* ---------------------------------------------------------------------- */
/** \name Extract Face-dots Indices
* \{ */
diff --git a/source/blender/draw/intern/draw_cache_extract_mesh_private.h b/source/blender/draw/intern/draw_cache_extract_mesh_private.h
index 6761282fe79..4fc93d19b3c 100644
--- a/source/blender/draw/intern/draw_cache_extract_mesh_private.h
+++ b/source/blender/draw/intern/draw_cache_extract_mesh_private.h
@@ -430,14 +430,14 @@ typedef struct MeshExtract {
/** Executed on one worker thread after all elements iterations. */
ExtractFinishFn *finish;
/** Used to request common data. */
- const eMRDataType data_type;
+ eMRDataType data_type;
/** Used to know if the element callbacks are thread-safe and can be parallelized. */
- const bool use_threading;
+ bool use_threading;
/**
* Offset in bytes of the buffer inside a MeshBufferCache instance. Points to a vertex or index
* buffer.
*/
- const size_t mesh_buffer_offset;
+ size_t mesh_buffer_offset;
} MeshExtract;
/** \} */
diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc
new file mode 100644
index 00000000000..ee80a3c458c
--- /dev/null
+++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc
@@ -0,0 +1,174 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2021 by Blender Foundation.
+ * All rights reserved.
+ */
+
+/** \file
+ * \ingroup draw
+ */
+
+#include "draw_cache_extract_mesh_private.h"
+
+#include "BLI_vector.hh"
+
+#include "MEM_guardedalloc.h"
+
+namespace blender::draw {
+
+/* ---------------------------------------------------------------------- */
+/** \name Extract Point Indices
+ * \{ */
+static void *extract_points_init(const MeshRenderData *mr,
+ struct MeshBatchCache *UNUSED(cache),
+ void *UNUSED(buf))
+{
+ GPUIndexBufBuilder *elb = static_cast<GPUIndexBufBuilder *>(MEM_mallocN(sizeof(*elb), __func__));
+ GPU_indexbuf_init(elb, GPU_PRIM_POINTS, mr->vert_len, mr->loop_len + mr->loop_loose_len);
+ return elb;
+}
+
+BLI_INLINE void vert_set_bm(GPUIndexBufBuilder *elb, BMVert *eve, int l_index)
+{
+ const int v_index = BM_elem_index_get(eve);
+ if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
+ GPU_indexbuf_set_point_vert(elb, v_index, l_index);
+ }
+ else {
+ GPU_indexbuf_set_point_restart(elb, v_index);
+ }
+}
+
+BLI_INLINE void vert_set_mesh(GPUIndexBufBuilder *elb,
+ const MeshRenderData *mr,
+ const int v_index,
+ const int l_index)
+{
+ const MVert *mv = &mr->mvert[v_index];
+ if (!((mr->use_hide && (mv->flag & ME_HIDE)) ||
+ ((mr->extract_type == MR_EXTRACT_MAPPED) && (mr->v_origindex) &&
+ (mr->v_origindex[v_index] == ORIGINDEX_NONE)))) {
+ GPU_indexbuf_set_point_vert(elb, v_index, l_index);
+ }
+ else {
+ GPU_indexbuf_set_point_restart(elb, v_index);
+ }
+}
+
+static void extract_points_iter_poly_bm(const MeshRenderData *UNUSED(mr),
+ BMFace *f,
+ const int UNUSED(f_index),
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list