summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2022-06-15 13:00:35 -0400
committerDylan Baker <dylan.c.baker@intel.com>2022-06-17 13:33:26 -0700
commitdfea92f4295de93f5d24102408339726c30abcf2 (patch)
tree65ae6bf89adf9c048b2594b5a601d139050656a7
parent0c283ca15627954239913de43e386aaf2a4b7675 (diff)
zink: clamp renderpass layers better
this needs to be the minimum layer, not the maximum cc: mesa-stable Reviewed-by: Adam Jackson <ajax@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17061> (cherry picked from commit bd859e1f96565e2676048ee4d85ca6ee4fcd6850)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/drivers/zink/zink_framebuffer.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index cd8a0908a05..81aec0da0c9 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -877,7 +877,7 @@
"description": "zink: clamp renderpass layers better",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": null
},
diff --git a/src/gallium/drivers/zink/zink_framebuffer.c b/src/gallium/drivers/zink/zink_framebuffer.c
index 99aead406ae..fc718ef9c65 100644
--- a/src/gallium/drivers/zink/zink_framebuffer.c
+++ b/src/gallium/drivers/zink/zink_framebuffer.c
@@ -188,7 +188,7 @@ zink_get_framebuffer_imageless(struct zink_context *ctx)
state.num_attachments += num_resolves;
state.width = MAX2(ctx->fb_state.width, 1);
state.height = MAX2(ctx->fb_state.height, 1);
- state.layers = MAX2(util_framebuffer_get_num_layers(&ctx->fb_state), 1) - 1;
+ state.layers = MAX2(zink_framebuffer_get_num_layers(&ctx->fb_state), 1) - 1;
state.samples = ctx->fb_state.samples - 1;
struct zink_framebuffer *fb;