From 157f2a20e6bd539604a0d5ff48a4b7741eb1952b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= <foucault.clem@gmail.com>
Date: Mon, 10 Aug 2020 01:40:23 +0200
Subject: GPU: Use GPU_vertbuf_create & GPU_indexbuf_calloc instead of manual
 alloc

---
 source/blender/draw/intern/draw_cache_impl_metaball.c | 10 +++++-----
 source/blender/draw/intern/draw_cache_impl_volume.c   |  2 +-
 source/blender/draw/intern/draw_cache_inline.h        |  4 ++--
 source/blender/gpu/GPU_element.h                      |  2 ++
 source/blender/gpu/intern/gpu_element.cc              |  5 +++++
 5 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'source')

diff --git a/source/blender/draw/intern/draw_cache_impl_metaball.c b/source/blender/draw/intern/draw_cache_impl_metaball.c
index 076d32ffe1f..5f0af06931e 100644
--- a/source/blender/draw/intern/draw_cache_impl_metaball.c
+++ b/source/blender/draw/intern/draw_cache_impl_metaball.c
@@ -155,7 +155,7 @@ static GPUVertBuf *mball_batch_cache_get_pos_and_normals(Object *ob, MetaBallBat
 {
   if (cache->pos_nor_in_order == NULL) {
     ListBase *lb = &ob->runtime.curve_cache->disp;
-    cache->pos_nor_in_order = MEM_callocN(sizeof(GPUVertBuf), __func__);
+    cache->pos_nor_in_order = GPU_vertbuf_create(GPU_USAGE_STATIC);
     DRW_displist_vertbuf_create_pos_and_nor(lb, cache->pos_nor_in_order);
   }
   return cache->pos_nor_in_order;
@@ -165,7 +165,7 @@ static GPUIndexBuf *mball_batch_cache_get_edges_adj_lines(Object *ob, MetaBallBa
 {
   if (cache->edges_adj_lines == NULL) {
     ListBase *lb = &ob->runtime.curve_cache->disp;
-    cache->edges_adj_lines = MEM_callocN(sizeof(GPUVertBuf), __func__);
+    cache->edges_adj_lines = GPU_indexbuf_calloc();
     DRW_displist_indexbuf_create_edges_adjacency_lines(
         lb, cache->edges_adj_lines, &cache->is_manifold);
   }
@@ -187,7 +187,7 @@ GPUBatch *DRW_metaball_batch_cache_get_triangles_with_normals(Object *ob)
 
   if (cache->batch == NULL) {
     ListBase *lb = &ob->runtime.curve_cache->disp;
-    GPUIndexBuf *ibo = MEM_callocN(sizeof(GPUIndexBuf), __func__);
+    GPUIndexBuf *ibo = GPU_indexbuf_calloc();
     DRW_displist_indexbuf_create_triangles_in_order(lb, ibo);
     cache->batch = GPU_batch_create_ex(GPU_PRIM_TRIS,
                                        mball_batch_cache_get_pos_and_normals(ob, cache),
@@ -234,10 +234,10 @@ GPUBatch *DRW_metaball_batch_cache_get_wireframes_face(Object *ob)
   if (cache->face_wire.batch == NULL) {
     ListBase *lb = &ob->runtime.curve_cache->disp;
 
-    GPUVertBuf *vbo_wiredata = MEM_callocN(sizeof(GPUVertBuf), __func__);
+    GPUVertBuf *vbo_wiredata = GPU_vertbuf_create(GPU_USAGE_STATIC);
     DRW_displist_vertbuf_create_wiredata(lb, vbo_wiredata);
 
-    GPUIndexBuf *ibo = MEM_callocN(sizeof(GPUIndexBuf), __func__);
+    GPUIndexBuf *ibo = GPU_indexbuf_calloc();
     DRW_displist_indexbuf_create_lines_in_order(lb, ibo);
 
     cache->face_wire.batch = GPU_batch_create_ex(GPU_PRIM_LINES,
diff --git a/source/blender/draw/intern/draw_cache_impl_volume.c b/source/blender/draw/intern/draw_cache_impl_volume.c
index e07f5b33d58..825fec83cf1 100644
--- a/source/blender/draw/intern/draw_cache_impl_volume.c
+++ b/source/blender/draw/intern/draw_cache_impl_volume.c
@@ -163,7 +163,7 @@ static void drw_volume_wireframe_cb(
   GPU_vertbuf_attr_fill_stride(cache->face_wire.pos_nor_in_order, nor_id, 0, &packed_normal);
 
   /* Create wiredata. */
-  GPUVertBuf *vbo_wiredata = MEM_callocN(sizeof(GPUVertBuf), __func__);
+  GPUVertBuf *vbo_wiredata = GPU_vertbuf_create(GPU_USAGE_STATIC);
   DRW_vertbuf_create_wiredata(vbo_wiredata, totvert);
 
   if (volume->display.wireframe_type == VOLUME_WIREFRAME_POINTS) {
diff --git a/source/blender/draw/intern/draw_cache_inline.h b/source/blender/draw/intern/draw_cache_inline.h
index 06d6f1afc31..415fe2479ab 100644
--- a/source/blender/draw/intern/draw_cache_inline.h
+++ b/source/blender/draw/intern/draw_cache_inline.h
@@ -69,7 +69,7 @@ BLI_INLINE bool DRW_batch_requested(GPUBatch *batch, int prim_type)
 BLI_INLINE void DRW_ibo_request(GPUBatch *batch, GPUIndexBuf **ibo)
 {
   if (*ibo == NULL) {
-    *ibo = MEM_callocN(sizeof(GPUIndexBuf), "GPUIndexBuf");
+    *ibo = GPU_indexbuf_calloc();
   }
   if (batch != NULL) {
     GPU_batch_vao_cache_clear(batch);
@@ -87,7 +87,7 @@ BLI_INLINE bool DRW_ibo_requested(GPUIndexBuf *ibo)
 BLI_INLINE void DRW_vbo_request(GPUBatch *batch, GPUVertBuf **vbo)
 {
   if (*vbo == NULL) {
-    *vbo = MEM_callocN(sizeof(GPUVertBuf), "GPUVertBuf");
+    *vbo = GPU_vertbuf_create(GPU_USAGE_STATIC);
   }
   if (batch != NULL) {
     /* HACK set first vbo if not init. */
diff --git a/source/blender/gpu/GPU_element.h b/source/blender/gpu/GPU_element.h
index 3d5195b12fc..5cf85b4ea0e 100644
--- a/source/blender/gpu/GPU_element.h
+++ b/source/blender/gpu/GPU_element.h
@@ -54,6 +54,8 @@ typedef struct GPUIndexBuf {
   };
 } GPUIndexBuf;
 
+GPUIndexBuf *GPU_indexbuf_calloc(void);
+
 void GPU_indexbuf_use(GPUIndexBuf *);
 uint GPU_indexbuf_size_get(const GPUIndexBuf *);
 
diff --git a/source/blender/gpu/intern/gpu_element.cc b/source/blender/gpu/intern/gpu_element.cc
index cf7cc1d214c..29c95c725fd 100644
--- a/source/blender/gpu/intern/gpu_element.cc
+++ b/source/blender/gpu/intern/gpu_element.cc
@@ -326,6 +326,11 @@ static void squeeze_indices_short(GPUIndexBufBuilder *builder,
 
 #endif /* GPU_TRACK_INDEX_RANGE */
 
+GPUIndexBuf *GPU_indexbuf_calloc(void)
+{
+  return (GPUIndexBuf *)MEM_callocN(sizeof(GPUIndexBuf), __func__);
+}
+
 GPUIndexBuf *GPU_indexbuf_build(GPUIndexBufBuilder *builder)
 {
   GPUIndexBuf *elem = (GPUIndexBuf *)MEM_callocN(sizeof(GPUIndexBuf), "GPUIndexBuf");
-- 
cgit v1.2.3