Mesa (master): st/mesa: use MAX3() macro, as we do for sampler view code below
Brian Paul
brianp at kemper.freedesktop.org
Wed Feb 10 00:48:43 UTC 2016
Module: Mesa
Branch: master
Commit: 9e2a9d5743246e0fdaa03fe90f8dc341cea10907
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9e2a9d5743246e0fdaa03fe90f8dc341cea10907
Author: Brian Paul <brianp at vmware.com>
Date: Tue Feb 9 14:20:41 2016 -0700
st/mesa: use MAX3() macro, as we do for sampler view code below
Reviewed-by: Roland Scheidegger <sroland at vmware.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 9c1eba4..7096bd2 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;
More information about the mesa-commit
mailing list