diff options
author | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-23 14:53:55 +0000 |
---|---|---|
committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-23 14:53:55 +0000 |
commit | 706f66831a575bdc2b1ab1331b48b793cd487356 (patch) | |
tree | 2a9457241edf1a433643c92d2dafa933fff7d0a2 /src/effects/gradients/SkTwoPointRadialGradient.cpp | |
parent | 281c726c760c2b0ef957674da0360d5595d52a9c (diff) |
Reland r6330 thru r6333 but do without enabling GL_ARB_fragment_coord_conventions on Intel GPUs.
git-svn-id: http://skia.googlecode.com/svn/trunk@6048 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/gradients/SkTwoPointRadialGradient.cpp')
-rw-r--r-- | src/effects/gradients/SkTwoPointRadialGradient.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp index 3476c398c4..00578aadbe 100644 --- a/src/effects/gradients/SkTwoPointRadialGradient.cpp +++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp @@ -368,10 +368,7 @@ public: const char* outputColor, const char* inputColor, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLUniformManager&, - const GrCustomStage&, - const GrRenderTarget*, - int stageNum) SK_OVERRIDE; + virtual void setData(const GrGLUniformManager&, const GrCustomStage&) SK_OVERRIDE; static StageKey GenKey(const GrCustomStage& s, const GrGLCaps& caps); @@ -566,7 +563,6 @@ void GrGLRadial2Gradient::emitFS(GrGLShaderBuilder* builder, bVar = fFSVaryingName; } else { bVar = "b"; - //bVar.appendS32(stageNum); code->appendf("\tfloat %s = 2.0 * (%s * %s.x - %s);\n", bVar.c_str(), p2.c_str(), builder->defaultTexCoordsName(), p3.c_str()); @@ -605,11 +601,8 @@ void GrGLRadial2Gradient::emitFS(GrGLShaderBuilder* builder, this->emitColorLookup(builder, t.c_str(), outputColor, inputColor, samplers[0]); } -void GrGLRadial2Gradient::setData(const GrGLUniformManager& uman, - const GrCustomStage& baseData, - const GrRenderTarget* target, - int stageNum) { - INHERITED::setData(uman, baseData, target, stageNum); +void GrGLRadial2Gradient::setData(const GrGLUniformManager& uman, const GrCustomStage& baseData) { + INHERITED::setData(uman, baseData); const GrRadial2Gradient& data = static_cast<const GrRadial2Gradient&>(baseData); GrAssert(data.isDegenerate() == fIsDegenerate); |