From a17409115a739a10b82119011b75a4cf63a3ca9b Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Fri, 25 Nov 2022 13:05:07 +0200 Subject: [PATCH] anv: correctly predicate ray tracing Signed-off-by: Lionel Landwerlin Fixes: 7479fe6ae093 ("anv: Implement vkCmdTraceRays and vkCmdTraceRaysIndirect") Reviewed-by: Ivan Briano Part-of: (cherry picked from commit af3f7948d149faded1b4f24ec5e6ae03001e7cfb) --- .pick_status.json | 2 +- src/intel/vulkan/genX_cmd_buffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 929bd47a48a..08b74cae2b1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4468,7 +4468,7 @@ "description": "anv: correctly predicate ray tracing", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "7479fe6ae0935fb8f9e3c64c16c7e6855481d1da" }, diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 1aa997f2ade..b59f57b47f0 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -5824,7 +5824,7 @@ cmd_buffer_trace_rays(struct anv_cmd_buffer *cmd_buffer, anv_batch_emit(&cmd_buffer->batch, GENX(COMPUTE_WALKER), cw) { cw.IndirectParameterEnable = is_indirect; - cw.PredicateEnable = false; + cw.PredicateEnable = cmd_buffer->state.conditional_render_enabled; cw.SIMDSize = dispatch.simd_size / 16; cw.LocalXMaximum = (1 << local_size_log2[0]) - 1; cw.LocalYMaximum = (1 << local_size_log2[1]) - 1;