KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radeonsi/gfx10: fix InstanceID for legacy VS+GS 

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
This commit is contained in:
Marek Olšák 2019-08-20 20:56:22 -04:00
parent e121d75de9
commit 28f44ee533
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gallium/drivers/radeonsi/si_state_shaders.c
View File

@ -878,10 +878,15 @@ static void si_shader_gs(struct si_screen *sscreen, struct si_shader *shader)
unsigned es_type = shader->key.part.gs.es->type; unsigned es_type = shader->key.part.gs.es->type;
unsigned es_vgpr_comp_cnt, gs_vgpr_comp_cnt; unsigned es_vgpr_comp_cnt, gs_vgpr_comp_cnt;
if (es_type == PIPE_SHADER_VERTEX) if (es_type == PIPE_SHADER_VERTEX) {
/* VGPR0-3: (VertexID, InstanceID / StepRate0, ...) */ /* GFX10: (VertexID, UserVGPR0, UserVGPR1, UserVGPR2 or InstanceID)
es_vgpr_comp_cnt = shader->info.uses_instanceid ? 1 : 0; * GFX9: (VertexID, InstanceID / StepRate0, ...)
else if (es_type == PIPE_SHADER_TESS_EVAL) */
if (sscreen->info.chip_class >= GFX10)
es_vgpr_comp_cnt = shader->info.uses_instanceid ? 3 : 0;
else
es_vgpr_comp_cnt = shader->info.uses_instanceid ? 1 : 0;
} else if (es_type == PIPE_SHADER_TESS_EVAL)
es_vgpr_comp_cnt = shader->key.part.gs.es->info.uses_primid ? 3 : 2; es_vgpr_comp_cnt = shader->key.part.gs.es->info.uses_primid ? 3 : 2;
else else
unreachable("invalid shader selector type"); unreachable("invalid shader selector type");