diff options
| author | Dave Airlie <airlied@linux.ie> | 2009-04-22 21:41:57 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2009-04-22 21:41:57 +1000 |
| commit | 466c78c93538f2853449124c06274d538830cd5a (patch) | |
| tree | a6bd88060ba328d8bed1ff2ea1a37ee741a90a17 /src/mesa/main/texenvprogram.c | |
| parent | 65fe0c86ffcff99f9f09606d462bf3731ea0c308 (diff) | |
| parent | f057f6543da469f231d551cb5728d98df8add4fa (diff) | |
Merge remote branch 'origin/master' into radeon-rewrite
Diffstat (limited to 'src/mesa/main/texenvprogram.c')
| -rw-r--r-- | src/mesa/main/texenvprogram.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c index 4a124bf27e..a70d069bd9 100644 --- a/src/mesa/main/texenvprogram.c +++ b/src/mesa/main/texenvprogram.c @@ -663,9 +663,8 @@ static void emit_arg( struct prog_src_register *reg, reg->File = ureg.file; reg->Index = ureg.idx; reg->Swizzle = ureg.swz; - reg->NegateBase = ureg.negatebase ? 0xf : 0x0; + reg->Negate = ureg.negatebase ? NEGATE_XYZW : NEGATE_NONE; reg->Abs = ureg.abs; - reg->NegateAbs = ureg.negateabs; } static void emit_dst( struct prog_dst_register *dst, |