broadcom/compiler: rename QUNIFORM_GET_BUFFER_SIZE to QUNIFORM_GET_SSBO_SIZE

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>

diff --git a/src/broadcom/compiler/nir_to_vir.c b/src/broadcom/compiler/nir_to_vir.c
index e83dc0f..b7cf2a2 100644 (file)
--- a/src/broadcom/compiler/nir_to_vir.c
+++ b/src/broadcom/compiler/nir_to_vir.c
@@ -2197,7 +2197,7 @@ ntq_emit_intrinsic(struct v3d_compile *c, nir_intrinsic_instr *instr)
 
         case nir_intrinsic_get_ssbo_size:
                 ntq_store_dest(c, &instr->dest, 0,
-                               vir_uniform(c, QUNIFORM_GET_BUFFER_SIZE,
+                               vir_uniform(c, QUNIFORM_GET_SSBO_SIZE,
                                            nir_src_as_uint(instr->src[0])));
                 break;
 

diff --git a/src/broadcom/compiler/v3d_compiler.h b/src/broadcom/compiler/v3d_compiler.h
index f42f161..11262d9 100644 (file)
--- a/src/broadcom/compiler/v3d_compiler.h
+++ b/src/broadcom/compiler/v3d_compiler.h
@@ -252,7 +252,7 @@ enum quniform_contents {
         QUNIFORM_SSBO_OFFSET,
 
         /* Returns the size of the SSBO or UBO given by the data value. */
-        QUNIFORM_GET_BUFFER_SIZE,
+        QUNIFORM_GET_SSBO_SIZE,
         QUNIFORM_GET_UBO_SIZE,
 
         /* Sizes (in pixels) of a shader image given by the data value. */

diff --git a/src/broadcom/compiler/vir_dump.c b/src/broadcom/compiler/vir_dump.c
index bc450c4..98cb226 100644 (file)
--- a/src/broadcom/compiler/vir_dump.c
+++ b/src/broadcom/compiler/vir_dump.c
@@ -118,7 +118,7 @@ vir_dump_uniform(enum quniform_contents contents,
                 fprintf(stderr, "ssbo[%d]", data);
                 break;
 
-        case QUNIFORM_GET_BUFFER_SIZE:
+        case QUNIFORM_GET_SSBO_SIZE:
                 fprintf(stderr, "ssbo_size[%d]", data);
                 break;
 

diff --git a/src/broadcom/vulkan/v3dv_uniforms.c b/src/broadcom/vulkan/v3dv_uniforms.c
index 5731aa5..c368b80 100644 (file)
--- a/src/broadcom/vulkan/v3dv_uniforms.c
+++ b/src/broadcom/vulkan/v3dv_uniforms.c
@@ -215,7 +215,7 @@ write_ubo_ssbo_uniforms(struct v3dv_cmd_buffer *cmd_buffer,
       assert(descriptor->buffer->mem);
       assert(descriptor->buffer->mem->bo);
 
-      if (content == QUNIFORM_GET_BUFFER_SIZE ||
+      if (content == QUNIFORM_GET_SSBO_SIZE ||
           content == QUNIFORM_GET_UBO_SIZE) {
          cl_aligned_u32(uniforms, descriptor->range);
       } else {
@@ -376,7 +376,7 @@ v3dv_write_uniforms_wg_offsets(struct v3dv_cmd_buffer *cmd_buffer,
 
       case QUNIFORM_SSBO_OFFSET:
       case QUNIFORM_UBO_ADDR:
-      case QUNIFORM_GET_BUFFER_SIZE:
+      case QUNIFORM_GET_SSBO_SIZE:
       case QUNIFORM_GET_UBO_SIZE:
          write_ubo_ssbo_uniforms(cmd_buffer, pipeline, &uniforms,
                                  uinfo->contents[i], data);

diff --git a/src/gallium/drivers/v3d/v3d_uniforms.c b/src/gallium/drivers/v3d/v3d_uniforms.c
index 37fb98d..b1e8e82 100644 (file)
--- a/src/gallium/drivers/v3d/v3d_uniforms.c
+++ b/src/gallium/drivers/v3d/v3d_uniforms.c
@@ -352,7 +352,7 @@ v3d_write_uniforms(struct v3d_context *v3d, struct v3d_job *job,
                         break;
                 }
 
-                case QUNIFORM_GET_BUFFER_SIZE:
+                case QUNIFORM_GET_SSBO_SIZE:
                         cl_aligned_u32(&uniforms,
                                        v3d->ssbo[stage].sb[data].buffer_size);
                         break;
@@ -457,7 +457,7 @@ v3d_set_shader_uniform_dirty_flags(struct v3d_compiled_shader *shader)
                         break;
 
                 case QUNIFORM_SSBO_OFFSET:
-                case QUNIFORM_GET_BUFFER_SIZE:
+                case QUNIFORM_GET_SSBO_SIZE:
                         dirty |= VC5_DIRTY_SSBO;
                         break;