Index: src/gpu/effects/GrConvolutionEffect.cpp |
diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp |
index 5367b279021b0d0bd74770e61c4bf1aff97a02ee..55b44b7f56fb7c227823a3d9e8897619fd73ad76 100644 |
--- a/src/gpu/effects/GrConvolutionEffect.cpp |
+++ b/src/gpu/effects/GrConvolutionEffect.cpp |
@@ -6,8 +6,7 @@ |
*/ |
#include "GrConvolutionEffect.h" |
-#include "gl/GrGLFragmentProcessor.h" |
-#include "gl/GrGLTexture.h" |
+#include "glsl/GrGLSLFragmentProcessor.h" |
#include "glsl/GrGLSLFragmentShaderBuilder.h" |
#include "glsl/GrGLSLProgramBuilder.h" |
#include "glsl/GrGLSLProgramDataManager.h" |
@@ -15,7 +14,7 @@ |
// For brevity |
typedef GrGLSLProgramDataManager::UniformHandle UniformHandle; |
-class GrGLConvolutionEffect : public GrGLFragmentProcessor { |
+class GrGLConvolutionEffect : public GrGLSLFragmentProcessor { |
public: |
GrGLConvolutionEffect(const GrProcessor&); |
@@ -38,7 +37,7 @@ private: |
UniformHandle fImageIncrementUni; |
UniformHandle fBoundsUni; |
- typedef GrGLFragmentProcessor INHERITED; |
+ typedef GrGLSLFragmentProcessor INHERITED; |
}; |
GrGLConvolutionEffect::GrGLConvolutionEffect(const GrProcessor& processor) { |
@@ -200,7 +199,7 @@ void GrConvolutionEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, |
GrGLConvolutionEffect::GenKey(*this, caps, b); |
} |
-GrGLFragmentProcessor* GrConvolutionEffect::onCreateGLInstance() const { |
+GrGLSLFragmentProcessor* GrConvolutionEffect::onCreateGLInstance() const { |
return new GrGLConvolutionEffect(*this); |
} |