Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1114)

Unified Diff: src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

Issue 1225673007: Initial CL to create dummy GrShaderDataManager and thread it through (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
index 3f511ed2afe2907c9a9d57faaeb462f3f21f1bf3..357e39c3adc6fee44097071b5dcae4eb6cd23311 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 @@ GrFragmentProcessor* Edge2PtConicalEffect::TestCreate(SkRandom* random,
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 @@ GrFragmentProcessor* FocalOutside2PtConicalEffect::TestCreate(SkRandom* random,
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 @@ GrFragmentProcessor* FocalInside2PtConicalEffect::TestCreate(SkRandom* random,
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 @@ GrFragmentProcessor* CircleInside2PtConicalEffect::TestCreate(SkRandom* random,
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 @@ GrFragmentProcessor* CircleOutside2PtConicalEffect::TestCreate(SkRandom* random,
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)

Powered by Google App Engine
This is Rietveld 408576698