commit e69b9efcb347b8a7aa1c7d05fe4d2ff80b1c3184
author Brian Salomon <bsalomon@google.com> Wed Jul 22 11:18:06 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jul 22 16:05:05 2020 +0000
tree 45200a1dedecaa01671842903406c8edb04fbbdd
parent 40ad5fd50a2663e62385a4d89eec90ce78ab1416

Separate MIP filtering from min/mag filtering.

Does not add kNearest as a mip map mode yet.

Bug: skia:10344

Change-Id: Ida80cbf19e2b1eed5209d0680837fb45e54b4261
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/303481
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

tests/RectangleTextureTest.cpp

diff --git a/tests/RectangleTextureTest.cpp b/tests/RectangleTextureTest.cpp
index 6798b81..6510573 100644
--- a/tests/RectangleTextureTest.cpp
+++ b/tests/RectangleTextureTest.cpp
@@ -28,17 +28,17 @@
                                    SkAlphaType alphaType, uint32_t expectedPixelValues[]) {
     auto rtContext = GrRenderTargetContext::Make(
             context, colorType, nullptr, SkBackingFit::kExact, rectView.proxy()->dimensions());
-    for (auto filter : {GrSamplerState::Filter::kNearest,
-                        GrSamplerState::Filter::kLinear,
-                        GrSamplerState::Filter::kMipMap}) {
-        rtContext->clear(SkPMColor4f::FromBytes_RGBA(0xDDCCBBAA));
-        auto fp = GrTextureEffect::Make(rectView, alphaType, SkMatrix::I(), filter);
-        GrPaint paint;
-        paint.setPorterDuffXPFactory(SkBlendMode::kSrc);
-        paint.setColorFragmentProcessor(std::move(fp));
-        rtContext->drawPaint(nullptr, std::move(paint), SkMatrix::I());
-        TestReadPixels(reporter, rtContext.get(), expectedPixelValues,
-                       "RectangleTexture-basic-draw");
+    for (auto filter : {GrSamplerState::Filter::kNearest, GrSamplerState::Filter::kLinear}) {
+        for (auto mm : {GrSamplerState::MipmapMode::kNone, GrSamplerState::MipmapMode::kLinear}) {
+            rtContext->clear(SkPMColor4f::FromBytes_RGBA(0xDDCCBBAA));
+            auto fp = GrTextureEffect::Make(rectView, alphaType, SkMatrix::I(), filter, mm);
+            GrPaint paint;
+            paint.setPorterDuffXPFactory(SkBlendMode::kSrc);
+            paint.setColorFragmentProcessor(std::move(fp));
+            rtContext->drawPaint(nullptr, std::move(paint), SkMatrix::I());
+            TestReadPixels(reporter, rtContext.get(), expectedPixelValues,
+                           "RectangleTexture-basic-draw");
+        }
     }
 }