commit 2bbdcc44c63974f29f3743bb58d929601a3f65c6
author Brian Salomon <bsalomon@google.com> Thu Sep 07 12:36:34 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Sep 07 16:58:31 2017 +0000
tree d420f298f606b061054e56866d1930ab84f00ed5
parent 4df0092eac6e9bb5afc516773a0c618630193dc6

Rework GrSamplerParams to be more compact and use its own wrap mode enum.

The main change is to make GrSamplerParams smaller by making its enums have byte-sized underlying types. The rest is cosmetic.

Change-Id: Ib71ea50612d24619a85e463826c6b8dfb9b445e3
Reviewed-on: https://skia-review.googlesource.com/43200
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/effects/GrTextureDomain.cpp

diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp
index 5101762..3bb96b2 100644
--- a/src/gpu/effects/GrTextureDomain.cpp
+++ b/src/gpu/effects/GrTextureDomain.cpp
@@ -212,7 +212,7 @@
         const SkMatrix& matrix,
         const SkRect& domain,
         GrTextureDomain::Mode mode,
-        GrSamplerParams::FilterMode filterMode) {
+        GrSamplerState::Filter filterMode) {
     if (GrTextureDomain::kIgnore_Mode == mode ||
         (GrTextureDomain::kClamp_Mode == mode && can_ignore_rect(proxy.get(), domain))) {
         return GrSimpleTextureEffect::Make(std::move(proxy),
@@ -228,14 +228,14 @@
                                              const SkMatrix& matrix,
                                              const SkRect& domain,
                                              GrTextureDomain::Mode mode,
-                                             GrSamplerParams::FilterMode filterMode)
+                                             GrSamplerState::Filter filterMode)
         : INHERITED(OptFlags(proxy->config(), mode))
         , fCoordTransform(matrix, proxy.get())
         , fTextureDomain(proxy.get(), domain, mode)
         , fTextureSampler(std::move(proxy), filterMode)
         , fColorSpaceXform(std::move(colorSpaceXform)) {
     SkASSERT(mode != GrTextureDomain::kRepeat_Mode ||
-             filterMode == GrSamplerParams::kNone_FilterMode);
+             filterMode == GrSamplerState::Filter::kNearest);
     this->initClassID<GrTextureDomainEffect>();
     this->addCoordTransform(&fCoordTransform);
     this->addTextureSampler(&fTextureSampler);
@@ -325,13 +325,13 @@
     const SkMatrix& matrix = GrTest::TestMatrix(d->fRandom);
     bool bilerp = mode != GrTextureDomain::kRepeat_Mode ? d->fRandom->nextBool() : false;
     sk_sp<GrColorSpaceXform> colorSpaceXform = GrTest::TestColorXform(d->fRandom);
-    return GrTextureDomainEffect::Make(std::move(proxy),
-                                       std::move(colorSpaceXform),
-                                       matrix,
-                                       domain,
-                                       mode,
-                                       bilerp ? GrSamplerParams::kBilerp_FilterMode
-                                              : GrSamplerParams::kNone_FilterMode);
+    return GrTextureDomainEffect::Make(
+            std::move(proxy),
+            std::move(colorSpaceXform),
+            matrix,
+            domain,
+            mode,
+            bilerp ? GrSamplerState::Filter::kBilerp : GrSamplerState::Filter::kNearest);
 }
 #endif
 
@@ -343,11 +343,9 @@
 }
 
 GrDeviceSpaceTextureDecalFragmentProcessor::GrDeviceSpaceTextureDecalFragmentProcessor(
-                    sk_sp<GrTextureProxy> proxy,
-                    const SkIRect& subset,
-                    const SkIPoint& deviceSpaceOffset)
+        sk_sp<GrTextureProxy> proxy, const SkIRect& subset, const SkIPoint& deviceSpaceOffset)
         : INHERITED(kCompatibleWithCoverageAsAlpha_OptimizationFlag)
-        , fTextureSampler(proxy, GrSamplerParams::ClampNoFilter())
+        , fTextureSampler(proxy, GrSamplerState::ClampNearest())
         , fTextureDomain(proxy.get(), GrTextureDomain::MakeTexelDomain(subset),
                          GrTextureDomain::kDecal_Mode) {
     this->addTextureSampler(&fTextureSampler);