Copy the location when moving output declarations out of functions

[libs/gl.git] / source / glsl / generate.cpp

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index 02021a4c39993c999f544c8718ea40292a4b0806..71b35b2c59f3ef8217db37d32b93123da763d047 100644 (file)
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -417,10 +417,10 @@ string InterfaceGenerator::change_prefix(const string &name, const string &prefi
        return prefix+name.substr(offset);
 }
 
-bool InterfaceGenerator::generate_interface(VariableDeclaration &var, const string &iface, const string &name)
+VariableDeclaration *InterfaceGenerator::generate_interface(VariableDeclaration &var, const string &iface, const string &name)
 {
        if(stage->content.variables.count(name))
-               return false;
+               return 0;
 
        VariableDeclaration* iface_var = new VariableDeclaration;
        iface_var->sampling = var.sampling;
@@ -445,13 +445,13 @@ bool InterfaceGenerator::generate_interface(VariableDeclaration &var, const stri
        iface_target_block->body.insert(iface_insert_point, iface_var);
        iface_target_block->variables[name] = iface_var;
 
-       return true;
+       return iface_var;
 }
 
-bool InterfaceGenerator::generate_interface(InterfaceBlock &out_block)
+InterfaceBlock *InterfaceGenerator::generate_interface(InterfaceBlock &out_block)
 {
        if(stage->interface_blocks.count(out_block.name))
-               return false;
+               return 0;
 
        InterfaceBlock *in_block = new InterfaceBlock;
        in_block->interface = "in";
@@ -480,7 +480,7 @@ bool InterfaceGenerator::generate_interface(InterfaceBlock &out_block)
        SetForScope<Block *> set_block(current_block, &stage->content);
        in_block->visit(*this);
 
-       return true;
+       return in_block;
 }
 
 ExpressionStatement &InterfaceGenerator::insert_assignment(const string &left, Expression *right)
@@ -565,8 +565,11 @@ void InterfaceGenerator::visit(VariableDeclaration &var)
        {
                /* For output variables in function scope, generate a global interface
                and replace the local declaration with an assignment. */
-               if(function_scope && generate_interface(var, "out", var.name))
+               VariableDeclaration *out_var = 0;
+               if(function_scope && (out_var=generate_interface(var, "out", var.name)))
                {
+                       out_var->source = var.source;
+                       out_var->line = var.line;
                        nodes_to_remove.insert(&var);
                        if(var.init_expression)
                        {