radeonsi: remove unused and not useful variables

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index 08c41e795c86a25812b89541a7240a8e796afe67..57a1e20ee0e6c2d518093d74c0f61afe006af79d 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -148,8 +148,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 b6b40916dfe294ddcf9915d5c1e3d0e144526dd1..c9997b376506b79c7848239b269da56df13d03c7 100644 (file)
--- 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 504b428816c9e6e8db0c4052fc0a77196eefc5ca..8927e50644b114e72a9c554fc2b35675ecb9c277 100644 (file)
--- 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];