commit 018fb62d12d1febf121fe265da5b6117b86a6541
author egdaniel <egdaniel@google.com> Wed Oct 28 07:26:40 2015 -0700
committer Commit bot <commit-bot@chromium.org> Wed Oct 28 07:26:40 2015 -0700
tree 61d845716f03c05ea86aab539fcc5035b5f30734
parent fe6876280f6d79deb6a3f9d5a75f90a937e9026f

Create GLSL base class for ProgramDataManager

BUG=skia:

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

src/effects/gradients/SkGradientShader.cpp

diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp
index 2fe2382..e3a3759 100644
--- a/src/effects/gradients/SkGradientShader.cpp
+++ b/src/effects/gradients/SkGradientShader.cpp
@@ -910,6 +910,7 @@
 #include "GrInvariantOutput.h"
 #include "gl/GrGLContext.h"
 #include "gl/builders/GrGLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 #include "SkGr.h"
 
 GrGLGradientEffect::GrGLGradientEffect()
@@ -946,8 +947,8 @@
     }
 }
 
-static inline void set_color_uni(const GrGLProgramDataManager& pdman,
-                                 const GrGLProgramDataManager::UniformHandle uni,
+static inline void set_color_uni(const GrGLSLProgramDataManager& pdman,
+                                 const GrGLSLProgramDataManager::UniformHandle uni,
                                  const SkColor* color) {
        pdman.set4f(uni,
                    SkColorGetR(*color) / 255.f,
@@ -956,8 +957,8 @@
                    SkColorGetA(*color) / 255.f);
 }
 
-static inline void set_mul_color_uni(const GrGLProgramDataManager& pdman,
-                                     const GrGLProgramDataManager::UniformHandle uni,
+static inline void set_mul_color_uni(const GrGLSLProgramDataManager& pdman,
+                                     const GrGLSLProgramDataManager::UniformHandle uni,
                                      const SkColor* color){
        float a = SkColorGetA(*color) / 255.f;
        float aDiv255 = a / 255.f;
@@ -968,8 +969,8 @@
                    a);
 }
 
-void GrGLGradientEffect::onSetData(const GrGLProgramDataManager& pdman,
-                                 const GrProcessor& processor) {
+void GrGLGradientEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                   const GrProcessor& processor) {
 
     const GrGradientEffect& e = processor.cast<GrGradientEffect>();