Use a different method of adding builtins to stages

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

diff --git a/source/glsl/builtin.cpp b/source/glsl/builtin.cpp
index 1fd496b40c5e8210636960d2a69644363844e95a..955266fe0a1ce4ad3a8abfcd9fb3afb0340266f8 100644 (file)
--- a/source/glsl/builtin.cpp
+++ b/source/glsl/builtin.cpp
@@ -1,5 +1,4 @@
 #include "builtin.h"
-#include "generate.h"
 #include "parser.h"
 
 using namespace std;
@@ -37,13 +36,7 @@ Module *get_builtins_module()
                initialized = true;
 
                Parser parser;
-               Module *module = new Module(parser.parse(builtins_src, "<builtin>"));
-               for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
-               {
-                       VariableResolver().apply(*i);
-                       for(map<string, VariableDeclaration *>::iterator j=i->content.variables.begin(); j!=i->content.variables.end(); ++j)
-                               j->second->linked_declaration = j->second;
-               }
+               Module *module = new Module(parser.parse(builtins_src, "<builtin>", BUILTIN_SOURCE));
 
                builtins_module = module;
        }
@@ -56,6 +49,8 @@ Stage *get_builtins(Stage::Type type)
        if(!module)
                return 0;
 
+       if(type==Stage::SHARED)
+               return &module->shared;
        for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
                if(i->type==type)
                        return &*i;