diff options
| author | marha <marha@users.sourceforge.net> | 2014-07-04 19:52:56 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-07-04 19:52:56 +0200 |
| commit | 62ed212e1add98e39c0f7a6e5a8a5726d66f161e (patch) | |
| tree | a80c4bf566c76665b3449f13fac7de72c66aa80a /mesalib/src/glsl/ir_constant_expression.cpp | |
| parent | 3095a03ec3cb1f05b49362327d10a767299d7635 (diff) | |
| parent | fe03d6aef6338e43593f164b09ae993bcd0ecbdd (diff) | |
| download | vcxsrv-62ed212e1add98e39c0f7a6e5a8a5726d66f161e.tar.gz vcxsrv-62ed212e1add98e39c0f7a6e5a8a5726d66f161e.tar.bz2 vcxsrv-62ed212e1add98e39c0f7a6e5a8a5726d66f161e.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/glsl/ir_constant_expression.cpp')
| -rwxr-xr-x | mesalib/src/glsl/ir_constant_expression.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mesalib/src/glsl/ir_constant_expression.cpp b/mesalib/src/glsl/ir_constant_expression.cpp index 73380d243..fa59cc16a 100755 --- a/mesalib/src/glsl/ir_constant_expression.cpp +++ b/mesalib/src/glsl/ir_constant_expression.cpp @@ -1775,8 +1775,7 @@ bool ir_function_signature::constant_expression_evaluate_expression_list(const s struct hash_table *variable_context, ir_constant **result) { - foreach_list(n, &body) { - ir_instruction *inst = (ir_instruction *)n; + foreach_in_list(ir_instruction, inst, &body) { switch(inst->ir_type) { /* (declare () type symbol) */ @@ -1915,8 +1914,8 @@ ir_function_signature::constant_expression_value(exec_list *actual_parameters, s */ const exec_node *parameter_info = origin ? origin->parameters.head : parameters.head; - foreach_list(n, actual_parameters) { - ir_constant *constant = ((ir_rvalue *) n)->constant_expression_value(variable_context); + foreach_in_list(ir_rvalue, n, actual_parameters) { + ir_constant *constant = n->constant_expression_value(variable_context); if (constant == NULL) { hash_table_dtor(deref_hash); return NULL; |