From d32a26b3e6915b9bcbe7d881011b97712229dc23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Briano?= Date: Thu, 14 Nov 2024 15:19:59 -0800 Subject: [PATCH] anv: remove unused/misleading/wrong parameters from the RT trampoline Since the shader parameters are passed as inline data, push constants are no longer used and so, not actually set on dispatch. But the nr_params = 4 was still making the shader emit the code to load them, causing page faults on simulation, and would also on HW if we didn't always have a scratch page set. The uses_inline_data parameter will be set from brw_compile_cs(), called shortly after this point, so we don't need it here. The subgroup_size is misleading, as we don't actually require that size and the code that checks for it isn't even running for this shader. Fixes: 97b17aa0b1b ("brw/nir: rework inline_data_intel to work with compute") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12152 Signed-off-by: Lionel Landwerlin Part-of: --- src/intel/vulkan/anv_pipeline.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index 4fb795a6abd..255ac6219f5 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -3904,13 +3904,7 @@ anv_device_init_rt_shaders(struct anv_device *device) nir_shader *trampoline_nir = brw_nir_create_raygen_trampoline(device->physical->compiler, tmp_ctx); - trampoline_nir->info.subgroup_size = SUBGROUP_SIZE_REQUIRE_16; - - uint32_t dummy_params[4] = { 0, }; struct brw_cs_prog_data trampoline_prog_data = { - .base.nr_params = 4, - .base.param = dummy_params, - .uses_inline_data = true, .uses_btd_stack_ids = true, }; struct brw_compile_cs_params params = {