diff options
author | Stephen Hines <srhines@google.com> | 2012-03-12 14:45:32 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-12 14:45:32 -0700 |
commit | 3c4b03d48461928f007efff9da35c5197313fbac (patch) | |
tree | e5b7e54c9be21daaf9e51e76c7f79d87d87637d3 /libs/rs | |
parent | dd4a464741a1f674e7e5f04c1694912810855719 (diff) | |
parent | d091526841d7eabd6fc73124b572c94bb47f177c (diff) | |
download | frameworks_base-3c4b03d48461928f007efff9da35c5197313fbac.zip frameworks_base-3c4b03d48461928f007efff9da35c5197313fbac.tar.gz frameworks_base-3c4b03d48461928f007efff9da35c5197313fbac.tar.bz2 |
Merge "Fix argument passing with dimLOD."
Diffstat (limited to 'libs/rs')
-rw-r--r-- | libs/rs/rsType.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/rs/rsType.cpp b/libs/rs/rsType.cpp index 9ac553e..b668a78 100644 --- a/libs/rs/rsType.cpp +++ b/libs/rs/rsType.cpp @@ -257,14 +257,14 @@ ObjectBaseRef<Type> Type::getTypeRef(Context *rsc, const Element *e, ObjectBaseRef<Type> Type::cloneAndResize1D(Context *rsc, uint32_t dimX) const { return getTypeRef(rsc, mElement.get(), dimX, - mHal.state.dimY, mHal.state.dimZ, mHal.state.lodCount, mHal.state.faces); + getDimY(), getDimZ(), getDimLOD(), getDimFaces()); } ObjectBaseRef<Type> Type::cloneAndResize2D(Context *rsc, uint32_t dimX, uint32_t dimY) const { return getTypeRef(rsc, mElement.get(), dimX, dimY, - mHal.state.dimZ, mHal.state.lodCount, mHal.state.faces); + getDimZ(), getDimLOD(), getDimFaces()); } |