From 8d61a23b1a1d0d4b21f0fab64f6d863a8ee3d7f1 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Thu, 5 Aug 2010 16:00:46 -0700
Subject: glsl2: Don't assert in a couple of places when encountering sampler
 arrays.

Fixes glean shaderAPI.
---
 src/mesa/program/ir_to_mesa.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/mesa/program/ir_to_mesa.cpp')

diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 9979e6e3e0..66b1a2f9d9 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -518,6 +518,11 @@ type_size(const struct glsl_type *type)
 	 size += type_size(type->fields.structure[i].type);
       }
       return size;
+   case GLSL_TYPE_SAMPLER:
+      /* Samplers take up no register space, since they're baked in at
+       * link time.
+       */
+      return 0;
    default:
       assert(0);
    }
-- 
cgit v1.2.3