[Mesa-dev] [PATCH] mesa: Remove 'invalidate_state' parameter to _mesa_dirty_texobj().

[Ian Romanick]

On 09/23/2013 09:08 PM, Kenneth Graunke wrote:
> Every caller passed true.
> 
> Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

> ---
>  src/mesa/main/teximage.c                | 6 +++---
>  src/mesa/main/texobj.c                  | 9 +++------
>  src/mesa/main/texobj.h                  | 3 +--
>  src/mesa/main/texparam.c                | 2 +-
>  src/mesa/state_tracker/st_cb_eglimage.c | 2 +-
>  src/mesa/state_tracker/st_manager.c     | 2 +-
>  6 files changed, 10 insertions(+), 14 deletions(-)
> 
> diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
> index b719fc8..236b047 100644
> --- a/src/mesa/main/teximage.c
> +++ b/src/mesa/main/teximage.c
> @@ -3172,7 +3172,7 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
>  
>              _mesa_update_fbo_texture(ctx, texObj, face, level);
>  
> -            _mesa_dirty_texobj(ctx, texObj, GL_TRUE);
> +            _mesa_dirty_texobj(ctx, texObj);
>           }
>        }
>        _mesa_unlock_texture(ctx, texObj);
> @@ -3291,7 +3291,7 @@ _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image)
>        ctx->Driver.EGLImageTargetTexture2D(ctx, target,
>  					  texObj, texImage, image);
>  
> -      _mesa_dirty_texobj(ctx, texObj, GL_TRUE);
> +      _mesa_dirty_texobj(ctx, texObj);
>     }
>     _mesa_unlock_texture(ctx, texObj);
>  
> @@ -3562,7 +3562,7 @@ copyteximage(struct gl_context *ctx, GLuint dims,
>  
>           _mesa_update_fbo_texture(ctx, texObj, face, level);
>  
> -         _mesa_dirty_texobj(ctx, texObj, GL_TRUE);
> +         _mesa_dirty_texobj(ctx, texObj);
>        }
>     }
>     _mesa_unlock_texture(ctx, texObj);
> diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
> index cc2c786..abd30c5 100644
> --- a/src/mesa/main/texobj.c
> +++ b/src/mesa/main/texobj.c
> @@ -715,20 +715,17 @@ _mesa_cube_complete(const struct gl_texture_object *texObj)
>  
>  /**
>   * Mark a texture object dirty.  It forces the object to be incomplete
> - * and optionally forces the context to re-validate its state.
> + * and forces the context to re-validate its state.
>   *
>   * \param ctx GL context.
>   * \param texObj texture object.
> - * \param invalidate_state also invalidate context state.
>   */
>  void
> -_mesa_dirty_texobj(struct gl_context *ctx, struct gl_texture_object *texObj,
> -                   GLboolean invalidate_state)
> +_mesa_dirty_texobj(struct gl_context *ctx, struct gl_texture_object *texObj)
>  {
>     texObj->_BaseComplete = GL_FALSE;
>     texObj->_MipmapComplete = GL_FALSE;
> -   if (invalidate_state)
> -      ctx->NewState |= _NEW_TEXTURE;
> +   ctx->NewState |= _NEW_TEXTURE;
>  }
>  
>  
> diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
> index 0df088c..55091a6 100644
> --- a/src/mesa/main/texobj.h
> +++ b/src/mesa/main/texobj.h
> @@ -126,8 +126,7 @@ extern GLboolean
>  _mesa_cube_complete(const struct gl_texture_object *texObj);
>  
>  extern void
> -_mesa_dirty_texobj(struct gl_context *ctx, struct gl_texture_object *texObj,
> -                   GLboolean invalidate_state);
> +_mesa_dirty_texobj(struct gl_context *ctx, struct gl_texture_object *texObj);
>  
>  extern struct gl_texture_object *
>  _mesa_get_fallback_texture(struct gl_context *ctx, gl_texture_index tex);
> diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
> index 757ae80..31723c3 100644
> --- a/src/mesa/main/texparam.c
> +++ b/src/mesa/main/texparam.c
> @@ -256,7 +256,7 @@ static inline void
>  incomplete(struct gl_context *ctx, struct gl_texture_object *texObj)
>  {
>     FLUSH_VERTICES(ctx, _NEW_TEXTURE);
> -   _mesa_dirty_texobj(ctx, texObj, GL_TRUE);
> +   _mesa_dirty_texobj(ctx, texObj);
>  }
>  
>  
> diff --git a/src/mesa/state_tracker/st_cb_eglimage.c b/src/mesa/state_tracker/st_cb_eglimage.c
> index b871cdd..7484cb4 100644
> --- a/src/mesa/state_tracker/st_cb_eglimage.c
> +++ b/src/mesa/state_tracker/st_cb_eglimage.c
> @@ -132,7 +132,7 @@ st_bind_surface(struct gl_context *ctx, GLenum target,
>     stObj->depth0 = 1;
>     stObj->surface_format = ps->format;
>  
> -   _mesa_dirty_texobj(ctx, texObj, GL_TRUE);
> +   _mesa_dirty_texobj(ctx, texObj);
>  }
>  
>  static void
> diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c
> index b1fd91a..8158450 100644
> --- a/src/mesa/state_tracker/st_manager.c
> +++ b/src/mesa/state_tracker/st_manager.c
> @@ -545,7 +545,7 @@ st_context_teximage(struct st_context_iface *stctxi,
>     stObj->depth0 = depth;
>     stObj->surface_format = pipe_format;
>  
> -   _mesa_dirty_texobj(ctx, texObj, GL_TRUE);
> +   _mesa_dirty_texobj(ctx, texObj);
>     _mesa_unlock_texture(ctx, texObj);
>     
>     return TRUE;
>