Mesa (staging/22.0): zink: reuse local res pointer in set_shader_images

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: 67a8137be4c148a95f270d6eff3eff605aee9b5e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=67a8137be4c148a95f270d6eff3eff605aee9b5e

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri May 13 11:22:50 2022 -0400

zink: reuse local res pointer in set_shader_images

no functional changes

cc: mesa-stable

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16508>
(cherry picked from commit 22954b486067e08780ba5a1679edfbad7f23c45a)

---

 .pick_status.json                       | 2 +-
 src/gallium/drivers/zink/zink_context.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 93b712a4111..9122bf5f2cf 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -508,7 +508,7 @@
         "description": "zink: reuse local res pointer in set_shader_images",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": null
     },
     {
diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index 609b2336bce..0a961cd7e4c 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -1394,7 +1394,7 @@ zink_set_shader_images(struct pipe_context *pctx,
          memcpy(&image_view->base, images + i, sizeof(struct pipe_image_view));
          VkAccessFlags access = 0;
          if (image_view->base.access & PIPE_IMAGE_ACCESS_WRITE) {
-            zink_resource(image_view->base.resource)->write_bind_count[p_stage == PIPE_SHADER_COMPUTE]++;
+            res->write_bind_count[p_stage == PIPE_SHADER_COMPUTE]++;
             access |= VK_ACCESS_SHADER_WRITE_BIT;
          }
          if (image_view->base.access & PIPE_IMAGE_ACCESS_READ) {
@@ -1413,8 +1413,8 @@ zink_set_shader_images(struct pipe_context *pctx,
             finalize_image_bind(ctx, res, p_stage == PIPE_SHADER_COMPUTE);
             zink_batch_usage_set(&image_view->surface->batch_uses, ctx->batch.state);
          }
-         zink_batch_resource_usage_set(&ctx->batch, zink_resource(image_view->base.resource),
-                                          zink_resource_access_is_write(access));
+         zink_batch_resource_usage_set(&ctx->batch, res,
+                                       zink_resource_access_is_write(access));
          update = true;
          update_descriptor_state_image(ctx, p_stage, start_slot + i, res);
       } else if (image_view->base.resource) {