Mesa (master): glsl: make sure to only add subroutines to resource list

[Timothy Arceri]

Module: Mesa
Branch: master
Commit: 8e4cf900f0af9eb8a72c81a0e5e393906b11764a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e4cf900f0af9eb8a72c81a0e5e393906b11764a

Author: Timothy Arceri <t_arceri at yahoo.com.au>
Date:   Wed Nov  4 08:41:29 2015 +1100

glsl: make sure to only add subroutines to resource list

Over looked in 763cd8c080353.

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

---

 src/glsl/linker.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 3ad2955..26c0298 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -3776,7 +3776,8 @@ build_program_resource_list(struct gl_shader_program *shProg)
          continue;
 
       for (int j = MESA_SHADER_VERTEX; j < MESA_SHADER_STAGES; j++) {
-         if (!shProg->UniformStorage[i].opaque[j].active)
+         if (!shProg->UniformStorage[i].opaque[j].active ||
+             !shProg->UniformStorage[i].type->is_subroutine())
             continue;
 
          type = _mesa_shader_stage_to_subroutine_uniform((gl_shader_stage)j);