glsl: make sure to only add subroutines to resource list

Over looked in 763cd8c080. Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
2015-11-04 08:41:29 +11:00
parent f6b3c163f9
commit 8e4cf900f0
1 changed files with 2 additions and 1 deletions
--- 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);