freedreno/computerator: MERGEDREGS update

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5458>
This commit is contained in:
Rob Clark
2020-06-13 10:43:00 -07:00
committed by Marge Bot
parent 0e0d4daa5b
commit 5baf430261
2 changed files with 3 additions and 1 deletions

View File

@@ -135,7 +135,8 @@ cs_program_emit(struct fd_ringbuffer *ring, struct kernel *kernel)
OUT_PKT4(ring, REG_A6XX_SP_CS_CTRL_REG0, 1);
OUT_RING(ring, A6XX_SP_CS_CTRL_REG0_THREADSIZE(thrsz) |
A6XX_SP_CS_CTRL_REG0_FULLREGFOOTPRINT(i->max_reg + 1) |
A6XX_SP_CS_CTRL_REG0_MERGEDREGS |
A6XX_SP_CS_CTRL_REG0_HALFREGFOOTPRINT(i->max_half_reg + 1) |
COND(v->mergedregs, A6XX_SP_CS_CTRL_REG0_MERGEDREGS) |
A6XX_SP_CS_CTRL_REG0_BRANCHSTACK(v->branchstack) |
COND(v->need_pixlod, A6XX_SP_CS_CTRL_REG0_PIXLODENABLE));

View File

@@ -38,6 +38,7 @@ ir3_asm_assemble(struct ir3_compiler *c, FILE *in)
struct ir3_shader_variant *v = calloc(1, sizeof(*v));
v->type = MESA_SHADER_COMPUTE;
v->shader = shader;
v->mergedregs = true;
kernel->v = v;