OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi: don't overwrite the scratch offset in shader prologs

Browse Source 
Prologs only look at num_input_sgprs.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Marek Olšák
2016-04-13 17:46:23 +02:00
parent ffe44d0283
commit 112291964e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gallium/drivers/radeonsi/si_shader.c
View File

@@ -5839,6 +5839,10 @@ int si_compile_tgsi_shader(struct si_screen *sscreen,
radeon_llvm_dispose(&ctx.radeon_bld); radeon_llvm_dispose(&ctx.radeon_bld);
/* Add the scratch offset to input SGPRs. */
if (shader->config.scratch_bytes_per_wave)
shader->info.num_input_sgprs += 1; /* scratch byte offset */
/* Calculate the number of fragment input VGPRs. */ /* Calculate the number of fragment input VGPRs. */
if (ctx.type == TGSI_PROCESSOR_FRAGMENT) { if (ctx.type == TGSI_PROCESSOR_FRAGMENT) {
shader->info.num_input_vgprs = 0; shader->info.num_input_vgprs = 0;
@@ -6765,9 +6769,6 @@ static void si_fix_num_sgprs(struct si_shader *shader)
{ {
unsigned min_sgprs = shader->info.num_input_sgprs + 2; /* VCC */ unsigned min_sgprs = shader->info.num_input_sgprs + 2; /* VCC */
if (shader->config.scratch_bytes_per_wave)
min_sgprs += 1; /* scratch wave offset */
shader->config.num_sgprs = MAX2(shader->config.num_sgprs, min_sgprs); shader->config.num_sgprs = MAX2(shader->config.num_sgprs, min_sgprs);
} }