freedreno: fix bogus IMM const reg index

We were assigning incorrect const register for immediates, and
potentially writing immediate const to the wrong location.  This fixes
an incorrect-rendering bug with xonotic.

Signed-off-by: Rob Clark <robclark@freedesktop.org>
This commit is contained in:
Rob Clark 2013-04-24 17:45:00 -04:00
parent 9495ee12c6
commit 49a7624973
2 changed files with 3 additions and 3 deletions

View File

@ -201,8 +201,8 @@ compile_init(struct fd_compile_context *ctx, struct fd_program_stateobj *prog,
ctx->input_export_idx[decl->Range.First] =
semantic_idx(&decl->Semantic);
}
ctx->num_regs[decl->Declaration.File] +=
1 + decl->Range.Last - decl->Range.First;
ctx->num_regs[decl->Declaration.File] =
MAX2(ctx->num_regs[decl->Declaration.File], decl->Range.Last + 1);
break;
}
case TGSI_TOKEN_TYPE_IMMEDIATE: {

View File

@ -279,7 +279,7 @@ emit_constants(struct fd_ringbuffer *ring, uint32_t base,
if (shader) {
for (i = 0; i < shader->num_immediates; i++) {
OUT_PKT3(ring, CP_SET_CONSTANT, 5);
OUT_RING(ring, base);
OUT_RING(ring, start_base + (4 * (shader->first_immediate + i)));
OUT_RING(ring, shader->immediates[i].val[0]);
OUT_RING(ring, shader->immediates[i].val[1]);
OUT_RING(ring, shader->immediates[i].val[2]);