From: Timothy Arceri <t_arceri@yahoo.com.au>
Date: Sun, 9 Aug 2015 06:25:50 +0000 (+1000)
Subject: glsl: remove specical case subroutine type counting
X-Git-Tag: upstream/17.1.0~16474
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8bc8d723598ec87bbce9a2439075dfe1612a359;p=platform%2Fupstream%2Fmesa.git

glsl: remove specical case subroutine type counting

Unlike samplers we can get the correct value for subroutines from
component_slots()

Reviewed-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
index 254086d..a0cb618 100644
--- a/src/glsl/link_uniforms.cpp
+++ b/src/glsl/link_uniforms.cpp
@@ -47,10 +47,9 @@
 static unsigned
 values_for_type(const glsl_type *type)
 {
-   if (type->is_sampler() || type->is_subroutine()) {
+   if (type->is_sampler()) {
       return 1;
-   } else if (type->is_array() && (type->fields.array->is_sampler() ||
-                                   type->fields.array->is_subroutine())) {
+   } else if (type->is_array() && type->fields.array->is_sampler()) {
       return type->array_size();
    } else {
       return type->component_slots();