Mesa (master): radeonsi: remove a tautology sctx->framebuffer.nr_samples > = 1

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 01fed6760886a266d99922fb6562644fe0c74868
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=01fed6760886a266d99922fb6562644fe0c74868

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Aug  3 00:01:49 2017 +0200

radeonsi: remove a tautology sctx->framebuffer.nr_samples >= 1

Tested-by: Dieter Nützel <Dieter at nuetzel-hh.de>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

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

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index c9bb108cc1..11dee499b8 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -2985,8 +2985,7 @@ static void si_emit_msaa_sample_locs(struct si_context *sctx,
 	if (has_msaa_sample_loc_bug)
 		nr_samples = MAX2(nr_samples, 1);
 
-	if (nr_samples >= 1 &&
-	    (nr_samples != sctx->msaa_sample_locs.nr_samples)) {
+	if (nr_samples != sctx->msaa_sample_locs.nr_samples) {
 		sctx->msaa_sample_locs.nr_samples = nr_samples;
 		cayman_emit_msaa_sample_locs(cs, nr_samples);
 	}