From: Christoph Bumiller <e0425955@student.tuwien.ac.at>
Date: Sat, 22 Jan 2011 12:59:47 +0000 (+0100)
Subject: nvc0: remove bad assert and emit TEMP movs instead
X-Git-Tag: mesa-7.11-rc1~2554
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95eef7a7059c5323230badbf024f3af74a62a6cb;p=platform%2Fupstream%2Fmesa.git

nvc0: remove bad assert and emit TEMP movs instead
---

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);