fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 11:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl2: do not use __retval name; two underscores is reserved word according to GLSL spec (and Win7 ATI drivers do complain about that)

Browse source
This commit is contained in:
Aras Pranckevicius 2010-08-09 11:17:32 +03:00 • committed by Ian Romanick
parent 5023edaf5d
commit 3adce986c4
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/glsl/glsl_types.cpp
View file

@ -267,11 +267,11 @@ glsl_type::generate_constructor(glsl_symbol_table *symtab) const
}
/* Generate the body of the constructor. The body assigns each of the
* parameters to a portion of a local variable called __retval that has
* the same type as the constructor. After initializing __retval,
* __retval is returned.
* parameters to a portion of a local variable called _ret_val that has
* the same type as the constructor. After initializing _ret_val,
* _ret_val is returned.
*/
ir_variable *retval = new(ctx) ir_variable(this, "__retval", ir_var_auto);
ir_variable *retval = new(ctx) ir_variable(this, "_ret_val", ir_var_auto);
sig->body.push_tail(retval);
for (unsigned i = 0; i < length; i++) {

2
src/glsl/ir_function_inlining.cpp
View file

@ -127,7 +127,7 @@ ir_call::generate_inline(ir_instruction *next_ir)
/* Generate storage for the return value. */
if (this->callee->return_type) {
retval = new(ctx) ir_variable(this->callee->return_type, "__retval",
retval = new(ctx) ir_variable(this->callee->return_type, "_ret_val",
ir_var_auto);
next_ir->insert_before(retval);
}