Add 3D allocation copies.
Remove resize2d.
bug 8567058
Change-Id: Ib143b7a417c7db88aa8da8714a63e0ee6091269a
diff --git a/driver/rsdAllocation.h b/driver/rsdAllocation.h
index b64c999..a3f62a1 100644
--- a/driver/rsdAllocation.h
+++ b/driver/rsdAllocation.h
@@ -113,9 +113,9 @@
const void *data, size_t sizeBytes, size_t stride);
void rsdAllocationData3D(const android::renderscript::Context *rsc,
const android::renderscript::Allocation *alloc,
- uint32_t xoff, uint32_t yoff, uint32_t zoff,
- uint32_t lod, RsAllocationCubemapFace face,
- uint32_t w, uint32_t h, uint32_t d, const void *data, size_t sizeBytes);
+ uint32_t xoff, uint32_t yoff, uint32_t zoff, uint32_t lod,
+ uint32_t w, uint32_t h, uint32_t d, const void *data, size_t sizeBytes,
+ size_t stride);
void rsdAllocationRead1D(const android::renderscript::Context *rsc,
const android::renderscript::Allocation *alloc,
@@ -128,9 +128,9 @@
void *data, size_t sizeBytes, size_t stride);
void rsdAllocationRead3D(const android::renderscript::Context *rsc,
const android::renderscript::Allocation *alloc,
- uint32_t xoff, uint32_t yoff, uint32_t zoff,
- uint32_t lod, RsAllocationCubemapFace face,
- uint32_t w, uint32_t h, uint32_t d, void *data, size_t sizeBytes);
+ uint32_t xoff, uint32_t yoff, uint32_t zoff, uint32_t lod,
+ uint32_t w, uint32_t h, uint32_t d, void *data, size_t sizeBytes,
+ size_t stride);
void * rsdAllocationLock1D(const android::renderscript::Context *rsc,
const android::renderscript::Allocation *alloc);
@@ -153,11 +153,11 @@
void rsdAllocationData3D_alloc(const android::renderscript::Context *rsc,
const android::renderscript::Allocation *dstAlloc,
uint32_t dstXoff, uint32_t dstYoff, uint32_t dstZoff,
- uint32_t dstLod, RsAllocationCubemapFace dstFace,
+ uint32_t dstLod,
uint32_t w, uint32_t h, uint32_t d,
const android::renderscript::Allocation *srcAlloc,
uint32_t srcXoff, uint32_t srcYoff, uint32_t srcZoff,
- uint32_t srcLod, RsAllocationCubemapFace srcFace);
+ uint32_t srcLod);
void rsdAllocationElementData1D(const android::renderscript::Context *rsc,
const android::renderscript::Allocation *alloc,