diff options
author | Eric Anholt <eric@anholt.net> | 2010-08-05 16:00:46 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2010-08-06 00:42:59 -0700 |
commit | 8d61a23b1a1d0d4b21f0fab64f6d863a8ee3d7f1 (patch) | |
tree | 99eab30c2a0a4fc426bf3ef39045237656db380a /src/mesa | |
parent | 658e25987fbec3b826f500baa6d4d936b9552b13 (diff) |
glsl2: Don't assert in a couple of places when encountering sampler arrays.
Fixes glean shaderAPI.
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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); } |