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

diff --git a/source/glsl/builtin.cpp b/source/glsl/builtin.cpp
index 9aa6a6c2..c9483151 100644
--- a/source/glsl/builtin.cpp
+++ b/source/glsl/builtin.cpp
@@ -1,6 +1,7 @@
 #include <msp/gl/resources.h>
 #include <msp/io/seekable.h>
 #include "builtin.h"
+#include "generate.h"
 #include "parser.h"
 
 using namespace std;
@@ -24,12 +25,46 @@ 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 = "float";
+		type->size = 32;
+		type->kind = BasicTypeDeclaration::FLOAT;
+		shared_body.insert(insert_point, type);
+
+		TypeResolver().apply(module->shared);
+		for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+			TypeResolver().apply(*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)