AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nv50: make assimilate_temp safe

Browse Source 
Cannot change hw reg assigned to a TGSI TEMP on the fly if
we are in a loop, conditional, or can jump around wildly.
This commit is contained in:
Christoph Bumiller
2009-12-30 21:17:31 +01:00
parent d9ae8f31d5
commit b3425bc360
1 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/nv50/nv50_program.c
+28 -16
View File
@@ -285,22 +285,6 @@ alloc_temp(struct nv50_pc *pc, struct nv50_reg *dst)
return NULL;
}
/* Assign the hw of the discarded temporary register src
* to the tgsi register dst and free src.
*/
static void
assimilate_temp(struct nv50_pc *pc, struct nv50_reg *dst, struct nv50_reg *src)
{
assert(src->index == -1 && src->hw != -1);
if (dst->hw != -1)
pc->r_temp[dst->hw] = NULL;
pc->r_temp[src->hw] = dst;
dst->hw = src->hw;
FREE(src);
}
/* release the hardware resource held by r */
static void
release_hw(struct nv50_pc *pc, struct nv50_reg *r)
@@ -721,6 +705,34 @@ emit_mov_immdval(struct nv50_pc *pc, struct nv50_reg *dst, float f)
FREE(imm);
}
/* Assign the hw of the discarded temporary register src
* to the tgsi register dst and free src.
*/
static void
assimilate_temp(struct nv50_pc *pc, struct nv50_reg *dst, struct nv50_reg *src)
{
assert(src->index == -1 && src->hw != -1);
if (pc->if_lvl || pc->loop_lvl ||
(dst->type != P_TEMP) ||
(src->hw < pc->result_nr * 4 &&
pc->p->type == PIPE_SHADER_FRAGMENT) ||
pc->p->info.opcode_count[TGSI_OPCODE_CAL] ||
pc->p->info.opcode_count[TGSI_OPCODE_BRA]) {
emit_mov(pc, dst, src);
free_temp(pc, src);
return;
}
if (dst->hw != -1)
pc->r_temp[dst->hw] = NULL;
pc->r_temp[src->hw] = dst;
dst->hw = src->hw;
FREE(src);
}
static void
emit_nop(struct nv50_pc *pc)
{