st/mesa: use MAX3() macro, as we do for sampler view code below
authorBrian Paul <brianp@vmware.com>
Tue, 9 Feb 2016 21:20:41 +0000 (14:20 -0700)
committerBrian Paul <brianp@vmware.com>
Wed, 10 Feb 2016 00:48:25 +0000 (17:48 -0700)
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
src/mesa/state_tracker/st_cb_drawpixels.c

index 9c1eba49dcd281de63ce80938876cff573900006..7096bd277ba55687ebdae2de77f9946f0f1cffdb 100644 (file)
@@ -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;