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/drivers/dri/r300/radeon_nqssadce.c | |
parent | 7571d5d3b013e544a9fbde91e4aec05e0b13b4cb (diff) | |
parent | 7db7ff878d3e5a6b345228e6eaee4797bb68b360 (diff) |
Merge branch 'register-negate'
Diffstat (limited to 'src/mesa/drivers/dri/r300/radeon_nqssadce.c')
-rw-r--r-- | src/mesa/drivers/dri/r300/radeon_nqssadce.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/r300/radeon_nqssadce.c b/src/mesa/drivers/dri/r300/radeon_nqssadce.c index a083c3d243..4a2e1cba40 100644 --- a/src/mesa/drivers/dri/r300/radeon_nqssadce.c +++ b/src/mesa/drivers/dri/r300/radeon_nqssadce.c @@ -61,12 +61,12 @@ static struct prog_src_register lmul_swizzle(GLuint swizzle, struct prog_src_reg struct prog_src_register tmp = srcreg; int i; tmp.Swizzle = 0; - tmp.NegateBase = 0; + tmp.Negate = NEGATE_NONE; for(i = 0; i < 4; ++i) { GLuint swz = GET_SWZ(swizzle, i); if (swz < 4) { tmp.Swizzle |= GET_SWZ(srcreg.Swizzle, swz) << (i*3); - tmp.NegateBase |= GET_BIT(srcreg.NegateBase, swz) << i; + tmp.Negate |= GET_BIT(srcreg.Negate, swz) << i; } else { tmp.Swizzle |= swz << (i*3); } @@ -103,9 +103,8 @@ static struct prog_instruction* track_used_srcreg(struct nqssadce_state* s, inst->SrcReg[src].File = PROGRAM_TEMPORARY; inst->SrcReg[src].Index = dstreg.Index; inst->SrcReg[src].Swizzle = 0; - inst->SrcReg[src].NegateBase = 0; + inst->SrcReg[src].Negate = NEGATE_NONE; inst->SrcReg[src].Abs = 0; - inst->SrcReg[src].NegateAbs = 0; for(i = 0; i < 4; ++i) { if (GET_BIT(sourced, i)) inst->SrcReg[src].Swizzle |= i << (3*i); |