X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foutput.cpp;h=81f335735e80eb433fd746ae85216dc59b309e83;hb=9ec831710f64a62ad5f2e896a55ae82a3519f29e;hp=9d4383e4de979b91c6febdab5e0cd02ca599e4e8;hpb=dccad64b2ec82249d850b9745614042171499972;p=libs%2Fgl.git

diff --git a/source/glsl/output.cpp b/source/glsl/output.cpp
index 9d4383e4..81f33573 100644
--- a/source/glsl/output.cpp
+++ b/source/glsl/output.cpp
@@ -22,23 +22,29 @@ const string &Formatter::apply(Stage &s, Compiler::Mode m)
 	mode = m;
 	stage = &s;
 
-	GLApi api = get_gl_api();
-	const Version &ver = s.required_version;
+	const Version &ver = s.required_features.glsl_version;
 
 	if(ver)
 	{
 		append(format("#version %d%02d", ver.major, ver.minor));
-		if(api==OPENGL_ES2 && ver>=Version(3, 0))
+		if(s.required_features.gl_api==OPENGL_ES2 && ver>=Version(3, 0))
 			append(" es");
 		formatted += '\n';
 	}
 
-	for(vector<const Extension *>::const_iterator i=s.required_extensions.begin(); i!=s.required_extensions.end(); ++i)
-		append(format("#extension %s: require\n", (*i)->get_name()));
-	if(!s.required_extensions.empty())
-		formatted += '\n';
+	if(s.required_features.arb_explicit_attrib_location)
+		append("#extension arb_explicit_attrib_location: require\n");
+	if(s.required_features.arb_gpu_shader5)
+		append("#extension arb_gpu_shader5: require\n");
+	if(s.required_features.arb_uniform_buffer_object)
+		append("#extension arb_uniform_buffer_object: require\n");
+	if(s.required_features.ext_gpu_shader4)
+		append("#extension ext_gpu_shader4: require\n");
+	if(s.required_features.ext_texture_array)
+		append("#extension ext_texture_array: require\n");
+	formatted += '\n';
 
-	visit(s.content);
+	s.content.visit(*this);
 
 	return formatted;
 }
@@ -67,7 +73,7 @@ void Formatter::set_source(unsigned index, unsigned line)
 		else
 		{
 			unsigned l = line;
-			if(mode==Compiler::PROGRAM && stage && stage->required_version<Version(3, 30))
+			if(mode==Compiler::PROGRAM && stage && stage->required_features.glsl_version<Version(3, 30))
 				--l;
 			formatted += format("#line %d %d\n", l, index);
 		}
@@ -93,6 +99,11 @@ void Formatter::visit(VariableReference &var)
 	append(var.name);
 }
 
+void Formatter::visit(InterfaceBlockReference &iface)
+{
+	append(iface.name);
+}
+
 void Formatter::visit(MemberAccess &memacc)
 {
 	memacc.left->visit(*this);
@@ -150,10 +161,14 @@ void Formatter::visit(Block &block)
 
 	SetForScope<unsigned> set(indent, indent+(indent>0 || use_braces));
 	string spaces(indent*2, ' ');
+	bool first = true;
 	for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
 	{
-		if(i!=block.body.begin())
+		if((*i)->source==BUILTIN_SOURCE)
+			continue;
+		if(!first)
 			append('\n');
+		first = false;
 		set_source((*i)->source, (*i)->line);
 		append(spaces);
 		(*i)->visit(*this);
@@ -180,9 +195,9 @@ void Formatter::visit(Layout &layout)
 	{
 		if(i!=layout.qualifiers.begin())
 			append(", ");
-		append(i->identifier);
-		if(!i->value.empty())
-			append(format("=%s", i->value));
+		append(i->name);
+		if(i->has_value)
+			append(format("=%d", i->value));
 	}
 	append(')');
 }
@@ -216,7 +231,7 @@ void Formatter::visit(VariableDeclaration &var)
 	if(!var.interface.empty() && var.interface!=block_interface)
 	{
 		string interface = var.interface;
-		if(mode==Compiler::PROGRAM && stage && stage->required_version<Version(1, 30))
+		if(mode==Compiler::PROGRAM && stage && stage->required_features.glsl_version<Version(1, 30))
 		{
 			if(stage->type==Stage::VERTEX && var.interface=="in")
 				interface = "attribute";
@@ -249,6 +264,13 @@ void Formatter::visit(InterfaceBlock &iface)
 	SetForScope<string> set(block_interface, iface.interface);
 	append(format("%s %s\n", iface.interface, iface.name));
 	iface.members.visit(*this);
+	if(!iface.instance_name.empty())
+	{
+		append(' ');
+		append(iface.instance_name);
+		if(iface.array)
+			append("[]");
+	}
 	append(';');
 }
 
@@ -335,6 +357,18 @@ void Formatter::visit(Iteration &iter)
 	}
 }
 
+void Formatter::visit(Passthrough &pass)
+{
+	append("passthrough");
+	if(pass.subscript)
+	{
+		append('[');
+		pass.subscript->visit(*this);
+		append(']');
+	}
+	append(';');
+}
+
 void Formatter::visit(Return &ret)
 {
 	append("return");