From: Timothy Arceri <t_arceri@yahoo.com.au>
Date: Tue, 3 Nov 2015 21:41:29 +0000 (+1100)
Subject: glsl: make sure to only add subroutines to resource list
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8e4cf900f0af9eb8a72c81a0e5e393906b11764a;p=mesa.git

glsl: make sure to only add subroutines to resource list

Over looked in 763cd8c080353.

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

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 3ad295587f8..26c02986be4 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);