[Mesa-dev] [PATCH 03/13] radeonsi: remove unused and not useful variables

[Marek Olšák]

From: Marek Olšák <marek.olsak at amd.com>

---
 src/gallium/drivers/radeonsi/si_pipe.h  | 2 --
 src/gallium/drivers/radeonsi/si_state.c | 3 +--
 src/gallium/drivers/radeonsi/si_state.h | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index 83d046e..3632929 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -145,8 +145,6 @@ struct si_context {
 	struct r600_atom		msaa_config;
 	int				ps_iter_samples;
 
-	unsigned default_ps_gprs, default_vs_gprs;
-
 	/* Vertex and index buffers. */
 	bool			vertex_buffers_dirty;
 	struct pipe_index_buffer index_buffer;
diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index b6b4091..c9997b3 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -835,10 +835,9 @@ static void *si_create_dsa_state(struct pipe_context *ctx,
 	/* alpha */
 	if (state->alpha.enabled) {
 		dsa->alpha_func = state->alpha.func;
-		dsa->alpha_ref = state->alpha.ref_value;
 
 		si_pm4_set_reg(pm4, R_00B030_SPI_SHADER_USER_DATA_PS_0 +
-		               SI_SGPR_ALPHA_REF * 4, fui(dsa->alpha_ref));
+		               SI_SGPR_ALPHA_REF * 4, fui(state->alpha.ref_value));
 	} else {
 		dsa->alpha_func = PIPE_FUNC_ALWAYS;
 	}
diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h
index 504b428..8927e50 100644
--- a/src/gallium/drivers/radeonsi/si_state.h
+++ b/src/gallium/drivers/radeonsi/si_state.h
@@ -64,7 +64,6 @@ struct si_state_rasterizer {
 	unsigned		pa_sc_line_stipple;
 	unsigned		pa_su_sc_mode_cntl;
 	unsigned		pa_cl_clip_cntl;
-	unsigned		pa_cl_vs_out_cntl;
 	unsigned		clip_plane_enable;
 	float			offset_units;
 	float			offset_scale;
@@ -72,7 +71,6 @@ struct si_state_rasterizer {
 
 struct si_state_dsa {
 	struct si_pm4_state	pm4;
-	float			alpha_ref;
 	unsigned		alpha_func;
 	uint8_t			valuemask[2];
 	uint8_t			writemask[2];
-- 
2.1.0