[Mesa-dev] [PATCH 3/6] mesa: don't use _NEW_TEXTURE mainly in mesa/main

[Timothy Arceri]

On 24/03/17 10:42, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
>
> ---
>  src/mesa/drivers/dri/i965/brw_state_upload.c |  3 ++-
>  src/mesa/main/attrib.c                       |  2 +-
>  src/mesa/main/debug.c                        |  3 ++-
>  src/mesa/main/state.c                        | 10 +++++-----
>  src/mesa/main/texstate.c                     | 11 ++++++-----
>  5 files changed, 16 insertions(+), 13 deletions(-)


<snip/>

> diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
> index 3471b26..f909f83 100644
> --- a/src/mesa/main/debug.c
> +++ b/src/mesa/main/debug.c
> @@ -84,23 +84,24 @@ _mesa_print_state( const char *msg, GLuint state )
>  	   (state & _NEW_FOG)             ? "ctx->Fog, " : "",
>  	   (state & _NEW_HINT)            ? "ctx->Hint, " : "",
>  	   (state & _NEW_LIGHT)           ? "ctx->Light, " : "",
>  	   (state & _NEW_LINE)            ? "ctx->Line, " : "",
>  	   (state & _NEW_PIXEL)           ? "ctx->Pixel, " : "",
>  	   (state & _NEW_POINT)           ? "ctx->Point, " : "",
>  	   (state & _NEW_POLYGON)         ? "ctx->Polygon, " : "",
>  	   (state & _NEW_POLYGONSTIPPLE)  ? "ctx->PolygonStipple, " : "",
>  	   (state & _NEW_SCISSOR)         ? "ctx->Scissor, " : "",
>  	   (state & _NEW_STENCIL)         ? "ctx->Stencil, " : "",
> -	   (state & _NEW_TEXTURE)         ? "ctx->Texture, " : "",
> +	   (state & _NEW_TEXTURE_OBJECT)  ? "ctx->Texture(Object), " : "",
>  	   (state & _NEW_TRANSFORM)       ? "ctx->Transform, " : "",
>  	   (state & _NEW_VIEWPORT)        ? "ctx->Viewport, " : "",
> +           (state & _NEW_TEXTURE_STATE)   ? "ctx->Texture(State), " : "",
>  	   (state & _NEW_ARRAY)           ? "ctx->Array, " : "",
>  	   (state & _NEW_RENDERMODE)      ? "ctx->RenderMode, " : "",
>  	   (state & _NEW_BUFFERS)         ? "ctx->Visual, ctx->DrawBuffer,, " : "");
>  }
>

You need to add an extra %s to the format here.