Mesa (master): nvc0: remove bad assert and emit TEMP movs instead

[Christoph Bumiller]

Module: Mesa
Branch: master
Commit: 95eef7a7059c5323230badbf024f3af74a62a6cb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=95eef7a7059c5323230badbf024f3af74a62a6cb

Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date:   Sat Jan 22 13:59:47 2011 +0100

nvc0: remove bad assert and emit TEMP movs instead

---

 src/gallium/drivers/nvc0/nvc0_tgsi_to_nc.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nvc0/nvc0_tgsi_to_nc.c b/src/gallium/drivers/nvc0/nvc0_tgsi_to_nc.c
index 3709369..be1bb44 100644
--- a/src/gallium/drivers/nvc0/nvc0_tgsi_to_nc.c
+++ b/src/gallium/drivers/nvc0/nvc0_tgsi_to_nc.c
@@ -878,11 +878,10 @@ emit_store(struct bld_context *bld, const struct tgsi_full_instruction *inst,
       break;
    case TGSI_FILE_TEMPORARY:
       assert(idx < BLD_MAX_TEMPS);
-      if (!res->insn)
+      if (!res->insn || res->insn->bb != bld->pc->current_block)
          res = bld_insn_1(bld, NV_OP_MOV, res);
 
       assert(res->reg.file == NV_FILE_GPR);
-      assert(res->insn->bb = bld->pc->current_block);
 
       if (bld->ti->require_stores)
          bld_lmem_store(bld, ptr, idx * 4 + chan, res);