radeonsi: replace use of is_gs_copy_shader in si_shader_vs
authorNicolai Hähnle <nicolai.haehnle@amd.com>
Fri, 22 Jan 2016 22:09:58 +0000 (17:09 -0500)
committerNicolai Hähnle <nicolai.haehnle@amd.com>
Mon, 25 Jan 2016 15:15:55 +0000 (10:15 -0500)
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 <eocallaghan@alterapraxis.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
src/gallium/drivers/radeonsi/si_state_shaders.c

index a7259a7621c26ca36a62a7a7e6106d87499ba3e8..36174eb5a9494d96d4eba3f122c5b5a4efbe55cf 100644 (file)
@@ -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) {