GPUUniformBuf: Rename struct and change API a bit

This follows the GPU module naming of other buffers.
We pass name to distinguish each GPUUniformBuf in debug mode.
Also remove DRW_uniform_buffer interface.

1 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/draw/engines/workbench/workbench_private.h b/source/blender/draw/engines/workbench/workbench_private.h
index 4a6dadc32fd..12e573a02d0 100644
--- a/source/blender/draw/engines/workbench/workbench_private.h
+++ b/source/blender/draw/engines/workbench/workbench_private.h
@@ -238,7 +238,7 @@ typedef struct WORKBENCH_PrivateData {
   /** Copy of context mode for faster access. */
   eContextObjectMode ctx_mode;
   /** Shorthand for wpd->vldata->world_ubo. */
-  struct GPUUniformBuffer *world_ubo;
+  struct GPUUniformBuf *world_ubo;
   /** Background color to clear the color buffer with. */
   float background_color[4];
 
@@ -309,7 +309,7 @@ typedef struct WORKBENCH_PrivateData {
   struct BLI_memblock *material_ubo_data;
   /** Current material chunk being filled by workbench_material_setup_ex(). */
   WORKBENCH_UBO_Material *material_ubo_data_curr;
-  struct GPUUniformBuffer *material_ubo_curr;
+  struct GPUUniformBuf *material_ubo_curr;
   /** Copy of txl->dummy_image_tx for faster access. */
   struct GPUTexture *dummy_image_tx;
   /** Total number of used material chunk. */
@@ -359,11 +359,11 @@ typedef struct WORKBENCH_ObjectData {
 
 typedef struct WORKBENCH_ViewLayerData {
   /** Depth of field sample location array.*/
-  struct GPUUniformBuffer *dof_sample_ubo;
+  struct GPUUniformBuf *dof_sample_ubo;
   /** All constant data used for a render loop.*/
-  struct GPUUniformBuffer *world_ubo;
+  struct GPUUniformBuf *world_ubo;
   /** Cavity sample location array.*/
-  struct GPUUniformBuffer *cavity_sample_ubo;
+  struct GPUUniformBuf *cavity_sample_ubo;
   /** Blue noise texture used to randomize the sampling of some effects.*/
   struct GPUTexture *cavity_jitter_tx;
   /** Materials ubos allocated in a memblock for easy bookeeping. */
@@ -490,7 +490,7 @@ DRWShadingGroup *workbench_image_setup_ex(WORKBENCH_PrivateData *wpd,
 void workbench_private_data_init(WORKBENCH_PrivateData *wpd);
 void workbench_update_world_ubo(WORKBENCH_PrivateData *wpd);
 void workbench_update_material_ubos(WORKBENCH_PrivateData *wpd);
-struct GPUUniformBuffer *workbench_material_ubo_alloc(WORKBENCH_PrivateData *wpd);
+struct GPUUniformBuf *workbench_material_ubo_alloc(WORKBENCH_PrivateData *wpd);
 
 /* workbench_volume.c */
 void workbench_volume_engine_init(WORKBENCH_Data *vedata);