Fix flattening of GLSL interface blocks

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

diff --git a/source/glsl/finalize.cpp b/source/glsl/finalize.cpp
index 27c352098e0c0b0206616336f431e2c84de1942d..f005d87dcbf82749e33eb1ba8c55fdbece642b76 100644 (file)
--- a/source/glsl/finalize.cpp
+++ b/source/glsl/finalize.cpp
@@ -336,6 +336,15 @@ void LegacyConverter::visit(Block &block)
        }
 }
 
+void LegacyConverter::visit(RefPtr<Expression> &expr)
+{
+       r_replaced_reference = 0;
+       expr->visit(*this);
+       if(r_replaced_reference)
+               expr = r_replaced_reference;
+       r_replaced_reference = 0;
+}
+
 bool LegacyConverter::check_version(const Version &feature_version) const
 {
        if(features.glsl_version<feature_version)
@@ -386,6 +395,23 @@ void LegacyConverter::visit(VariableReference &var)
        }
 }
 
+void LegacyConverter::visit(InterfaceBlockReference &iface)
+{
+       r_flattened_interface = nodes_to_remove.count(iface.declaration);
+}
+
+void LegacyConverter::visit(MemberAccess &memacc)
+{
+       r_flattened_interface = false;
+       visit(memacc.left);
+       if(r_flattened_interface)
+       {
+               VariableReference *var = new VariableReference;
+               var->name = memacc.member;
+               r_replaced_reference = var;
+       }
+}
+
 void LegacyConverter::visit(Assignment &assign)
 {
        TraversingVisitor::visit(assign);
@@ -635,6 +661,9 @@ void LegacyConverter::visit(InterfaceBlock &iface)
                        unsupported("ARB_uniform_buffer_object required for interface block instances");
                else if(iface.struct_declaration)
                {
+                       for(const RefPtr<Statement> &s: iface.struct_declaration->members.body)
+                               if(VariableDeclaration *var = dynamic_cast<VariableDeclaration *>(s.get()))
+                                       var->interface = iface.interface;
                        stage->content.body.splice(uniform_insert_point, iface.struct_declaration->members.body);
                        nodes_to_remove.insert(&iface);
                        nodes_to_remove.insert(iface.struct_declaration);