| Index: src/gpu/GrRectanizer_fifo.cpp
|
| diff --git a/src/gpu/GrRectanizer_fifo.cpp b/src/gpu/GrRectanizer_fifo.cpp
|
| index b6ef1d9a8837032f453fafa6b83714617e8766ba..0c36f49bf6494c7406384922b4123ed0defe3cdd 100644
|
| --- a/src/gpu/GrRectanizer_fifo.cpp
|
| +++ b/src/gpu/GrRectanizer_fifo.cpp
|
| @@ -47,7 +47,7 @@ public:
|
| Row fRows[16];
|
|
|
| static int HeightToRowIndex(int height) {
|
| - GrAssert(height >= MIN_HEIGHT_POW2);
|
| + SkASSERT(height >= MIN_HEIGHT_POW2);
|
| return 32 - Gr_clz(height - 1);
|
| }
|
|
|
| @@ -84,7 +84,7 @@ bool GrRectanizerFIFO::addRect(int width, int height, GrIPoint16* loc) {
|
| }
|
|
|
| Row* row = &fRows[HeightToRowIndex(height)];
|
| - GrAssert(row->fRowHeight == 0 || row->fRowHeight == height);
|
| + SkASSERT(row->fRowHeight == 0 || row->fRowHeight == height);
|
|
|
| if (0 == row->fRowHeight) {
|
| if (!this->canAddStrip(height)) {
|
| @@ -102,14 +102,14 @@ bool GrRectanizerFIFO::addRect(int width, int height, GrIPoint16* loc) {
|
| }
|
| }
|
|
|
| - GrAssert(row->fRowHeight == height);
|
| - GrAssert(row->canAddWidth(width, this->width()));
|
| + SkASSERT(row->fRowHeight == height);
|
| + SkASSERT(row->canAddWidth(width, this->width()));
|
| *loc = row->fLoc;
|
| row->fLoc.fX += width;
|
|
|
| - GrAssert(row->fLoc.fX <= this->width());
|
| - GrAssert(row->fLoc.fY <= this->height());
|
| - GrAssert(fNextStripY <= this->height());
|
| + SkASSERT(row->fLoc.fX <= this->width());
|
| + SkASSERT(row->fLoc.fY <= this->height());
|
| + SkASSERT(fNextStripY <= this->height());
|
| fAreaSoFar += area;
|
| return true;
|
| }
|
|
|