commit 8ca93e7c733ab064c8a9e03715ac405ae739cf51
author joshualitt <joshualitt@chromium.org> Wed Jul 08 06:51:43 2015 -0700
committer Commit bot <commit-bot@chromium.org> Wed Jul 08 06:51:43 2015 -0700
tree 5423fe8631957bf363453c8c5f7ce3e19a6e51e4
parent 2f19b551ac10b96a1a35a147063cd4300d6fe07a

Initial CL to create dummy GrShaderDataManager and thread it through

TBR=bsalomon@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/1225673007

src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
index 3f511ed..357e39c 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
@@ -11,6 +11,7 @@
 #include "SkTwoPointConicalGradient.h"
 
 #if SK_SUPPORT_GPU
+#include "GrPaint.h"
 #include "gl/builders/GrGLProgramBuilder.h"
 // For brevity
 typedef GrGLProgramDataManager::UniformHandle UniformHandle;
@@ -216,9 +217,10 @@
     SkPaint paint;
     GrFragmentProcessor* fp;
     GrColor paintColor;
+    GrPaint grPaint;
     SkAssertResult(shader->asFragmentProcessor(context, paint,
                                                GrTest::TestMatrix(random), NULL,
-                                               &paintColor, &fp));
+                                               &paintColor, grPaint.getShaderDataManager(), &fp));
     return fp;
 }
 
@@ -502,10 +504,11 @@
     SkPaint paint;
     GrFragmentProcessor* effect;
     GrColor paintColor;
-
+    GrPaint grPaint;
     SkAssertResult(shader->asFragmentProcessor(context, paint,
                                                GrTest::TestMatrix(random), NULL,
-                                               &paintColor, &effect));
+                                               &paintColor, grPaint.getShaderDataManager(),
+                                               &effect));
     return effect;
 }
 
@@ -723,9 +726,10 @@
     SkPaint paint;
     GrColor paintColor;
     GrFragmentProcessor* fp;
+    GrPaint grPaint;
     SkAssertResult(shader->asFragmentProcessor(context, paint,
                                                GrTest::TestMatrix(random), NULL,
-                                               &paintColor, &fp));
+                                               &paintColor, grPaint.getShaderDataManager(), &fp));
     return fp;
 }
 
@@ -977,11 +981,12 @@
                                                                           tm));
     SkPaint paint;
     GrColor paintColor;
-    GrFragmentProcessor* processor;
+    GrFragmentProcessor* fp;
+    GrPaint grPaint;
     SkAssertResult(shader->asFragmentProcessor(context, paint,
                                                GrTest::TestMatrix(random), NULL,
-                                               &paintColor, &processor));
-    return processor;
+                                               &paintColor, grPaint.getShaderDataManager(), &fp));
+    return fp;
 }
 
 GLCircleInside2PtConicalEffect::GLCircleInside2PtConicalEffect(const GrProcessor& processor)
@@ -1217,12 +1222,12 @@
                                                                           tm));
     SkPaint paint;
     GrColor paintColor;
-    GrFragmentProcessor* processor;
-
+    GrFragmentProcessor* fp;
+    GrPaint grPaint;
     SkAssertResult(shader->asFragmentProcessor(context, paint,
                                                GrTest::TestMatrix(random), NULL,
-                                               &paintColor, &processor));
-    return processor;
+                                               &paintColor, grPaint.getShaderDataManager(), &fp));
+    return fp;
 }
 
 GLCircleOutside2PtConicalEffect::GLCircleOutside2PtConicalEffect(const GrProcessor& processor)