From a7dd172aaa11fcada1513082ff0abea031090b1e Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 4 Aug 2020 19:24:24 -0500 Subject: [PATCH] nir/lower_io: Support shader_call_data in vars_to_explicit_types Reviewed-by: Caio Marcelo de Oliveira Filho Part-of: --- src/compiler/nir/nir_lower_io.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/compiler/nir/nir_lower_io.c b/src/compiler/nir/nir_lower_io.c index a723728a13a..1c5a52b66bf 100644 --- a/src/compiler/nir/nir_lower_io.c +++ b/src/compiler/nir/nir_lower_io.c @@ -2240,6 +2240,7 @@ lower_vars_to_explicit(nir_shader *shader, case nir_var_mem_constant: offset = shader->constant_data_size; break; + case nir_var_shader_call_data: case nir_var_ray_hit_attrib: offset = 0; break; @@ -2279,6 +2280,7 @@ lower_vars_to_explicit(nir_shader *shader, case nir_var_mem_constant: shader->constant_data_size = offset; break; + case nir_var_shader_call_data: case nir_var_ray_hit_attrib: break; default: @@ -2305,7 +2307,7 @@ nir_lower_vars_to_explicit_types(nir_shader *shader, ASSERTED nir_variable_mode supported = nir_var_mem_shared | nir_var_mem_global | nir_var_mem_constant | nir_var_shader_temp | nir_var_function_temp | nir_var_uniform | - nir_var_ray_hit_attrib; + nir_var_shader_call_data | nir_var_ray_hit_attrib; assert(!(modes & ~supported) && "unsupported"); bool progress = false; @@ -2318,6 +2320,8 @@ nir_lower_vars_to_explicit_types(nir_shader *shader, progress |= lower_vars_to_explicit(shader, &shader->variables, nir_var_shader_temp, type_info); if (modes & nir_var_mem_constant) progress |= lower_vars_to_explicit(shader, &shader->variables, nir_var_mem_constant, type_info); + if (modes & nir_var_shader_call_data) + progress |= lower_vars_to_explicit(shader, &shader->variables, nir_var_shader_call_data, type_info); if (modes & nir_var_ray_hit_attrib) progress |= lower_vars_to_explicit(shader, &shader->variables, nir_var_ray_hit_attrib, type_info);