From: Marek Olšák <marek.olsak@amd.com>
Date: Wed, 2 Aug 2017 22:01:49 +0000 (+0200)
Subject: radeonsi: remove a tautology sctx->framebuffer.nr_samples >= 1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=01fed6760886a266d99922fb6562644fe0c74868;p=mesa.git

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

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

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index c9bb108cc16..11dee499b87 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);
 	}