From 6894548d6c4062d047cef871383c5ea1bee9c0d4 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 7 Apr 2023 15:46:57 -0400 Subject: [PATCH] Revert "zink: don't trigger shader variants on pcp change if driver supports dynamic pcp" This reverts commit 472fcf74e250a72053d837f7730fb991c1c3cb7e. this is sort of right but then also sort of broken, going to rework a little Part-of: --- src/gallium/drivers/zink/zink_program.c | 1 - src/gallium/drivers/zink/zink_program.h | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c index 78f1b9d..e6a95c0 100644 --- a/src/gallium/drivers/zink/zink_program.c +++ b/src/gallium/drivers/zink/zink_program.c @@ -677,7 +677,6 @@ update_gfx_program_optimal(struct zink_context *ctx, struct zink_gfx_program *pr } } if (prog->shaders[MESA_SHADER_TESS_CTRL] && prog->shaders[MESA_SHADER_TESS_CTRL]->non_fs.is_generated && - !zink_screen(ctx->base.screen)->info.dynamic_state2_feats.extendedDynamicState2PatchControlPoints && ctx->gfx_pipeline_state.shader_keys_optimal.key.tcs_bits != optimal_key->tcs_bits) { assert(!prog->is_separable); bool changed = update_gfx_shader_module_optimal(ctx, prog, MESA_SHADER_TESS_CTRL); diff --git a/src/gallium/drivers/zink/zink_program.h b/src/gallium/drivers/zink/zink_program.h index 3ad083d..bf78d19 100644 --- a/src/gallium/drivers/zink/zink_program.h +++ b/src/gallium/drivers/zink/zink_program.h @@ -299,8 +299,7 @@ zink_set_tcs_key_patches(struct zink_context *ctx, uint8_t patch_vertices) &ctx->gfx_pipeline_state.shader_keys.key[MESA_SHADER_TESS_CTRL].key.tcs; if (tcs->patch_vertices == patch_vertices) return false; - if (!zink_screen(ctx->base.screen)->info.dynamic_state2_feats.extendedDynamicState2PatchControlPoints) - ctx->dirty_gfx_stages |= BITFIELD_BIT(MESA_SHADER_TESS_CTRL); + ctx->dirty_gfx_stages |= BITFIELD_BIT(MESA_SHADER_TESS_CTRL); tcs->patch_vertices = patch_vertices; return true; } -- 2.7.4