diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-12-09 15:10:07 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-09 20:43:41 +0000 |
| commit | 0e8fc8b9e6a138cf4a66b421fb824679df717329 (patch) | |
| tree | 9db412fc2ea22314336f3680249e905c4984902c /tests/SRGBMipMapTest.cpp | |
| parent | 385836d3d764303cc37c4d1bcc0ab890d209374e (diff) | |
Relandx2 "Remove antialiasing control from GrPaint."
Fixes a bad merge.
This reverts commit 073285c0595d46205d1482cc19af2d7d891bfeae.
Change-Id: I5e92339d9b33d3a6dc58b9fcd2a1b3a5684e8f8a
Reviewed-on: https://skia-review.googlesource.com/5774
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tests/SRGBMipMapTest.cpp')
| -rw-r--r-- | tests/SRGBMipMapTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/SRGBMipMapTest.cpp b/tests/SRGBMipMapTest.cpp index b963aaff4b..afe81678f2 100644 --- a/tests/SRGBMipMapTest.cpp +++ b/tests/SRGBMipMapTest.cpp @@ -136,13 +136,13 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(SRGBMipMaps, reporter, ctxInfo) { // 1) Draw texture to S32 surface (should generate/use sRGB mips) paint.setGammaCorrect(true); - s32RenderTargetContext->drawRect(noClip, paint, SkMatrix::I(), rect); + s32RenderTargetContext->drawRect(noClip, paint, GrAA::kNo, SkMatrix::I(), rect); read_and_check_pixels(reporter, s32RenderTargetContext->asTexture().get(), expectedSRGB, error, "first render of sRGB"); // 2) Draw texture to L32 surface (should generate/use linear mips) paint.setGammaCorrect(false); - l32RenderTargetContext->drawRect(noClip, paint, SkMatrix::I(), rect); + l32RenderTargetContext->drawRect(noClip, paint, GrAA::kNo, SkMatrix::I(), rect); // Right now, this test only runs on GL (because Vulkan doesn't support legacy mip-mapping // skbug.com/5048). On GL, we may not have sRGB decode support. In that case, rendering sRGB @@ -162,7 +162,7 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(SRGBMipMaps, reporter, ctxInfo) { // 3) Go back to sRGB paint.setGammaCorrect(true); - s32RenderTargetContext->drawRect(noClip, paint, SkMatrix::I(), rect); + s32RenderTargetContext->drawRect(noClip, paint, GrAA::kNo, SkMatrix::I(), rect); read_and_check_pixels(reporter, s32RenderTargetContext->asTexture().get(), expectedSRGB, error, "re-render as sRGB"); } |