diff options
| author | Brian Paul <brianp@vmware.com> | 2016-02-09 14:20:41 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2016-02-09 17:48:25 -0700 |
| commit | 9e2a9d5743246e0fdaa03fe90f8dc341cea10907 (patch) | |
| tree | b1a139bbdec70ffdbb031cfcfc21e86518ecd4e7 /src/mesa/state_tracker/st_cb_drawpixels.c | |
| parent | a5b8ede25319217843f8ff7681a0af5ad4aab84a (diff) | |
| download | external_mesa3d-9e2a9d5743246e0fdaa03fe90f8dc341cea10907.zip external_mesa3d-9e2a9d5743246e0fdaa03fe90f8dc341cea10907.tar.gz external_mesa3d-9e2a9d5743246e0fdaa03fe90f8dc341cea10907.tar.bz2 | |
st/mesa: use MAX3() macro, as we do for sampler view code below
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Diffstat (limited to 'src/mesa/state_tracker/st_cb_drawpixels.c')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_drawpixels.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |