diff options
| author | Brian Paul <brianp@vmware.com> | 2009-04-16 22:02:54 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-04-16 22:02:54 -0600 |
| commit | eb0d46490332091b2ee247f32a1f08a04e1fe00f (patch) | |
| tree | cfb8e07d4e2a8c4ddbd20c8a17e847ab3fed42b3 /src/mesa/main | |
| parent | 7571d5d3b013e544a9fbde91e4aec05e0b13b4cb (diff) | |
| parent | 7db7ff878d3e5a6b345228e6eaee4797bb68b360 (diff) | |
Merge branch 'register-negate'
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/ffvertex_prog.c | 3 | ||||
| -rw-r--r-- | src/mesa/main/texenvprogram.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c index 03f42704a7..1ce5685af4 100644 --- a/src/mesa/main/ffvertex_prog.c +++ b/src/mesa/main/ffvertex_prog.c @@ -570,9 +570,8 @@ static void emit_arg( struct prog_src_register *src, src->File = reg.file; src->Index = reg.idx; src->Swizzle = reg.swz; - src->NegateBase = reg.negate ? NEGATE_XYZW : 0; + src->Negate = reg.negate ? NEGATE_XYZW : NEGATE_NONE; src->Abs = 0; - src->NegateAbs = 0; src->RelAddr = 0; /* Check that bitfield sizes aren't exceeded */ ASSERT(src->Index == reg.idx); 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, |