From 9fea9e5e2115bcb52435648d2ef753638733d7d9 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 12 Oct 2010 12:50:29 -0700 Subject: [PATCH] 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. --- src/mesa/program/ir_to_mesa.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index be162e7..da0d810 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]; } -- 2.7.4