[Mesa-dev] Mesa (master): st/mesa: remove st_flush_bitmap wrapper

[Brian Paul]

On 07/21/2012 07:39 PM, Marek Olšák wrote:
> Module: Mesa
> Branch: master
> Commit: f96405f254819238ef6bce8e7341fcc7d00eaf85
> URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f96405f254819238ef6bce8e7341fcc7d00eaf85
>
> Author: Marek Olšák<maraeo at gmail.com>
> Date:   Sun Jul 22 02:46:30 2012 +0200
>
> st/mesa: remove st_flush_bitmap wrapper
>
> just a cleanup
>
> ---
>
>   src/mesa/state_tracker/st_cb_bitmap.c |   10 ----------
>   src/mesa/state_tracker/st_cb_bitmap.h |    6 ------
>   src/mesa/state_tracker/st_cb_flush.c  |    2 +-
>   3 files changed, 1 insertions(+), 17 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_cb_bitmap.c b/src/mesa/state_tracker/st_cb_bitmap.c
> index 09152c7..f48c9c1 100644
> --- a/src/mesa/state_tracker/st_cb_bitmap.c
> +++ b/src/mesa/state_tracker/st_cb_bitmap.c
> @@ -684,16 +684,6 @@ st_flush_bitmap_cache(struct st_context *st)
>
>
>   /**
> - * Flush bitmap cache.
> - */
> -void
> -st_flush_bitmap( struct st_context *st )
> -{
> -   st_flush_bitmap_cache(st);
> -}
> -
> -
> -/**
>    * Try to accumulate this glBitmap call in the bitmap cache.
>    * \return  GL_TRUE for success, GL_FALSE if bitmap is too large, etc.
>    */
> diff --git a/src/mesa/state_tracker/st_cb_bitmap.h b/src/mesa/state_tracker/st_cb_bitmap.h
> index ed14158..25410e5 100644
> --- a/src/mesa/state_tracker/st_cb_bitmap.h
> +++ b/src/mesa/state_tracker/st_cb_bitmap.h
> @@ -58,12 +58,6 @@ st_make_bitmap_fragment_program(struct st_context *st,
>   extern void
>   st_flush_bitmap_cache(struct st_context *st);
>
> -/* Flush bitmap cache and release vertex buffer.  Needed at end of
> - * frame to avoid synchronous rendering.
> - */
> -extern void
> -st_flush_bitmap(struct st_context *st);
> -
>   #else
>
>   static INLINE void
> diff --git a/src/mesa/state_tracker/st_cb_flush.c b/src/mesa/state_tracker/st_cb_flush.c
> index 4e40a93..b4372ae 100644
> --- a/src/mesa/state_tracker/st_cb_flush.c
> +++ b/src/mesa/state_tracker/st_cb_flush.c
> @@ -81,7 +81,7 @@ void st_flush( struct st_context *st,
>   {
>      FLUSH_CURRENT(st->ctx, 0);
>
> -   st_flush_bitmap(st);
> +   st_flush_bitmap_cache(st);
>
>      st->pipe->flush( st->pipe, fence );
>   }

Reviewed-by: Brian Paul <brianp at vmware.com>