summaryrefslogtreecommitdiff
path: root/RenderScript.h
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2010-12-13 15:32:35 -0800
committerJason Sams <rjsams@android.com>2010-12-13 15:32:35 -0800
commitebc5019400a129b1f1e57bd1fe8200a21f8da00b (patch)
treefe0a3b0dea2761523bd7263988ebcaabdbbd71cf /RenderScript.h
parent03bc9c11af2471cd3384e98eefc8ba762104cb63 (diff)
downloadrs-ebc5019400a129b1f1e57bd1fe8200a21f8da00b.tar.gz
More API updates.
Change-Id: I754dc645ac08fa25019eed8fd8b7b3c47f178ff2
Diffstat (limited to 'RenderScript.h')
-rw-r--r--RenderScript.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/RenderScript.h b/RenderScript.h
index 9e307999..43d4291c 100644
--- a/RenderScript.h
+++ b/RenderScript.h
@@ -105,10 +105,10 @@ enum RsAllocationUsageType {
RS_ALLOCATION_USAGE_ALL = 0x000F
};
-enum RsAllocationMipmapGenerationControl {
- RS_MIPMAP_NONE = 0,
- RS_MIPMAP_FULL = 1,
- RS_MIPMAP_TEXTURE_ONLY = 2
+enum RsAllocationMipmapControl {
+ RS_ALLOCATION_MIPMAP_NONE = 0,
+ RS_ALLOCATION_MIPMAP_FULL = 1,
+ RS_ALLOCATION_MIPMAP_ON_SYNC_TO_TEXTURE = 2
};
enum RsDataType {
@@ -345,13 +345,13 @@ void rsaElementGetSubElements(RsContext, RsElement, uint32_t *ids, const char **
RsType rsaTypeCreate(RsContext, RsElement, uint32_t dimX, uint32_t dimY,
uint32_t dimZ, bool mips, bool faces);
RsAllocation rsaAllocationCreateTyped(RsContext rsc, RsType vtype,
- RsAllocationMipmapGenerationControl mips,
+ RsAllocationMipmapControl mips,
uint32_t usages);
RsAllocation rsaAllocationCreateFromBitmap(RsContext con, RsType vtype,
- RsAllocationMipmapGenerationControl mips,
+ RsAllocationMipmapControl mips,
const void *data, uint32_t usages);
RsAllocation rsaAllocationCubeCreateFromBitmap(RsContext con, RsType vtype,
- RsAllocationMipmapGenerationControl mips,
+ RsAllocationMipmapControl mips,
const void *data, uint32_t usages);
#ifndef NO_RS_FUNCS