[Mesa-dev] [PATCH 1/4] st/mesa: use MAX3() instead of MAX2(MAX2) in draw_textured_quad()

[Sinclair Yeh]

1 and 3 look good to me.


On Thu, Oct 15, 2015 at 01:01:40PM -0600, Brian Paul wrote:
> ---
>  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 7e8633e..e4d3580 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],
> -- 
> 1.9.1
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev