diff options
| author | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2016-04-19 14:08:13 +0200 |
|---|---|---|
| committer | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2016-04-19 18:31:23 +0200 |
| commit | 1f32d5d59fff7a4ef42cd2811ef4116c5827b9a0 (patch) | |
| tree | 02c9f497de93d7f141d10d746bb6472cfa23b5cc /src/gallium/drivers/radeonsi/si_compute.c | |
| parent | 6c833ba1ab7ffe615d8c025a7452984083c1143b (diff) | |
| download | external_mesa3d-1f32d5d59fff7a4ef42cd2811ef4116c5827b9a0.zip external_mesa3d-1f32d5d59fff7a4ef42cd2811ef4116c5827b9a0.tar.gz external_mesa3d-1f32d5d59fff7a4ef42cd2811ef4116c5827b9a0.tar.bz2 | |
radeonsi: Consider input SGPR count for compute shader SGPR count.
si_shader_create corrects the SGPR count with si_fix_num_sgprs. We then
recompute the rsrc1 register to use the new SGPR count.
Signed-off-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_compute.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_compute.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index 557e892..905c169 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -81,14 +81,20 @@ static void *si_create_compute_state( program->shader.selector = &sel; - if (si_compile_tgsi_shader(sscreen, sctx->tm, &program->shader, - true, &sctx->b.debug)) { + if (si_shader_create(sscreen, sctx->tm, &program->shader, + &sctx->b.debug)) { FREE(sel.tokens); return NULL; } scratch_enabled = shader->config.scratch_bytes_per_wave > 0; + shader->config.rsrc1 = + S_00B848_VGPRS((shader->config.num_vgprs - 1) / 4) | + S_00B848_SGPRS((shader->config.num_sgprs - 1) / 8) | + S_00B848_DX10_CLAMP(1) | + S_00B848_FLOAT_MODE(shader->config.float_mode); + shader->config.rsrc2 = S_00B84C_USER_SGPR(SI_CS_NUM_USER_SGPR) | S_00B84C_SCRATCH_EN(scratch_enabled) | S_00B84C_TGID_X_EN(1) | S_00B84C_TGID_Y_EN(1) | @@ -105,10 +111,10 @@ static void *si_create_compute_state( radeon_elf_read(code, header->num_bytes, &program->shader.binary); si_shader_binary_read_config(&program->shader.binary, &program->shader.config, 0); + si_shader_dump(sctx->screen, &program->shader, &sctx->b.debug, + PIPE_SHADER_COMPUTE, stderr); + si_shader_binary_upload(sctx->screen, &program->shader); } - si_shader_dump(sctx->screen, &program->shader, &sctx->b.debug, - TGSI_PROCESSOR_COMPUTE, stderr); - si_shader_binary_upload(sctx->screen, &program->shader); return program; } |