From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 12 Oct 2010 19:50:29 +0000 (-0700)
Subject: glsl: Fix incorrect assertion
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9fea9e5e2115bcb52435648d2ef753638733d7d9;p=mesa.git

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.
---

diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index be162e7a25a..da0d8106dff 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];
 }