From d6d2f3661f2815a6ed7088a6107c229e8c3fc03b Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Tue, 16 May 2023 09:20:09 +0300 Subject: [PATCH] anv: disable mesh/task for generated draws MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lionel Landwerlin Fixes: c950fe97a0 ("anv: implement generated (indexed) indirect draws") Reviewed-by: José Roberto de Souza Reviewed-by: Ivan Briano Part-of: (cherry picked from commit 0da39bf8ee1090ad60bb82b067a721abed5ac4ec) --- .pick_status.json | 2 +- src/intel/vulkan/genX_cmd_draw_generated_indirect.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index e80627e84ba..caf5f3432d2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -985,7 +985,7 @@ "description": "anv: disable mesh/task for generated draws", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "c950fe97a05ef54e8298544a4582d21e524ada08" }, diff --git a/src/intel/vulkan/genX_cmd_draw_generated_indirect.h b/src/intel/vulkan/genX_cmd_draw_generated_indirect.h index fa60ab49ef1..370213d3c76 100644 --- a/src/intel/vulkan/genX_cmd_draw_generated_indirect.h +++ b/src/intel/vulkan/genX_cmd_draw_generated_indirect.h @@ -143,6 +143,14 @@ genX(cmd_buffer_emit_generate_draws_pipeline)(struct anv_cmd_buffer *cmd_buffer) anv_batch_emit(batch, GENX(3DSTATE_TE), te); anv_batch_emit(batch, GENX(3DSTATE_DS), DS); +#if GFX_VERx10 >= 125 + if (device->vk.enabled_extensions.NV_mesh_shader || + device->vk.enabled_extensions.EXT_mesh_shader) { + anv_batch_emit(batch, GENX(3DSTATE_MESH_CONTROL), mesh); + anv_batch_emit(batch, GENX(3DSTATE_TASK_CONTROL), task); + } +#endif + anv_batch_emit(batch, GENX(3DSTATE_STREAMOUT), so); anv_batch_emit(batch, GENX(3DSTATE_GS), gs);