Fix FPs

The generated FPs have been broken for a while

Change-Id: I32bcb3f8c5510049f65a44e226fa78149e01587f
Reviewed-on: https://skia-review.googlesource.com/94901
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/effects/GrCircleBlurFragmentProcessor.cpp

@@ -227,9 +227,8 @@ static sk_sp<GrTextureProxy> create_profile_texture(GrProxyProvider* proxyProvid
                     create_circle_profile(sigma * scale, circleR * scale, kProfileTextureWidth));
         }
 
-        // This will be an exact match texture
+        blurProfile =
-        blurProfile = proxyProvider->createTextureProxy(texDesc, SkBudgeted::kYes,
+                proxyProvider->createTextureProxy(texDesc, SkBudgeted::kYes, profile.get(), 0);
-                                                        profile.get(), 0);
         if (!blurProfile) {
             return nullptr;
         }

src/effects/GrCircleBlurFragmentProcessor.fp

@@ -242,8 +242,8 @@ uniform half4 circleData;
                                                     kProfileTextureWidth));
             }
 
-            blurProfile = GrSurfaceProxy::MakeDeferred(proxyProvider,
+            blurProfile = proxyProvider->createTextureProxy(texDesc, SkBudgeted::kYes,
-                                                       texDesc, SkBudgeted::kYes, profile.get(), 0);
+                                                            profile.get(), 0);
             if (!blurProfile) {
                 return nullptr;
             }

src/gpu/effects/GrConfigConversionEffect.fp

@@ -2,6 +2,7 @@
     #include "GrClip.h"
     #include "GrContext.h"
     #include "GrContextPriv.h"
+    #include "GrProxyProvider.h"
     #include "GrRenderTargetContext.h"
 }
 
@@ -49,8 +50,8 @@
 
         GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
 
-        sk_sp<GrTextureProxy> dataProxy = GrSurfaceProxy::MakeDeferred(proxyProvider, desc,
+        sk_sp<GrTextureProxy> dataProxy = proxyProvider->createTextureProxy(desc, SkBudgeted::kYes,
-                                                                       SkBudgeted::kYes, data, 0);
+                                                                            data, 0);
         if (!dataProxy) {
             return false;
         }

src/gpu/effects/GrConfigConversionEffect.h

@@ -61,8 +61,8 @@ public:
 
         GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
 
-        sk_sp<GrTextureProxy> dataProxy = proxyProvider->createTextureProxy(desc, SkBudgeted::kYes,
+        sk_sp<GrTextureProxy> dataProxy =
-                                                                            data, 0);
+                proxyProvider->createTextureProxy(desc, SkBudgeted::kYes, data, 0);
         if (!dataProxy) {
             return false;
         }

src/gpu/effects/GrRectBlurEffect.fp

@@ -53,8 +53,8 @@ uniform half profileSize;
 
             std::unique_ptr<uint8_t[]> profile(SkBlurMask::ComputeBlurProfile(sigma));
 
-            blurProfile = GrSurfaceProxy::MakeDeferred(proxyProvider,
+            blurProfile = proxyProvider->createTextureProxy(texDesc, SkBudgeted::kYes,
-                                                       texDesc, SkBudgeted::kYes, profile.get(), 0);
+                                                            profile.get(), 0);
             if (!blurProfile) {
                 return nullptr;
             }

src/gpu/effects/GrRectBlurEffect.h

@@ -40,8 +40,8 @@ public:
 
             std::unique_ptr<uint8_t[]> profile(SkBlurMask::ComputeBlurProfile(sigma));
 
-            blurProfile = proxyProvider->createTextureProxy(texDesc, SkBudgeted::kYes,
+            blurProfile =
-                                                            profile.get(), 0);
+                    proxyProvider->createTextureProxy(texDesc, SkBudgeted::kYes, profile.get(), 0);
             if (!blurProfile) {
                 return nullptr;
             }

src/sksl/sksl_enums.include

@@ -1,35 +1,35 @@
-R"(/*
+R"(/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google Inc.
- *
+ *
- * Use of this source code is governed by a BSD-style license that can be
+ * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
+ * found in the LICENSE file.
- */
+ */
-
+
-
+
-/*************************************************************************************************/
+/*************************************************************************************************/
-/* This file is used from both C++ and SkSL, so we need to stick to syntax compatible with both. */
+/* This file is used from both C++ and SkSL, so we need to stick to syntax compatible with both. */
-/*************************************************************************************************/
+/*************************************************************************************************/
-
+
-/**
+/**
- * We have coverage effects that clip rendering to the edge of some geometric primitive.
+ * We have coverage effects that clip rendering to the edge of some geometric primitive.
- * This enum specifies how that clipping is performed. Not all factories that take a
+ * This enum specifies how that clipping is performed. Not all factories that take a
- * GrProcessorEdgeType will succeed with all values and it is up to the caller to check for
+ * GrProcessorEdgeType will succeed with all values and it is up to the caller to check for
- * a NULL return.
+ * a NULL return.
- */
+ */
-enum class GrClipEdgeType {
+enum class GrClipEdgeType {
-    kFillBW,
+    kFillBW,
-    kFillAA,
+    kFillAA,
-    kInverseFillBW,
+    kInverseFillBW,
-    kInverseFillAA,
+    kInverseFillAA,
-    kHairlineAA,
+    kHairlineAA,
-
+
-    kLast = kHairlineAA
+    kLast = kHairlineAA
-};
+};
-
+
-enum class PMConversion {
+enum class PMConversion {
-    kToPremul        = 0,
+    kToPremul        = 0,
-    kToUnpremul      = 1,
+    kToUnpremul      = 1,
-    kPMConversionCnt = 2
+    kPMConversionCnt = 2
-};
+};
-
+
-)"
+)"