diff options
author | Tim Murray <timmurray@google.com> | 2013-03-20 16:54:03 -0700 |
---|---|---|
committer | Tim Murray <timmurray@google.com> | 2013-03-20 16:58:32 -0700 |
commit | 099bc262f862cdeb547cf8a78fe9e0e92560f437 (patch) | |
tree | 53ce151f307ea059e2677e014ae402106e98e4ce /rsType.cpp | |
parent | 962e720b3d1c27bcfec90374ff393584b99577b3 (diff) | |
download | rs-099bc262f862cdeb547cf8a78fe9e0e92560f437.tar.gz |
Start making RS 64-bit clean.
Change-Id: Ie40ad9a1d2b59094c86eb7e40b358e60120ce213
Diffstat (limited to 'rsType.cpp')
-rw-r--r-- | rsType.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -346,7 +346,7 @@ RsType rsi_TypeCreate(Context *rsc, RsElement _e, uint32_t dimX, } } -void rsaTypeGetNativeData(RsContext con, RsType type, uint32_t *typeData, uint32_t typeDataSize) { +void rsaTypeGetNativeData(RsContext con, RsType type, uintptr_t *typeData, uint32_t typeDataSize) { rsAssert(typeDataSize == 6); // Pack the data in the follofing way mHal.state.dimX; mHal.state.dimY; mHal.state.dimZ; // mHal.state.lodCount; mHal.state.faces; mElement; into typeData @@ -357,6 +357,6 @@ void rsaTypeGetNativeData(RsContext con, RsType type, uint32_t *typeData, uint32 (*typeData++) = t->getDimZ(); (*typeData++) = t->getDimLOD() ? 1 : 0; (*typeData++) = t->getDimFaces() ? 1 : 0; - (*typeData++) = (uint32_t)t->getElement(); + (*typeData++) = (uintptr_t)t->getElement(); t->getElement()->incUserRef(); } |