diff options
| author | Yang Ni <yangni@google.com> | 2015-02-14 18:00:59 -0800 |
|---|---|---|
| committer | Yang Ni <yangni@google.com> | 2015-02-15 20:10:40 +0000 |
| commit | b8353c5943f4038fd7f08db3d958390ce9418798 (patch) | |
| tree | 2cfac49d1f790e077f40dfc7ba42904ee5658f50 /rsProgramRaster.cpp | |
| parent | 1ce0dfd82311d4922dbffdde302599410fc25c5d (diff) | |
| download | rs-b8353c5943f4038fd7f08db3d958390ce9418798.tar.gz | |
Revert "Replaced android::Vector with std::vector."
b/19148482
This reverts commit 93d6bc872b7d9fba63abfa7513d56b38d9c3d371.
I also made some changes to Make it work with HEAD.
Change-Id: I5e516976ec1d85ffe1cf388c01795348a9441982
Diffstat (limited to 'rsProgramRaster.cpp')
| -rw-r--r-- | rsProgramRaster.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/rsProgramRaster.cpp b/rsProgramRaster.cpp index d47e588d..c9a24bf6 100644 --- a/rsProgramRaster.cpp +++ b/rsProgramRaster.cpp @@ -31,14 +31,10 @@ ProgramRaster::ProgramRaster(Context *rsc, bool pointSprite, RsCullMode cull) } void ProgramRaster::preDestroy() const { - auto &rasters = mRSC->mStateRaster.mRasterPrograms; - - for (auto prIter = rasters.begin(), endIter = rasters.end(); - prIter != endIter; prIter++) { - - if (this == *prIter) { - rasters.erase(prIter); - return; + for (uint32_t ct = 0; ct < mRSC->mStateRaster.mRasterPrograms.size(); ct++) { + if (mRSC->mStateRaster.mRasterPrograms[ct] == this) { + mRSC->mStateRaster.mRasterPrograms.removeAt(ct); + break; } } } @@ -98,7 +94,7 @@ ObjectBaseRef<ProgramRaster> ProgramRaster::getProgramRaster(Context *rsc, returnRef.set(pr); ObjectBase::asyncLock(); - rsc->mStateRaster.mRasterPrograms.push_back(pr); + rsc->mStateRaster.mRasterPrograms.push(pr); ObjectBase::asyncUnlock(); return returnRef; @@ -115,3 +111,4 @@ RsProgramRaster rsi_ProgramRasterCreate(Context * rsc, bool pointSprite, RsCullM } } + |