From: Brian Paul <brianp@vmware.com>
Date: Tue, 9 Feb 2016 21:20:41 +0000 (-0700)
Subject: st/mesa: use MAX3() macro, as we do for sampler view code below
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9e2a9d5743246e0fdaa03fe90f8dc341cea10907;p=mesa.git

st/mesa: use MAX3() macro, as we do for sampler view code below

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
---

diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 9c1eba49dcd..7096bd277ba 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -650,7 +650,8 @@ draw_textured_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z,
       if (fpv) {
          /* drawing a color image */
          const struct pipe_sampler_state *samplers[PIPE_MAX_SAMPLERS];
-         uint num = MAX2(MAX2(fpv->drawpix_sampler, fpv->pixelmap_sampler) + 1,
+         uint num = MAX3(fpv->drawpix_sampler + 1,
+                         fpv->pixelmap_sampler + 1,
                          st->state.num_samplers[PIPE_SHADER_FRAGMENT]);
          uint i;