fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-02 06:40:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: fix temp register allocation problems.

Browse source 
Complex texcombine modes were running out of registers (>32 registers for 8 tex units).
This commit is contained in:
Brian Paul 2008-09-26 11:18:06 -06:00
parent 7944efffff
commit 8fd329d048
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/mesa/main/texenvprogram.c
View file

@ -398,6 +398,14 @@ static struct ureg get_tex_temp( struct texenv_fragment_program *p )
}
/** Mark a temp reg as being no longer allocatable. */
static void reserve_temp( struct texenv_fragment_program *p, struct ureg r )
{
if (r.file == PROGRAM_TEMPORARY)
p->temps_output |= (1 << r.idx);
}
static void release_temps(GLcontext *ctx, struct texenv_fragment_program *p )
{
GLuint max_temp = ctx->Const.FragmentProgram.MaxTemps;
@ -491,10 +499,12 @@ emit_op(struct texenv_fragment_program *p,
emit_dst( &inst->DstReg, dest, mask );
#if 0
/* Accounting for indirection tracking:
*/
if (dest.file == PROGRAM_TEMPORARY)
p->temps_output |= 1 << dest.idx;
#endif
return inst;
}
@ -549,6 +559,10 @@ static struct ureg emit_texld( struct texenv_fragment_program *p,
p->program->Base.NumTexInstructions++;
/* Accounting for indirection tracking:
*/
reserve_temp(p, dest);
/* Is this a texture indirection?
*/
if ((coord.file == PROGRAM_TEMPORARY &&
@ -1062,6 +1076,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
for (unit = 0 ; unit < ctx->Const.MaxTextureUnits; unit++)
if (key->enabled_units & (1<<unit)) {
p.src_previous = emit_texenv( &p, unit );
reserve_temp(&p, p.src_previous); /* don't re-use this temp reg */
release_temps(ctx, &p); /* release all temps */
}
}