From 8104b4a92b7bfeb74588f7e48b0e920a19a5f579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Briano?= Date: Mon, 17 Jul 2023 21:37:10 -0700 Subject: [PATCH] anv: ensure CFE_STATE is emitted for ray tracing pipelines Fixes sporadic failures in dEQP-VK.robustness.robustness2.*.rgen Fixes: ecb709c8535 ("anv: only emit CFE_STATE when scratch space increases") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9382 Reviewed-by: Lionel Landwerlin Reviewed-by: Sagar Ghuge Part-of: (cherry picked from commit 75990e5564fc8f155c9f165517712a232a2100c8) --- .pick_status.json | 2 +- src/intel/vulkan/genX_cmd_buffer.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 7e26529dc3a..3cc9eab52b0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -211,7 +211,7 @@ "description": "anv: ensure CFE_STATE is emitted for ray tracing pipelines", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "ecb709c85351c8c127a1cd3577c74d6b2b0b706a" }, diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 8f03056f696..0be6823b86c 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -6503,6 +6503,8 @@ cmd_buffer_trace_rays(struct anv_cmd_buffer *cmd_buffer, } } + genX(cmd_buffer_ensure_cfe_state)(cmd_buffer, pipeline->scratch_size); + const struct brw_cs_prog_data *cs_prog_data = brw_cs_prog_data_const(device->rt_trampoline->prog_data); struct brw_cs_dispatch_info dispatch =