summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Arceri <timothy.arceri@collabora.com>2016-01-08 15:25:37 +1100
committerTimothy Arceri <timothy.arceri@collabora.com>2016-01-11 09:24:05 +1100
commit124c9c2b977013f540f417d5dd102775ad02c77d (patch)
tree050f87134e9f6492fce26badec9544de0f7d37e1
parentcf757f48eae44865bf35c0e95ce99576b160074a (diff)
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 <eocallaghan@alterapraxis.com>
-rw-r--r--src/glsl/link_varyings.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/glsl/link_varyings.cpp b/src/glsl/link_varyings.cpp
index 3853abdb8e6..7cc58800765 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: