From: Marek Olšák <marek.olsak@amd.com>
Date: Wed, 14 Jun 2017 20:37:31 +0000 (+0200)
Subject: st/mesa: remove redundant sample_mask checking
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a8753b254d86b8b791dcbb4d3484be1a35c5e792;p=mesa.git

st/mesa: remove redundant sample_mask checking

cso does that too

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/mesa/state_tracker/st_atom_msaa.c b/src/mesa/state_tracker/st_atom_msaa.c
index 0bdb9b23e4b..814077faadf 100644
--- a/src/mesa/state_tracker/st_atom_msaa.c
+++ b/src/mesa/state_tracker/st_atom_msaa.c
@@ -62,12 +62,7 @@ void st_update_sample_mask( struct st_context *st )
          sample_mask &= st->ctx->Multisample.SampleMaskValue;
    }
 
-   /* mask off unused bits or don't care? */
-
-   if (sample_mask != st->state.sample_mask) {
-      st->state.sample_mask = sample_mask;
-      cso_set_sample_mask(st->cso_context, sample_mask);
-   }
+   cso_set_sample_mask(st->cso_context, sample_mask);
 }
 
 void st_update_sample_shading( struct st_context *st )
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 6497587b1f4..2fe9d92e8bc 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -156,7 +156,6 @@ struct st_context
          boolean include;
          struct pipe_scissor_state rects[PIPE_MAX_WINDOW_RECTANGLES];
       } window_rects;
-      unsigned sample_mask;
 
       GLuint poly_stipple[32];  /**< In OpenGL's bottom-to-top order */