Index: src/gpu/GrOvalRenderer.cpp |
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp |
index 27bd74a88afae2d6fdc89eeb6629d75e525a9033..4a5631d9c349df6d78304a81617ef9f67a9bfd37 100644 |
--- a/src/gpu/GrOvalRenderer.cpp |
+++ b/src/gpu/GrOvalRenderer.cpp |
@@ -98,7 +98,7 @@ public: |
const GrDrawEffect& drawEffect, |
EffectKey key, |
const char* outputColor, |
- const char* inputColor, |
+ const GrGLSLExpr4& inputColor, |
const TransformedCoordsArray&, |
const TextureSamplerArray& samplers) SK_OVERRIDE { |
const CircleEdgeEffect& circleEffect = drawEffect.castEffect<CircleEdgeEffect>(); |
@@ -117,7 +117,7 @@ public: |
} |
builder->fsCodeAppendf("\t%s = %s;\n", outputColor, |
- (GrGLSLExpr4(inputColor) * GrGLSLExpr1("edgeAlpha")).c_str()); |
+ (inputColor * GrGLSLExpr1("edgeAlpha")).c_str()); |
} |
static inline EffectKey GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&) { |
@@ -209,7 +209,7 @@ public: |
const GrDrawEffect& drawEffect, |
EffectKey key, |
const char* outputColor, |
- const char* inputColor, |
+ const GrGLSLExpr4& inputColor, |
const TransformedCoordsArray&, |
const TextureSamplerArray& samplers) SK_OVERRIDE { |
const EllipseEdgeEffect& ellipseEffect = drawEffect.castEffect<EllipseEdgeEffect>(); |
@@ -249,7 +249,7 @@ public: |
} |
builder->fsCodeAppendf("\t%s = %s;\n", outputColor, |
- (GrGLSLExpr4(inputColor) * GrGLSLExpr1("edgeAlpha")).c_str()); |
+ (inputColor * GrGLSLExpr1("edgeAlpha")).c_str()); |
} |
static inline EffectKey GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&) { |
@@ -349,7 +349,7 @@ public: |
const GrDrawEffect& drawEffect, |
EffectKey key, |
const char* outputColor, |
- const char* inputColor, |
+ const GrGLSLExpr4& inputColor, |
const TransformedCoordsArray&, |
const TextureSamplerArray& samplers) SK_OVERRIDE { |
const DIEllipseEdgeEffect& ellipseEffect = drawEffect.castEffect<DIEllipseEdgeEffect>(); |
@@ -407,7 +407,7 @@ public: |
} |
builder->fsCodeAppendf("\t%s = %s;\n", outputColor, |
- (GrGLSLExpr4(inputColor) * GrGLSLExpr1("edgeAlpha")).c_str()); |
+ (inputColor * GrGLSLExpr1("edgeAlpha")).c_str()); |
} |
static inline EffectKey GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&) { |