diff options
author | Ian Romanick <[email protected]> | 2016-12-05 11:51:54 -0800 |
---|---|---|
committer | Ian Romanick <[email protected]> | 2016-12-12 17:17:12 -0800 |
commit | a0ce9ff8c49c03d8e952c26ac3e9274ac2f24c8c (patch) | |
tree | de642e7685722b57de3b70f8ec1366d49c9798f6 /src/compiler/nir/nir_print.c | |
parent | 75149088bea168a10f47df08fc62bcfeed744ce9 (diff) |
nir: Only float and double types can be matrices
In 19a541f (nir: Get rid of nir_constant_data) a number of places that
operated on nir_constant::values were mechanically converted to operate
on the whole array without regard for the base type. Only
GLSL_TYPE_FLOAT and GLSL_TYPE_DOUBLE can be matrices, so only those
types can have data in the non-0 array element.
See also b870394.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Cc: Iago Toral Quiroga <[email protected]>
Diffstat (limited to 'src/compiler/nir/nir_print.c')
-rw-r--r-- | src/compiler/nir/nir_print.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/compiler/nir/nir_print.c b/src/compiler/nir/nir_print.c index eb5f57f9534..e51b6f53691 100644 --- a/src/compiler/nir/nir_print.c +++ b/src/compiler/nir/nir_print.c @@ -303,11 +303,12 @@ print_constant(nir_constant *c, const struct glsl_type *type, print_state *state case GLSL_TYPE_UINT: case GLSL_TYPE_INT: case GLSL_TYPE_BOOL: - for (i = 0; i < cols; i++) { - for (j = 0; j < rows; j++) { - if (i + j > 0) fprintf(fp, ", "); - fprintf(fp, "0x%08x", c->values[i].u32[j]); - } + /* Only float base types can be matrices. */ + assert(cols == 1); + + for (i = 0; i < rows; i++) { + if (i > 0) fprintf(fp, ", "); + fprintf(fp, "0x%08x", c->values[0].u32[i]); } break; |