X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fbuiltin.cpp;h=12602707db80ca5043b6582f5b6917422cb2f477;hb=91e65bc9e24a6889995081035f6f6f0a78a6c20e;hp=9aa6a6c2b4dd6bcef9d71cc26ea9d6af6343646d;hpb=992516fcf616fe6ceb55f5a6767eb174aff3f830;p=libs%2Fgl.git

diff --git a/source/glsl/builtin.cpp b/source/glsl/builtin.cpp
index 9aa6a6c2..12602707 100644
--- 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;
@@ -24,12 +31,54 @@ Module *get_builtins_module()
 		Parser parser;
 		Module *module = new Module(parser.parse(*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;
 	}
 	return builtins_module.get();
 }
 
-Stage *get_builtins(Stage::Type type)
+const Stage *get_builtins(Stage::Type type)
 {
 	Module *module = get_builtins_module();
 	if(!module)