Module: Mesa Branch: master Commit: 124c9c2b977013f540f417d5dd102775ad02c77d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=124c9c2b977013f540f417d5dd102775ad02c77d
Author: Timothy Arceri <[email protected]> Date: Fri Jan 8 15:25:37 2016 +1100 glsl: replace unreachable code path with assert The lower_named_interface_blocks() pass is called before we try assign locations to varyings so this shouldn't be reachable. Reviewed-by: Edward O'Callaghan <[email protected]> --- src/glsl/link_varyings.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/glsl/link_varyings.cpp b/src/glsl/link_varyings.cpp index 3853abd..7cc5880 100644 --- a/src/glsl/link_varyings.cpp +++ b/src/glsl/link_varyings.cpp @@ -1295,13 +1295,12 @@ 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; - if (var->is_interface_instance()) - program_resource_visitor::process(var->get_interface_type(), - var->get_interface_type()->name); - else - program_resource_visitor::process(var); + program_resource_visitor::process(var); } private: _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
