Unlike samplers we can get the correct value for subroutines from
component_slots()
---
src/glsl/link_uniforms.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
index 4757fd5..3c6930a 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();
--
2.4.3
_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
