commit 323471ec790df30330911f00c7eaed91fd5e68b0
author Robert Phillips <robertphillips@google.com> Mon Nov 11 11:33:37 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Nov 11 17:17:01 2019 +0000
tree a0df5c2c2f967a378cd576ff8890b6b87bdf0a19
parent ee5864a1700e4dd24e146e5f4fe404a3777f3772

Remove GrProgramDesc's need for the GrGpu

Although not strictly necessary, being able to compute the program key w/o needing access to the Gpu will give us more flexibility.

Bug: skia:9455
Change-Id: I0cd76d79a3008b69be18636be370e7aaa531bc65
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/247686
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/ops/GrQuadPerEdgeAA.cpp

diff --git a/src/gpu/ops/GrQuadPerEdgeAA.cpp b/src/gpu/ops/GrQuadPerEdgeAA.cpp
index f979d6b..86fe00f 100644
--- a/src/gpu/ops/GrQuadPerEdgeAA.cpp
+++ b/src/gpu/ops/GrQuadPerEdgeAA.cpp
@@ -293,11 +293,11 @@
     static sk_sp<GrGeometryProcessor> Make(const VertexSpec& vertexSpec, const GrShaderCaps& caps,
                                            const GrBackendFormat& backendFormat,
                                            const GrSamplerState& samplerState,
-                                           const GrSwizzle& swizzle, uint32_t extraSamplerKey,
+                                           const GrSwizzle& swizzle,
                                            sk_sp<GrColorSpaceXform> textureColorSpaceXform,
                                            Saturate saturate) {
         return sk_sp<QuadPerEdgeAAGeometryProcessor>(new QuadPerEdgeAAGeometryProcessor(
-                vertexSpec, caps, backendFormat, samplerState, swizzle, extraSamplerKey,
+                vertexSpec, caps, backendFormat, samplerState, swizzle,
                 std::move(textureColorSpaceXform), saturate));
     }
 
@@ -501,13 +501,12 @@
                                    const GrBackendFormat& backendFormat,
                                    const GrSamplerState& samplerState,
                                    const GrSwizzle& swizzle,
-                                   uint32_t extraSamplerKey,
                                    sk_sp<GrColorSpaceXform> textureColorSpaceXform,
                                    Saturate saturate)
             : INHERITED(kQuadPerEdgeAAGeometryProcessor_ClassID)
             , fSaturate(saturate)
             , fTextureColorSpaceXform(std::move(textureColorSpaceXform))
-            , fSampler(samplerState, backendFormat, swizzle, extraSamplerKey) {
+            , fSampler(samplerState, backendFormat, swizzle) {
         SkASSERT(spec.hasLocalCoords());
         this->initializeAttrs(spec);
         this->setTextureSamplerCnt(1);
@@ -590,12 +589,11 @@
 sk_sp<GrGeometryProcessor> MakeTexturedProcessor(const VertexSpec& spec, const GrShaderCaps& caps,
                                                  const GrBackendFormat& backendFormat,
                                                  const GrSamplerState& samplerState,
-                                                 const GrSwizzle& swizzle, uint32_t extraSamplerKey,
+                                                 const GrSwizzle& swizzle,
                                                  sk_sp<GrColorSpaceXform> textureColorSpaceXform,
                                                  Saturate saturate) {
     return QuadPerEdgeAAGeometryProcessor::Make(spec, caps, backendFormat, samplerState, swizzle,
-                                                extraSamplerKey, std::move(textureColorSpaceXform),
-                                                saturate);
+                                                std::move(textureColorSpaceXform), saturate);
 }
 
 } // namespace GrQuadPerEdgeAA