From 3afc1e068f9f3ad125decc2761f7c0cf1fe2c3a6 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Wed, 16 Jan 2019 00:09:27 +0100 Subject: nir: rename nir_var_ubo to nir_var_mem_ubo Signed-off-by: Karol Herbst Acked-by: Jason Ekstrand Reviewed-by: Eric Anholt Reviewed-by: Kenneth Graunke Reviewed-by: Bas Nieuwenhuizen --- src/compiler/spirv/vtn_variables.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/compiler/spirv/vtn_variables.c') diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c index 16cc7aadd71..0ec34ccbe47 100644 --- a/src/compiler/spirv/vtn_variables.c +++ b/src/compiler/spirv/vtn_variables.c @@ -259,7 +259,7 @@ vtn_nir_deref_pointer_dereference(struct vtn_builder *b, assert(base->mode == vtn_variable_mode_ssbo || base->mode == vtn_variable_mode_ubo); nir_variable_mode nir_mode = - base->mode == vtn_variable_mode_ssbo ? nir_var_ssbo : nir_var_ubo; + base->mode == vtn_variable_mode_ssbo ? nir_var_ssbo : nir_var_mem_ubo; tail = nir_build_deref_cast(&b->nb, desc, nir_mode, type->type, base->ptr_type->stride); @@ -1662,7 +1662,7 @@ vtn_storage_class_to_mode(struct vtn_builder *b, case SpvStorageClassUniform: if (interface_type->block) { mode = vtn_variable_mode_ubo; - nir_mode = nir_var_ubo; + nir_mode = nir_var_mem_ubo; } else if (interface_type->buffer_block) { mode = vtn_variable_mode_ssbo; nir_mode = nir_var_ssbo; -- cgit v1.2.3