From d17bf881ea750ec99971c7e70c3a95e8ae285901 Mon Sep 17 00:00:00 2001 From: Konstantin Seurer Date: Tue, 7 Mar 2023 08:28:54 +0100 Subject: [PATCH] radv/rt: Fix updating stack_size if the shader uses scratch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit src_vars contains the stack_size of the shader that is about to get inlined. Fixes: 7fadee9b70c9d1d7229c7bbc9811a858297b193c ('radv/rt: only reserve stack_sizes after rt_case insertion') Reviewed-by: Daniel Schürmann Part-of: --- src/amd/vulkan/radv_rt_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_rt_shader.c b/src/amd/vulkan/radv_rt_shader.c index c60c5f9fdb8..30c35d65e79 100644 --- a/src/amd/vulkan/radv_rt_shader.c +++ b/src/amd/vulkan/radv_rt_shader.c @@ -815,7 +815,7 @@ insert_rt_case(nir_builder *b, nir_shader *shader, struct rt_variables *vars, ni if (shader->info.stage == MESA_SHADER_CLOSEST_HIT || call_idx == 1) NIR_PASS_V(shader, lower_hit_attribs, NULL, workgroup_size); - vars->stack_size = MAX2(vars->stack_size, shader->scratch_size); + src_vars.stack_size = MAX2(src_vars.stack_size, shader->scratch_size); nir_push_if(b, nir_ieq_imm(b, idx, call_idx)); nir_inline_function_impl(b, nir_shader_get_entrypoint(shader), NULL, var_remap);