From: Marek Olšák <marek.ol...@amd.com>
---
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 11662e7..7ef8208 100644
--- a/src/gallium/auxiliary/util/u_upload_mgr.c
+++ b/src/gallium/auxiliary/util/u_upload_mgr.c
@@ -257,42 +257,10 @@ void u_upload_data(struct u_upload_mgr *upload,
struct pipe_resource **outbuf)
{
uint8_t *ptr;
u_upload_alloc(upload, min_out_offset, size, alignment,
out_offset, outbuf,
(void**)&ptr);
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 fcd6235..633291e 100644
--- a/src/gallium/auxiliary/util/u_upload_mgr.h
+++ b/src/gallium/auxiliary/util/u_upload_mgr.h
@@ -102,30 +102,11 @@ void u_upload_alloc(struct u_upload_mgr *upload,
* to the pointer returned from u_upload_alloc.
*/
void u_upload_data(struct u_upload_mgr *upload,
unsigned min_out_offset,
unsigned size,
unsigned alignment,
const void *data,
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.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
