diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-12-09 14:06:38 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-09 19:56:24 +0000 |
| commit | 3944484020d98ff8f386378296106c321279482b (patch) | |
| tree | a77a4a189b715cc544656929d3d3d71be3aca622 /tests/PrimitiveProcessorTest.cpp | |
| parent | d263413a2a92cafe3fd3b051c67d00206c9a0e4d (diff) | |
Reland "Remove antialiasing control from GrPaint."
This contains fixes for GLPrograms test and mixed samples rendering.
This reverts commit 419d81eed4a010e6080db199795117cbedf9e6e4.
BUG=skia:
Change-Id: If8f002fbfaaaab6d1607403f2b15ccc7f1e17e87
Reviewed-on: https://skia-review.googlesource.com/5763
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests/PrimitiveProcessorTest.cpp')
| -rw-r--r-- | tests/PrimitiveProcessorTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp index 816b4e45a2..17ce369580 100644 --- a/tests/PrimitiveProcessorTest.cpp +++ b/tests/PrimitiveProcessorTest.cpp @@ -127,7 +127,7 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(VertexAttributeCount, reporter, ctxInfo) { GrPaint grPaint; // This one should succeed. batch.reset(new Batch(attribCnt)); - renderTargetContext->priv().testingOnly_drawBatch(grPaint, batch.get()); + renderTargetContext->priv().testingOnly_drawBatch(grPaint, GrAAType::kNone, batch.get()); context->flush(); #if GR_GPU_STATS REPORTER_ASSERT(reporter, context->getGpu()->stats()->numDraws() == 1); @@ -136,7 +136,7 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(VertexAttributeCount, reporter, ctxInfo) { context->resetGpuStats(); // This one should fail. batch.reset(new Batch(attribCnt+1)); - renderTargetContext->priv().testingOnly_drawBatch(grPaint, batch.get()); + renderTargetContext->priv().testingOnly_drawBatch(grPaint, GrAAType::kNone, batch.get()); context->flush(); #if GR_GPU_STATS REPORTER_ASSERT(reporter, context->getGpu()->stats()->numDraws() == 0); |