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

ast_to_hir: Fix bug in constant initializers.

Browse Source 
Implicit conversions were not being performed, nor was there any
type checking - it was possible to have, say, var->type == float
and var->constant_value->type == int.  Later use of the constant
expression would trigger an assertion.

Fixes piglit test const-implicit-conversion.frag.
This commit is contained in:
Kenneth Graunke
2010-07-20 03:53:47 -07:00
parent 46d6b8d1ba
commit e1d71850fa
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/glsl/ast_to_hir.cpp
View File

@@ -1804,6 +1804,16 @@ ast_declarator_list::hir(exec_list *instructions,
* declaration. * declaration.
*/ */
if (this->type->qualifier.constant || this->type->qualifier.uniform) { if (this->type->qualifier.constant || this->type->qualifier.uniform) {
ir_rvalue *new_rhs = validate_assignment(state, var->type, rhs);
if (new_rhs != NULL) {
rhs = new_rhs;
} else {
_mesa_glsl_error(&initializer_loc, state,
"initializer of type %s cannot be assigned to "
"variable of type %s",
rhs->type->name, var->type->name);
}
ir_constant *constant_value = rhs->constant_expression_value(); ir_constant *constant_value = rhs->constant_expression_value();
if (!constant_value) { if (!constant_value) {
_mesa_glsl_error(& initializer_loc, state, _mesa_glsl_error(& initializer_loc, state,