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

spirv: Allow block-decorated struct types for constants

Browse Source 
Whenever a struct type is decorated Block or BufferBlock we turn that
into a GLSL_TYPE_INTERFACE.  Since these decorations can end up random
places, we should allow them for constants.

Closes: #3252
Fixes: 9d0ae777dd "spirv: Use interface type for block and buffer..."
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5855>
This commit is contained in:
Jason Ekstrand
2020-07-10 15:58:39 -05:00
committed by Marge Bot
parent 81773b4b44
commit 351b5137d7
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/compiler/nir/nir_print.c
View File

@@ -399,6 +399,7 @@ print_constant(nir_constant *c, const struct glsl_type *type, print_state *state
break; break;
case GLSL_TYPE_STRUCT: case GLSL_TYPE_STRUCT:
case GLSL_TYPE_INTERFACE:
for (i = 0; i < c->num_elements; i++) { for (i = 0; i < c->num_elements; i++) {
if (i > 0) fprintf(fp, ", "); if (i > 0) fprintf(fp, ", ");
fprintf(fp, "{ "); fprintf(fp, "{ ");

3
src/compiler/spirv/spirv_to_nir.c
View File

@@ -256,7 +256,8 @@ vtn_const_ssa_value(struct vtn_builder *b, nir_constant *constant,
break; break;
} }
case GLSL_TYPE_STRUCT: { case GLSL_TYPE_STRUCT:
case GLSL_TYPE_INTERFACE: {
unsigned elems = glsl_get_length(val->type); unsigned elems = glsl_get_length(val->type);
val->elems = ralloc_array(b, struct vtn_ssa_value *, elems); val->elems = ralloc_array(b, struct vtn_ssa_value *, elems);
for (unsigned i = 0; i < elems; i++) { for (unsigned i = 0; i < elems; i++) {