Mesa (nvc0): nvc0: fix immediate arg for SHL/SHR
Christoph Bumiller
chrisbmr at kemper.freedesktop.org
Thu Dec 9 14:31:33 UTC 2010
Module: Mesa
Branch: nvc0
Commit: 14a09095d30f926c7d6869784d61cc59e6bd0578
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=14a09095d30f926c7d6869784d61cc59e6bd0578
Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date: Thu Dec 9 14:43:11 2010 +0100
nvc0: fix immediate arg for SHL/SHR
---
src/gallium/drivers/nvc0/nvc0_pc_emit.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/gallium/drivers/nvc0/nvc0_pc_emit.c b/src/gallium/drivers/nvc0/nvc0_pc_emit.c
index 4edbdb2..6735f93 100644
--- a/src/gallium/drivers/nvc0/nvc0_pc_emit.c
+++ b/src/gallium/drivers/nvc0/nvc0_pc_emit.c
@@ -153,10 +153,15 @@ set_immd_u32(struct nv_pc *pc, uint32_t u32)
{
if ((pc->emit[0] & 0xf) == 0x2) {
set_immd_u32_l(pc, u32);
+ } else
+ if ((pc->emit[0] & 0xf) == 0x3) {
+ assert(!(pc->emit[1] & 0xc000));
+ pc->emit[1] |= 0xc000;
+ assert(!(u32 & 0xfff00000));
+ set_immd_u32_l(pc, u32);
} else {
assert(!(pc->emit[1] & 0xc000));
pc->emit[1] |= 0xc000;
-
assert(!(u32 & 0xfff));
set_immd_u32_l(pc, u32 >> 12);
}
More information about the mesa-commit
mailing list