From 6b27b764320ef9fa26c1a1cc2b676b4a69db4d27 Mon Sep 17 00:00:00 2001
From: Frank Binns <frank.binns@imgtec.com>
Date: Mon, 20 Feb 2023 12:06:16 +0000
Subject: [PATCH] pvr: use util_dynarray_begin() in more places

Signed-off-by: Frank Binns <frank.binns@imgtec.com>
Acked-by: Karmjit Mahil <Karmjit.Mahil@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21550>
---
 src/imagination/rogue/tools/vk_compiler.c |  7 +++++--
 src/imagination/vulkan/pvr_pipeline.c     | 23 +++++++++++++----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/imagination/rogue/tools/vk_compiler.c b/src/imagination/rogue/tools/vk_compiler.c
index 7011d1f557a..2fde1682023 100644
--- a/src/imagination/rogue/tools/vk_compiler.c
+++ b/src/imagination/rogue/tools/vk_compiler.c
@@ -27,6 +27,7 @@
 #include "util/macros.h"
 #include "util/os_file.h"
 #include "util/ralloc.h"
+#include "util/u_dynarray.h"
 
 #include <getopt.h>
 #include <stdbool.h>
@@ -227,8 +228,10 @@ int main(int argc, char *argv[])
       goto err_free_build_context;
    }
 
-   bytes_written =
-      fwrite(ctx->binary[opts.stage].data, 1, ctx->binary[opts.stage].size, fp);
+   bytes_written = fwrite(util_dynarray_begin(&ctx->binary[opts.stage]),
+                          1,
+                          ctx->binary[opts.stage].size,
+                          fp);
    if (bytes_written != ctx->binary[opts.stage].size) {
       fprintf(
          stderr,
diff --git a/src/imagination/vulkan/pvr_pipeline.c b/src/imagination/vulkan/pvr_pipeline.c
index d95fd4ce1a8..bb4e98f198c 100644
--- a/src/imagination/vulkan/pvr_pipeline.c
+++ b/src/imagination/vulkan/pvr_pipeline.c
@@ -46,6 +46,7 @@
 #include "util/log.h"
 #include "util/macros.h"
 #include "util/ralloc.h"
+#include "util/u_dynarray.h"
 #include "util/u_math.h"
 #include "vk_alloc.h"
 #include "vk_graphics_state.h"
@@ -1789,11 +1790,12 @@ pvr_graphics_pipeline_compile(struct pvr_device *const device,
       }
    }
 
-   result = pvr_gpu_upload_usc(device,
-                               ctx->binary[MESA_SHADER_VERTEX].data,
-                               ctx->binary[MESA_SHADER_VERTEX].size,
-                               cache_line_size,
-                               &gfx_pipeline->shader_state.vertex.bo);
+   result =
+      pvr_gpu_upload_usc(device,
+                         util_dynarray_begin(&ctx->binary[MESA_SHADER_VERTEX]),
+                         ctx->binary[MESA_SHADER_VERTEX].size,
+                         cache_line_size,
+                         &gfx_pipeline->shader_state.vertex.bo);
    if (result != VK_SUCCESS)
       goto err_free_build_context;
 
@@ -1821,11 +1823,12 @@ pvr_graphics_pipeline_compile(struct pvr_device *const device,
       }
    }
 
-   result = pvr_gpu_upload_usc(device,
-                               ctx->binary[MESA_SHADER_FRAGMENT].data,
-                               ctx->binary[MESA_SHADER_FRAGMENT].size,
-                               cache_line_size,
-                               &gfx_pipeline->shader_state.fragment.bo);
+   result = pvr_gpu_upload_usc(
+      device,
+      util_dynarray_begin(&ctx->binary[MESA_SHADER_FRAGMENT]),
+      ctx->binary[MESA_SHADER_FRAGMENT].size,
+      cache_line_size,
+      &gfx_pipeline->shader_state.fragment.bo);
    if (result != VK_SUCCESS)
       goto err_free_vertex_bo;