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/ops/GrAtlasTextOp.cpp

diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index c5d1d47..f621082 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -319,11 +319,11 @@
                                                               *target->caps().shaderCaps(),
                                                               views, numActiveViews);
     } else {
-        GrSamplerState samplerState = fNeedsGlyphTransform ? GrSamplerState::ClampBilerp()
-                                                           : GrSamplerState::ClampNearest();
-        flushInfo.fGeometryProcessor = GrBitmapTextGeoProc::Make(target->allocator(),
-            *target->caps().shaderCaps(), this->color(), false, views, numActiveViews,
-            samplerState, maskFormat, localMatrix, vmPerspective);
+        auto filter = fNeedsGlyphTransform ? GrSamplerState::Filter::kBilerp
+                                           : GrSamplerState::Filter::kNearest;
+        flushInfo.fGeometryProcessor = GrBitmapTextGeoProc::Make(
+                target->allocator(), *target->caps().shaderCaps(), this->color(), false, views,
+                numActiveViews, filter, maskFormat, localMatrix, vmPerspective);
     }
 
     size_t vertexStride = flushInfo.fGeometryProcessor->vertexStride();
@@ -454,16 +454,15 @@
         if (this->usesDistanceFields()) {
             if (this->isLCD()) {
                 reinterpret_cast<GrDistanceFieldLCDTextGeoProc*>(gp)->addNewViews(
-                    views, numActiveViews, GrSamplerState::ClampBilerp());
+                        views, numActiveViews, GrSamplerState::Filter::kBilerp);
             } else {
                 reinterpret_cast<GrDistanceFieldA8TextGeoProc*>(gp)->addNewViews(
-                    views, numActiveViews, GrSamplerState::ClampBilerp());
+                        views, numActiveViews, GrSamplerState::Filter::kBilerp);
             }
         } else {
-            GrSamplerState samplerState = fNeedsGlyphTransform ? GrSamplerState::ClampBilerp()
-                                                               : GrSamplerState::ClampNearest();
-            reinterpret_cast<GrBitmapTextGeoProc*>(gp)->addNewViews(views, numActiveViews,
-                                                                      samplerState);
+            auto filter = fNeedsGlyphTransform ? GrSamplerState::Filter::kBilerp
+                                               : GrSamplerState::Filter::kNearest;
+            reinterpret_cast<GrBitmapTextGeoProc*>(gp)->addNewViews(views, numActiveViews, filter);
         }
     }
     int maxGlyphsPerDraw = static_cast<int>(flushInfo->fIndexBuffer->size() / sizeof(uint16_t) / 6);
@@ -578,7 +577,7 @@
                 GrDistanceFieldLCDTextGeoProc::DistanceAdjust::Make(
                         redCorrection, greenCorrection, blueCorrection);
         return GrDistanceFieldLCDTextGeoProc::Make(arena, caps, views, numActiveViews,
-                                                   GrSamplerState::ClampBilerp(), widthAdjust,
+                                                   GrSamplerState::Filter::kBilerp, widthAdjust,
                                                    fDFGPFlags, localMatrix);
     } else {
 #ifdef SK_GAMMA_APPLY_TO_A8
@@ -590,11 +589,11 @@
                                                              fUseGammaCorrectDistanceTable);
         }
         return GrDistanceFieldA8TextGeoProc::Make(arena, caps, views, numActiveViews,
-                                                  GrSamplerState::ClampBilerp(),
-                                                  correction, fDFGPFlags, localMatrix);
+                                                  GrSamplerState::Filter::kBilerp, correction,
+                                                  fDFGPFlags, localMatrix);
 #else
         return GrDistanceFieldA8TextGeoProc::Make(arena, caps, views, numActiveViews,
-                                                  GrSamplerState::ClampBilerp(),
+                                                  GrSamplerState::Filter::kBilerp,
                                                   fDFGPFlags, localMatrix);
 #endif
     }