From 05ea705c7c6212d16fcc9bcf04619ffd4311bb03 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Fri, 11 May 2012 22:56:08 +0200 Subject: r600g: remove slab allocator for pipe_resource (used mainly for user buffers) --- src/gallium/drivers/r600/r600_pipe.c | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'src/gallium/drivers/r600/r600_pipe.c') diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index bb2336a37e4..cb13ca767c9 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -152,25 +152,6 @@ static void r600_flush_from_winsys(void *ctx, unsigned flags) r600_flush((struct pipe_context*)ctx, NULL, flags); } -static void r600_update_num_contexts(struct r600_screen *rscreen, int diff) -{ - pipe_mutex_lock(rscreen->mutex_num_contexts); - if (diff > 0) { - rscreen->num_contexts++; - - if (rscreen->num_contexts > 1) - util_slab_set_thread_safety(&rscreen->pool_buffers, - UTIL_SLAB_MULTITHREADED); - } else { - rscreen->num_contexts--; - - if (rscreen->num_contexts <= 1) - util_slab_set_thread_safety(&rscreen->pool_buffers, - UTIL_SLAB_SINGLETHREADED); - } - pipe_mutex_unlock(rscreen->mutex_num_contexts); -} - static void r600_destroy_context(struct pipe_context *context) { struct r600_context *rctx = (struct r600_context *)context; @@ -197,8 +178,6 @@ static void r600_destroy_context(struct pipe_context *context) } util_slab_destroy(&rctx->pool_transfers); - r600_update_num_contexts(rctx->screen, -1); - r600_release_command_buffer(&rctx->start_cs_cmd); if (rctx->cs) { @@ -221,8 +200,6 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void sizeof(struct pipe_transfer), 64, UTIL_SLAB_SINGLETHREADED); - r600_update_num_contexts(rscreen, 1); - rctx->context.screen = screen; rctx->context.priv = priv; rctx->context.destroy = r600_destroy_context; @@ -613,9 +590,6 @@ static void r600_destroy_screen(struct pipe_screen* pscreen) pipe_mutex_destroy(rscreen->fences.mutex); rscreen->ws->destroy(rscreen->ws); - - util_slab_destroy(&rscreen->pool_buffers); - pipe_mutex_destroy(rscreen->mutex_num_contexts); FREE(rscreen); } @@ -873,12 +847,6 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws) util_format_s3tc_init(); - util_slab_create(&rscreen->pool_buffers, - sizeof(struct r600_resource), 64, - UTIL_SLAB_SINGLETHREADED); - - pipe_mutex_init(rscreen->mutex_num_contexts); - rscreen->fences.bo = NULL; rscreen->fences.data = NULL; rscreen->fences.next_index = 0; -- cgit v1.2.3