diff options
Diffstat (limited to 'src/effects')
20 files changed, 83 insertions, 85 deletions
diff --git a/src/effects/GrCircleBlurFragmentProcessor.cpp b/src/effects/GrCircleBlurFragmentProcessor.cpp index 7776b630d0..b7f394c1a8 100644 --- a/src/effects/GrCircleBlurFragmentProcessor.cpp +++ b/src/effects/GrCircleBlurFragmentProcessor.cpp @@ -13,12 +13,12 @@ #include "GrContext.h" #include "GrTextureProvider.h" -#include "gl/GrGLFragmentProcessor.h" +#include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" -class GrGLCircleBlurFragmentProcessor : public GrGLFragmentProcessor { +class GrGLCircleBlurFragmentProcessor : public GrGLSLFragmentProcessor { public: GrGLCircleBlurFragmentProcessor(const GrProcessor&) {} void emitCode(EmitArgs&) override; @@ -29,7 +29,7 @@ protected: private: GrGLSLProgramDataManager::UniformHandle fDataUniform; - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; }; void GrGLCircleBlurFragmentProcessor::emitCode(EmitArgs& args) { @@ -93,7 +93,7 @@ GrCircleBlurFragmentProcessor::GrCircleBlurFragmentProcessor(const SkRect& circl this->setWillReadFragmentPosition(); } -GrGLFragmentProcessor* GrCircleBlurFragmentProcessor::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrCircleBlurFragmentProcessor::onCreateGLInstance() const { return new GrGLCircleBlurFragmentProcessor(*this); } diff --git a/src/effects/GrCircleBlurFragmentProcessor.h b/src/effects/GrCircleBlurFragmentProcessor.h index 4d39ec8e11..67f1a252cb 100644 --- a/src/effects/GrCircleBlurFragmentProcessor.h +++ b/src/effects/GrCircleBlurFragmentProcessor.h @@ -48,7 +48,7 @@ private: GrCircleBlurFragmentProcessor(const SkRect& circle, float sigma, float offset, GrTexture* blurProfile); - GrGLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLInstance() const override; void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp index 167489b689..6497111690 100644 --- a/src/effects/SkAlphaThresholdFilter.cpp +++ b/src/effects/SkAlphaThresholdFilter.cpp @@ -57,7 +57,7 @@ SkImageFilter* SkAlphaThresholdFilter::Create(const SkRegion& region, #include "SkGr.h" -#include "gl/GrGLFragmentProcessor.h" +#include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" @@ -101,7 +101,7 @@ private: this->addTextureAccess(&fMaskTextureAccess); } - GrGLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLInstance() const override; void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; @@ -121,7 +121,7 @@ private: typedef GrFragmentProcessor INHERITED; }; -class GrGLAlphaThresholdEffect : public GrGLFragmentProcessor { +class GrGLAlphaThresholdEffect : public GrGLSLFragmentProcessor { public: GrGLAlphaThresholdEffect(const GrFragmentProcessor&) {} @@ -135,7 +135,7 @@ private: GrGLSLProgramDataManager::UniformHandle fInnerThresholdVar; GrGLSLProgramDataManager::UniformHandle fOuterThresholdVar; - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; }; void GrGLAlphaThresholdEffect::emitCode(EmitArgs& args) { @@ -208,7 +208,7 @@ void AlphaThresholdEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrGLAlphaThresholdEffect::GenKey(*this, caps, b); } -GrGLFragmentProcessor* AlphaThresholdEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* AlphaThresholdEffect::onCreateGLInstance() const { return new GrGLAlphaThresholdEffect(*this); } diff --git a/src/effects/SkArithmeticMode_gpu.cpp b/src/effects/SkArithmeticMode_gpu.cpp index ebc8293b20..2ab5172b57 100644 --- a/src/effects/SkArithmeticMode_gpu.cpp +++ b/src/effects/SkArithmeticMode_gpu.cpp @@ -13,9 +13,8 @@ #include "GrInvariantOutput.h" #include "GrProcessor.h" #include "GrTexture.h" -#include "gl/GrGLCaps.h" -#include "gl/GrGLFragmentProcessor.h" #include "gl/GrGLXferProcessor.h" +#include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" @@ -54,7 +53,7 @@ static void add_arithmetic_code(GrGLSLFragmentBuilder* fsBuilder, } } -class GLArithmeticFP : public GrGLFragmentProcessor { +class GLArithmeticFP : public GrGLSLFragmentProcessor { public: GLArithmeticFP(const GrArithmeticFP& arithmeticFP) : fEnforcePMColor(arithmeticFP.enforcePMColor()) {} @@ -92,7 +91,7 @@ private: GrGLSLProgramDataManager::UniformHandle fKUni; bool fEnforcePMColor; - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; }; /////////////////////////////////////////////////////////////////////////////// @@ -111,7 +110,7 @@ void GrArithmeticFP::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyB GLArithmeticFP::GenKey(*this, caps, b); } -GrGLFragmentProcessor* GrArithmeticFP::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrArithmeticFP::onCreateGLInstance() const { return new GLArithmeticFP(*this); } diff --git a/src/effects/SkArithmeticMode_gpu.h b/src/effects/SkArithmeticMode_gpu.h index 4810baed4a..2f8013ff16 100644 --- a/src/effects/SkArithmeticMode_gpu.h +++ b/src/effects/SkArithmeticMode_gpu.h @@ -47,7 +47,7 @@ public: bool enforcePMColor() const { return fEnforcePMColor; } private: - GrGLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLInstance() const override; void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 2ec5b90a40..7ec9464533 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -27,7 +27,7 @@ #include "SkGrPixelRef.h" #include "SkDraw.h" #include "effects/GrSimpleTextureEffect.h" -#include "gl/GrGLFragmentProcessor.h" +#include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" @@ -655,7 +655,7 @@ private: GrRectBlurEffect(const SkRect& rect, float sigma, GrTexture *blurProfile, GrSLPrecision fPrecision); - GrGLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLInstance() const override; void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; @@ -675,7 +675,7 @@ private: typedef GrFragmentProcessor INHERITED; }; -class GrGLRectBlurEffect : public GrGLFragmentProcessor { +class GrGLRectBlurEffect : public GrGLSLFragmentProcessor { public: GrGLRectBlurEffect(const GrProcessor&, GrSLPrecision precision) : fPrecision(precision) { @@ -694,7 +694,7 @@ private: UniformHandle fProfileSizeUniform; GrSLPrecision fPrecision; - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; }; void OutputRectBlurProfileLookup(GrGLSLFragmentBuilder* fsBuilder, @@ -821,7 +821,7 @@ void GrRectBlurEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrGLRectBlurEffect::GenKey(fPrecision, b); } -GrGLFragmentProcessor* GrRectBlurEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrRectBlurEffect::onCreateGLInstance() const { return new GrGLRectBlurEffect(*this, fPrecision); } @@ -912,7 +912,7 @@ public: float getSigma() const { return fSigma; } private: - GrGLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLInstance() const override; GrRRectBlurEffect(float sigma, const SkRRect&, GrTexture* profileTexture); @@ -1043,7 +1043,7 @@ const GrFragmentProcessor* GrRRectBlurEffect::TestCreate(GrProcessorTestData* d) ////////////////////////////////////////////////////////////////////////////// -class GrGLRRectBlurEffect : public GrGLFragmentProcessor { +class GrGLRRectBlurEffect : public GrGLSLFragmentProcessor { public: GrGLRRectBlurEffect(const GrProcessor&) {} @@ -1056,7 +1056,7 @@ private: GrGLSLProgramDataManager::UniformHandle fProxyRectUniform; GrGLSLProgramDataManager::UniformHandle fCornerRadiusUniform; GrGLSLProgramDataManager::UniformHandle fBlurRadiusUniform; - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; }; void GrGLRRectBlurEffect::emitCode(EmitArgs& args) { @@ -1135,7 +1135,7 @@ void GrRRectBlurEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorK GrGLRRectBlurEffect::GenKey(*this, caps, b); } -GrGLFragmentProcessor* GrRRectBlurEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrRRectBlurEffect::onCreateGLInstance() const { return new GrGLRRectBlurEffect(*this); } diff --git a/src/effects/SkColorCubeFilter.cpp b/src/effects/SkColorCubeFilter.cpp index 3abda5fe48..541f43aab2 100644 --- a/src/effects/SkColorCubeFilter.cpp +++ b/src/effects/SkColorCubeFilter.cpp @@ -18,7 +18,7 @@ #include "GrInvariantOutput.h" #include "GrTexturePriv.h" #include "SkGr.h" -#include "gl/GrGLFragmentProcessor.h" +#include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" @@ -175,7 +175,7 @@ public: void onComputeInvariantOutput(GrInvariantOutput*) const override; - class GLProcessor : public GrGLFragmentProcessor { + class GLProcessor : public GrGLSLFragmentProcessor { public: GLProcessor(const GrProcessor&); virtual ~GLProcessor(); @@ -191,14 +191,14 @@ public: GrGLSLProgramDataManager::UniformHandle fColorCubeSizeUni; GrGLSLProgramDataManager::UniformHandle fColorCubeInvSizeUni; - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; }; private: virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLInstance() const override; bool onIsEqual(const GrFragmentProcessor&) const override { return true; } @@ -224,7 +224,7 @@ void GrColorCubeEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorK GLProcessor::GenKey(*this, caps, b); } -GrGLFragmentProcessor* GrColorCubeEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrColorCubeEffect::onCreateGLInstance() const { return new GLProcessor(*this); } diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp index fd3200e2cd..bc72b1fa63 100644 --- a/src/effects/SkColorMatrixFilter.cpp +++ b/src/effects/SkColorMatrixFilter.cpp @@ -385,7 +385,7 @@ SkColorFilter* SkColorMatrixFilter::newComposed(const SkColorFilter* innerFilter #if SK_SUPPORT_GPU #include "GrFragmentProcessor.h" #include "GrInvariantOutput.h" -#include "gl/GrGLFragmentProcessor.h" +#include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" @@ -400,7 +400,7 @@ public: GR_DECLARE_FRAGMENT_PROCESSOR_TEST; - class GLProcessor : public GrGLFragmentProcessor { + class GLProcessor : public GrGLSLFragmentProcessor { public: // this class always generates the same code. static void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder* b) {} @@ -458,7 +458,7 @@ public: GrGLSLProgramDataManager::UniformHandle fMatrixHandle; GrGLSLProgramDataManager::UniformHandle fVectorHandle; - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; }; private: @@ -466,7 +466,7 @@ private: this->initClassID<ColorMatrixEffect>(); } - GrGLFragmentProcessor* onCreateGLInstance() const override { return new GLProcessor(*this); } + GrGLSLFragmentProcessor* onCreateGLInstance() const override { return new GLProcessor(*this); } virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index b9411b2e12..d90e9f3200 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp @@ -17,7 +17,7 @@ #include "GrCoordTransform.h" #include "GrInvariantOutput.h" #include "effects/GrTextureDomain.h" -#include "gl/GrGLFragmentProcessor.h" +#include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" @@ -304,7 +304,7 @@ void SkDisplacementMapEffect::toString(SkString* str) const { /////////////////////////////////////////////////////////////////////////////// #if SK_SUPPORT_GPU -class GrGLDisplacementMapEffect : public GrGLFragmentProcessor { +class GrGLDisplacementMapEffect : public GrGLSLFragmentProcessor { public: GrGLDisplacementMapEffect(const GrProcessor&); virtual ~GrGLDisplacementMapEffect(); @@ -324,7 +324,7 @@ private: GrGLSLProgramDataManager::UniformHandle fScaleUni; GrTextureDomain::GLDomain fGLDomain; - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; }; /////////////////////////////////////////////////////////////////////////////// @@ -352,7 +352,7 @@ public: const GrTextureDomain& domain() const { return fDomain; } private: - GrGLFragmentProcessor* onCreateGLInstance() const override { + GrGLSLFragmentProcessor* onCreateGLInstance() const override { return new GrGLDisplacementMapEffect(*this); } diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index 1f120c0466..46daea1f4a 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -21,7 +21,7 @@ #include "GrInvariantOutput.h" #include "GrPaint.h" #include "effects/GrSingleTextureEffect.h" -#include "gl/GrGLFragmentProcessor.h" +#include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" @@ -531,7 +531,7 @@ public: SkScalar kd() const { return fKD; } private: - GrGLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLInstance() const override; void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; @@ -564,7 +564,7 @@ public: const char* name() const override { return "SpecularLighting"; } - GrGLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLInstance() const override; SkScalar ks() const { return fKS; } SkScalar shininess() const { return fShininess; } @@ -1508,7 +1508,7 @@ SkString emitNormalFunc(BoundaryMode mode, } -class GrGLLightingEffect : public GrGLFragmentProcessor { +class GrGLLightingEffect : public GrGLSLFragmentProcessor { public: GrGLLightingEffect(const GrProcessor&); virtual ~GrGLLightingEffect(); @@ -1526,7 +1526,7 @@ protected: virtual void emitLightFunc(GrGLSLFPBuilder*, SkString* funcName) = 0; private: - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; UniformHandle fImageIncrementUni; UniformHandle fSurfaceScaleUni; @@ -1619,7 +1619,7 @@ void GrDiffuseLightingEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrGLDiffuseLightingEffect::GenKey(*this, caps, b); } -GrGLFragmentProcessor* GrDiffuseLightingEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrDiffuseLightingEffect::onCreateGLInstance() const { return new GrGLDiffuseLightingEffect(*this); } @@ -1820,7 +1820,7 @@ void GrSpecularLightingEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrGLSpecularLightingEffect::GenKey(*this, caps, b); } -GrGLFragmentProcessor* GrSpecularLightingEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrSpecularLightingEffect::onCreateGLInstance() const { return new GrGLSpecularLightingEffect(*this); } diff --git a/src/effects/SkLumaColorFilter.cpp b/src/effects/SkLumaColorFilter.cpp index bdedf3b8b7..107331a37a 100644 --- a/src/effects/SkLumaColorFilter.cpp +++ b/src/effects/SkLumaColorFilter.cpp @@ -13,7 +13,7 @@ #if SK_SUPPORT_GPU #include "GrContext.h" #include "GrInvariantOutput.h" -#include "gl/GrGLFragmentProcessor.h" +#include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLProgramBuilder.h" #endif @@ -61,7 +61,7 @@ public: const char* name() const override { return "Luminance-to-Alpha"; } - class GLProcessor : public GrGLFragmentProcessor { + class GLProcessor : public GrGLSLFragmentProcessor { public: GLProcessor(const GrProcessor&) {} @@ -84,7 +84,7 @@ public: } private: - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; }; private: @@ -92,7 +92,7 @@ private: this->initClassID<LumaColorFilterEffect>(); } - GrGLFragmentProcessor* onCreateGLInstance() const override { return new GLProcessor(*this); } + GrGLSLFragmentProcessor* onCreateGLInstance() const override { return new GLProcessor(*this); } virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp index 2d90c44781..6c0b00fe9c 100644 --- a/src/effects/SkMagnifierImageFilter.cpp +++ b/src/effects/SkMagnifierImageFilter.cpp @@ -17,8 +17,7 @@ #if SK_SUPPORT_GPU #include "GrInvariantOutput.h" #include "effects/GrSingleTextureEffect.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" @@ -75,7 +74,7 @@ private: this->initClassID<GrMagnifierEffect>(); } - GrGLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLInstance() const override; void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; @@ -99,7 +98,7 @@ private: // For brevity typedef GrGLSLProgramDataManager::UniformHandle UniformHandle; -class GrGLMagnifierEffect : public GrGLFragmentProcessor { +class GrGLMagnifierEffect : public GrGLSLFragmentProcessor { public: GrGLMagnifierEffect(const GrProcessor&); @@ -114,7 +113,7 @@ private: UniformHandle fInvInsetVar; UniformHandle fBoundsVar; - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; }; GrGLMagnifierEffect::GrGLMagnifierEffect(const GrProcessor&) { @@ -186,7 +185,7 @@ void GrMagnifierEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrGLMagnifierEffect::GenKey(*this, caps, b); } -GrGLFragmentProcessor* GrMagnifierEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrMagnifierEffect::onCreateGLInstance() const { return new GrGLMagnifierEffect(*this); } diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index 1d465edcb5..b0b84908a9 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -19,7 +19,7 @@ #include "GrInvariantOutput.h" #include "GrTexture.h" #include "effects/Gr1DKernelEffect.h" -#include "gl/GrGLFragmentProcessor.h" +#include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" @@ -236,7 +236,7 @@ protected: float fRange[2]; private: - GrGLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLInstance() const override; void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; @@ -255,7 +255,7 @@ private: /////////////////////////////////////////////////////////////////////////////// -class GrGLMorphologyEffect : public GrGLFragmentProcessor { +class GrGLMorphologyEffect : public GrGLSLFragmentProcessor { public: GrGLMorphologyEffect(const GrProcessor&); @@ -276,7 +276,7 @@ private: GrGLSLProgramDataManager::UniformHandle fPixelSizeUni; GrGLSLProgramDataManager::UniformHandle fRangeUni; - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; }; GrGLMorphologyEffect::GrGLMorphologyEffect(const GrProcessor& proc) { @@ -427,7 +427,7 @@ void GrMorphologyEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessor GrGLMorphologyEffect::GenKey(*this, caps, b); } -GrGLFragmentProcessor* GrMorphologyEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrMorphologyEffect::onCreateGLInstance() const { return new GrGLMorphologyEffect(*this); } bool GrMorphologyEffect::onIsEqual(const GrFragmentProcessor& sBase) const { diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp index 045f3beff2..2d4ab8ff2a 100644 --- a/src/effects/SkPerlinNoiseShader.cpp +++ b/src/effects/SkPerlinNoiseShader.cpp @@ -20,7 +20,7 @@ #include "GrInvariantOutput.h" #include "SkGr.h" #include "effects/GrConstColorProcessor.h" -#include "gl/GrGLFragmentProcessor.h" +#include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" @@ -484,7 +484,7 @@ void SkPerlinNoiseShader::PerlinNoiseShaderContext::shadeSpan16( #if SK_SUPPORT_GPU -class GrGLPerlinNoise : public GrGLFragmentProcessor { +class GrGLPerlinNoise : public GrGLSLFragmentProcessor { public: GrGLPerlinNoise(const GrProcessor&); virtual ~GrGLPerlinNoise() {} @@ -505,7 +505,7 @@ private: GrGLSLProgramDataManager::UniformHandle fBaseFrequencyUni; private: - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; }; ///////////////////////////////////////////////////////////////////// @@ -534,7 +534,7 @@ public: const SkMatrix& matrix() const { return fCoordTransform.getMatrix(); } private: - GrGLFragmentProcessor* onCreateGLInstance() const override { + GrGLSLFragmentProcessor* onCreateGLInstance() const override { return new GrGLPerlinNoise(*this); } diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index 872fdfddc2..55de828cca 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -335,7 +335,7 @@ SkColorFilter* SkTable_ColorFilter::newComposed(const SkColorFilter* innerFilter #include "GrInvariantOutput.h" #include "SkGr.h" #include "effects/GrTextureStripAtlas.h" -#include "gl/GrGLFragmentProcessor.h" +#include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" @@ -352,7 +352,7 @@ public: int atlasRow() const { return fRow; } private: - GrGLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLInstance() const override; void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; @@ -375,7 +375,7 @@ private: typedef GrFragmentProcessor INHERITED; }; -class GLColorTableEffect : public GrGLFragmentProcessor { +class GLColorTableEffect : public GrGLSLFragmentProcessor { public: GLColorTableEffect(const GrProcessor&); @@ -388,7 +388,7 @@ protected: private: UniformHandle fRGBAYValuesUni; - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; }; GLColorTableEffect::GLColorTableEffect(const GrProcessor&) { @@ -506,7 +506,7 @@ void ColorTableEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GLColorTableEffect::GenKey(*this, caps, b); } -GrGLFragmentProcessor* ColorTableEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* ColorTableEffect::onCreateGLInstance() const { return new GLColorTableEffect(*this); } diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h index a295b5cf93..003191d397 100644 --- a/src/effects/gradients/SkGradientShaderPriv.h +++ b/src/effects/gradients/SkGradientShaderPriv.h @@ -296,7 +296,7 @@ static inline int next_dither_toggle16(int toggle) { #include "GrCoordTransform.h" #include "GrFragmentProcessor.h" -#include "gl/GrGLFragmentProcessor.h" +#include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLProgramDataManager.h" class GrInvariantOutput; @@ -396,7 +396,7 @@ private: /////////////////////////////////////////////////////////////////////////////// // Base class for GL gradient effects -class GrGLGradientEffect : public GrGLFragmentProcessor { +class GrGLGradientEffect : public GrGLSLFragmentProcessor { public: GrGLGradientEffect(); virtual ~GrGLGradientEffect(); @@ -450,7 +450,7 @@ private: GrGLSLProgramDataManager::UniformHandle fColorMidUni; GrGLSLProgramDataManager::UniformHandle fColorEndUni; - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; }; #endif diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp index 11c79f0956..1726bb6d59 100644 --- a/src/effects/gradients/SkLinearGradient.cpp +++ b/src/effects/gradients/SkLinearGradient.cpp @@ -487,7 +487,7 @@ private: this->initClassID<GrLinearGradient>(); } - GrGLFragmentProcessor* onCreateGLInstance() const override { + GrGLSLFragmentProcessor* onCreateGLInstance() const override { return new GrGLLinearGradient(*this); } diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp index a9cdb2a912..05adcb1cb7 100644 --- a/src/effects/gradients/SkRadialGradient.cpp +++ b/src/effects/gradients/SkRadialGradient.cpp @@ -459,7 +459,7 @@ private: this->initClassID<GrRadialGradient>(); } - GrGLFragmentProcessor* onCreateGLInstance() const override { + GrGLSLFragmentProcessor* onCreateGLInstance() const override { return new GrGLRadialGradient(*this); } diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp index 172c7d152a..71e8957fd8 100644 --- a/src/effects/gradients/SkSweepGradient.cpp +++ b/src/effects/gradients/SkSweepGradient.cpp @@ -208,7 +208,7 @@ private: this->initClassID<GrSweepGradient>(); } - GrGLFragmentProcessor* onCreateGLInstance() const override { + GrGLSLFragmentProcessor* onCreateGLInstance() const override { return new GrGLSweepGradient(*this); } diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp index dec3e96bdb..fef8b43ba1 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp @@ -79,7 +79,7 @@ public: SkScalar radius() const { return fRadius0; } private: - GrGLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLInstance() const override; void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; @@ -174,7 +174,7 @@ void Edge2PtConicalEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GLEdge2PtConicalEffect::GenKey(*this, caps, b); } -GrGLFragmentProcessor* Edge2PtConicalEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* Edge2PtConicalEffect::onCreateGLInstance() const { return new GLEdge2PtConicalEffect(*this); } @@ -385,7 +385,7 @@ public: SkScalar focal() const { return fFocalX; } private: - GrGLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLInstance() const override; void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; @@ -451,7 +451,7 @@ void FocalOutside2PtConicalEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GLFocalOutside2PtConicalEffect::GenKey(*this, caps, b); } -GrGLFragmentProcessor* FocalOutside2PtConicalEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* FocalOutside2PtConicalEffect::onCreateGLInstance() const { return new GLFocalOutside2PtConicalEffect(*this); } @@ -595,7 +595,7 @@ public: typedef GLFocalInside2PtConicalEffect GLProcessor; private: - GrGLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLInstance() const override; void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; @@ -655,7 +655,7 @@ void FocalInside2PtConicalEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GLFocalInside2PtConicalEffect::GenKey(*this, caps, b); } -GrGLFragmentProcessor* FocalInside2PtConicalEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* FocalInside2PtConicalEffect::onCreateGLInstance() const { return new GLFocalInside2PtConicalEffect(*this); } @@ -828,7 +828,7 @@ public: SkScalar C() const { return fInfo.fC; } private: - GrGLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLInstance() const override; virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; @@ -897,7 +897,7 @@ void CircleInside2PtConicalEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GLCircleInside2PtConicalEffect::GenKey(*this, caps, b); } -GrGLFragmentProcessor* CircleInside2PtConicalEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* CircleInside2PtConicalEffect::onCreateGLInstance() const { return new GLCircleInside2PtConicalEffect(*this); } @@ -1040,7 +1040,7 @@ public: bool isFlipped() const { return fIsFlipped; } private: - GrGLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLInstance() const override; void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; @@ -1122,7 +1122,7 @@ void CircleOutside2PtConicalEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GLCircleOutside2PtConicalEffect::GenKey(*this, caps, b); } -GrGLFragmentProcessor* CircleOutside2PtConicalEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* CircleOutside2PtConicalEffect::onCreateGLInstance() const { return new GLCircleOutside2PtConicalEffect(*this); } |