openharmony/third_party_mesa3d
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_mesa3d synced 2025-02-19 17:41:50 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

glsl: Don't support integer types for operations that can't handle them

Browse Source 
ir_unop_fract already forbade integer types in ir_validate.  ir_unop_rcp,
ir_unop_rsq, and ir_unop_sqrt should also forbid them in ir_validate.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Ian Romanick 2016-07-08 17:39:48 -07:00
parent 437e612bd7
commit cd8764737e
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiler/glsl/ir_constant_expression.cpp
View File

@ -729,12 +729,6 @@ ir_expression::constant_expression_value(struct hash_table *variable_context)
case ir_unop_fract:
for (unsigned c = 0; c < op[0]->type->components(); c++) {
switch (this->type->base_type) {
case GLSL_TYPE_UINT:
data.u[c] = 0;
break;
case GLSL_TYPE_INT:
data.i[c] = 0;
break;
case GLSL_TYPE_FLOAT:
data.f[c] = op[0]->value.f[c] - floor(op[0]->value.f[c]);
break;
@ -823,14 +817,6 @@ ir_expression::constant_expression_value(struct hash_table *variable_context)
case ir_unop_rcp:
for (unsigned c = 0; c < op[0]->type->components(); c++) {
switch (this->type->base_type) {
case GLSL_TYPE_UINT:
if (op[0]->value.u[c] != 0.0)
data.u[c] = 1 / op[0]->value.u[c];
break;
case GLSL_TYPE_INT:
if (op[0]->value.i[c] != 0.0)
data.i[c] = 1 / op[0]->value.i[c];
break;
case GLSL_TYPE_FLOAT:
if (op[0]->value.f[c] != 0.0)
data.f[c] = 1.0F / op[0]->value.f[c];

2
src/compiler/glsl/ir_validate.cpp
View File

@ -260,6 +260,8 @@ ir_validate::visit_leave(ir_expression *ir)
case ir_unop_rcp:
case ir_unop_rsq:
case ir_unop_sqrt:
assert(ir->type->base_type == GLSL_TYPE_FLOAT ||
ir->type->base_type == GLSL_TYPE_DOUBLE);
assert(ir->type == ir->operands[0]->type);
break;