Cleanup: Simplify arguments to sculpt draw functions

Instead of passing pointers to specific mesh data, rely on
retrieving that data from the mesh internally. This makes
it easier to support retrieving additional data from Mesh
(like active attribute names in D15101 or D15169). It also makes
the functions simpler conceptually, because they're drawing
a mesh with an acceleration strcture on top.

The BKE_id_attribute_copy_domains_temp call was unnecessary
because the GPU_pbvh_mesh_buffers_update function was only
called when Mesh/PBVH_FACES is used in the first place.

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

1 files changed, 6 insertions, 8 deletions

diff --git a/source/blender/gpu/GPU_buffers.h b/source/blender/gpu/GPU_buffers.h
index 89473ac0fe0..6dc49ff494d 100644
--- a/source/blender/gpu/GPU_buffers.h
+++ b/source/blender/gpu/GPU_buffers.h
@@ -22,6 +22,7 @@ struct CCGKey;
 struct DMFlagMat;
 struct GSet;
 struct TableGSet;
+struct Mesh;
 struct MLoop;
 struct MLoopCol;
 struct MLoopTri;
@@ -46,14 +47,12 @@ typedef struct GPU_PBVH_Buffers GPU_PBVH_Buffers;
  *
  * Threaded: do not call any functions that use OpenGL calls!
  */
-GPU_PBVH_Buffers *GPU_pbvh_mesh_buffers_build(const struct MPoly *mpoly,
-                                              const struct MLoop *mloop,
+GPU_PBVH_Buffers *GPU_pbvh_mesh_buffers_build(const struct Mesh *mesh,
+                                              const struct MVert *vertices,
                                               const struct MLoopTri *looptri,
-                                              const struct MVert *mvert,
-                                              const int *face_indices,
                                               const int *sculpt_face_sets,
-                                              int face_indices_len,
-                                              const struct Mesh *mesh);
+                                              const int *face_indices,
+                                              int face_indices_len);
 
 /**
  * Threaded: do not call any functions that use OpenGL calls!
@@ -91,9 +90,8 @@ enum {
  */
 void GPU_pbvh_mesh_buffers_update(PBVHGPUFormat *vbo_id,
                                   GPU_PBVH_Buffers *buffers,
+                                  const struct Mesh *mesh,
                                   const struct MVert *mvert,
-                                  const CustomData *vdata,
-                                  const CustomData *ldata,
                                   const float *vmask,
                                   const int *sculpt_face_sets,
                                   const int face_sets_color_seed,