OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spirv/nir: tweak nir type when storage class is SpvStorageClassAtomicCounter

Browse Source 
GLSL types differentiates uint from atomic uint. On SPIR-V the type is
uint, and the variable has a specific storage class. So we need to
tweak the type based on the storage class.

Ideally we would like to get the proper type at vtn_handle_type, but
we don't have the storage class at that moment.

We tweak only the nir type, as is the one that really requires it.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Alejandro Piñeiro
2017-11-10 16:57:40 +01:00
parent 88d3325a44
commit 480d2c56b3
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/compiler/spirv/vtn_variables.c
View File

@@ -1643,7 +1643,17 @@ vtn_create_variable(struct vtn_builder *b, struct vtn_value *val,
/* For these, we create the variable normally */
var->var = rzalloc(b->shader, nir_variable);
var->var->name = ralloc_strdup(var->var, val->name);
var->var->type = var->type->type;
/* Need to tweak the nir type here as at vtn_handle_type we don't have
* 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();
} else {
var->var->type = var->type->type;
}
var->var->data.mode = nir_mode;
var->var->data.location = -1;
var->var->interface_type = NULL;