From 5699c8a2f704ff03b03efdcd15d1644595a288b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 8 Feb 2017 20:36:26 +0100 Subject: [PATCH] gallium/u_upload_mgr: remove deprecated function u_upload_buffer MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle Tested-by: Charmaine Lee --- src/gallium/auxiliary/util/u_upload_mgr.c | 32 ----------------------- src/gallium/auxiliary/util/u_upload_mgr.h | 19 -------------- 2 files changed, 51 deletions(-) diff --git a/src/gallium/auxiliary/util/u_upload_mgr.c b/src/gallium/auxiliary/util/u_upload_mgr.c index 11662e7e9b3..7ef82082dac 100644 --- a/src/gallium/auxiliary/util/u_upload_mgr.c +++ b/src/gallium/auxiliary/util/u_upload_mgr.c @@ -264,35 +264,3 @@ void u_upload_data(struct u_upload_mgr *upload, if (ptr) memcpy(ptr, data, size); } - -/* XXX: Remove. It's basically a CPU fallback of resource_copy_region. */ -void u_upload_buffer(struct u_upload_mgr *upload, - unsigned min_out_offset, - unsigned offset, - unsigned size, - unsigned alignment, - struct pipe_resource *inbuf, - unsigned *out_offset, - struct pipe_resource **outbuf) -{ - struct pipe_transfer *transfer = NULL; - const char *map = NULL; - - map = (const char *)pipe_buffer_map_range(upload->pipe, - inbuf, - offset, size, - PIPE_TRANSFER_READ, - &transfer); - - if (!map) { - pipe_resource_reference(outbuf, NULL); - return; - } - - if (0) - debug_printf("upload ptr %p ofs %d sz %d\n", map, offset, size); - - u_upload_data(upload, min_out_offset, size, alignment, - map, out_offset, outbuf); - pipe_buffer_unmap( upload->pipe, transfer ); -} diff --git a/src/gallium/auxiliary/util/u_upload_mgr.h b/src/gallium/auxiliary/util/u_upload_mgr.h index fcd6235847f..633291e2ce3 100644 --- a/src/gallium/auxiliary/util/u_upload_mgr.h +++ b/src/gallium/auxiliary/util/u_upload_mgr.h @@ -109,23 +109,4 @@ void u_upload_data(struct u_upload_mgr *upload, unsigned *out_offset, struct pipe_resource **outbuf); - -/** - * Allocate space in an upload buffer and copy an input buffer to it. - * - * Same as u_upload_data, except that the input data comes from a buffer - * instead of a user pointer. - */ -void u_upload_buffer(struct u_upload_mgr *upload, - unsigned min_out_offset, - unsigned offset, - unsigned size, - unsigned alignment, - struct pipe_resource *inbuf, - unsigned *out_offset, - struct pipe_resource **outbuf); - - - #endif - -- 2.30.2