Module: Mesa Branch: main Commit: 3cd72a28402852ad94c9a613be7e11dd3490c609 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3cd72a28402852ad94c9a613be7e11dd3490c609
Author: Lionel Landwerlin <[email protected]> Date: Tue Feb 28 21:03:07 2023 +0200 anv: fixup Wa_16011107343 for Gfx12 only Signed-off-by: Lionel Landwerlin <[email protected]> Fixes: 75968398f37c ("anv: emit 3DSTATE_HS for each primitive on gfx12") Acked-by: Ivan Briano <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21605> --- src/intel/vulkan/genX_cmd_buffer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index dde5542cfd8..a7ffa13bbb2 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -3398,7 +3398,7 @@ genX(cmd_buffer_flush_gfx_state)(struct anv_cmd_buffer *cmd_buffer) /* Wa_1306463417, Wa_16011107343 - Send HS state for every primitive. */ if (cmd_buffer->state.gfx.dirty & ANV_CMD_DIRTY_PIPELINE || - (GFX_VER == 11 || GFX_VER == 12)) { + (GFX_VER == 11 || GFX_VERx10 == 120)) { genX(emit_hs)(cmd_buffer); } @@ -3561,7 +3561,7 @@ anv_use_generated_draws(const struct anv_cmd_buffer *cmd_buffer, uint32_t count) { const struct anv_device *device = cmd_buffer->device; -#if GFX_VER == 11 || GFX_VER == 12 +#if GFX_VER == 11 || GFX_VERx10 == 120 /* Limit generated draws to pipelines without HS stage. This makes things * simpler for implementing Wa_1306463417, Wa_16011107343. */ @@ -4210,7 +4210,7 @@ void genX(CmdDrawMultiEXT)( /* Wa_1306463417, Wa_16011107343 - Send HS state for every primitive, * first one was handled by cmd_buffer_flush_gfx_state. */ - if (i && (GFX_VER == 11 || GFX_VER == 12)) + if (i && (GFX_VER == 11 || GFX_VERx10 == 120)) genX(emit_hs)(cmd_buffer); anv_batch_emit(&cmd_buffer->batch, GENX(3DPRIMITIVE_EXTENDED), prim) { @@ -4417,7 +4417,7 @@ void genX(CmdDrawMultiIndexedEXT)( /* Wa_1306463417, Wa_16011107343 - Send HS state for every primitive, * first one was handled by cmd_buffer_flush_gfx_state. */ - if (i && (GFX_VER == 11 || GFX_VER == 12)) + if (i && (GFX_VER == 11 || GFX_VERx10 == 120)) genX(emit_hs)(cmd_buffer); anv_batch_emit(&cmd_buffer->batch, GENX(3DPRIMITIVE_EXTENDED), prim) { @@ -4667,7 +4667,7 @@ emit_indirect_draws(struct anv_cmd_buffer *cmd_buffer, /* Wa_1306463417, Wa_16011107343 - Send HS state for every primitive, * first one was handled by cmd_buffer_flush_gfx_state. */ - if (i && (GFX_VER == 11 || GFX_VER == 12)) + if (i && (GFX_VER == 11 || GFX_VERx10 == 120)) genX(emit_hs)(cmd_buffer); anv_batch_emit(&cmd_buffer->batch, @@ -4901,7 +4901,7 @@ emit_indirect_count_draws(struct anv_cmd_buffer *cmd_buffer, /* Wa_1306463417, Wa_16011107343 - Send HS state for every primitive, * first one was handled by cmd_buffer_flush_gfx_state. */ - if (i && (GFX_VER == 11 || GFX_VER == 12)) + if (i && (GFX_VER == 11 || GFX_VERx10 == 120)) genX(emit_hs)(cmd_buffer); anv_batch_emit(&cmd_buffer->batch,
