Always remove location qualifier if not supported

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

diff --git a/source/glsl/compatibility.cpp b/source/glsl/compatibility.cpp
index a5ba8247a53d705c82223d9b8241e5d28dbea14e..280a38c9f2c829443991da07f5d6d6713db190a9 100644 (file)
--- a/source/glsl/compatibility.cpp
+++ b/source/glsl/compatibility.cpp
@@ -172,8 +172,8 @@ void LegacyConverter::visit(VariableReference &var)
 void LegacyConverter::visit(Assignment &assign)
 {
        TraversingVisitor::visit(assign);
-       if(assign.target_declaration==frag_out && !supports_unified_interface_syntax())
-               assign.target_declaration = 0;
+       if(assign.target.declaration==frag_out && !supports_unified_interface_syntax())
+               assign.target.declaration = 0;
 }
 
 bool LegacyConverter::supports_unified_sampling_functions() const
@@ -286,12 +286,10 @@ void LegacyConverter::visit(VariableDeclaration &var)
                        else if(stage->type==Stage::FRAGMENT && var.interface=="out")
                        {
                                if(check_extension(&Features::ext_gpu_shader4))
-                               {
                                        stage->locations[var.name] = i->value;
-                                       var.layout->qualifiers.erase(i);
-                               }
                                else if(i->value!=0)
                                        unsupported("EXT_gpu_shader4 required for multiple fragment shader outputs");
+                               var.layout->qualifiers.erase(i);
                        }
 
                        if(var.layout->qualifiers.empty())
@@ -341,15 +339,20 @@ bool LegacyConverter::supports_interface_blocks(const string &iface) const
 
 void LegacyConverter::visit(InterfaceBlock &iface)
 {
-       if(!supports_interface_blocks(iface.interface))
+       if(!supports_interface_blocks(iface.interface) && iface.type_declaration)
        {
                if(!iface.instance_name.empty())
                        unsupported("ARB_uniform_buffer_object required for interface block instances");
-               else
+               else if(iface.struct_declaration)
                {
-                       stage->content.body.splice(uniform_insert_point, iface.members.body);
+                       stage->content.body.splice(uniform_insert_point, iface.struct_declaration->members.body);
                        nodes_to_remove.insert(&iface);
+                       nodes_to_remove.insert(iface.struct_declaration);
                }
+               else
+                       /* If the interface block is an array, it should have an instance
+                       name too, so this should never be reached */
+                       throw logic_error("Unexpected interface block configuration");
        }
 }