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>

src/gpu/GrProgramInfo.cpp

diff --git a/src/gpu/GrProgramInfo.cpp b/src/gpu/GrProgramInfo.cpp
index 2c9d91f..1e57d4f 100644
--- a/src/gpu/GrProgramInfo.cpp
+++ b/src/gpu/GrProgramInfo.cpp
@@ -43,7 +43,7 @@
         SkASSERT(tex);
 
         // Ensure mipmaps were all resolved ahead of time by the DAG.
-        if (GrSamplerState::Filter::kMipMap == te.samplerState().filter() &&
+        if (te.samplerState().mipmapped() == GrMipmapped::kYes &&
             (tex->width() != 1 || tex->height() != 1)) {
             // There are some cases where we might be given a non-mipmapped texture with a
             // mipmap filter. See skbug.com/7094.