diff options
author | Marek Olšák <maraeo@gmail.com> | 2013-02-14 14:30:59 +0100 |
---|---|---|
committer | Marek Olšák <maraeo@gmail.com> | 2013-02-18 17:57:41 +0100 |
commit | 07cdfdb708ac28aa487a738db30b128cb0df1dc3 (patch) | |
tree | c41f694ab4ebab69b9b93d58ed8d47164f988cd9 | |
parent | 40ee93c4e885f868af68381b0a8542b6439ae774 (diff) |
st/mesa: remove what is left from u_blit
Reviewed-by: Brian Paul <brianp@vmware.com>
-rw-r--r-- | src/mesa/state_tracker/st_cb_blit.c | 16 | ||||
-rw-r--r-- | src/mesa/state_tracker/st_cb_blit.h | 7 | ||||
-rw-r--r-- | src/mesa/state_tracker/st_cb_flush.c | 1 | ||||
-rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 1 | ||||
-rw-r--r-- | src/mesa/state_tracker/st_context.c | 2 | ||||
-rw-r--r-- | src/mesa/state_tracker/st_context.h | 2 |
6 files changed, 0 insertions, 29 deletions
diff --git a/src/mesa/state_tracker/st_cb_blit.c b/src/mesa/state_tracker/st_cb_blit.c index ddef2707a97..c463e3b047a 100644 --- a/src/mesa/state_tracker/st_cb_blit.c +++ b/src/mesa/state_tracker/st_cb_blit.c @@ -41,25 +41,9 @@ #include "st_cb_fbo.h" #include "st_atom.h" -#include "util/u_blit.h" #include "util/u_format.h" -void -st_init_blit(struct st_context *st) -{ - st->blit = util_create_blit(st->pipe, st->cso_context); -} - - -void -st_destroy_blit(struct st_context *st) -{ - util_destroy_blit(st->blit); - st->blit = NULL; -} - - static void st_BlitFramebuffer(struct gl_context *ctx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, diff --git a/src/mesa/state_tracker/st_cb_blit.h b/src/mesa/state_tracker/st_cb_blit.h index eb6089e4747..159c6ca8d5a 100644 --- a/src/mesa/state_tracker/st_cb_blit.h +++ b/src/mesa/state_tracker/st_cb_blit.h @@ -35,13 +35,6 @@ struct dd_function_table; struct st_context; - -extern void -st_init_blit(struct st_context *st); - -extern void -st_destroy_blit(struct st_context *st); - extern void st_init_blit_functions(struct dd_function_table *functions); diff --git a/src/mesa/state_tracker/st_cb_flush.c b/src/mesa/state_tracker/st_cb_flush.c index b569e3b3c6f..b11004718f6 100644 --- a/src/mesa/state_tracker/st_cb_flush.c +++ b/src/mesa/state_tracker/st_cb_flush.c @@ -44,7 +44,6 @@ #include "pipe/p_defines.h" #include "pipe/p_screen.h" #include "util/u_gen_mipmap.h" -#include "util/u_blit.h" /** Check if we have a front color buffer and if it's been drawn to. */ diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 606bae010d3..c922a31642e 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -59,7 +59,6 @@ #include "util/u_inlines.h" #include "pipe/p_shader_tokens.h" #include "util/u_tile.h" -#include "util/u_blit.h" #include "util/u_format.h" #include "util/u_surface.h" #include "util/u_sampler.h" diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index 676fc069d83..f9a584ba0ac 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -146,7 +146,6 @@ st_create_context_priv( struct gl_context *ctx, struct pipe_context *pipe, st_init_clear(st); st_init_draw( st ); st_init_generate_mipmap(st); - st_init_blit(st); if(pipe->screen->get_param(pipe->screen, PIPE_CAP_NPOT_TEXTURES)) st->internal_target = PIPE_TEXTURE_2D; @@ -242,7 +241,6 @@ static void st_destroy_context_priv( struct st_context *st ) st_destroy_atoms( st ); st_destroy_draw( st ); st_destroy_generate_mipmap(st); - st_destroy_blit(st); st_destroy_clear(st); st_destroy_bitmap(st); st_destroy_drawpix(st); diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h index 726c64d04ae..a7b6cb53502 100644 --- a/src/mesa/state_tracker/st_context.h +++ b/src/mesa/state_tracker/st_context.h @@ -34,7 +34,6 @@ #include "main/fbobject.h" struct bitmap_cache; -struct blit_state; struct dd_function_table; struct draw_context; struct draw_stage; @@ -182,7 +181,6 @@ struct st_context enum pipe_texture_target internal_target; struct gen_mipmap_state *gen_mipmap; - struct blit_state *blit; struct cso_context *cso_context; |