r300-gallium: vs: Fix negation calculation.

Still doesn't draw right, but at least it's the right numbers now.
Thanks to taiu in #dri-devel.
This commit is contained in:
Corbin Simpson
2009-06-04 23:56:32 -07:00
parent 571b36831b
commit 4c66c5bf92
+4 -4
View File
@@ -164,13 +164,13 @@ static uint32_t r300_vs_op(unsigned op)
static uint32_t r300_vs_swiz(struct tgsi_full_src_register* reg)
{
if (reg->SrcRegister.Extended) {
return (reg->SrcRegister.Negate ? R300_PVS_NEGATE_XYZW : 0) |
return (reg->SrcRegister.Negate ? (0xf << 12) : 0) |
reg->SrcRegisterExtSwz.ExtSwizzleX |
(reg->SrcRegisterExtSwz.ExtSwizzleY << 3) |
(reg->SrcRegisterExtSwz.ExtSwizzleZ << 6) |
(reg->SrcRegisterExtSwz.ExtSwizzleW << 9);
} else {
return (reg->SrcRegister.Negate ? R300_PVS_NEGATE_XYZW : 0) |
return (reg->SrcRegister.Negate ? (0xf << 12) : 0) |
reg->SrcRegister.SwizzleX |
(reg->SrcRegister.SwizzleY << 3) |
(reg->SrcRegister.SwizzleZ << 6) |
@@ -182,13 +182,13 @@ static uint32_t r300_vs_swiz(struct tgsi_full_src_register* reg)
static uint32_t r300_vs_scalar_swiz(struct tgsi_full_src_register* reg)
{
if (reg->SrcRegister.Extended) {
return (reg->SrcRegister.Negate ? R300_PVS_NEGATE_XYZW : 0) |
return (reg->SrcRegister.Negate ? (0xf << 12) : 0) |
reg->SrcRegisterExtSwz.ExtSwizzleX |
(reg->SrcRegisterExtSwz.ExtSwizzleX << 3) |
(reg->SrcRegisterExtSwz.ExtSwizzleX << 6) |
(reg->SrcRegisterExtSwz.ExtSwizzleX << 9);
} else {
return (reg->SrcRegister.Negate ? R300_PVS_NEGATE_XYZW : 0) |
return (reg->SrcRegister.Negate ? (0xf << 12) : 0) |
reg->SrcRegister.SwizzleX |
(reg->SrcRegister.SwizzleX << 3) |
(reg->SrcRegister.SwizzleX << 6) |