fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 20:10:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir/split_vars: Handle ray hit attributes

Browse source 
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19866>
This commit is contained in:
Konstantin Seurer 2022-11-09 17:44:21 +01:00 • committed by Marge Bot
parent 9f03e9c286
commit 5bfc4c293f
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/compiler/nir/nir_split_vars.c
View file

@ -299,13 +299,14 @@ nir_split_struct_vars(nir_shader *shader, nir_variable_mode modes)
_mesa_pointer_hash_table_create(mem_ctx);
struct set *complex_vars = NULL;
assert((modes & (nir_var_shader_temp | nir_var_function_temp)) == modes);
assert((modes & (nir_var_shader_temp | nir_var_ray_hit_attrib | nir_var_function_temp)) == modes);
bool has_global_splits = false;
if (modes & nir_var_shader_temp) {
nir_variable_mode global_modes = modes & (nir_var_shader_temp | nir_var_ray_hit_attrib);
if (global_modes) {
has_global_splits = split_var_list_structs(shader, NULL,
&shader->variables,
nir_var_shader_temp,
global_modes,
var_field_map,
&complex_vars,
mem_ctx);
@ -864,13 +865,13 @@ nir_split_array_vars(nir_shader *shader, nir_variable_mode modes)
struct hash_table *var_info_map = _mesa_pointer_hash_table_create(mem_ctx);
struct set *complex_vars = NULL;
assert((modes & (nir_var_shader_temp | nir_var_function_temp)) == modes);
assert((modes & (nir_var_shader_temp | nir_var_ray_hit_attrib | nir_var_function_temp)) == modes);
bool has_global_array = false;
if (modes & nir_var_shader_temp) {
if (modes & (nir_var_shader_temp | nir_var_ray_hit_attrib)) {
has_global_array = init_var_list_array_infos(shader,
&shader->variables,
nir_var_shader_temp,
modes,
var_info_map,
&complex_vars,
mem_ctx);
@ -905,10 +906,10 @@ nir_split_array_vars(nir_shader *shader, nir_variable_mode modes)
}
bool has_global_splits = false;
if (modes & nir_var_shader_temp) {
if (modes & (nir_var_shader_temp | nir_var_ray_hit_attrib)) {
has_global_splits = split_var_list_arrays(shader, NULL,
&shader->variables,
nir_var_shader_temp,
modes,
var_info_map, mem_ctx);
}