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

nir/spirv: Fix atomic counter (multidimensional-)arrays

Browse source 
When constructing NIR if we have a SPIR-V uint variable and the
storage class is SpvStorageClassAtomicCounter, we store as NIR's
glsl_type an atomic_uint to reflect the fact that the variable is an
atomic counter.

However, we were tweaking the type only for atomic_uint scalars, we
have to do it as well for atomic_uint arrays and atomic_uint arrays of
arrays of any depth.

Signed-off-by: Antia Puentes <apuentes@igalia.com>
Signed-off-by: Alejandro Piñeiro <apinheiro@igalia.com>

v2: update after deref patches got pushed (Alejandro Piñeiro)
v3: simplify repair_atomic_type (suggested by Timothy Arceri, included
    on the patch by Alejandro)

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Antia Puentes 2018-05-02 22:28:43 +02:00 • committed by Alejandro Piñeiro
parent 480d2c56b3
commit 4110bc4c17
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -374,6 +374,28 @@ vtn_pointer_for_variable(struct vtn_builder *b,
return pointer;
}
/* Returns an atomic_uint type based on the original uint type. The returned
* type will be equivalent to the original one but will have an atomic_uint
* type as leaf instead of an uint.
*
* Manages uint scalars, arrays, and arrays of arrays of any nested depth.
*/
static const struct glsl_type *
repair_atomic_type(const struct glsl_type *type)
{
assert(glsl_get_base_type(glsl_without_array(type)) == GLSL_TYPE_UINT);
assert(glsl_type_is_scalar(glsl_without_array(type)));
if (glsl_type_is_array(type)) {
const struct glsl_type *atomic =
repair_atomic_type(glsl_get_array_element(type));
return glsl_array_type(atomic, glsl_get_length(type));
} else {
return glsl_atomic_uint_type();
}
}
nir_deref_instr *
vtn_pointer_to_deref(struct vtn_builder *b, struct vtn_pointer *ptr)
{
@ -1648,9 +1670,8 @@ vtn_create_variable(struct vtn_builder *b, struct vtn_value *val,
* the access to storage_class, that is the one that points us that is
* an atomic uint.
*/
if (glsl_get_base_type(var->type->type) == GLSL_TYPE_UINT &&
storage_class == SpvStorageClassAtomicCounter) {
var->var->type = glsl_atomic_uint_type();
if (storage_class == SpvStorageClassAtomicCounter) {
var->var->type = repair_atomic_type(var->type->type);
} else {
var->var->type = var->type->type;
}