projects
/
profile
/
ivi
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
69ab4b2
)
fix assertions in swizzle()
author
Brian
<brian.paul@tungstengraphics.com>
Thu, 23 Aug 2007 00:48:28 +0000
(18:48 -0600)
committer
Brian
<brian.paul@tungstengraphics.com>
Thu, 23 Aug 2007 00:52:40 +0000
(18:52 -0600)
src/mesa/pipe/i915simple/i915_fpc.h
patch
|
blob
|
history
diff --git
a/src/mesa/pipe/i915simple/i915_fpc.h
b/src/mesa/pipe/i915simple/i915_fpc.h
index
afef706
..
af347c7
100644
(file)
--- 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, u
int 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) |