Mesa (main): zink: only update layout when doing mixed zs attachment renderpass check
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Jun 8 03:05:35 UTC 2022
Module: Mesa
Branch: main
Commit: cb5973a3dd78c540eb799959cdfe0cad890d821d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb5973a3dd78c540eb799959cdfe0cad890d821d
Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date: Mon Jun 6 20:54:53 2022 -0400
zink: only update layout when doing mixed zs attachment renderpass check
avoid doing any sort of extra work here and avoid multi-context weirdness
cc: mesa-stable
Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16900>
---
src/gallium/drivers/zink/zink_context.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index 4960f9aa650..e3963ec254f 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -2214,7 +2214,9 @@ zink_prep_fb_attachment(struct zink_context *ctx, struct zink_surface *surf, uns
unsigned find = res->bind_count[0] - res->image_bind_count[0];
for (unsigned i = 0; find && i < PIPE_SHADER_COMPUTE; i++) {
u_foreach_bit(slot, res->sampler_binds[i]) {
- update_descriptor_state_sampler(ctx, i, slot, res);
+ /* only set layout, skip rest of update */
+ if (ctx->di.descriptor_res[ZINK_DESCRIPTOR_TYPE_SAMPLER_VIEW][i][slot] == res)
+ ctx->di.textures[i][slot].imageLayout = zink_descriptor_util_image_layout_eval(ctx, res, false);
find--;
if (!find) break;
}
More information about the mesa-commit
mailing list