From 64c4728c70001ed074fecf5c4e083781987b12e9 Mon Sep 17 00:00:00 2001 From: egdaniel Date: Fri, 13 Nov 2015 06:54:19 -0800 Subject: Make all GrFragmentProcessors GL independent. TBR=bsalomon@google.com BUG=skia: Review URL: https://codereview.chromium.org/1434313002 --- src/gpu/effects/GrConvolutionEffect.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/gpu/effects/GrConvolutionEffect.cpp') diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index 5367b27902..55b44b7f56 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); } -- cgit v1.2.3