From d4b23b54445b13dacaafad97d100999abb36ea6f Mon Sep 17 00:00:00 2001 From: Jason Sams Date: Mon, 13 Dec 2010 15:32:35 -0800 Subject: More API updates. Change-Id: I754dc645ac08fa25019eed8fd8b7b3c47f178ff2 --- libs/rs/RenderScript.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libs/rs/RenderScript.h') 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 -- cgit v1.2.3-59-g8ed1b