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

nir: Only float and double types can be matrices

Browse Source 
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 <ian.d.romanick@intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
Cc: Iago Toral Quiroga <itoral@igalia.com>
This commit is contained in:
Ian Romanick
2016-12-05 11:51:54 -08:00
parent 75149088be
commit a0ce9ff8c4
2 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/compiler/glsl/glsl_to_nir.cpp
View File

@@ -207,17 +207,21 @@ constant_copy(ir_constant *ir, void *mem_ctx)
ret->num_elements = 0;
switch (ir->type->base_type) {
case GLSL_TYPE_UINT:
for (unsigned c = 0; c < cols; c++) {
for (unsigned r = 0; r < rows; r++)
ret->values[c].u32[r] = ir->value.u[c * rows + r];
}
/* Only float base types can be matrices. */
assert(cols == 1);
for (unsigned r = 0; r < rows; r++)
ret->values[0].u32[r] = ir->value.u[r];
break;
case GLSL_TYPE_INT:
for (unsigned c = 0; c < cols; c++) {
for (unsigned r = 0; r < rows; r++)
ret->values[c].i32[r] = ir->value.i[c * rows + r];
}
/* Only float base types can be matrices. */
assert(cols == 1);
for (unsigned r = 0; r < rows; r++)
ret->values[0].i32[r] = ir->value.i[r];
break;
case GLSL_TYPE_FLOAT:
@@ -235,12 +239,12 @@ constant_copy(ir_constant *ir, void *mem_ctx)
break;
case GLSL_TYPE_BOOL:
for (unsigned c = 0; c < cols; c++) {
for (unsigned r = 0; r < rows; r++) {
ret->values[c].u32[r] = ir->value.b[c * rows + r] ?
NIR_TRUE : NIR_FALSE;
}
}
/* Only float base types can be matrices. */
assert(cols == 1);
for (unsigned r = 0; r < rows; r++)
ret->values[0].u32[r] = ir->value.b[r] ? NIR_TRUE : NIR_FALSE;
break;
case GLSL_TYPE_STRUCT:

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

@@ -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;