Revert "glsl: replace unreachable code path with assert"
authorTimothy Arceri <timothy.arceri@collabora.com>
Sun, 10 Jan 2016 22:20:39 +0000 (09:20 +1100)
committerTimothy Arceri <timothy.arceri@collabora.com>
Sun, 10 Jan 2016 22:20:39 +0000 (09:20 +1100)
This reverts commit 98270fd20d4d58db8ae5af3b6f10ed6a81c058a6.

Something went terribly wrong the commit is not what the commit
message says.

src/glsl/link_varyings.cpp

index 7cc58800765f2d11253171873ef9bed3e7606dfa..3853abdb8e6bc07199845e2c0593ded405ae66e0 100644 (file)
@@ -1295,12 +1295,13 @@ public:
 
    void process(ir_variable *var)
    {
-      /* All named varying interface blocks should be flattened by now */
-      assert(!var->is_interface_instance());
-
       this->toplevel_var = var;
       this->varying_floats = 0;
-      program_resource_visitor::process(var);
+      if (var->is_interface_instance())
+         program_resource_visitor::process(var->get_interface_type(),
+                                           var->get_interface_type()->name);
+      else
+         program_resource_visitor::process(var);
    }
 
 private: