aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-05-31 19:53:37 +0000
committerGravatar tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-05-31 19:53:37 +0000
commitdcdc1fccc5e1254e6aa4757e8c886ab80084f552 (patch)
tree5c9f07917008d3b82fb4272025a06a744bb492fc
parent7fab52d4c7a683692f5f364f977d68129ea45ffc (diff)
Fix SK_OVERRIDE error caught by Clang in r4105; wrong params for setData().
git-svn-id: http://skia.googlecode.com/svn/trunk@4105 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--src/gpu/effects/GrGradientEffects.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gpu/effects/GrGradientEffects.cpp b/src/gpu/effects/GrGradientEffects.cpp
index 3f498b332d..892c2ed99b 100644
--- a/src/gpu/effects/GrGradientEffects.cpp
+++ b/src/gpu/effects/GrGradientEffects.cpp
@@ -87,7 +87,7 @@ public:
virtual void initUniforms(const GrGLInterface*, int programID) SK_OVERRIDE;
virtual void setData(const GrGLInterface*,
const GrGLTexture&,
- GrCustomStage*,
+ const GrCustomStage&,
int stageNum) SK_OVERRIDE;
static StageKey GenKey(const GrCustomStage& s) {
@@ -248,16 +248,16 @@ void GrGLRadial2Gradient::initUniforms(const GrGLInterface* gl, int programID) {
void GrGLRadial2Gradient::setData(const GrGLInterface* gl,
const GrGLTexture& texture,
- GrCustomStage* baseData,
+ const GrCustomStage& baseData,
int stageNum) {
- const GrRadial2Gradient* data =
- static_cast<const GrRadial2Gradient*>(baseData);
- GrAssert(data->isDegenerate() == fIsDegenerate);
- GrScalar centerX1 = data->center();
- GrScalar radius0 = data->radius();
+ const GrRadial2Gradient& data =
+ static_cast<const GrRadial2Gradient&>(baseData);
+ GrAssert(data.isDegenerate() == fIsDegenerate);
+ GrScalar centerX1 = data.center();
+ GrScalar radius0 = data.radius();
if (fCachedCenter != centerX1 ||
fCachedRadius != radius0 ||
- fCachedPosRoot != data->isPosRoot()) {
+ fCachedPosRoot != data.isPosRoot()) {
GrScalar a = GrMul(centerX1, centerX1) - GR_Scalar1;
@@ -272,13 +272,13 @@ void GrGLRadial2Gradient::setData(const GrGLInterface* gl,
GrScalarToFloat(centerX1),
GrScalarToFloat(radius0),
GrScalarToFloat(GrMul(radius0, radius0)),
- data->isPosRoot() ? 1.f : -1.f
+ data.isPosRoot() ? 1.f : -1.f
};
GR_GL_CALL(gl, Uniform1fv(fParamLocation, 6, values));
fCachedCenter = centerX1;
fCachedRadius = radius0;
- fCachedPosRoot = data->isPosRoot();
+ fCachedPosRoot = data.isPosRoot();
}
}