From 72437f6d540d77e7bcfcfd46938accd996684b51 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 1 Feb 2021 16:55:33 -0600 Subject: [PATCH] spirv: Create acceleration structure and shader record variables spirv_to_nir now requires NIR variables to be created for everything. Fixes: 10b3eecd361af "spirv: Don't remove variables used by resource..." Reviewed-by: Caio Marcelo de Oliveira Filho Reviewed-by: Lionel Landwerlin Part-of: --- src/compiler/spirv/vtn_variables.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c index cc49564a20c..8423434e1c7 100644 --- a/src/compiler/spirv/vtn_variables.c +++ b/src/compiler/spirv/vtn_variables.c @@ -1831,6 +1831,8 @@ vtn_create_variable(struct vtn_builder *b, struct vtn_value *val, case vtn_variable_mode_ubo: case vtn_variable_mode_ssbo: case vtn_variable_mode_push_constant: + case vtn_variable_mode_accel_struct: + case vtn_variable_mode_shader_record: var->var = rzalloc(b->shader, nir_variable); var->var->name = ralloc_strdup(var->var, val->name); @@ -1935,11 +1937,6 @@ vtn_create_variable(struct vtn_builder *b, struct vtn_value *val, break; } - case vtn_variable_mode_accel_struct: - case vtn_variable_mode_shader_record: - /* These don't need actual variables. */ - break; - case vtn_variable_mode_image: case vtn_variable_mode_phys_ssbo: case vtn_variable_mode_generic: