fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-22 12:00:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

spirv: Load block descriptors as soon as we hit them

Browse source 
With changes suggested by Faith.

Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36427>
This commit is contained in:
Caio Oliveira 2025-07-03 23:58:41 -07:00 • committed by Marge Bot
parent d1be63c355
commit 8eaf1dced0
3 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/compiler/spirv/spirv_to_nir.c
View file

@ -1194,6 +1194,13 @@ vtn_type_contains_block(struct vtn_builder *b, struct vtn_type *type)
}
}
bool
vtn_type_is_block_array(struct vtn_builder *b, struct vtn_type *type)
{
return type->base_type == vtn_base_type_array &&
vtn_type_contains_block(b, type->array_element);
}
/** Returns true if two types are "compatible", i.e. you can do an OpLoad,
* OpStore, or OpCopyMemory between them without breaking anything.
* Technically, the SPIR-V rules require the exact same type ID but this lets

1
src/compiler/spirv/vtn_private.h
View file

@ -413,6 +413,7 @@ struct vtn_type {
};
bool vtn_type_contains_block(struct vtn_builder *b, struct vtn_type *type);
bool vtn_type_is_block_array(struct vtn_builder *b, struct vtn_type *type);
bool vtn_types_compatible(struct vtn_builder *b,
struct vtn_type *t1, struct vtn_type *t2);

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

@ -414,11 +414,19 @@ vtn_pointer_dereference(struct vtn_builder *b,
desc_index, desc_arr_idx);
}
if (idx == deref_chain->length) {
/* The entire deref was consumed in finding the block index. Return
* a pointer which just has a block index and a later access chain
* will dereference deeper.
*/
/* For acceleration structures, this is the end of the line. We leave
* them as a desc_index pointer and do the descriptor load when we see
* the OpLoad on the acceleration structure pointer.
*
* If we got here and we are still a block array then we also need to
* return a desc_index pointer. We leave loading the descriptor to some
* later access chain when it hits the block type.
*/
if (base->mode == vtn_variable_mode_accel_struct ||
vtn_type_is_block_array(b, type)) {
/* This has to be the end of the access chain */
vtn_assert(idx == deref_chain->length);
struct vtn_pointer *ptr = vtn_zalloc(b, struct vtn_pointer);
ptr->type = vtn_create_internal_pointer_type(b, base->type, type);
ptr->mode = base->mode;
@ -427,9 +435,8 @@ vtn_pointer_dereference(struct vtn_builder *b,
return ptr;
}
/* If we got here, there's more access chain to handle and we have the
* final block index. Insert a descriptor load and cast to a deref to
* start the deref chain.
/* For block types, we just hit the end of the array of blocks and we
* can go ahead and load the descriptor and cast it to a deref.
*/
nir_def *desc = vtn_descriptor_load(b, base->mode, desc_index);
@ -1952,7 +1959,7 @@ vtn_pointer_ssa_is_desc_index(struct vtn_builder *b,
return false;
return vtn_pointer_is_external_block(b, ptr) &&
vtn_type_contains_block(b, ptr->type->pointed);
vtn_type_is_block_array(b, ptr->type->pointed);
}
nir_def *