summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2017-02-08 20:36:26 +0100
committerMarek Olšák <[email protected]>2017-02-14 21:46:16 +0100
commit5699c8a2f704ff03b03efdcd15d1644595a288b8 (patch)
tree778bfd87b5a9c1b165b13b8da2feb71d7d2f6bbb /src/gallium/auxiliary
parent2ca3548eb926e0c89a3ef72bb07dedf85d3c250a (diff)
gallium/u_upload_mgr: remove deprecated function u_upload_buffer
Reviewed-by: Nicolai Hähnle <[email protected]> Tested-by: Charmaine Lee <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r--src/gallium/auxiliary/util/u_upload_mgr.c32
-rw-r--r--src/gallium/auxiliary/util/u_upload_mgr.h19
2 files changed, 0 insertions, 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
-