diff options
author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2023-02-26 10:47:02 -0500 |
---|---|---|
committer | Eric Engestrom <eric@engestrom.ch> | 2023-03-08 18:00:16 +0000 |
commit | 27aa0a3d76b5e9c70fd1ab05f73a583b3d5ffbe5 (patch) | |
tree | e5872310f62ad40b3949bcd95000cc61dd44bf5c | |
parent | 21680b8f0d31ac04b944b05786c18c523f7c33f1 (diff) | |
download | mesa-27aa0a3d76b5e9c70fd1ab05f73a583b3d5ffbe5.tar.gz |
zink: fix zink_resource_access_is_write()
this was accurately returning whether the access had only write flags,
but it was incorrectly returning false for READ|WRITE
cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21583>
(cherry picked from commit 5be506c16ece8c62b84e21a625db9d36bc489982)
-rw-r--r-- | .pick_status.json | 2 | ||||
-rw-r--r-- | src/gallium/drivers/zink/zink_context.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 0baf24ee1ff..a136da802d8 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1597,7 +1597,7 @@ "description": "zink: fix zink_resource_access_is_write()", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 46aca386eb9..6d73f74b284 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -3263,7 +3263,7 @@ pipeline_dst_stage(VkImageLayout layout) bool zink_resource_access_is_write(VkAccessFlags flags) { - return (flags & ALL_READ_ACCESS_FLAGS) != flags; + return (flags & ~ALL_READ_ACCESS_FLAGS) > 0; } bool |