Mesa (master): radeonsi: use MIN2 instead of expanded ?: operator

[Nicolai Hähnle]

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

Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date:   Fri Apr 22 12:46:55 2016 -0500

radeonsi: use MIN2 instead of expanded ?: operator

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/drivers/radeonsi/si_blit.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c
index 2b00da9..6db73f7 100644
--- a/src/gallium/drivers/radeonsi/si_blit.c
+++ b/src/gallium/drivers/radeonsi/si_blit.c
@@ -135,7 +135,7 @@ static void si_blit_decompress_depth(struct pipe_context *ctx,
 		/* The smaller the mipmap level, the less layers there are
 		 * as far as 3D textures are concerned. */
 		max_layer = util_max_layer(&texture->resource.b.b, level);
-		checked_last_layer = last_layer < max_layer ? last_layer : max_layer;
+		checked_last_layer = MIN2(last_layer, max_layer);
 
 		for (layer = first_layer; layer <= checked_last_layer; layer++) {
 			for (sample = first_sample; sample <= last_sample; sample++) {
@@ -209,7 +209,7 @@ static void si_blit_decompress_depth_in_place(struct si_context *sctx,
 		/* The smaller the mipmap level, the less layers there are
 		 * as far as 3D textures are concerned. */
 		max_layer = util_max_layer(&texture->resource.b.b, level);
-		checked_last_layer = last_layer < max_layer ? last_layer : max_layer;
+		checked_last_layer = MIN2(last_layer, max_layer);
 
 		for (layer = first_layer; layer <= checked_last_layer; layer++) {
 			surf_tmpl.u.tex.first_layer = layer;
@@ -295,7 +295,7 @@ static void si_blit_decompress_color(struct pipe_context *ctx,
 		/* The smaller the mipmap level, the less layers there are
 		 * as far as 3D textures are concerned. */
 		max_layer = util_max_layer(&rtex->resource.b.b, level);
-		checked_last_layer = last_layer < max_layer ? last_layer : max_layer;
+		checked_last_layer = MIN2(last_layer, max_layer);
 
 		for (layer = first_layer; layer <= checked_last_layer; layer++) {
 			struct pipe_surface *cbsurf, surf_tmpl;