From: Marek Olšák Date: Sun, 22 Feb 2015 14:11:49 +0000 (+0100) Subject: radeonsi: only preload VertexID for the GS copy shader X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=53494371547392f3b9a836cdda66b5a1fdc9fda2;p=mesa.git radeonsi: only preload VertexID for the GS copy shader The copy shader doesn't use any other preloaded VGPRs. Reviewed-by: Michel Dänzer --- diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index 5b463365c96..0a2ff2a2f03 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -159,12 +159,14 @@ static void si_shader_vs(struct si_shader *shader) va = shader->bo->gpu_address; si_pm4_add_bo(pm4, shader->bo, RADEON_USAGE_READ, RADEON_PRIO_SHADER_DATA); - vgpr_comp_cnt = shader->uses_instanceid ? 3 : 0; - - if (shader->is_gs_copy_shader) + if (shader->is_gs_copy_shader) { + vgpr_comp_cnt = 0; /* only VertexID is needed for GS-COPY. */ num_user_sgprs = SI_GSCOPY_NUM_USER_SGPR; - else + } else if (shader->selector->type == PIPE_SHADER_VERTEX) { + vgpr_comp_cnt = shader->uses_instanceid ? 3 : 0; num_user_sgprs = SI_VS_NUM_USER_SGPR; + } else + assert(0); num_sgprs = shader->num_sgprs; if (num_user_sgprs > num_sgprs) {