diff options
Diffstat (limited to 'src/compiler/glsl')
| -rw-r--r-- | src/compiler/glsl/ir_constant_expression.cpp | 6 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_validate.cpp | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/compiler/glsl/ir_constant_expression.cpp b/src/compiler/glsl/ir_constant_expression.cpp index 6329acde2b6..2d7895e471f 100644 --- a/src/compiler/glsl/ir_constant_expression.cpp +++ b/src/compiler/glsl/ir_constant_expression.cpp @@ -785,9 +785,6 @@ ir_expression::constant_expression_value(struct hash_table *variable_context) case ir_unop_abs: for (unsigned c = 0; c < op[0]->type->components(); c++) { switch (this->type->base_type) { - case GLSL_TYPE_UINT: - data.u[c] = op[0]->value.u[c]; - break; case GLSL_TYPE_INT: data.i[c] = op[0]->value.i[c]; if (data.i[c] < 0) @@ -808,9 +805,6 @@ ir_expression::constant_expression_value(struct hash_table *variable_context) case ir_unop_sign: for (unsigned c = 0; c < op[0]->type->components(); c++) { switch (this->type->base_type) { - case GLSL_TYPE_UINT: - data.u[c] = op[0]->value.i[c] > 0; - break; case GLSL_TYPE_INT: data.i[c] = (op[0]->value.i[c] > 0) - (op[0]->value.i[c] < 0); break; diff --git a/src/compiler/glsl/ir_validate.cpp b/src/compiler/glsl/ir_validate.cpp index bade45a62ab..3ded2029906 100644 --- a/src/compiler/glsl/ir_validate.cpp +++ b/src/compiler/glsl/ir_validate.cpp @@ -246,8 +246,17 @@ ir_validate::visit_leave(ir_expression *ir) break; case ir_unop_neg: + assert(ir->type == ir->operands[0]->type); + break; + case ir_unop_abs: case ir_unop_sign: + assert(ir->operands[0]->type->base_type == GLSL_TYPE_INT || + ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT || + ir->operands[0]->type->base_type == GLSL_TYPE_DOUBLE); + assert(ir->type == ir->operands[0]->type); + break; + case ir_unop_rcp: case ir_unop_rsq: case ir_unop_sqrt: |