commit f0aee749bfed7a6ac54f696aa4abc8d9901e1874
author Brian Osman <brianosman@google.com> Thu Mar 12 09:28:44 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Mar 12 13:59:40 2020 +0000
tree e8d6bace6fe1518484e6718c39a13fb189f704d0
parent 9b449b73d3679816df860de1e902419d8bc9715d

Remove (unused) shader caps from default GP factory functions

Change-Id: Id3313169be2fecfb8a11045f08a55490fbec9b9e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/276486
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/GrDefaultGeoProcFactory.cpp

diff --git a/src/gpu/GrDefaultGeoProcFactory.cpp b/src/gpu/GrDefaultGeoProcFactory.cpp
index 03b3cdf..8840abe 100644
--- a/src/gpu/GrDefaultGeoProcFactory.cpp
+++ b/src/gpu/GrDefaultGeoProcFactory.cpp
@@ -36,7 +36,6 @@
 class DefaultGeoProc : public GrGeometryProcessor {
 public:
     static GrGeometryProcessor* Make(SkArenaAlloc* arena,
-                                     const GrShaderCaps* shaderCaps,
                                      uint32_t gpTypeFlags,
                                      const SkPMColor4f& color,
                                      sk_sp<GrColorSpaceXform> colorSpaceXform,
@@ -44,9 +43,9 @@
                                      const SkMatrix& localMatrix,
                                      bool localCoordsWillBeRead,
                                      uint8_t coverage) {
-        return arena->make<DefaultGeoProc>(shaderCaps, gpTypeFlags, color,
-                                           std::move(colorSpaceXform), viewMatrix, localMatrix,
-                                           coverage, localCoordsWillBeRead);
+        return arena->make<DefaultGeoProc>(gpTypeFlags, color, std::move(colorSpaceXform),
+                                           viewMatrix, localMatrix, coverage,
+                                           localCoordsWillBeRead);
     }
 
     const char* name() const override { return "DefaultGeometryProcessor"; }
@@ -230,8 +229,7 @@
 private:
     friend class ::SkArenaAlloc; // for access to ctor
 
-    DefaultGeoProc(const GrShaderCaps* shaderCaps,
-                   uint32_t gpTypeFlags,
+    DefaultGeoProc(uint32_t gpTypeFlags,
                    const SkPMColor4f& color,
                    sk_sp<GrColorSpaceXform> colorSpaceXform,
                    const SkMatrix& viewMatrix,
@@ -302,7 +300,7 @@
         flags |= kLocalCoordAttribute_GPFlag;
     }
 
-    return DefaultGeoProc::Make(d->allocator(), d->caps()->shaderCaps(),
+    return DefaultGeoProc::Make(d->allocator(),
                                 flags,
                                 SkPMColor4f::FromBytes_RGBA(GrRandomColor(d->fRandom)),
                                 GrTest::TestColorXform(d->fRandom),
@@ -314,7 +312,6 @@
 #endif
 
 GrGeometryProcessor* GrDefaultGeoProcFactory::Make(SkArenaAlloc* arena,
-                                                   const GrShaderCaps* shaderCaps,
                                                    const Color& color,
                                                    const Coverage& coverage,
                                                    const LocalCoords& localCoords,
@@ -338,7 +335,6 @@
     bool localCoordsWillBeRead = localCoords.fType != LocalCoords::kUnused_Type;
 
     return DefaultGeoProc::Make(arena,
-                                shaderCaps,
                                 flags,
                                 color.fColor,
                                 color.fColorSpaceXform,
@@ -349,7 +345,6 @@
 }
 
 GrGeometryProcessor* GrDefaultGeoProcFactory::MakeForDeviceSpace(SkArenaAlloc* arena,
-                                                                 const GrShaderCaps* shaderCaps,
                                                                  const Color& color,
                                                                  const Coverage& coverage,
                                                                  const LocalCoords& localCoords,
@@ -367,5 +362,5 @@
     }
 
     LocalCoords inverted(LocalCoords::kUsePosition_Type, &invert);
-    return Make(arena, shaderCaps, color, coverage, inverted, SkMatrix::I());
+    return Make(arena, color, coverage, inverted, SkMatrix::I());
 }