diff options
author | Marek Olšák <[email protected]> | 2012-07-22 02:46:30 +0200 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2012-07-22 03:32:55 +0200 |
commit | f96405f254819238ef6bce8e7341fcc7d00eaf85 (patch) | |
tree | 0408d1ebdc5e1c89990d5a014dc1563f75e1f7b9 | |
parent | 749c9060aca85277c388377d15fd6323ba20b78e (diff) |
st/mesa: remove st_flush_bitmap wrapper
just a cleanup
-rw-r--r-- | src/mesa/state_tracker/st_cb_bitmap.c | 10 | ||||
-rw-r--r-- | src/mesa/state_tracker/st_cb_bitmap.h | 6 | ||||
-rw-r--r-- | 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 09152c79a11..f48c9c19200 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 ed141580376..25410e5037f 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 4e40a93f5e6..b4372ae7c1f 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 ); } |