nv50: put low limit on REG_ALLOC_TEMP and FP_RESULT_COUNT

This commit is contained in:
Christoph Bumiller 2010-09-15 15:21:41 +02:00
parent c46e7a05e5
commit 84d170bbce
2 changed files with 5 additions and 2 deletions

View file

@ -539,8 +539,8 @@ nv50_generate_code(struct nv50_translation_info *ti)
ti->p->immd_size = pc->immd_count * 4;
ti->p->immd = pc->immd_buf;
/* highest 16 bit reg to num of 32 bit regs */
ti->p->max_gpr = (pc->max_reg[NV_FILE_GPR] >> 1) + 1;
/* highest 16 bit reg to num of 32 bit regs, limit to >= 4 */
ti->p->max_gpr = MAX2(4, (pc->max_reg[NV_FILE_GPR] >> 1) + 1);
ti->p->fixups = pc->fixups;
ti->p->num_fixups = pc->num_fixups;

View file

@ -514,6 +514,9 @@ nv50_fragprog_prepare(struct nv50_translation_info *ti)
if (depr < p->out_nr) {
p->out[depr].mask = 0x4;
p->out[depr].hw = ti->output_map[depr][2] = p->max_out++;
} else {
/* allowed values are 1, 4, 5, 8, 9, ... */
p->max_out = MAX2(4, p->max_out);
}
return 0;