Redesign loading of GLSL sources

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

diff --git a/source/glsl/builtin.cpp b/source/glsl/builtin.cpp
index 9aa6a6c2b4dd6bcef9d71cc26ea9d6af6343646d..b9fe487c7bb2f810360918167df628d05a5acbfb 100644 (file)
--- a/source/glsl/builtin.cpp
+++ b/source/glsl/builtin.cpp
@@ -9,6 +9,13 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
+void populate_types(Stage &stage)
+{
+       for(NodeList<Statement>::const_iterator i=stage.content.body.begin(); i!=stage.content.body.end(); ++i)
+               if(TypeDeclaration *type = dynamic_cast<TypeDeclaration *>(i->get()))
+                       stage.types[type->name] = type;
+}
+
 Module *get_builtins_module()
 {
        static RefPtr<Module> builtins_module;
@@ -21,15 +28,58 @@ Module *get_builtins_module()
                if(!io)
                        return 0;
 
-               Parser parser;
-               Module *module = new Module(parser.parse(*io, "<builtin>", BUILTIN_SOURCE));
+               RefPtr<Module> module = new Module;
+               Parser parser(0);
+               parser.parse(*module, *io, "<builtin>", BUILTIN_SOURCE);
+
+               NodeList<Statement> &shared_body = module->shared.content.body;
+               NodeList<Statement>::iterator insert_point = shared_body.begin();
+
+               RefPtr<BasicTypeDeclaration> type = new BasicTypeDeclaration;
+               type->source = BUILTIN_SOURCE;
+               type->name = "void";
+               type->kind = BasicTypeDeclaration::VOID;
+               shared_body.insert(insert_point, type);
+
+               type = new BasicTypeDeclaration;
+               type->source = BUILTIN_SOURCE;
+               type->name = "bool";
+               type->size = 1;
+               type->kind = BasicTypeDeclaration::BOOL;
+               shared_body.insert(insert_point, type);
+
+               type = new BasicTypeDeclaration;
+               type->source = BUILTIN_SOURCE;
+               type->name = "int";
+               type->size = 32;
+               type->kind = BasicTypeDeclaration::INT;
+               shared_body.insert(insert_point, type);
+
+               type = new BasicTypeDeclaration;
+               type->source = BUILTIN_SOURCE;
+               type->name = "uint";
+               type->size = 32;
+               type->sign = false;
+               type->kind = BasicTypeDeclaration::INT;
+               shared_body.insert(insert_point, type);
+
+               type = new BasicTypeDeclaration;
+               type->source = BUILTIN_SOURCE;
+               type->name = "float";
+               type->size = 32;
+               type->kind = BasicTypeDeclaration::FLOAT;
+               shared_body.insert(insert_point, type);
+
+               populate_types(module->shared);
+               for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+                       populate_types(*i);
 
-               builtins_module = module;
+               builtins_module = module.release();
        }
        return builtins_module.get();
 }
 
-Stage *get_builtins(Stage::Type type)
+const Stage *get_builtins(Stage::Type type)
 {
        Module *module = get_builtins_module();
        if(!module)