Even more validation for uniform mismatches

[libs/gl.git] / source / glsl / output.cpp

diff --git a/source/glsl/output.cpp b/source/glsl/output.cpp
index f1e9b4be99ca8a2582e7a97944c0c16666f80540..b86cdd0a0ad4f75082d49146c05ae892e5684b16 100644 (file)
--- a/source/glsl/output.cpp
+++ b/source/glsl/output.cpp
@@ -33,15 +33,15 @@ const string &Formatter::apply(Stage &s)
        }
 
        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_gpu_shader5)
-               append("#extension arb_gpu_shader5: require\n");
+               append("#extension GL_ARB_gpu_shader5: 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,13 +145,6 @@ 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);
@@ -313,7 +306,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())