Mesa (master): v3dv: drop v3dv_resource definition

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: dac20e100b4cb967fb28989e8cd718946baa72c7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dac20e100b4cb967fb28989e8cd718946baa72c7

Author: Alejandro Piñeiro <apinheiro at igalia.com>
Date:   Thu Jan 21 14:18:14 2021 +0100

v3dv: drop v3dv_resource definition

In the end it became a v3dv_bo+offset combination, and for that we
already have v3dv_cl_reloc, so it became redundant.

Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8613>

---

 src/broadcom/vulkan/v3dv_private.h  | 12 +-----------
 src/broadcom/vulkan/v3dv_uniforms.c |  2 +-
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/broadcom/vulkan/v3dv_private.h b/src/broadcom/vulkan/v3dv_private.h
index 7ffa8639f58..878a5c7c28e 100644
--- a/src/broadcom/vulkan/v3dv_private.h
+++ b/src/broadcom/vulkan/v3dv_private.h
@@ -1133,16 +1133,6 @@ struct v3dv_combined_image_sampler_descriptor {
    uint8_t sampler_state[cl_aligned_packet_length(SAMPLER_STATE, 32)];
 };
 
-/* Aux struct as it is really common to have a pair bo/address. Called
- * resource because it is really likely that we would need something like that
- * if we work on reuse the same bo at different points (like the shader
- * assembly).
- */
-struct v3dv_resource {
-   struct v3dv_bo *bo;
-   uint32_t offset;
-};
-
 struct v3dv_query {
    bool maybe_available;
    union {
@@ -1198,7 +1188,7 @@ struct v3dv_cmd_buffer {
    struct v3dv_cmd_buffer_state state;
 
    uint32_t push_constants_data[MAX_PUSH_CONSTANTS_SIZE / 4];
-   struct v3dv_resource push_constants_resource;
+   struct v3dv_cl_reloc push_constants_resource;
 
    /* Collection of Vulkan objects created internally by the driver (typically
     * during recording of meta operations) that are part of the command buffer
diff --git a/src/broadcom/vulkan/v3dv_uniforms.c b/src/broadcom/vulkan/v3dv_uniforms.c
index f6ab54270e6..95e933d0db8 100644
--- a/src/broadcom/vulkan/v3dv_uniforms.c
+++ b/src/broadcom/vulkan/v3dv_uniforms.c
@@ -185,7 +185,7 @@ write_ubo_ssbo_uniforms(struct v3dv_cmd_buffer *cmd_buffer,
        */
       check_push_constants_ubo(cmd_buffer);
 
-      struct v3dv_resource *resource =
+      struct v3dv_cl_reloc *resource =
          &cmd_buffer->push_constants_resource;
       assert(resource->bo);