Follow type aliases in TypeResolver

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index 433d506e1a8ab762f50a0e930e314bf387c58be0..f5b6b7adb91769277f95de93d56d605e38cc88f7 100644 (file)
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -125,10 +125,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 +149,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,15 +169,12 @@ 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)
 {
-       map<string, TypeDeclaration *>::iterator i = stage->types.find(func.return_type);
-       func.return_type_declaration = (i!=stage->types.end() ? i->second : 0);
+       func.return_type_declaration = resolve_type(func.return_type);
        TraversingVisitor::visit(func);
 }
 

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index d4e570ab9908b239ceb291c4eafff8765afd39da..b660a0957447f1507fb9aa1b0a8ed5e5dedf28f5 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -60,6 +60,7 @@ class TypeResolver: private TraversingVisitor
 {
 private:
        Stage *stage;
+       std::map<TypeDeclaration *, TypeDeclaration *> alias_map;
 
 public:
        TypeResolver();
@@ -67,6 +68,7 @@ public:
        void apply(Stage &);
 
 private:
+       TypeDeclaration *resolve_type(const std::string &);
        virtual void visit(BasicTypeDeclaration &);
        virtual void visit(ImageTypeDeclaration &);
        virtual void visit(StructDeclaration &);

diff --git a/tests/glsl/alias_types.glsl b/tests/glsl/alias_types.glsl
new file mode 100644 (file)
index 0000000..8e6e9a9
--- /dev/null
+++ b/tests/glsl/alias_types.glsl
@@ -0,0 +1,20 @@
+typedef vec4 myvec4;
+typedef mat4x4 mymat4;
+
+uniform mymat4 mvp;
+
+#pragma MSP stage(vertex)
+layout(location=0) in myvec4 position;
+void main()
+{
+       gl_Position = mvp*position;
+}
+
+/* Expected output: vertex
+uniform mat4 mvp;
+layout(location=0) in vec4 position;
+void main()
+{
+       gl_Position = mvp*position;
+}
+*/