X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foutput.cpp;h=38adb5bd6b799f54f165299657b90f09830293de;hb=dfcf8ebc329b79c369b88bdbeb982480aa5fc12a;hp=f1e9b4be99ca8a2582e7a97944c0c16666f80540;hpb=bde40be11da83206f3d33a8225963d47a413662e;p=libs%2Fgl.git

diff --git a/source/glsl/output.cpp b/source/glsl/output.cpp
index f1e9b4be..38adb5bd 100644
--- a/source/glsl/output.cpp
+++ b/source/glsl/output.cpp
@@ -14,7 +14,8 @@ Formatter::Formatter():
 	source_line(1),
 	indent(0),
 	parameter_list(false),
-	omit_builtin(false)
+	omit_builtin(false),
+	r_empty_name(false)
 { }
 
 const string &Formatter::apply(Stage &s)
@@ -32,16 +33,22 @@ const string &Formatter::apply(Stage &s)
 		formatted += '\n';
 	}
 
+	if(s.required_features.arb_enhanced_layouts)
+		append("#extension GL_ARB_enhanced_layouts: require\n");
 	if(s.required_features.arb_explicit_attrib_location)
-		append("#extension arb_explicit_attrib_location: require\n");
+		append("#extension GL_ARB_explicit_attrib_location: require\n");
+	if(s.required_features.arb_explicit_uniform_location)
+		append("#extension GL_ARB_explicit_uniform_location: require\n");
 	if(s.required_features.arb_gpu_shader5)
-		append("#extension arb_gpu_shader5: require\n");
+		append("#extension GL_ARB_gpu_shader5: require\n");
+	if(s.required_features.arb_separate_shader_objects)
+		append("#extension GL_ARB_separate_shader_objects: require\n");
 	if(s.required_features.arb_uniform_buffer_object)
-		append("#extension arb_uniform_buffer_object: require\n");
+		append("#extension GL_ARB_uniform_buffer_object: require\n");
 	if(s.required_features.ext_gpu_shader4)
-		append("#extension ext_gpu_shader4: require\n");
+		append("#extension GL_EXT_gpu_shader4: require\n");
 	if(s.required_features.ext_texture_array)
-		append("#extension ext_texture_array: require\n");
+		append("#extension GL_EXT_texture_array: require\n");
 	formatted += '\n';
 
 	s.content.visit(*this);
@@ -145,27 +152,25 @@ void Formatter::visit(Literal &literal)
 	append(literal.token);
 }
 
-void Formatter::visit(ParenthesizedExpression &parexpr)
-{
-	append('(');
-	parexpr.expression->visit(*this);
-	append(')');
-}
-
 void Formatter::visit(VariableReference &var)
 {
 	append(var.name);
+	r_empty_name = false;
 }
 
 void Formatter::visit(InterfaceBlockReference &iface)
 {
-	append(iface.name);
+	r_empty_name = iface.declaration->instance_name.empty();
+	if(!r_empty_name)
+		append(iface.declaration->instance_name);
 }
 
 void Formatter::visit(MemberAccess &memacc)
 {
 	visit_expression(*memacc.left, memacc.oper, false);
-	append(format(".%s", memacc.member));
+	if(!r_empty_name)
+		append('.');
+	append(memacc.member);
 }
 
 void Formatter::visit(Swizzle &swizzle)
@@ -313,7 +318,12 @@ void Formatter::visit(VariableDeclaration &var)
 
 void Formatter::visit(InterfaceBlock &iface)
 {
-	append(format("%s %s\n", iface.interface, iface.name));
+	if(iface.layout)
+	{
+		iface.layout->visit(*this);
+		append(' ');
+	}
+	append(format("%s %s\n", iface.interface, iface.block_name));
 	if(iface.struct_declaration)
 		iface.struct_declaration->members.visit(*this);
 	if(!iface.instance_name.empty())