From: Nicolai Hähnle Date: Fri, 22 Jan 2016 22:09:58 +0000 (-0500) Subject: radeonsi: replace use of is_gs_copy_shader in si_shader_vs X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a7754ffd31bfdb92fcc9873fef0190c1c7a9ef4d;p=mesa.git radeonsi: replace use of is_gs_copy_shader in si_shader_vs We now have an explicit parameter that contains the same information, and this will allow us to get rid of is_gs_copy_shader in the si_shader struct. Reviewed-by: Edward O'Callaghan Reviewed-by: Marek Olšák --- diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index a7259a7621c..36174eb5a94 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -339,7 +339,7 @@ static void si_shader_vs(struct si_shader *shader, struct si_shader *gs) va = shader->bo->gpu_address; si_pm4_add_bo(pm4, shader->bo, RADEON_USAGE_READ, RADEON_PRIO_USER_SHADER); - if (shader->is_gs_copy_shader) { + if (gs) { vgpr_comp_cnt = 0; /* only VertexID is needed for GS-COPY. */ num_user_sgprs = SI_GSCOPY_NUM_USER_SGPR; } else if (shader->selector->type == PIPE_SHADER_VERTEX) {