From a9d381ca100e2edf9aa39f2799cc46af8dfbc951 Mon Sep 17 00:00:00 2001 From: antonino Date: Fri, 5 May 2023 13:57:54 +0200 Subject: [PATCH] zink: don't replace non generated gs Zink replaced the gs emulation shader when the primitive type changes, however it didn't check whether the gs being replaced was generated. Fixes: eedbf9046e7 ("zink: handle switching between primitives") Part-of: (cherry picked from commit a4113fd0210129e997331e57b994e346f1c3d76e) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_program.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index e440ff362dc..51a7f7b0b62 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3001,7 +3001,7 @@ "description": "zink: don't replace non generated gs", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "eedbf9046e72d253b39e7065424ec6d1f2dbf598" }, diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c index dba686d91b6..418b932c5fb 100644 --- a/src/gallium/drivers/zink/zink_program.c +++ b/src/gallium/drivers/zink/zink_program.c @@ -2326,8 +2326,8 @@ zink_set_primitive_emulation_keys(struct zink_context *ctx) //when using transform feedback primitives must be tessellated lower_filled_quad |= lower_quad_prim && ctx->gfx_stages[prev_vertex_stage]->info.has_transform_feedback_varyings; - if (!ctx->gfx_stages[MESA_SHADER_GEOMETRY] || - (ctx->gfx_stages[MESA_SHADER_GEOMETRY]->info.gs.input_primitive != ctx->gfx_pipeline_state.gfx_prim_mode)) { + if (!ctx->gfx_stages[MESA_SHADER_GEOMETRY] || (ctx->gfx_stages[MESA_SHADER_GEOMETRY]->non_fs.is_generated && + ctx->gfx_stages[MESA_SHADER_GEOMETRY]->info.gs.input_primitive != ctx->gfx_pipeline_state.gfx_prim_mode)) { if (!ctx->gfx_stages[prev_vertex_stage]->non_fs.generated_gs[ctx->gfx_pipeline_state.gfx_prim_mode][zink_prim_type]) { nir_shader *prev_stage = zink_shader_deserialize(screen, ctx->gfx_stages[prev_vertex_stage]);