1 files changed, 4 insertions, 12 deletions
diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index 4a55bfeab26..c3b7f064de8 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -662,11 +662,6 @@ struct si_screen {
    unsigned ge_wave_size;
 };
 
-struct si_blend_color {
-   struct pipe_blend_color state;
-   bool any_nonzeros;
-};
-
 struct si_sampler_view {
    struct pipe_sampler_view base;
    /* [0..7] = image descriptor
@@ -762,11 +757,6 @@ struct si_viewports {
    bool y_inverted;
 };
 
-struct si_clip_state {
-   struct pipe_clip_state state;
-   bool any_nonzeros;
-};
-
 struct si_streamout_target {
    struct pipe_stream_output_target b;
 
@@ -1029,10 +1019,12 @@ struct si_context {
    unsigned sample_locs_num_samples;
    uint16_t sample_mask;
    unsigned last_cb_target_mask;
-   struct si_blend_color blend_color;
-   struct si_clip_state clip_state;
+   struct pipe_blend_color blend_color;
+   struct pipe_clip_state clip_state;
    struct si_shader_data shader_pointers;
    struct si_stencil_ref stencil_ref;
+   bool blend_color_any_nonzeros:1;
+   bool clip_state_any_nonzeros:1;
    struct pipe_scissor_state scissors[SI_MAX_VIEWPORTS];
    struct si_streamout streamout;
    struct si_viewports viewports;