| Index: src/gpu/effects/GrConfigConversionEffect.cpp
|
| diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp
|
| index 160773d81ecdd05844fc1bf137ed59f978d61721..0273858a3b8ddfc05bbb63b672706b048c456dda 100644
|
| --- a/src/gpu/effects/GrConfigConversionEffect.cpp
|
| +++ b/src/gpu/effects/GrConfigConversionEffect.cpp
|
| @@ -11,11 +11,11 @@
|
| #include "GrInvariantOutput.h"
|
| #include "GrSimpleTextureEffect.h"
|
| #include "SkMatrix.h"
|
| -#include "gl/GrGLFragmentProcessor.h"
|
| +#include "glsl/GrGLSLFragmentProcessor.h"
|
| #include "glsl/GrGLSLFragmentShaderBuilder.h"
|
| #include "glsl/GrGLSLProgramBuilder.h"
|
|
|
| -class GrGLConfigConversionEffect : public GrGLFragmentProcessor {
|
| +class GrGLConfigConversionEffect : public GrGLSLFragmentProcessor {
|
| public:
|
| GrGLConfigConversionEffect(const GrProcessor& processor) {
|
| const GrConfigConversionEffect& configConversionEffect =
|
| @@ -91,7 +91,7 @@ private:
|
| bool fSwapRedAndBlue;
|
| GrConfigConversionEffect::PMConversion fPMConversion;
|
|
|
| - typedef GrGLFragmentProcessor INHERITED;
|
| + typedef GrGLSLFragmentProcessor INHERITED;
|
|
|
| };
|
|
|
| @@ -147,7 +147,7 @@ void GrConfigConversionEffect::onGetGLProcessorKey(const GrGLSLCaps& caps,
|
| GrGLConfigConversionEffect::GenKey(*this, caps, b);
|
| }
|
|
|
| -GrGLFragmentProcessor* GrConfigConversionEffect::onCreateGLInstance() const {
|
| +GrGLSLFragmentProcessor* GrConfigConversionEffect::onCreateGLInstance() const {
|
| return new GrGLConfigConversionEffect(*this);
|
| }
|
|
|
|
|