AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ir_constant_visitor: Types of ir_binop_{equal,nequal} must match

Browse Source 
The types must match exactly, so there is no reason to check the types here.
This commit is contained in:
Ian Romanick
2010-06-11 16:20:43 -07:00
parent 4daaab6040
commit 083d75a942
1 changed files with 36 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ir_constant_expression.cpp
+36 -40
View File
@@ -466,50 +466,46 @@ ir_constant_visitor::visit(ir_expression *ir)
break;
case ir_binop_equal:
if (ir->operands[0]->type == ir->operands[1]->type) {
type = glsl_type::bool_type;
data.b[0] = true;
for (c = 0; c < ir->operands[0]->type->components(); c++) {
switch (ir->operands[0]->type->base_type) {
case GLSL_TYPE_UINT:
data.b[0] = data.b[0] && op[0]->value.u[c] == op[1]->value.u[c];
break;
case GLSL_TYPE_INT:
data.b[0] = data.b[0] && op[0]->value.i[c] == op[1]->value.i[c];
break;
case GLSL_TYPE_FLOAT:
data.b[0] = data.b[0] && op[0]->value.f[c] == op[1]->value.f[c];
break;
case GLSL_TYPE_BOOL:
data.b[0] = data.b[0] && op[0]->value.b[c] == op[1]->value.b[c];
break;
default:
assert(0);
}
type = glsl_type::bool_type;
data.b[0] = true;
for (c = 0; c < ir->operands[0]->type->components(); c++) {
switch (ir->operands[0]->type->base_type) {
case GLSL_TYPE_UINT:
data.b[0] = data.b[0] && op[0]->value.u[c] == op[1]->value.u[c];
break;
case GLSL_TYPE_INT:
data.b[0] = data.b[0] && op[0]->value.i[c] == op[1]->value.i[c];
break;
case GLSL_TYPE_FLOAT:
data.b[0] = data.b[0] && op[0]->value.f[c] == op[1]->value.f[c];
break;
case GLSL_TYPE_BOOL:
data.b[0] = data.b[0] && op[0]->value.b[c] == op[1]->value.b[c];
break;
default:
assert(0);
}
}
break;
case ir_binop_nequal:
if (ir->operands[0]->type == ir->operands[1]->type) {
type = glsl_type::bool_type;
data.b[0] = false;
for (c = 0; c < ir->operands[0]->type->components(); c++) {
switch (ir->operands[0]->type->base_type) {
case GLSL_TYPE_UINT:
data.b[0] = data.b[0] || op[0]->value.u[c] != op[1]->value.u[c];
break;
case GLSL_TYPE_INT:
data.b[0] = data.b[0] || op[0]->value.i[c] != op[1]->value.i[c];
break;
case GLSL_TYPE_FLOAT:
data.b[0] = data.b[0] || op[0]->value.f[c] != op[1]->value.f[c];
break;
case GLSL_TYPE_BOOL:
data.b[0] = data.b[0] || op[0]->value.b[c] != op[1]->value.b[c];
break;
default:
assert(0);
}
type = glsl_type::bool_type;
data.b[0] = false;
for (c = 0; c < ir->operands[0]->type->components(); c++) {
switch (ir->operands[0]->type->base_type) {
case GLSL_TYPE_UINT:
data.b[0] = data.b[0] || op[0]->value.u[c] != op[1]->value.u[c];
break;
case GLSL_TYPE_INT:
data.b[0] = data.b[0] || op[0]->value.i[c] != op[1]->value.i[c];
break;
case GLSL_TYPE_FLOAT:
data.b[0] = data.b[0] || op[0]->value.f[c] != op[1]->value.f[c];
break;
case GLSL_TYPE_BOOL:
data.b[0] = data.b[0] || op[0]->value.b[c] != op[1]->value.b[c];
break;
default:
assert(0);
}
}
break;