X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramcompiler.cpp;h=fd756de0e00cbbca4c5aa18587b251afc4e94ccb;hb=48e37a09b49cd4148db390170cfd07eef92c9d02;hp=aef17fa2369fdadc46366c7b4868751ba2d1fc1e;hpb=ec5ec4201b60b8ba15aaa6208e453225a1d7a291;p=libs%2Fgl.git

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index aef17fa2..fd756de0 100644
--- a/source/programcompiler.cpp
+++ b/source/programcompiler.cpp
@@ -61,17 +61,20 @@ void ProgramCompiler::add_shaders(Program &program)
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 	{
 		if(i->type==VERTEX)
+		{
 			program.attach_shader_owned(new VertexShader(apply<Formatter>(*i)));
+			for(map<string, unsigned>::iterator j=i->locations.begin(); j!=i->locations.end(); ++j)
+				program.bind_attribute(j->second, j->first);
+		}
 		else if(i->type==GEOMETRY)
 			program.attach_shader_owned(new GeometryShader(apply<Formatter>(*i)));
 		else if(i->type==FRAGMENT)
+		{
 			program.attach_shader_owned(new FragmentShader(apply<Formatter>(*i)));
+			for(map<string, unsigned>::iterator j=i->locations.begin(); j!=i->locations.end(); ++j)
+				program.bind_fragment_data(j->second, j->first);
+		}
 	}
-
-	program.bind_attribute(VERTEX4, "vertex");
-	program.bind_attribute(NORMAL3, "normal");
-	program.bind_attribute(COLOR4_FLOAT, "color");
-	program.bind_attribute(TEXCOORD4, "texcoord");
 }
 
 Module *ProgramCompiler::create_builtins_module()
@@ -334,7 +337,13 @@ void ProgramCompiler::Formatter::visit(Layout &layout)
 		if(!i->value.empty())
 			formatted += format("=%s", i->value);
 	}
-	formatted += format(") %s;", layout.interface);
+	formatted += ')';
+}
+
+void ProgramCompiler::Formatter::visit(InterfaceLayout &layout)
+{
+	layout.layout.visit(*this);
+	formatted += format(" %s;", layout.interface);
 }
 
 void ProgramCompiler::Formatter::visit(StructDeclaration &strct)
@@ -346,6 +355,11 @@ void ProgramCompiler::Formatter::visit(StructDeclaration &strct)
 
 void ProgramCompiler::Formatter::visit(VariableDeclaration &var)
 {
+	if(var.layout)
+	{
+		var.layout->visit(*this);
+		formatted += ' ';
+	}
 	if(var.constant)
 		formatted += "const ";
 	if(!var.sampling.empty())
@@ -1283,6 +1297,7 @@ void ProgramCompiler::NodeRemover::visit(VariableDeclaration &var)
 	{
 		stage->in_variables.erase(var.name);
 		stage->out_variables.erase(var.name);
+		stage->locations.erase(var.name);
 		if(var.linked_declaration)
 			var.linked_declaration->linked_declaration = 0;
 	}
@@ -1352,19 +1367,41 @@ void ProgramCompiler::LegacyConverter::visit(FunctionCall &call)
 
 void ProgramCompiler::LegacyConverter::visit(VariableDeclaration &var)
 {
-	if(var.interface=="in" || var.interface=="out")
-		if(!check_version(Version(1, 30)))
+	if(var.layout && !check_version(Version(3, 30)))
+	{
+		vector<Layout::Qualifier>::iterator i;
+		for(i=var.layout->qualifiers.begin(); (i!=var.layout->qualifiers.end() && i->identifier!="location"); ++i) ;
+		if(i!=var.layout->qualifiers.end())
 		{
+			unsigned location = lexical_cast<unsigned>(i->value);
 			if(stage->type==VERTEX && var.interface=="in")
-				var.interface = "attribute";
-			else if((stage->type==VERTEX && var.interface=="out") || (stage->type==FRAGMENT && var.interface=="in"))
-				var.interface = "varying";
+			{
+				stage->locations[var.name] = location;
+				var.layout->qualifiers.erase(i);
+			}
 			else if(stage->type==FRAGMENT && var.interface=="out")
 			{
-				frag_out_name = var.name;
-				remove_node = true;
+				stage->locations[var.name] = location;
+				var.layout->qualifiers.erase(i);
 			}
+
+			if(var.layout->qualifiers.empty())
+				var.layout = 0;
 		}
+	}
+
+	if((var.interface=="in" || var.interface=="out") && !check_version(Version(1, 30)))
+	{
+		if(stage->type==VERTEX && var.interface=="in")
+			var.interface = "attribute";
+		else if((stage->type==VERTEX && var.interface=="out") || (stage->type==FRAGMENT && var.interface=="in"))
+			var.interface = "varying";
+		else if(stage->type==FRAGMENT && var.interface=="out")
+		{
+			frag_out_name = var.name;
+			remove_node = true;
+		}
+	}
 
 	TraversingVisitor::visit(var);
 }