summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Bumiller <e0425955@student.tuwien.ac.at>2012-05-09 20:32:44 +0200
committerChristoph Bumiller <e0425955@student.tuwien.ac.at>2012-05-17 15:24:58 +0200
commit717f55d79d9709a31e0f85a87f076ac13446701d (patch)
treea03f47baf4eae21825bad4ff827db02c0cd5d6c3
parente6caafd9d7fbfcb5906d22be9d6a3c1714e078ac (diff)
nv50/ir: fix reversed order of lane ops in quadops
-rw-r--r--src/gallium/drivers/nv50/codegen/nv50_ir_lowering_nv50.cpp5
-rw-r--r--src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp5
2 files changed, 6 insertions, 4 deletions
diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_lowering_nv50.cpp b/src/gallium/drivers/nv50/codegen/nv50_ir_lowering_nv50.cpp
index 16bba0e1723..39e0cfa613d 100644
--- a/src/gallium/drivers/nv50/codegen/nv50_ir_lowering_nv50.cpp
+++ b/src/gallium/drivers/nv50/codegen/nv50_ir_lowering_nv50.cpp
@@ -109,9 +109,10 @@ expandIntegerMUL(BuildUtil *bld, Instruction *mul)
#define QOP_SUB 2
#define QOP_MOV2 3
+// UL UR LL LR
#define QUADOP(q, r, s, t) \
- ((QOP_##q << 0) | (QOP_##r << 2) | \
- (QOP_##s << 4) | (QOP_##t << 6))
+ ((QOP_##q << 6) | (QOP_##r << 4) | \
+ (QOP_##s << 2) | (QOP_##t << 0))
class NV50LegalizePostRA : public Pass
{
diff --git a/src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp b/src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp
index 900e998df8d..8fd4541a96a 100644
--- a/src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp
+++ b/src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp
@@ -34,9 +34,10 @@ namespace nv50_ir {
#define QOP_SUB 2
#define QOP_MOV2 3
+// UL UR LL LR
#define QUADOP(q, r, s, t) \
- ((QOP_##q << 0) | (QOP_##r << 2) | \
- (QOP_##s << 4) | (QOP_##t << 6))
+ ((QOP_##q << 6) | (QOP_##r << 4) | \
+ (QOP_##s << 2) | (QOP_##t << 0))
class NVC0LegalizeSSA : public Pass
{