Module: Mesa Branch: master Commit: cf757f48eae44865bf35c0e95ce99576b160074a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cf757f48eae44865bf35c0e95ce99576b160074a
Author: Timothy Arceri <[email protected]> Date: Mon Jan 11 09:20:39 2016 +1100 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. --- src/glsl/link_varyings.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/glsl/link_varyings.cpp b/src/glsl/link_varyings.cpp index 7cc5880..3853abd 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: _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
