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

Use glsl_type::is_error instead of comparison with glsl_error_type pointer

Browse Source
This commit is contained in:
Ian Romanick
2010-03-26 14:27:23 -07:00
parent affc1413ac
commit a43817a483
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ast_to_hir.cpp
View File

@@ -446,8 +446,7 @@ ast_expression::hir(exec_list *instructions,
op[0] = this->subexpressions[0]->hir(instructions, state); op[0] = this->subexpressions[0]->hir(instructions, state);
op[1] = this->subexpressions[1]->hir(instructions, state); op[1] = this->subexpressions[1]->hir(instructions, state);
error_emitted = ((op[0]->type == glsl_error_type) error_emitted = op[0]->type->is_error() || op[1]->type->is_error();
|| (op[1]->type == glsl_error_type));
type = op[0]->type; type = op[0]->type;
if (!error_emitted) { if (!error_emitted) {
@@ -477,8 +476,8 @@ ast_expression::hir(exec_list *instructions,
case ast_plus: case ast_plus:
op[0] = this->subexpressions[0]->hir(instructions, state); op[0] = this->subexpressions[0]->hir(instructions, state);
error_emitted = (op[0]->type == glsl_error_type); error_emitted = op[0]->type->is_error();
if (type == glsl_error_type) if (type->is_error())
op[0]->type = type; op[0]->type = type;
result = op[0]; result = op[0];
@@ -489,7 +488,7 @@ ast_expression::hir(exec_list *instructions,
type = unary_arithmetic_result_type(op[0]->type); type = unary_arithmetic_result_type(op[0]->type);
error_emitted = (op[0]->type == glsl_error_type); error_emitted = op[0]->type->is_error();
result = new ir_expression(operations[this->oper], type, result = new ir_expression(operations[this->oper], type,
op[0], NULL); op[0], NULL);
@@ -514,8 +513,7 @@ ast_expression::hir(exec_list *instructions,
op[0] = this->subexpressions[0]->hir(instructions, state); op[0] = this->subexpressions[0]->hir(instructions, state);
op[1] = this->subexpressions[1]->hir(instructions, state); op[1] = this->subexpressions[1]->hir(instructions, state);
error_emitted = ((op[0]->type == glsl_error_type) error_emitted = op[0]->type->is_error() || op[1]->type->is_error();
|| (op[1]->type == glsl_error_type));
type = modulus_result_type(op[0]->type, op[1]->type); type = modulus_result_type(op[0]->type, op[1]->type);
@@ -537,15 +535,14 @@ ast_expression::hir(exec_list *instructions,
op[0] = this->subexpressions[0]->hir(instructions, state); op[0] = this->subexpressions[0]->hir(instructions, state);
op[1] = this->subexpressions[1]->hir(instructions, state); op[1] = this->subexpressions[1]->hir(instructions, state);
error_emitted = ((op[0]->type == glsl_error_type) error_emitted = op[0]->type->is_error() || op[1]->type->is_error();
|| (op[1]->type == glsl_error_type));
type = relational_result_type(op[0]->type, op[1]->type, state); type = relational_result_type(op[0]->type, op[1]->type, state);
/* The relational operators must either generate an error or result /* The relational operators must either generate an error or result
* in a scalar boolean. See page 57 of the GLSL 1.50 spec. * in a scalar boolean. See page 57 of the GLSL 1.50 spec.
*/ */
assert((type == glsl_error_type) assert(type->is_error()
|| ((type->base_type == GLSL_TYPE_BOOL) || ((type->base_type == GLSL_TYPE_BOOL)
&& type->is_scalar())); && type->is_scalar()));
@@ -579,8 +576,7 @@ ast_expression::hir(exec_list *instructions,
op[0] = this->subexpressions[0]->hir(instructions, state); op[0] = this->subexpressions[0]->hir(instructions, state);
op[1] = this->subexpressions[1]->hir(instructions, state); op[1] = this->subexpressions[1]->hir(instructions, state);
error_emitted = ((op[0]->type == glsl_error_type) error_emitted = op[0]->type->is_error() || op[1]->type->is_error();
|| (op[1]->type == glsl_error_type));
type = arithmetic_result_type(op[0]->type, op[1]->type, type = arithmetic_result_type(op[0]->type, op[1]->type,
(this->oper == ast_mul_assign), (this->oper == ast_mul_assign),
@@ -592,8 +588,7 @@ ast_expression::hir(exec_list *instructions,
/* FINISHME: This is copied from ast_assign above. It should /* FINISHME: This is copied from ast_assign above. It should
* FINISHME: probably be consolidated. * FINISHME: probably be consolidated.
*/ */
error_emitted = ((op[0]->type == glsl_error_type) error_emitted = op[0]->type->is_error() || temp_rhs->type->is_error();
|| (temp_rhs->type == glsl_error_type));
type = op[0]->type; type = op[0]->type;
if (!error_emitted) { if (!error_emitted) {

2
hir_field_selection.cpp
View File

@@ -45,7 +45,7 @@ _mesa_ast_field_selection_to_hir(const ast_expression *expr,
* being applied. * being applied.
*/ */
YYLTYPE loc = expr->get_location(); YYLTYPE loc = expr->get_location();
if (op->type == glsl_error_type) { if (op->type->is_error()) {
/* silently propagate the error */ /* silently propagate the error */
} else if (op->type->is_vector()) { } else if (op->type->is_vector()) {
ir_swizzle *swiz = ir_swizzle::create(op, ir_swizzle *swiz = ir_swizzle::create(op,