diff options
author | Brian Paul <brianp@vmware.com> | 2009-04-14 22:14:30 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-04-14 22:14:30 -0600 |
commit | 7db7ff878d3e5a6b345228e6eaee4797bb68b360 (patch) | |
tree | 9dbdcfc3d9bc37d88f7e86f22f7c8f18b9420b14 /src/mesa/main/texenvprogram.c | |
parent | 0115a4f8f1952b166eaad09f317ff8bc465e0f28 (diff) |
mesa: merge the prog_src_register::NegateBase and NegateAbs fields
There's really no need for two negation fields. This came from the
GL_NV_fragment_program extension. The new, unified Negate bitfield applies
after the absolute value step.
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, |