From: Brian <brian.paul@tungstengraphics.com>
Date: Thu, 23 Aug 2007 00:48:28 +0000 (-0600)
Subject: fix assertions in swizzle()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ace2b98dd3511ea6959980a2ae2ee90fa7c28748;p=mesa.git

fix assertions in swizzle()
---

diff --git a/src/mesa/pipe/i915simple/i915_fpc.h b/src/mesa/pipe/i915simple/i915_fpc.h
index afef7064187..af347c7c8cc 100644
--- a/src/mesa/pipe/i915simple/i915_fpc.h
+++ b/src/mesa/pipe/i915simple/i915_fpc.h
@@ -185,12 +185,12 @@ struct i915_fp_compile {
 /* One neat thing about the UREG representation:  
  */
 static INLINE int
-swizzle(int reg, int x, int y, int z, int w)
+swizzle(int reg, uint x, uint y, uint z, uint w)
 {
-   assert(x < 4);
-   assert(y < 4);
-   assert(z < 4);
-   assert(w < 4);
+   assert(x <= SRC_ONE);
+   assert(y <= SRC_ONE);
+   assert(z <= SRC_ONE);
+   assert(w <= SRC_ONE);
    return ((reg & ~UREG_XYZW_CHANNEL_MASK) |
            CHANNEL_SRC(GET_CHANNEL_SRC(reg, x), 0) |
            CHANNEL_SRC(GET_CHANNEL_SRC(reg, y), 1) |