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

ir_constant_expression: Support scalar + vector and scalar + matrix.

Browse Source 
Fixes piglit tests const-vec-scalar-01.frag, const-vec-scalar-05.frag,
and const-mat-scalar-01.frag.
This commit is contained in:
Kenneth Graunke
2010-07-06 02:48:16 -07:00
committed by Ian Romanick
parent 6fc983b9bb
commit e74dcd7924
1 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/glsl/ir_constant_expression.cpp
View File

@@ -144,6 +144,16 @@ ir_constant_visitor::visit(ir_expression *ir)
if (op[1] != NULL) if (op[1] != NULL)
assert(op[0]->type->base_type == op[1]->type->base_type); assert(op[0]->type->base_type == op[1]->type->base_type);
bool op0_scalar = op[0]->type->is_scalar();
bool op1_scalar = op[1] != NULL && op[1]->type->is_scalar();
/* When iterating over a vector or matrix's components, we want to increase
* the loop counter. However, for scalars, we want to stay at 0.
*/
unsigned c0_inc = op0_scalar ? 1 : 0;
unsigned c1_inc = op1_scalar ? 1 : 0;
unsigned components = op[op1_scalar ? 0 : 1]->type->components();
switch (ir->operation) { switch (ir->operation) {
case ir_unop_logic_not: case ir_unop_logic_not:
assert(op[0]->type->base_type == GLSL_TYPE_BOOL); assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
@@ -308,25 +318,25 @@ ir_constant_visitor::visit(ir_expression *ir)
break; break;
case ir_binop_add: case ir_binop_add:
if (ir->operands[0]->type == ir->operands[1]->type) { assert(op[0]->type == op[1]->type || op0_scalar || op1_scalar);
for (c = 0; c < ir->operands[0]->type->components(); c++) { for (unsigned c = 0, c0 = 0, c1 = 0;
c < components;
c0 += c0_inc, c1 += c1_inc, c++) {
switch (ir->operands[0]->type->base_type) { switch (ir->operands[0]->type->base_type) {
case GLSL_TYPE_UINT: case GLSL_TYPE_UINT:
data.u[c] = op[0]->value.u[c] + op[1]->value.u[c]; data.u[c] = op[0]->value.u[c0] + op[1]->value.u[c1];
break; break;
case GLSL_TYPE_INT: case GLSL_TYPE_INT:
data.i[c] = op[0]->value.i[c] + op[1]->value.i[c]; data.i[c] = op[0]->value.i[c0] + op[1]->value.i[c1];
break; break;
case GLSL_TYPE_FLOAT: case GLSL_TYPE_FLOAT:
data.f[c] = op[0]->value.f[c] + op[1]->value.f[c]; data.f[c] = op[0]->value.f[c0] + op[1]->value.f[c1];
break; break;
default: default:
assert(0); assert(0);
} }
} }
} else
/* FINISHME: Support operations with non-equal types. */
return;
break; break;
case ir_binop_sub: case ir_binop_sub: