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

On 11/04/2015 05:42 AM, Timothy Arceri wrote:
Over looked in 763cd8c080353.
---
  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 9dcc2a7..c1e4efb 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);

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to