Transform interface block contents into structs

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

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index ac014a00147bda31eef70d842c644cab3d27929d..ccfbe691195eefd91aa4314281db6afc1bb97c97 100644 (file)
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -166,7 +166,8 @@ string Compiler::get_diagnostics() const
        string combined;
        for(list<Stage>::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
                for(vector<Diagnostic>::const_iterator j=i->diagnostics.begin(); j!=i->diagnostics.end(); ++j)
-                       append(combined, "\n", format("%s:%d: %s", module->source_map.get_name(j->source), j->line, j->message));
+                       if(j->source!=INTERNAL_SOURCE)
+                               append(combined, "\n", format("%s:%d: %s", module->source_map.get_name(j->source), j->line, j->message));
        return combined;
 }
 
@@ -275,7 +276,7 @@ void Compiler::resolve(Stage &stage, unsigned flags)
                if(resolve<BlockHierarchyResolver>(stage, flags, RESOLVE_BLOCKS))
                        ;
                else if(resolve<TypeResolver>(stage, flags, RESOLVE_TYPES))
-                       flags |= RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS;
+                       flags |= RESOLVE_BLOCKS|RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS;
                else if(resolve<VariableResolver>(stage, flags, RESOLVE_VARIABLES))
                        flags |= RESOLVE_EXPRESSIONS;
                else if(resolve<FunctionResolver>(stage, flags, RESOLVE_FUNCTIONS))