Mesa (staging/22.0): zink: read shader image r/w usage from incoming data struct
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon May 16 19:33:38 UTC 2022
Module: Mesa
Branch: staging/22.0
Commit: 56f8047947dac4f9c4bc6497070bda525c83475b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=56f8047947dac4f9c4bc6497070bda525c83475b
Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date: Fri May 13 11:25:30 2022 -0400
zink: read shader image r/w usage from incoming data struct
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 32a77b1e255c5213124200076160902928a07830)
---
.pick_status.json | 2 +-
src/gallium/drivers/zink/zink_context.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index adb8913341f..11c1094de8b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -492,7 +492,7 @@
"description": "zink: read shader image r/w usage from incoming data struct",
"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 509a915993f..99f2433d9a4 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -1393,11 +1393,11 @@ zink_set_shader_images(struct pipe_context *pctx,
/* no refs */
memcpy(&image_view->base, images + i, sizeof(struct pipe_image_view));
VkAccessFlags access = 0;
- if (image_view->base.access & PIPE_IMAGE_ACCESS_WRITE) {
+ if (images[i].access & PIPE_IMAGE_ACCESS_WRITE) {
res->write_bind_count[p_stage == PIPE_SHADER_COMPUTE]++;
access |= VK_ACCESS_SHADER_WRITE_BIT;
}
- if (image_view->base.access & PIPE_IMAGE_ACCESS_READ) {
+ if (images[i].access & PIPE_IMAGE_ACCESS_READ) {
access |= VK_ACCESS_SHADER_READ_BIT;
}
res->image_bind_count[p_stage == PIPE_SHADER_COMPUTE]++;
More information about the mesa-commit
mailing list