summaryrefslogtreecommitdiff
path: root/libs/rs/RenderScript.h
diff options
context:
space:
mode:
author Jason Sams <rjsams@android.com> 2010-12-13 15:32:35 -0800
committer Jason Sams <rjsams@android.com> 2010-12-13 15:32:35 -0800
commitd4b23b54445b13dacaafad97d100999abb36ea6f (patch)
tree265a246ae22c5b726690c422bc5c5518e6d445a0 /libs/rs/RenderScript.h
parent666a5ed98142867bcd6658c97210b775c828dae5 (diff)
More API updates.
Change-Id: I754dc645ac08fa25019eed8fd8b7b3c47f178ff2
Diffstat (limited to 'libs/rs/RenderScript.h')
-rw-r--r--libs/rs/RenderScript.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/rs/RenderScript.h b/libs/rs/RenderScript.h
index 9e307999b56d..43d4291cfec9 100644
--- a/libs/rs/RenderScript.h
+++ b/libs/rs/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