From c8d42c8cf689fcaac1e0fd8477a8ddf269c4fe4d Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Sat, 9 Mar 2019 10:10:37 -0600 Subject: nir: Rename nir_address_format_vk_index_offset to not be vk It's just a 32-bit index and offset. We're going to want to use it in GL as well so stop talking about Vulkan. Reviewed-by: Kristian H. Kristensen Reviewed-by: Caio Marcelo de Oliveira Filho --- src/compiler/nir/nir_lower_io.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/compiler/nir/nir_lower_io.c') diff --git a/src/compiler/nir/nir_lower_io.c b/src/compiler/nir/nir_lower_io.c index d1f95cfe6ac..c9db2de0ba0 100644 --- a/src/compiler/nir/nir_lower_io.c +++ b/src/compiler/nir/nir_lower_io.c @@ -599,7 +599,7 @@ build_addr_iadd(nir_builder *b, nir_ssa_def *addr, assert(addr->num_components == 1); return nir_iadd(b, addr, offset); - case nir_address_format_vk_index_offset: + case nir_address_format_32bit_index_offset: assert(addr->num_components == 2); return nir_vec2(b, nir_channel(b, addr, 0), nir_iadd(b, nir_channel(b, addr, 1), offset)); @@ -619,7 +619,7 @@ static nir_ssa_def * addr_to_index(nir_builder *b, nir_ssa_def *addr, nir_address_format addr_format) { - assert(addr_format == nir_address_format_vk_index_offset); + assert(addr_format == nir_address_format_32bit_index_offset); assert(addr->num_components == 2); return nir_channel(b, addr, 0); } @@ -628,7 +628,7 @@ static nir_ssa_def * addr_to_offset(nir_builder *b, nir_ssa_def *addr, nir_address_format addr_format) { - assert(addr_format == nir_address_format_vk_index_offset); + assert(addr_format == nir_address_format_32bit_index_offset); assert(addr->num_components == 2); return nir_channel(b, addr, 1); } @@ -651,7 +651,7 @@ addr_to_global(nir_builder *b, nir_ssa_def *addr, assert(addr->num_components == 1); return addr; - case nir_address_format_vk_index_offset: + case nir_address_format_32bit_index_offset: unreachable("Cannot get a 64-bit address with this address format"); } -- cgit v1.2.3