summaryrefslogtreecommitdiff
path: root/src/glsl
diff options
context:
space:
mode:
authorTimothy Arceri <timothy.arceri@collabora.com>2016-01-11 09:20:39 +1100
committerTimothy Arceri <timothy.arceri@collabora.com>2016-01-11 09:20:39 +1100
commitcf757f48eae44865bf35c0e95ce99576b160074a (patch)
treee4c0f46201663326eccc8cb143c736d3905a77ee /src/glsl
parent98270fd20d4d58db8ae5af3b6f10ed6a81c058a6 (diff)
Revert "glsl: replace unreachable code path with assert"
This reverts commit 98270fd20d4d58db8ae5af3b6f10ed6a81c058a6. Something went terribly wrong the commit is not what the commit message says.
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/link_varyings.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/glsl/link_varyings.cpp b/src/glsl/link_varyings.cpp
index 7cc58800765..3853abdb8e6 100644
--- a/src/glsl/link_varyings.cpp
+++ b/src/glsl/link_varyings.cpp
@@ -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: