Store actual values for literals

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

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index c4a29110ffc8783f6d671340a5bdb05f8d0c5759..07181d3583e69fbc1067292bbaddc7855c58a5ac 100644 (file)
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -99,9 +99,15 @@ void ConstantSpecializer::visit(VariableDeclaration &var)
                {
                        RefPtr<Literal> literal = new Literal;
                        if(var.type=="bool")
+                       {
                                literal->token = (i->second ? "true" : "false");
+                               literal->value = static_cast<bool>(i->second);
+                       }
                        else if(var.type=="int")
+                       {
                                literal->token = lexical_cast<string>(i->second);
+                               literal->value = i->second;
+                       }
                        var.init_expression = literal;
                }
        }
@@ -125,10 +131,21 @@ void TypeResolver::apply(Stage &s)
        s.content.visit(*this);
 }
 
+TypeDeclaration *TypeResolver::resolve_type(const string &name)
+{
+       map<string, TypeDeclaration *>::iterator i = stage->types.find(name);
+       if(i!=stage->types.end())
+       {
+               map<TypeDeclaration *, TypeDeclaration *>::iterator j = alias_map.find(i->second);
+               return (j!=alias_map.end() ? j->second : i->second);
+       }
+       else
+               return 0;
+}
+
 void TypeResolver::visit(BasicTypeDeclaration &type)
 {
-       map<string, TypeDeclaration *>::iterator i = stage->types.find(type.base);
-       type.base_type = (i!=stage->types.end() ? i->second : 0);
+       type.base_type = resolve_type(type.base);
 
        if(type.kind==BasicTypeDeclaration::VECTOR && type.base_type)
                if(BasicTypeDeclaration *basic_base = dynamic_cast<BasicTypeDeclaration *>(type.base_type))
@@ -138,14 +155,15 @@ void TypeResolver::visit(BasicTypeDeclaration &type)
                                type.size |= basic_base->size<<16;
                        }
 
+       if(type.kind==BasicTypeDeclaration::ALIAS && type.base_type)
+               alias_map[&type] = type.base_type;
+
        stage->types.insert(make_pair(type.name, &type));
 }
 
 void TypeResolver::visit(ImageTypeDeclaration &type)
 {
-       map<string, TypeDeclaration *>::iterator i = stage->types.find(type.base);
-       type.base_type = (i!=stage->types.end() ? i->second : 0);
-
+       type.base_type = resolve_type(type.base);
        stage->types.insert(make_pair(type.name, &type));
 }
 
@@ -157,9 +175,13 @@ void TypeResolver::visit(StructDeclaration &strct)
 
 void TypeResolver::visit(VariableDeclaration &var)
 {
-       map<string, TypeDeclaration *>::iterator i = stage->types.find(var.type);
-       if(i!=stage->types.end())
-               var.type_declaration = i->second;
+       var.type_declaration = resolve_type(var.type);
+}
+
+void TypeResolver::visit(FunctionDeclaration &func)
+{
+       func.return_type_declaration = resolve_type(func.return_type);
+       TraversingVisitor::visit(func);
 }
 
 
@@ -197,12 +219,7 @@ void VariableResolver::visit(VariableReference &var)
                        var.declaration = i->second;
        }
 
-       if(var.declaration)
-       {
-               if(StructDeclaration *strct = dynamic_cast<StructDeclaration *>(var.declaration->type_declaration))
-                       r_members = &strct->members.variables;
-       }
-       else
+       if(!var.declaration)
        {
                const map<string, InterfaceBlock *> &blocks = stage->interface_blocks;
                map<string, InterfaceBlock *>::const_iterator i = blocks.find("_"+var.name);
@@ -211,6 +228,8 @@ void VariableResolver::visit(VariableReference &var)
                        /* The name refers to an interface block with an instance name rather
                        than a variable.  Prepare a new syntax tree node accordingly. */
                        r_iface_ref = new InterfaceBlockReference;
+                       r_iface_ref->source = var.source;
+                       r_iface_ref->line = var.line;
                        r_iface_ref->name = var.name;
                        r_iface_ref->declaration = i->second;
                        r_members = &i->second->members.variables;
@@ -228,6 +247,10 @@ void VariableResolver::visit(VariableReference &var)
                }
        }
 
+       if(var.declaration)
+               if(StructDeclaration *strct = dynamic_cast<StructDeclaration *>(var.declaration->type_declaration))
+                       r_members = &strct->members.variables;
+
        if(record_target)
        {
                if(r_assignment_target)