[Bf-blender-cvs] [b9b15d47f34] temp-gpu-compute-shader-hair: Rename to DRW_UNIFORM_VERTEX_BUFFER_AS_STORAGE

[Jeroen Bakker]

Commit: b9b15d47f345f4ff80faf73cd5626366094fca29
Author: Jeroen Bakker
Date:   Fri May 7 15:53:02 2021 +0200
Branches: temp-gpu-compute-shader-hair
https://developer.blender.org/rBb9b15d47f345f4ff80faf73cd5626366094fca29

Rename to DRW_UNIFORM_VERTEX_BUFFER_AS_STORAGE

===================================================================

M	source/blender/draw/intern/draw_manager.h
M	source/blender/draw/intern/draw_manager_data.c
M	source/blender/draw/intern/draw_manager_exec.c

===================================================================

diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h
index 89d6e5645da..d4e22c83798 100644
--- a/source/blender/draw/intern/draw_manager.h
+++ b/source/blender/draw/intern/draw_manager.h
@@ -285,6 +285,7 @@ struct DRWCallBuffer {
 };
 
 /** Used by #DRWUniform.type */
+/* TODO(jbakker): rename to DRW_RESOURCE/DRWResourceType. */
 typedef enum {
   DRW_UNIFORM_INT = 0,
   DRW_UNIFORM_INT_COPY,
@@ -297,8 +298,7 @@ typedef enum {
   DRW_UNIFORM_BLOCK,
   DRW_UNIFORM_BLOCK_REF,
   DRW_UNIFORM_TFEEDBACK_TARGET,
-  /* Not an actual uniform, but a buffer for compute shaders. */
-  DRW_VERTEX_BUFFER,
+  DRW_UNIFORM_VERTEX_BUFFER_AS_STORAGE,
   /** Per drawcall uniforms/UBO */
   DRW_UNIFORM_BLOCK_OBMATS,
   DRW_UNIFORM_BLOCK_OBINFOS,
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index 8e93e713d7d..3b852e7f8c8 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -456,7 +456,8 @@ void DRW_shgroup_vertex_buffer(DRWShadingGroup *shgroup,
     BLI_assert(false && "Unable to locate binding of shader storage buffer objects.");
     return;
   }
-  drw_shgroup_uniform_create_ex(shgroup, location, DRW_VERTEX_BUFFER, vertex_buffer, 0, 0, 1);
+  drw_shgroup_uniform_create_ex(
+      shgroup, location, DRW_UNIFORM_VERTEX_BUFFER_AS_STORAGE, vertex_buffer, 0, 0, 1);
 }
 
 /** \} */
@@ -527,10 +528,10 @@ static void drw_call_obinfos_init(DRWObjectInfos *ob_infos, Object *ob)
   drw_call_calc_orco(ob, ob_infos->orcotexfac);
   /* Random float value. */
   uint random = (DST.dupli_source) ?
-                     DST.dupli_source->random_id :
-                     /* TODO(fclem): this is rather costly to do at runtime. Maybe we can
-                      * put it in ob->runtime and make depsgraph ensure it is up to date. */
-                     BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0);
+                    DST.dupli_source->random_id :
+                    /* TODO(fclem): this is rather costly to do at runtime. Maybe we can
+                     * put it in ob->runtime and make depsgraph ensure it is up to date. */
+                    BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0);
   ob_infos->ob_random = random * (1.0f / (float)0xFFFFFFFF);
   /* Object State. */
   ob_infos->ob_flag = 1.0f; /* Required to have a correct sign */
diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c
index 810a525bc1a..f29caebeb84 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -673,7 +673,7 @@ static void draw_update_uniforms(DRWShadingGroup *shgroup,
           *use_tfeedback = GPU_shader_transform_feedback_enable(shgroup->shader,
                                                                 ((GPUVertBuf *)uni->pvalue));
           break;
-        case DRW_VERTEX_BUFFER:
+        case DRW_UNIFORM_VERTEX_BUFFER_AS_STORAGE:
           GPU_vertbuf_bind_as_ssbo((GPUVertBuf *)uni->pvalue, uni->location);
           break;
           /* Legacy/Fallback support. */