AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Clean up GrDrawOpAtlas"

Browse Source 
This reverts commit 9d57afd93e.

Reason for revert: Chrome

Original change's description:
> Clean up GrDrawOpAtlas
> 
> Change-Id: I18dea851fa950231c4106e2e049e74a678a03df2
> Reviewed-on: https://skia-review.googlesource.com/110380
> Reviewed-by: Jim Van Verth <jvanverth@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>

TBR=jvanverth@google.com,robertphillips@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: Ibf879c12e5074d8c4a4ec8563cfdd7ed0afb6aec
Reviewed-on: https://skia-review.googlesource.com/111041
Reviewed-by: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Robert Phillips 2018-02-28 16:40:18 +00:00
parent 5c56af1790
commit 3bd55bd59a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gpu/GrDrawOpAtlas.cpp
View File

@ -303,7 +303,7 @@ bool GrDrawOpAtlas::addToAtlas(GrResourceProvider* resourceProvider,
// Try to find a plot that we can perform an inline upload to. // Try to find a plot that we can perform an inline upload to.
// We prioritize this upload in reverse order of pages to counterbalance the order above. // We prioritize this upload in reverse order of pages to counterbalance the order above.
Plot* plot = nullptr; Plot* plot = nullptr;
for (int pageIdx = ((int)fNumActivePages)-1; pageIdx >= 0; --pageIdx) { for (int pageIdx = (int)(fNumActivePages-1); pageIdx >= 0; --pageIdx) {
Plot* currentPlot = fPages[pageIdx].fPlotList.tail(); Plot* currentPlot = fPages[pageIdx].fPlotList.tail();
if (currentPlot->lastUseToken() != target->tokenTracker()->nextDrawToken()) { if (currentPlot->lastUseToken() != target->tokenTracker()->nextDrawToken()) {
plot = currentPlot; plot = currentPlot;
@ -565,8 +565,8 @@ inline void GrDrawOpAtlas::deactivateLastPage() {
int numPlotsY = fTextureHeight/fPlotHeight; int numPlotsY = fTextureHeight/fPlotHeight;
fPages[lastPageIndex].fPlotList.reset(); fPages[lastPageIndex].fPlotList.reset();
for (int r = 0; r < numPlotsY; ++r) { for (int y = numPlotsY - 1, r = 0; y >= 0; --y, ++r) {
for (int c = 0; c < numPlotsX; ++c) { for (int x = numPlotsX - 1, c = 0; x >= 0; --x, ++c) {
uint32_t plotIndex = r * numPlotsX + c; uint32_t plotIndex = r * numPlotsX + c;
Plot* currPlot = fPages[lastPageIndex].fPlotArray[plotIndex].get(); Plot* currPlot = fPages[lastPageIndex].fPlotArray[plotIndex].get();