Module: Mesa Branch: staging/23.2 Commit: 9dc7d8e5f0dddf21ae9b46f954ec3df761e2a09c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9dc7d8e5f0dddf21ae9b46f954ec3df761e2a09c
Author: Iván Briano <[email protected]> Date: Mon Jul 17 21:37:10 2023 -0700 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 <[email protected]> Reviewed-by: Sagar Ghuge <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24206> (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 9703ddda29d..405994c10c2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1384,7 +1384,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", "notes": null diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 79e34aa6b7c..99dc152409e 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -6553,6 +6553,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 =
