From 717f55d79d9709a31e0f85a87f076ac13446701d Mon Sep 17 00:00:00 2001 From: Christoph Bumiller Date: Wed, 9 May 2012 20:32:44 +0200 Subject: [PATCH] nv50/ir: fix reversed order of lane ops in quadops --- src/gallium/drivers/nv50/codegen/nv50_ir_lowering_nv50.cpp | 5 +++-- src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp | 5 +++-- 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 { -- 2.30.2