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

Fix error handling of logic operators.

Browse Source 
They were always throwing a type error because type wasn't being set.
This commit is contained in:
Eric Anholt
2010-03-31 17:05:32 -10:00
committed by Ian Romanick
parent 183d8c6394
commit ebbf14b980
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ast_to_hir.cpp
View File

@@ -736,6 +736,7 @@ ast_expression::hir(exec_list *instructions,
_mesa_glsl_error(& loc, state, "LHS of `%s' must be scalar boolean", _mesa_glsl_error(& loc, state, "LHS of `%s' must be scalar boolean",
operator_string(this->oper)); operator_string(this->oper));
error_emitted = true;
} }
if (!op[1]->type->is_boolean() || !op[1]->type->is_scalar()) { if (!op[1]->type->is_boolean() || !op[1]->type->is_scalar()) {
@@ -743,10 +744,12 @@ ast_expression::hir(exec_list *instructions,
_mesa_glsl_error(& loc, state, "RHS of `%s' must be scalar boolean", _mesa_glsl_error(& loc, state, "RHS of `%s' must be scalar boolean",
operator_string(this->oper)); operator_string(this->oper));
error_emitted = true;
} }
result = new ir_expression(operations[this->oper], glsl_type::bool_type, result = new ir_expression(operations[this->oper], glsl_type::bool_type,
op[0], op[1]); op[0], op[1]);
type = glsl_type::bool_type;
break; break;
case ast_logic_not: case ast_logic_not:
@@ -757,10 +760,12 @@ ast_expression::hir(exec_list *instructions,
_mesa_glsl_error(& loc, state, _mesa_glsl_error(& loc, state,
"operand of `!' must be scalar boolean"); "operand of `!' must be scalar boolean");
error_emitted = true;
} }
result = new ir_expression(operations[this->oper], glsl_type::bool_type, result = new ir_expression(operations[this->oper], glsl_type::bool_type,
op[0], NULL); op[0], NULL);
type = glsl_type::bool_type;
break; break;
case ast_mul_assign: case ast_mul_assign: