commit ccb6142956ad256df1bc725e7a9187b114b4e51d
author Brian Salomon <bsalomon@google.com> Thu Jan 09 10:46:36 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jan 09 17:29:54 2020 +0000
tree 148562504e1f803af184c9845dc550cd2033fe86
parent a88cab1ad9f2df77203de01756bc0b26f3648fee

Allow implicit conversion from GrSamplerState::Filter to GrSamplerState

constexprify GrSamplerState

pass/return GrSamplerState by value (it's 3 bytes).

Remove unused function from GrTexturePriv

Change-Id: Iffecd941500acf5653f01cc88b42ff1d45678b54
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/263346
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/SkGpuDevice_drawTexture.cpp

diff --git a/src/gpu/SkGpuDevice_drawTexture.cpp b/src/gpu/SkGpuDevice_drawTexture.cpp
index fc32c27..23a4467 100644
--- a/src/gpu/SkGpuDevice_drawTexture.cpp
+++ b/src/gpu/SkGpuDevice_drawTexture.cpp
@@ -241,7 +241,7 @@
     if (attemptDrawTexture && can_use_draw_texture(paint)) {
         // We've done enough checks above to allow us to pass ClampNearest() and not check for
         // scaling adjustments.
-        auto proxy = producer->refTextureProxyForParams(GrSamplerState::ClampNearest(), nullptr);
+        auto proxy = producer->refTextureProxyForParams(GrSamplerState::Filter::kNearest, nullptr);
         if (!proxy) {
             return;
         }
@@ -529,7 +529,7 @@
             uint32_t uniqueID;
             proxy = image->refPinnedTextureProxy(this->context(), &uniqueID);
             if (!proxy) {
-                proxy = image->asTextureProxyRef(this->context(), GrSamplerState::ClampBilerp(),
+                proxy = image->asTextureProxyRef(this->context(), GrSamplerState::Filter::kBilerp,
                                                  nullptr);
             }
         }