From: Marek Olšák Date: Fri, 11 May 2012 20:34:34 +0000 (+0200) Subject: r300g: remove user_buffer_create X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4fd60ad6dae7e5cf3eb0ab4f49bf86378230b65f;p=mesa.git r300g: remove user_buffer_create --- diff --git a/src/gallium/drivers/r300/r300_resource.c b/src/gallium/drivers/r300/r300_resource.c index 823bc0fa775..46399fb2397 100644 --- a/src/gallium/drivers/r300/r300_resource.c +++ b/src/gallium/drivers/r300/r300_resource.c @@ -56,5 +56,4 @@ void r300_init_screen_resource_functions(struct r300_screen *r300screen) r300screen->screen.resource_from_handle = r300_texture_from_handle; r300screen->screen.resource_get_handle = r300_resource_get_handle; r300screen->screen.resource_destroy = u_resource_destroy_vtbl; - r300screen->screen.user_buffer_create = r300_user_buffer_create; } diff --git a/src/gallium/drivers/r300/r300_screen_buffer.c b/src/gallium/drivers/r300/r300_screen_buffer.c index 7927310a578..0c3f8702c4a 100644 --- a/src/gallium/drivers/r300/r300_screen_buffer.c +++ b/src/gallium/drivers/r300/r300_screen_buffer.c @@ -181,30 +181,3 @@ struct pipe_resource *r300_buffer_create(struct pipe_screen *screen, return &rbuf->b.b; } - -struct pipe_resource *r300_user_buffer_create(struct pipe_screen *screen, - void *ptr, unsigned size, - unsigned bind) -{ - struct r300_screen *r300screen = r300_screen(screen); - struct r300_resource *rbuf; - - rbuf = util_slab_alloc(&r300screen->pool_buffers); - - pipe_reference_init(&rbuf->b.b.reference, 1); - rbuf->b.b.screen = screen; - rbuf->b.b.target = PIPE_BUFFER; - rbuf->b.b.format = PIPE_FORMAT_R8_UNORM; - rbuf->b.b.usage = PIPE_USAGE_IMMUTABLE; - rbuf->b.b.bind = bind; - rbuf->b.b.width0 = ~0; - rbuf->b.b.height0 = 1; - rbuf->b.b.depth0 = 1; - rbuf->b.b.array_size = 1; - rbuf->b.b.flags = 0; - rbuf->b.vtbl = &r300_buffer_vtbl; - rbuf->domain = RADEON_DOMAIN_GTT; - rbuf->buf = NULL; - rbuf->constant_buffer = NULL; - return &rbuf->b.b; -} diff --git a/src/gallium/drivers/r300/r300_screen_buffer.h b/src/gallium/drivers/r300/r300_screen_buffer.h index 482b6e424ed..b4c8520039b 100644 --- a/src/gallium/drivers/r300/r300_screen_buffer.h +++ b/src/gallium/drivers/r300/r300_screen_buffer.h @@ -44,10 +44,6 @@ void r300_upload_index_buffer(struct r300_context *r300, struct pipe_resource *r300_buffer_create(struct pipe_screen *screen, const struct pipe_resource *templ); -struct pipe_resource *r300_user_buffer_create(struct pipe_screen *screen, - void *ptr, unsigned size, - unsigned bind); - /* Inline functions. */ static INLINE struct r300_buffer *r300_buffer(struct pipe_resource *buffer)