From: Timothy Arceri <timothy.arceri@collabora.com>
Date: Fri, 8 Jan 2016 04:25:37 +0000 (+1100)
Subject: glsl: replace unreachable code path with assert
X-Git-Tag: upstream/17.1.0~13279
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=98270fd20d4d58db8ae5af3b6f10ed6a81c058a6;p=platform%2Fupstream%2Fmesa.git

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>
---

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: