Mesa (master): st/mesa: use MAX3() instead of MAX2(MAX2) in draw_textured_quad()

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Oct 15 09:32:50 2015 -0600

st/mesa: use MAX3() instead of MAX2(MAX2) in draw_textured_quad()

Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
Reviewed-by: Sinclair Yeh <syeh at vmware.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/mesa/state_tracker/st_cb_drawpixels.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 20cbfde..c0e0484 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -667,7 +667,8 @@ draw_textured_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z,
    /* user textures, plus the drawpix textures */
    if (fpv) {
       struct pipe_sampler_view *sampler_views[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_sampler_views[PIPE_SHADER_FRAGMENT]);
 
       memcpy(sampler_views, st->state.sampler_views[PIPE_SHADER_FRAGMENT],