X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foutput.cpp;h=1d82cae6a9ed95f20debbcf500a6a242c929c54a;hb=d3a41542c4982d6df08b5e6f969267f9c8889f9f;hp=b85c45e30149cf38cfc7c8bc415124d6d3cc6eff;hpb=a4cd67f1c9f1f375bacacfbb421d40f78a22644b;p=libs%2Fgl.git

diff --git a/source/glsl/output.cpp b/source/glsl/output.cpp
index b85c45e3..1d82cae6 100644
--- a/source/glsl/output.cpp
+++ b/source/glsl/output.cpp
@@ -32,16 +32,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);
@@ -306,7 +312,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())