diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2010-10-12 12:50:29 -0700 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-10-12 12:50:29 -0700 |
commit | 9fea9e5e2115bcb52435648d2ef753638733d7d9 (patch) | |
tree | eed3ee64b8792fa3402369528270537d2464bd56 /src/mesa/program | |
parent | b2b9b22c1013ebf02aa6f0d9c1c7b5267523d973 (diff) |
glsl: Fix incorrect assertion
This assertion was added in commit f1c1ee11, but it did not notice
that the array is accessed with 'size-1' instead of 'size'. As a
result, the assertion was off by one. This caused failures in at
least glsl-orangebook-ch06-bump.
Diffstat (limited to 'src/mesa/program')
-rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index be162e7a25..da0d8106df 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -311,7 +311,7 @@ swizzle_for_size(int size) MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_W), }; - assert(size < 4); + assert((size >= 1) && (size <= 4)); return size_swizzles[size - 1]; } |