fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

spirv: Use a dereference instead of vtn_variable_resource_index

Browse source 
This is equivalent and means we don't have resource index code scattered
about.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
This commit is contained in:
Jason Ekstrand 2017-10-18 16:33:32 -07:00
parent dee936c805
commit 91d91ce3e2
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/compiler/spirv/vtn_variables.c
View file

@ -1495,11 +1495,9 @@ vtn_pointer_to_ssa(struct vtn_builder *b, struct vtn_pointer *ptr)
vtn_assert(ptr->ptr_type);
vtn_assert(ptr->ptr_type->type);
if (ptr->offset && ptr->block_index) {
return nir_vec2(&b->nb, ptr->block_index, ptr->offset);
} else {
/* If we don't have an offset or block index, then we must be a pointer
* to the variable itself.
if (!ptr->offset || !ptr->block_index) {
/* If we don't have an offset then we must be a pointer to the variable
* itself.
*/
vtn_assert(!ptr->offset && !ptr->block_index);
@ -1509,9 +1507,14 @@ vtn_pointer_to_ssa(struct vtn_builder *b, struct vtn_pointer *ptr)
*/
vtn_assert(ptr->var && ptr->var->type->base_type == vtn_base_type_struct);
return nir_vec2(&b->nb, vtn_variable_resource_index(b, ptr->var, NULL),
nir_imm_int(&b->nb, 0));
struct vtn_access_chain chain = {
.length = 0,
};
ptr = vtn_ssa_offset_pointer_dereference(b, ptr, &chain);
}
vtn_assert(ptr->offset && ptr->block_index);
return nir_vec2(&b->nb, ptr->block_index, ptr->offset);
}
struct vtn_pointer *