X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramcompiler.cpp;h=2bb2694609f89277b9d36efc50a0df5de0354d34;hb=a209ca32465c61b38f3a57ee6577568f3994e8ab;hp=096a5d84927a062904f92e45b28421a554a0c07e;hpb=49717d5554becc07a4fafa4f1cbf85ac6ca13907;p=libs%2Fgl.git

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index 096a5d84..2bb26946 100644
--- a/source/programcompiler.cpp
+++ b/source/programcompiler.cpp
@@ -8,6 +8,26 @@
 
 using namespace std;
 
+namespace {
+
+const char builtins_src[] =
+	"////// vertex\n"
+	"out gl_PerVertex {\n"
+	"  vec4 gl_Position;\n"
+	"  float gl_ClipDistance[];\n"
+	"};"
+	"////// geometry\n"
+	"in gl_PerVertex {\n"
+	"  vec4 gl_Position;\n"
+	"  float gl_ClipDistance[];\n"
+	"} gl_in[];\n"
+	"out gl_PerVertex {\n"
+	"  vec4 gl_Position;\n"
+	"  float gl_ClipDistance[];\n"
+	"};\n";
+
+}
+
 namespace Msp {
 namespace GL {
 
@@ -51,6 +71,35 @@ void ProgramCompiler::add_shaders(Program &program)
 	program.bind_attribute(TEXCOORD4, "texcoord");
 }
 
+Module *ProgramCompiler::create_builtins_module()
+{
+	ProgramParser parser;
+	Module *module = new Module(parser.parse(builtins_src));
+	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+	{
+		VariableResolver resolver;
+		i->content.visit(resolver);
+		for(map<string, VariableDeclaration *>::iterator j=i->content.variables.begin(); j!=i->content.variables.end(); ++j)
+			j->second->linked_declaration = j->second;
+	}
+	return module;
+}
+
+Module &ProgramCompiler::get_builtins_module()
+{
+	static RefPtr<Module> builtins_module = create_builtins_module();
+	return *builtins_module;
+}
+
+Stage *ProgramCompiler::get_builtins(StageType type)
+{
+	Module &module = get_builtins_module();
+	for(list<Stage>::iterator i=module.stages.begin(); i!=module.stages.end(); ++i)
+		if(i->type==type)
+			return &*i;
+	return 0;
+}
+
 void ProgramCompiler::process()
 {
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
@@ -242,7 +291,7 @@ void ProgramCompiler::Formatter::visit(VariableDeclaration &var)
 		formatted += "const ";
 	if(!var.sampling.empty())
 		formatted += format("%s ", var.sampling);
-	if(!var.interface.empty())
+	if(!var.interface.empty() && var.interface!=block_interface)
 		formatted += format("%s ", var.interface);
 	formatted += format("%s %s", var.type, var.name);
 	if(var.array)
@@ -263,6 +312,7 @@ void ProgramCompiler::Formatter::visit(VariableDeclaration &var)
 
 void ProgramCompiler::Formatter::visit(InterfaceBlock &iface)
 {
+	SetForScope<string> set(block_interface, iface.interface);
 	formatted += format("%s %s\n", iface.interface, iface.name);
 	iface.members.visit(*this);
 	formatted += ';';
@@ -333,6 +383,17 @@ ProgramCompiler::VariableResolver::VariableResolver():
 	anonymous(false)
 { }
 
+void ProgramCompiler::VariableResolver::apply(Stage &s)
+{
+	SetForScope<Stage *> set(stage, &s);
+	Stage *builtins = get_builtins(stage->type);
+	if(builtins)
+		blocks.push_back(&builtins->content);
+	stage->content.visit(*this);
+	if(builtins)
+		blocks.pop_back();
+}
+
 void ProgramCompiler::VariableResolver::visit(Block &block)
 {
 	blocks.push_back(&block);
@@ -407,6 +468,9 @@ void ProgramCompiler::VariableResolver::visit(VariableDeclaration &var)
 			var.type_declaration = j->second;
 	}
 
+	if(!block_interface.empty() && var.interface.empty())
+		var.interface = block_interface;
+
 	TraversingVisitor::visit(var);
 	blocks.back()->variables[var.name] = &var;
 	if(anonymous && blocks.size()>1)
@@ -416,6 +480,7 @@ void ProgramCompiler::VariableResolver::visit(VariableDeclaration &var)
 void ProgramCompiler::VariableResolver::visit(InterfaceBlock &iface)
 {
 	SetFlag set(anonymous);
+	SetForScope<string> set2(block_interface, iface.interface);
 	TraversingVisitor::visit(iface);
 }
 
@@ -591,6 +656,24 @@ void ProgramCompiler::InterfaceGenerator::visit(Passthrough &pass)
 		}
 	}
 
+	if(stage->type==GEOMETRY)
+	{
+		VariableReference *ref = new VariableReference;
+		ref->name = "gl_in";
+
+		BinaryExpression *subscript = new BinaryExpression;
+		subscript->left = ref;
+		subscript->oper = "[";
+		subscript->right = pass.subscript;
+		subscript->after = "]";
+
+		MemberAccess *memacc = new MemberAccess;
+		memacc->left = subscript;
+		memacc->member = "gl_Position";
+
+		insert_assignment("gl_Position", memacc);
+	}
+
 	for(vector<VariableDeclaration *>::const_iterator i=pass_vars.begin(); i!=pass_vars.end(); ++i)
 	{
 		string out_name = change_prefix((*i)->name, out_prefix);