| Index: src/effects/SkColorFilters.cpp
|
| diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp
|
| index 43df5e96a0b02a00331efe48c80995dafb2e5485..f16f07966e29a5da249a81bf6da2506a8072dba6 100644
|
| --- a/src/effects/SkColorFilters.cpp
|
| +++ b/src/effects/SkColorFilters.cpp
|
| @@ -131,7 +131,7 @@ private:
|
| #include "GrEffectUnitTest.h"
|
| #include "GrTBackendEffectFactory.h"
|
| #include "gl/GrGLEffect.h"
|
| -#include "gl/GrGLShaderBuilder.h"
|
| +#include "gl/builders/GrGLProgramBuilder.h"
|
| #include "SkGr.h"
|
|
|
| namespace {
|
| @@ -226,7 +226,7 @@ public:
|
| : INHERITED(factory) {
|
| }
|
|
|
| - virtual void emitCode(GrGLShaderBuilder* builder,
|
| + virtual void emitCode(GrGLProgramBuilder* builder,
|
| const GrDrawEffect& drawEffect,
|
| const GrEffectKey& key,
|
| const char* outputColor,
|
| @@ -238,7 +238,7 @@ public:
|
| SkASSERT(SkXfermode::kDst_Mode != mode);
|
| const char* colorFilterColorUniName = NULL;
|
| if (drawEffect.castEffect<ModeColorFilterEffect>().willUseFilterColor()) {
|
| - fFilterColorUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
|
| + fFilterColorUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,
|
| kVec4f_GrSLType, "FilterColor",
|
| &colorFilterColorUniName);
|
| }
|
| @@ -246,7 +246,8 @@ public:
|
| GrGLSLExpr4 filter =
|
| color_filter_expression(mode, GrGLSLExpr4(colorFilterColorUniName), GrGLSLExpr4(inputColor));
|
|
|
| - builder->fsCodeAppendf("\t%s = %s;\n", outputColor, filter.c_str());
|
| + builder->getFragmentShaderBuilder()->
|
| + codeAppendf("\t%s = %s;\n", outputColor, filter.c_str());
|
| }
|
|
|
| static void GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
|
|
|