From: Aras Pranckevicius <aras@unity3d.com>
Date: Mon, 9 Aug 2010 08:17:32 +0000 (+0300)
Subject: glsl2: do not use __retval name; two underscores is reserved word according to GLSL... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3adce986c498539d9a5d8db95926e66e1315da03;p=mesa.git

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

diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp
index 03f84603b55..9b1bef6cb85 100644
--- a/src/glsl/glsl_types.cpp
+++ b/src/glsl/glsl_types.cpp
@@ -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++) {
diff --git a/src/glsl/ir_function_inlining.cpp b/src/glsl/ir_function_inlining.cpp
index fd52d106b1b..874602c84f2 100644
--- a/src/glsl/ir_function_inlining.cpp
+++ b/src/glsl/ir_function_inlining.cpp
@@ -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);
    }