diff options
| -rw-r--r-- | src/gpu/GrBatchTest.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/batches/GrDrawAtlasBatch.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/gpu/GrBatchTest.cpp b/src/gpu/GrBatchTest.cpp index 1a19041fe5..420d61fbec 100644 --- a/src/gpu/GrBatchTest.cpp +++ b/src/gpu/GrBatchTest.cpp @@ -21,6 +21,7 @@ BATCH_TEST_EXTERN(DefaultPathBatch); BATCH_TEST_EXTERN(CircleBatch); BATCH_TEST_EXTERN(DIEllipseBatch); BATCH_TEST_EXTERN(EllipseBatch); +BATCH_TEST_EXTERN(GrDrawAtlasBatch); BATCH_TEST_EXTERN(GrStrokeRectBatch); BATCH_TEST_EXTERN(RRectBatch); BATCH_TEST_EXTERN(TesselatingPathBatch); @@ -38,6 +39,7 @@ static BatchTestFunc gTestBatches[] = { BATCH_TEST_ENTRY(CircleBatch), BATCH_TEST_ENTRY(DIEllipseBatch), BATCH_TEST_ENTRY(EllipseBatch), + BATCH_TEST_ENTRY(GrDrawAtlasBatch), BATCH_TEST_ENTRY(GrStrokeRectBatch), BATCH_TEST_ENTRY(RRectBatch), BATCH_TEST_ENTRY(TesselatingPathBatch), diff --git a/src/gpu/batches/GrDrawAtlasBatch.cpp b/src/gpu/batches/GrDrawAtlasBatch.cpp index 4291542102..3a71fcbc1b 100644 --- a/src/gpu/batches/GrDrawAtlasBatch.cpp +++ b/src/gpu/batches/GrDrawAtlasBatch.cpp @@ -19,7 +19,8 @@ void GrDrawAtlasBatch::initBatchTracker(const GrPipelineInfo& init) { // setup batch properties fColorIgnored = !init.readsColor(); fColor = fGeoData[0].fColor; - SkASSERT(init.readsLocalCoords()); + // We'd like to assert this, but we can't because of GLPrograms test + //SkASSERT(init.readsLocalCoords()); fCoverageIgnored = !init.readsCoverage(); } |