fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 21:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

brw: fix NIR metadata invalidation with closest-hit shaders

Browse source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: mesa-stable
Reviewed-by: Ivan Briano <ivan.briano@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36457>
This commit is contained in:
Lionel Landwerlin 2025-05-12 21:44:45 +03:00 • committed by Marge Bot
parent 9430a1ed00
commit 68c50d129e
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/intel/compiler/brw_nir_rt.c
View file

@ -59,7 +59,7 @@ lower_rt_io_derefs(nir_shader *shader, const struct intel_device_info *devinfo)
{
nir_function_impl *impl = nir_shader_get_entrypoint(shader);
bool progress = false;
nir_metadata metadata = nir_metadata_all;
unsigned num_shader_call_vars = 0;
nir_foreach_variable_with_modes(var, shader, nir_var_shader_call_data)
@ -85,7 +85,7 @@ lower_rt_io_derefs(nir_shader *shader, const struct intel_device_info *devinfo)
call_data_addr =
brw_nir_rt_load_scratch(&b, BRW_BTD_STACK_CALL_DATA_PTR_OFFSET, 8,
1, 64);
progress = true;
metadata &= nir_metadata_control_flow;
}
gl_shader_stage stage = shader->info.stage;
@ -112,7 +112,8 @@ lower_rt_io_derefs(nir_shader *shader, const struct intel_device_info *devinfo)
nir_store_global(&b, hit_attrib_addr, 4, tri_bary, 0x3);
}
nir_pop_if(&b, NULL);
progress = true;
metadata &= nir_metadata_none;
}
nir_foreach_block(block, impl) {
@ -130,7 +131,7 @@ lower_rt_io_derefs(nir_shader *shader, const struct intel_device_info *devinfo)
nir_var_function_temp,
deref->var->type, 0);
nir_def_replace(&deref->def, &cast->def);
progress = true;
metadata &= nir_metadata_control_flow;
}
} else if (nir_deref_mode_is(deref, nir_var_ray_hit_attrib)) {
deref->modes = nir_var_function_temp;
@ -141,7 +142,7 @@ lower_rt_io_derefs(nir_shader *shader, const struct intel_device_info *devinfo)
nir_var_function_temp,
deref->type, 0);
nir_def_replace(&deref->def, &cast->def);
progress = true;
metadata &= nir_metadata_control_flow;
}
}
@ -151,11 +152,11 @@ lower_rt_io_derefs(nir_shader *shader, const struct intel_device_info *devinfo)
*/
if (nir_deref_mode_is(deref, nir_var_function_temp) &&
resize_deref(&b, deref, 1, 64))
progress = true;
metadata &= nir_metadata_control_flow;
}
}
return nir_progress(progress, impl, nir_metadata_control_flow);
return nir_progress(metadata != nir_metadata_all, impl, metadata);
}
/** Lowers ray-tracing shader I/O and scratch access