commit 3390b9ac9ad69a6e772c2b957d75d19611239025
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Oct 03 15:17:58 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Oct 03 15:17:58 2013 +0000
tree 39b8dfb8c27086d504a1ecf139120e346efe3b54
parent 17cb562da95ff3bdfdd7b754a8e572e1ff528de6

Repurpose GrGLCoordTransform as GrGLProgramEffects

Creates a GrGLProgramEffects class that the GrGLProgram uses to manage
an array of effects. This gives us enough abstraction for the program
to cleanly handle different types of coord transforms.

R=bsalomon@google.com

Author: cdalton@nvidia.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@11588 2bbb7eff-a529-9590-31e7-b0007b416f81

src/effects/gradients/SkGradientShader.cpp

diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp
index 74355b8..04a2391 100644
--- a/src/effects/gradients/SkGradientShader.cpp
+++ b/src/effects/gradients/SkGradientShader.cpp
@@ -935,7 +935,7 @@
                                    EffectKey key,
                                    const char* outputColor,
                                    const char* inputColor,
-                                   const GrGLShaderBuilder::TextureSamplerArray& samplers) {
+                                   const TextureSamplerArray& samplers) {
     if (GrGradientEffect::kTwo_ColorType == ColorTypeFromKey(key)){
         builder->fsCodeAppendf("\tvec4 colorTemp = mix(%s, %s, clamp(%s, 0.0, 1.0));\n",
                                builder->getUniformVariable(fColorStartUni).c_str(),