Mesa (main): zink: improve detection for broken drawids
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Jul 14 19:31:48 UTC 2021
Module: Mesa
Branch: main
Commit: d08c84ab0c3ab1f8061e5d9ea1bcff2ed8b6cf57
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d08c84ab0c3ab1f8061e5d9ea1bcff2ed8b6cf57
Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date: Wed Jul 14 14:21:24 2021 -0400
zink: improve detection for broken drawids
this is also broken for multidraws where drawid shouldn't be incremented
Fixes: 2d32d123e56 ("zink: avoid unnecessarily rewriting gl_DrawID")
Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11878>
---
src/gallium/drivers/zink/zink_draw.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gallium/drivers/zink/zink_draw.c b/src/gallium/drivers/zink/zink_draw.c
index d8280c649cd..fc0c300fdec 100644
--- a/src/gallium/drivers/zink/zink_draw.c
+++ b/src/gallium/drivers/zink/zink_draw.c
@@ -422,7 +422,8 @@ zink_draw_vbo(struct pipe_context *pctx,
if (!dindirect || !dindirect->buffer)
ctx->drawid_broken = BITSET_TEST(ctx->gfx_stages[PIPE_SHADER_VERTEX]->nir->info.system_values_read, SYSTEM_VALUE_DRAW_ID) &&
(drawid_offset != 0 ||
- ((!ctx->tc || !screen->info.have_EXT_multi_draw) && num_draws > 1));
+ (!screen->info.have_EXT_multi_draw && num_draws > 1) ||
+ (screen->info.have_EXT_multi_draw && num_draws > 1 && !dinfo->increment_draw_id));
if (drawid_broken != ctx->drawid_broken)
ctx->dirty_shader_stages |= BITFIELD_BIT(PIPE_SHADER_VERTEX);
ctx->gfx_pipeline_state.vertices_per_patch = dinfo->vertices_per_patch;
More information about the mesa-commit
mailing list