From: egdaniel Date: Fri, 13 Nov 2015 19:57:27 +0000 (-0800) Subject: Rename some processor functions from GL to GLSL X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~208 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=57d3b039c635945e1dc2fcbac3462ed8bfedb068;p=platform%2Fupstream%2FlibSkiaSharp.git Rename some processor functions from GL to GLSL TBR=bsalomon@google.com BUG=skia: Review URL: https://codereview.chromium.org/1443743002 --- diff --git a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp index f4429db..eff451a 100644 --- a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp +++ b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp @@ -670,12 +670,12 @@ public: const SkMatrix& matrix() const { return fCoordTransform.getMatrix(); } private: - GrGLSLFragmentProcessor* onCreateGLInstance() const override { + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { return new GrGLPerlinNoise2(*this); } - virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override { + virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override { GrGLPerlinNoise2::GenKey(*this, caps, b); } @@ -1095,12 +1095,12 @@ public: const SkMatrix& matrix() const { return fCoordTransform.getMatrix(); } private: - GrGLSLFragmentProcessor* onCreateGLInstance() const override { + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { return new GrGLImprovedPerlinNoise(*this); } - virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override { + virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override { GrGLImprovedPerlinNoise::GenKey(*this, caps, b); } diff --git a/gm/dcshader.cpp b/gm/dcshader.cpp index 6a6bf05..d22ab02 100644 --- a/gm/dcshader.cpp +++ b/gm/dcshader.cpp @@ -64,7 +64,7 @@ public: this->initClassID(); } - GrGLSLFragmentProcessor* onCreateGLInstance() const override { + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { class DCGLFP : public GrGLSLFragmentProcessor { void emitCode(EmitArgs& args) override { GrGLSLFragmentBuilder* fpb = args.fBuilder->getFragmentShaderBuilder(); @@ -90,8 +90,8 @@ public: } private: - void onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override {} + void onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override {} bool onIsEqual(const GrFragmentProcessor&) const override { return true; } diff --git a/include/gpu/GrFragmentProcessor.h b/include/gpu/GrFragmentProcessor.h index 4284662..b0ef6b5 100644 --- a/include/gpu/GrFragmentProcessor.h +++ b/include/gpu/GrFragmentProcessor.h @@ -63,12 +63,12 @@ public: ~GrFragmentProcessor() override; - GrGLSLFragmentProcessor* createGLInstance() const; + GrGLSLFragmentProcessor* createGLSLInstance() const; - void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { - this->onGetGLProcessorKey(caps, b); + void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { + this->onGetGLSLProcessorKey(caps, b); for (int i = 0; i < fChildProcessors.count(); ++i) { - fChildProcessors[i]->getGLProcessorKey(caps, b); + fChildProcessors[i]->getGLSLProcessorKey(caps, b); } } @@ -104,7 +104,8 @@ public: from getFactory()). A return value of true from isEqual() should not be used to test whether the processor would - generate the same shader code. To test for identical code generation use getGLProcessorKey*/ + generate the same shader code. To test for identical code generation use getGLSLProcessorKey + */ bool isEqual(const GrFragmentProcessor& that, bool ignoreCoordTransforms) const; /** @@ -166,11 +167,11 @@ private: /** Returns a new instance of the appropriate *GL* implementation class for the given GrFragmentProcessor; caller is responsible for deleting the object. */ - virtual GrGLSLFragmentProcessor* onCreateGLInstance() const = 0; + virtual GrGLSLFragmentProcessor* onCreateGLSLInstance() const = 0; /** Implemented using GLFragmentProcessor::GenKey as described in this class's comment. */ - virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const = 0; + virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const = 0; /** * Subclass implements this to support isEqual(). It will only be called if it is known that diff --git a/include/gpu/GrXferProcessor.h b/include/gpu/GrXferProcessor.h index 21b89c5..4accbc8 100644 --- a/include/gpu/GrXferProcessor.h +++ b/include/gpu/GrXferProcessor.h @@ -92,15 +92,15 @@ public: }; /** - * Sets a unique key on the GrProcessorKeyBuilder calls onGetGLProcessorKey(...) to get the + * Sets a unique key on the GrProcessorKeyBuilder calls onGetGLSLProcessorKey(...) to get the * specific subclass's key. */ - void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const; + void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const; /** Returns a new instance of the appropriate *GL* implementation class for the given GrXferProcessor; caller is responsible for deleting the object. */ - virtual GrGLSLXferProcessor* createGLInstance() const = 0; + virtual GrGLSLXferProcessor* createGLSLInstance() const = 0; /** * Optimizations for blending / coverage that an OptDrawState should apply to itself. @@ -214,7 +214,8 @@ public: from getFactory()). A return value of true from isEqual() should not be used to test whether the processor would - generate the same shader code. To test for identical code generation use getGLProcessorKey*/ + generate the same shader code. To test for identical code generation use getGLSLProcessorKey + */ bool isEqual(const GrXferProcessor& that) const { if (this->classID() != that.classID()) { @@ -255,8 +256,8 @@ private: * Sets a unique key on the GrProcessorKeyBuilder that is directly associated with this xfer * processor's GL backend implementation. */ - virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const = 0; + virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const = 0; /** * Determines the type of barrier (if any) required by the subclass. Note that the possibility diff --git a/include/gpu/effects/GrConstColorProcessor.h b/include/gpu/effects/GrConstColorProcessor.h index 9f28167..c9686b6 100644 --- a/include/gpu/effects/GrConstColorProcessor.h +++ b/include/gpu/effects/GrConstColorProcessor.h @@ -41,9 +41,9 @@ private: this->initClassID(); } - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor&) const override; diff --git a/src/core/SkLightingShader.cpp b/src/core/SkLightingShader.cpp index ef88e69..7d2ab67 100644 --- a/src/core/SkLightingShader.cpp +++ b/src/core/SkLightingShader.cpp @@ -281,7 +281,7 @@ public: GrGLSLProgramDataManager::UniformHandle fXformUni; }; - void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { + void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { LightingGLFP::GenKey(*this, caps, b); } @@ -297,7 +297,7 @@ public: const SkVector& invNormRotation() const { return fInvNormRotation; } private: - GrGLSLFragmentProcessor* onCreateGLInstance() const override { return new LightingGLFP; } + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { return new LightingGLFP; } bool onIsEqual(const GrFragmentProcessor& proc) const override { const LightingFP& lightingFP = proc.cast(); diff --git a/src/effects/GrCircleBlurFragmentProcessor.cpp b/src/effects/GrCircleBlurFragmentProcessor.cpp index b7f394c..7c87ca4 100644 --- a/src/effects/GrCircleBlurFragmentProcessor.cpp +++ b/src/effects/GrCircleBlurFragmentProcessor.cpp @@ -93,12 +93,12 @@ GrCircleBlurFragmentProcessor::GrCircleBlurFragmentProcessor(const SkRect& circl this->setWillReadFragmentPosition(); } -GrGLSLFragmentProcessor* GrCircleBlurFragmentProcessor::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrCircleBlurFragmentProcessor::onCreateGLSLInstance() const { return new GrGLCircleBlurFragmentProcessor(*this); } -void GrCircleBlurFragmentProcessor::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void GrCircleBlurFragmentProcessor::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLCircleBlurFragmentProcessor::GenKey(*this, caps, b); } diff --git a/src/effects/GrCircleBlurFragmentProcessor.h b/src/effects/GrCircleBlurFragmentProcessor.h index 67f1a25..2b6e0d5 100644 --- a/src/effects/GrCircleBlurFragmentProcessor.h +++ b/src/effects/GrCircleBlurFragmentProcessor.h @@ -48,9 +48,9 @@ private: GrCircleBlurFragmentProcessor(const SkRect& circle, float sigma, float offset, GrTexture* blurProfile); - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; bool onIsEqual(const GrFragmentProcessor& other) const override { const GrCircleBlurFragmentProcessor& cbfp = other.cast(); diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp index 6497111..ff5e93e 100644 --- a/src/effects/SkAlphaThresholdFilter.cpp +++ b/src/effects/SkAlphaThresholdFilter.cpp @@ -101,9 +101,9 @@ private: this->addTextureAccess(&fMaskTextureAccess); } - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor&) const override; @@ -203,12 +203,12 @@ const GrFragmentProcessor* AlphaThresholdEffect::TestCreate(GrProcessorTestData* /////////////////////////////////////////////////////////////////////////////// -void AlphaThresholdEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void AlphaThresholdEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLAlphaThresholdEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* AlphaThresholdEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* AlphaThresholdEffect::onCreateGLSLInstance() const { return new GrGLAlphaThresholdEffect(*this); } diff --git a/src/effects/SkArithmeticMode_gpu.cpp b/src/effects/SkArithmeticMode_gpu.cpp index 7cb02e2..076610b 100644 --- a/src/effects/SkArithmeticMode_gpu.cpp +++ b/src/effects/SkArithmeticMode_gpu.cpp @@ -106,11 +106,11 @@ GrArithmeticFP::GrArithmeticFP(float k1, float k2, float k3, float k4, bool enfo SkASSERT(0 == dstIndex); } -void GrArithmeticFP::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { +void GrArithmeticFP::onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLArithmeticFP::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* GrArithmeticFP::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrArithmeticFP::onCreateGLSLInstance() const { return new GLArithmeticFP(*this); } @@ -154,7 +154,7 @@ public: const char* name() const override { return "Arithmetic"; } - GrGLSLXferProcessor* createGLInstance() const override; + GrGLSLXferProcessor* createGLSLInstance() const override; float k1() const { return fK1; } float k2() const { return fK2; } @@ -169,7 +169,7 @@ private: GrColor* overrideColor, const GrCaps& caps) override; - void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; bool onIsEqual(const GrXferProcessor& xpBase) const override { const ArithmeticXP& xp = xpBase.cast(); @@ -245,11 +245,11 @@ ArithmeticXP::ArithmeticXP(const DstTexture* dstTexture, bool hasMixedSamples, this->initClassID(); } -void ArithmeticXP::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { +void ArithmeticXP::onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLArithmeticXP::GenKey(*this, caps, b); } -GrGLSLXferProcessor* ArithmeticXP::createGLInstance() const { return new GLArithmeticXP(*this); } +GrGLSLXferProcessor* ArithmeticXP::createGLSLInstance() const { return new GLArithmeticXP(*this); } GrXferProcessor::OptFlags ArithmeticXP::onGetOptimizations(const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI, diff --git a/src/effects/SkArithmeticMode_gpu.h b/src/effects/SkArithmeticMode_gpu.h index 2f8013f..37ad49e 100644 --- a/src/effects/SkArithmeticMode_gpu.h +++ b/src/effects/SkArithmeticMode_gpu.h @@ -47,9 +47,9 @@ public: bool enforcePMColor() const { return fEnforcePMColor; } private: - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; bool onIsEqual(const GrFragmentProcessor&) const override; diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 7ec9464..ac10a8b 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -655,9 +655,9 @@ private: GrRectBlurEffect(const SkRect& rect, float sigma, GrTexture *blurProfile, GrSLPrecision fPrecision); - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; bool onIsEqual(const GrFragmentProcessor&) const override; @@ -816,12 +816,12 @@ GrRectBlurEffect::GrRectBlurEffect(const SkRect& rect, float sigma, GrTexture *b this->setWillReadFragmentPosition(); } -void GrRectBlurEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void GrRectBlurEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLRectBlurEffect::GenKey(fPrecision, b); } -GrGLSLFragmentProcessor* GrRectBlurEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrRectBlurEffect::onCreateGLSLInstance() const { return new GrGLRectBlurEffect(*this, fPrecision); } @@ -912,12 +912,12 @@ public: float getSigma() const { return fSigma; } private: - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; GrRRectBlurEffect(float sigma, const SkRRect&, GrTexture* profileTexture); - virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override; + virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override; bool onIsEqual(const GrFragmentProcessor& other) const override; @@ -1131,11 +1131,12 @@ void GrGLRRectBlurEffect::onSetData(const GrGLSLProgramDataManager& pdman, pdman.set1f(fCornerRadiusUniform, radius); } -void GrRRectBlurEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { +void GrRRectBlurEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLRRectBlurEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* GrRRectBlurEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrRRectBlurEffect::onCreateGLSLInstance() const { return new GrGLRRectBlurEffect(*this); } diff --git a/src/effects/SkColorCubeFilter.cpp b/src/effects/SkColorCubeFilter.cpp index 541f43a..87746e0 100644 --- a/src/effects/SkColorCubeFilter.cpp +++ b/src/effects/SkColorCubeFilter.cpp @@ -175,10 +175,10 @@ public: void onComputeInvariantOutput(GrInvariantOutput*) const override; - class GLProcessor : public GrGLSLFragmentProcessor { + class GLSLProcessor : public GrGLSLFragmentProcessor { public: - GLProcessor(const GrProcessor&); - virtual ~GLProcessor(); + GLSLProcessor(const GrProcessor&); + virtual ~GLSLProcessor(); virtual void emitCode(EmitArgs&) override; @@ -195,10 +195,10 @@ public: }; private: - virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, + virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; bool onIsEqual(const GrFragmentProcessor&) const override { return true; } @@ -220,12 +220,13 @@ GrColorCubeEffect::GrColorCubeEffect(GrTexture* colorCube) GrColorCubeEffect::~GrColorCubeEffect() { } -void GrColorCubeEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { - GLProcessor::GenKey(*this, caps, b); +void GrColorCubeEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { + GLSLProcessor::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* GrColorCubeEffect::onCreateGLInstance() const { - return new GLProcessor(*this); +GrGLSLFragmentProcessor* GrColorCubeEffect::onCreateGLSLInstance() const { + return new GLSLProcessor(*this); } void GrColorCubeEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const { @@ -234,13 +235,13 @@ void GrColorCubeEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const /////////////////////////////////////////////////////////////////////////////// -GrColorCubeEffect::GLProcessor::GLProcessor(const GrProcessor&) { +GrColorCubeEffect::GLSLProcessor::GLSLProcessor(const GrProcessor&) { } -GrColorCubeEffect::GLProcessor::~GLProcessor() { +GrColorCubeEffect::GLSLProcessor::~GLSLProcessor() { } -void GrColorCubeEffect::GLProcessor::emitCode(EmitArgs& args) { +void GrColorCubeEffect::GLSLProcessor::emitCode(EmitArgs& args) { if (nullptr == args.fInputColor) { args.fInputColor = "vec4(1)"; } @@ -293,16 +294,16 @@ void GrColorCubeEffect::GLProcessor::emitCode(EmitArgs& args) { cubeIdx, nonZeroAlpha, args.fInputColor); } -void GrColorCubeEffect::GLProcessor::onSetData(const GrGLSLProgramDataManager& pdman, - const GrProcessor& proc) { +void GrColorCubeEffect::GLSLProcessor::onSetData(const GrGLSLProgramDataManager& pdman, + const GrProcessor& proc) { const GrColorCubeEffect& colorCube = proc.cast(); SkScalar size = SkIntToScalar(colorCube.colorCubeSize()); pdman.set1f(fColorCubeSizeUni, SkScalarToFloat(size)); pdman.set1f(fColorCubeInvSizeUni, SkScalarToFloat(SkScalarInvert(size))); } -void GrColorCubeEffect::GLProcessor::GenKey(const GrProcessor& proc, - const GrGLSLCaps&, GrProcessorKeyBuilder* b) { +void GrColorCubeEffect::GLSLProcessor::GenKey(const GrProcessor& proc, + const GrGLSLCaps&, GrProcessorKeyBuilder* b) { } const GrFragmentProcessor* SkColorCubeFilter::asFragmentProcessor(GrContext* context) const { diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp index bc72b1f..bb7dd94 100644 --- a/src/effects/SkColorMatrixFilter.cpp +++ b/src/effects/SkColorMatrixFilter.cpp @@ -400,12 +400,12 @@ public: GR_DECLARE_FRAGMENT_PROCESSOR_TEST; - class GLProcessor : public GrGLSLFragmentProcessor { + class GLSLProcessor : public GrGLSLFragmentProcessor { public: // this class always generates the same code. static void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder* b) {} - GLProcessor(const GrProcessor&) {} + GLSLProcessor(const GrProcessor&) {} virtual void emitCode(EmitArgs& args) override { fMatrixHandle = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility, @@ -466,11 +466,13 @@ private: this->initClassID(); } - GrGLSLFragmentProcessor* onCreateGLInstance() const override { return new GLProcessor(*this); } + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { + return new GLSLProcessor(*this); + } - virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override { - GLProcessor::GenKey(*this, caps, b); + virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override { + GLSLProcessor::GenKey(*this, caps, b); } bool onIsEqual(const GrFragmentProcessor& s) const override { diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index d90e9f3..715391c 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp @@ -352,12 +352,12 @@ public: const GrTextureDomain& domain() const { return fDomain; } private: - GrGLSLFragmentProcessor* onCreateGLInstance() const override { + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { return new GrGLDisplacementMapEffect(*this); } - virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override { + virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override { GrGLDisplacementMapEffect::GenKey(*this, caps, b); } diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index 46daea1..411d73b 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -531,9 +531,9 @@ public: SkScalar kd() const { return fKD; } private: - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor&) const override; @@ -564,13 +564,13 @@ public: const char* name() const override { return "SpecularLighting"; } - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; SkScalar ks() const { return fKS; } SkScalar shininess() const { return fShininess; } private: - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor&) const override; @@ -1614,12 +1614,12 @@ bool GrDiffuseLightingEffect::onIsEqual(const GrFragmentProcessor& sBase) const this->kd() == s.kd(); } -void GrDiffuseLightingEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void GrDiffuseLightingEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLDiffuseLightingEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* GrDiffuseLightingEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrDiffuseLightingEffect::onCreateGLSLInstance() const { return new GrGLDiffuseLightingEffect(*this); } @@ -1815,12 +1815,12 @@ bool GrSpecularLightingEffect::onIsEqual(const GrFragmentProcessor& sBase) const this->shininess() == s.shininess(); } -void GrSpecularLightingEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void GrSpecularLightingEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLSpecularLightingEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* GrSpecularLightingEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrSpecularLightingEffect::onCreateGLSLInstance() const { return new GrGLSpecularLightingEffect(*this); } diff --git a/src/effects/SkLumaColorFilter.cpp b/src/effects/SkLumaColorFilter.cpp index 107331a..7f6dd1b 100644 --- a/src/effects/SkLumaColorFilter.cpp +++ b/src/effects/SkLumaColorFilter.cpp @@ -61,9 +61,9 @@ public: const char* name() const override { return "Luminance-to-Alpha"; } - class GLProcessor : public GrGLSLFragmentProcessor { + class GLSLProcessor : public GrGLSLFragmentProcessor { public: - GLProcessor(const GrProcessor&) {} + GLSLProcessor(const GrProcessor&) {} static void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder* b) {} @@ -92,11 +92,13 @@ private: this->initClassID(); } - GrGLSLFragmentProcessor* onCreateGLInstance() const override { return new GLProcessor(*this); } + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { + return new GLSLProcessor(*this); + } - virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override { - GLProcessor::GenKey(*this, caps, b); + virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override { + GLSLProcessor::GenKey(*this, caps, b); } bool onIsEqual(const GrFragmentProcessor&) const override { return true; } diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp index 6c0b00f..61118f5 100644 --- a/src/effects/SkMagnifierImageFilter.cpp +++ b/src/effects/SkMagnifierImageFilter.cpp @@ -74,9 +74,9 @@ private: this->initClassID(); } - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor&) const override; @@ -180,12 +180,12 @@ void GrGLMagnifierEffect::onSetData(const GrGLSLProgramDataManager& pdman, ///////////////////////////////////////////////////////////////////// -void GrMagnifierEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void GrMagnifierEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLMagnifierEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* GrMagnifierEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrMagnifierEffect::onCreateGLSLInstance() const { return new GrGLMagnifierEffect(*this); } diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index b0b8490..251938e 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -236,9 +236,9 @@ protected: float fRange[2]; private: - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor&) const override; @@ -423,11 +423,12 @@ GrMorphologyEffect::GrMorphologyEffect(GrTexture* texture, GrMorphologyEffect::~GrMorphologyEffect() { } -void GrMorphologyEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { +void GrMorphologyEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLMorphologyEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* GrMorphologyEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrMorphologyEffect::onCreateGLSLInstance() 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 2d4ab8f..914c534 100644 --- a/src/effects/SkPerlinNoiseShader.cpp +++ b/src/effects/SkPerlinNoiseShader.cpp @@ -534,12 +534,12 @@ public: const SkMatrix& matrix() const { return fCoordTransform.getMatrix(); } private: - GrGLSLFragmentProcessor* onCreateGLInstance() const override { + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { return new GrGLPerlinNoise(*this); } - virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override { + virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override { GrGLPerlinNoise::GenKey(*this, caps, b); } diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index 55de828..3e4877e 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -352,9 +352,9 @@ public: int atlasRow() const { return fRow; } private: - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor&) const override; @@ -501,12 +501,12 @@ ColorTableEffect::~ColorTableEffect() { } } -void ColorTableEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void ColorTableEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GLColorTableEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* ColorTableEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* ColorTableEffect::onCreateGLSLInstance() const { return new GLColorTableEffect(*this); } diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp index 1726bb6..ada9d70 100644 --- a/src/effects/gradients/SkLinearGradient.cpp +++ b/src/effects/gradients/SkLinearGradient.cpp @@ -487,12 +487,12 @@ private: this->initClassID(); } - GrGLSLFragmentProcessor* onCreateGLInstance() const override { + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { return new GrGLLinearGradient(*this); } - virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override { + virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override { GrGLLinearGradient::GenKey(*this, caps, b); } diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp index 05adcb1..c9ff20f 100644 --- a/src/effects/gradients/SkRadialGradient.cpp +++ b/src/effects/gradients/SkRadialGradient.cpp @@ -459,12 +459,12 @@ private: this->initClassID(); } - GrGLSLFragmentProcessor* onCreateGLInstance() const override { + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { return new GrGLRadialGradient(*this); } - virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override { + virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override { GrGLRadialGradient::GenKey(*this, caps, b); } diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp index 71e8957..c41c2a3 100644 --- a/src/effects/gradients/SkSweepGradient.cpp +++ b/src/effects/gradients/SkSweepGradient.cpp @@ -208,12 +208,12 @@ private: this->initClassID(); } - GrGLSLFragmentProcessor* onCreateGLInstance() const override { + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { return new GrGLSweepGradient(*this); } - virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override { + virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override { GrGLSweepGradient::GenKey(*this, caps, b); } diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp index fef8b43..653aa01 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp @@ -79,9 +79,9 @@ public: SkScalar radius() const { return fRadius0; } private: - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor& sBase) const override { const Edge2PtConicalEffect& s = sBase.cast(); @@ -169,12 +169,12 @@ private: }; -void Edge2PtConicalEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void Edge2PtConicalEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GLEdge2PtConicalEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* Edge2PtConicalEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* Edge2PtConicalEffect::onCreateGLSLInstance() const { return new GLEdge2PtConicalEffect(*this); } @@ -385,9 +385,9 @@ public: SkScalar focal() const { return fFocalX; } private: - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor& sBase) const override { const FocalOutside2PtConicalEffect& s = sBase.cast(); @@ -446,12 +446,12 @@ private: }; -void FocalOutside2PtConicalEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void FocalOutside2PtConicalEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GLFocalOutside2PtConicalEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* FocalOutside2PtConicalEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* FocalOutside2PtConicalEffect::onCreateGLSLInstance() const { return new GLFocalOutside2PtConicalEffect(*this); } @@ -592,12 +592,12 @@ public: SkScalar focal() const { return fFocalX; } - typedef GLFocalInside2PtConicalEffect GLProcessor; + typedef GLFocalInside2PtConicalEffect GLSLProcessor; private: - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor& sBase) const override { const FocalInside2PtConicalEffect& s = sBase.cast(); @@ -650,12 +650,12 @@ private: }; -void FocalInside2PtConicalEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void FocalInside2PtConicalEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GLFocalInside2PtConicalEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* FocalInside2PtConicalEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* FocalInside2PtConicalEffect::onCreateGLSLInstance() const { return new GLFocalInside2PtConicalEffect(*this); } @@ -828,10 +828,10 @@ public: SkScalar C() const { return fInfo.fC; } private: - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override; + virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override; bool onIsEqual(const GrFragmentProcessor& sBase) const override { const CircleInside2PtConicalEffect& s = sBase.cast(); @@ -892,12 +892,12 @@ private: }; -void CircleInside2PtConicalEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void CircleInside2PtConicalEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GLCircleInside2PtConicalEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* CircleInside2PtConicalEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* CircleInside2PtConicalEffect::onCreateGLSLInstance() const { return new GLCircleInside2PtConicalEffect(*this); } @@ -1040,9 +1040,9 @@ public: bool isFlipped() const { return fIsFlipped; } private: - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor& sBase) const override { const CircleOutside2PtConicalEffect& s = sBase.cast(); @@ -1117,12 +1117,12 @@ private: }; -void CircleOutside2PtConicalEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void CircleOutside2PtConicalEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GLCircleOutside2PtConicalEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* CircleOutside2PtConicalEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* CircleOutside2PtConicalEffect::onCreateGLSLInstance() const { return new GLCircleOutside2PtConicalEffect(*this); } diff --git a/src/gpu/GrDefaultGeoProcFactory.cpp b/src/gpu/GrDefaultGeoProcFactory.cpp index 6fcec4c..e1da5d6 100644 --- a/src/gpu/GrDefaultGeoProcFactory.cpp +++ b/src/gpu/GrDefaultGeoProcFactory.cpp @@ -56,9 +56,9 @@ public: bool coverageWillBeIgnored() const { return fCoverageWillBeIgnored; } bool hasVertexCoverage() const { return SkToBool(fInCoverage); } - class GLProcessor : public GrGLSLGeometryProcessor { + class GLSLProcessor : public GrGLSLGeometryProcessor { public: - GLProcessor() + GLSLProcessor() : fViewMatrix(SkMatrix::InvalidMatrix()), fColor(GrColor_ILLEGAL), fCoverage(0xff) {} void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override { @@ -176,12 +176,12 @@ public: typedef GrGLSLGeometryProcessor INHERITED; }; - void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { - GLProcessor::GenKey(*this, caps, b); + void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { + GLSLProcessor::GenKey(*this, caps, b); } - GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override { - return new GLProcessor(); + GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override { + return new GLSLProcessor(); } private: diff --git a/src/gpu/GrFragmentProcessor.cpp b/src/gpu/GrFragmentProcessor.cpp index 3741639..478fdb3 100644 --- a/src/gpu/GrFragmentProcessor.cpp +++ b/src/gpu/GrFragmentProcessor.cpp @@ -50,11 +50,11 @@ bool GrFragmentProcessor::isEqual(const GrFragmentProcessor& that, return true; } -GrGLSLFragmentProcessor* GrFragmentProcessor::createGLInstance() const { - GrGLSLFragmentProcessor* glFragProc = this->onCreateGLInstance(); +GrGLSLFragmentProcessor* GrFragmentProcessor::createGLSLInstance() const { + GrGLSLFragmentProcessor* glFragProc = this->onCreateGLSLInstance(); glFragProc->fChildProcessors.push_back_n(fChildProcessors.count()); for (int i = 0; i < fChildProcessors.count(); ++i) { - glFragProc->fChildProcessors[i] = fChildProcessors[i]->createGLInstance(); + glFragProc->fChildProcessors[i] = fChildProcessors[i]->createGLSLInstance(); } return glFragProc; } @@ -147,7 +147,7 @@ const GrFragmentProcessor* GrFragmentProcessor::MulOutputByInputUnpremulColor( const char* name() const override { return "Premultiply"; } private: - GrGLSLFragmentProcessor* onCreateGLInstance() const override { + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { class GLFP : public GrGLSLFragmentProcessor { public: GLFP() {} @@ -163,7 +163,7 @@ const GrFragmentProcessor* GrFragmentProcessor::MulOutputByInputUnpremulColor( return new GLFP; } - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override {} + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override {} bool onIsEqual(const GrFragmentProcessor&) const override { return true; } @@ -220,7 +220,7 @@ const GrFragmentProcessor* GrFragmentProcessor::OverrideInput(const GrFragmentPr const char* name() const override { return "Replace Color"; } - GrGLSLFragmentProcessor* onCreateGLInstance() const override { + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { class GLFP : public GrGLSLFragmentProcessor { public: GLFP() : fHaveSetColor(false) {} @@ -259,7 +259,8 @@ const GrFragmentProcessor* GrFragmentProcessor::OverrideInput(const GrFragmentPr } private: - void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {} + void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override + {} bool onIsEqual(const GrFragmentProcessor& that) const override { return fColor == that.cast().fColor; @@ -297,7 +298,7 @@ const GrFragmentProcessor* GrFragmentProcessor::RunInSeries(const GrFragmentProc const char* name() const override { return "Series"; } - GrGLSLFragmentProcessor* onCreateGLInstance() const override { + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { class GLFP : public GrGLSLFragmentProcessor { public: GLFP() {} @@ -317,7 +318,7 @@ const GrFragmentProcessor* GrFragmentProcessor::RunInSeries(const GrFragmentProc } private: - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override {} + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override {} bool onIsEqual(const GrFragmentProcessor&) const override { return true; } diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp index 3c438d4..fde9ba7 100644 --- a/src/gpu/GrOvalRenderer.cpp +++ b/src/gpu/GrOvalRenderer.cpp @@ -90,9 +90,9 @@ public: inline bool isStroked() const { return fStroke; } - class GLProcessor : public GrGLSLGeometryProcessor { + class GLSLProcessor : public GrGLSLGeometryProcessor { public: - GLProcessor() + GLSLProcessor() : fColor(GrColor_ILLEGAL) {} void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override{ @@ -165,12 +165,12 @@ public: typedef GrGLSLGeometryProcessor INHERITED; }; - void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { - GLProcessor::GenKey(*this, caps, b); + void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { + GLSLProcessor::GenKey(*this, caps, b); } - GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override { - return new GLProcessor(); + GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override { + return new GLSLProcessor(); } private: @@ -238,9 +238,9 @@ public: inline bool isStroked() const { return fStroke; } - class GLProcessor : public GrGLSLGeometryProcessor { + class GLSLProcessor : public GrGLSLGeometryProcessor { public: - GLProcessor() + GLSLProcessor() : fColor(GrColor_ILLEGAL) {} void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override{ @@ -334,12 +334,12 @@ public: typedef GrGLSLGeometryProcessor INHERITED; }; - void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { - GLProcessor::GenKey(*this, caps, b); + void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { + GLSLProcessor::GenKey(*this, caps, b); } - GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override { - return new GLProcessor(); + GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override { + return new GLSLProcessor(); } private: @@ -413,9 +413,9 @@ public: inline Mode getMode() const { return fMode; } - class GLProcessor : public GrGLSLGeometryProcessor { + class GLSLProcessor : public GrGLSLGeometryProcessor { public: - GLProcessor() + GLSLProcessor() : fViewMatrix(SkMatrix::InvalidMatrix()), fColor(GrColor_ILLEGAL) {} void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override { @@ -528,12 +528,12 @@ public: typedef GrGLSLGeometryProcessor INHERITED; }; - void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { - GLProcessor::GenKey(*this, caps, b); + void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { + GLSLProcessor::GenKey(*this, caps, b); } - GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override { - return new GLProcessor(); + GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override { + return new GLSLProcessor(); } private: diff --git a/src/gpu/GrPathProcessor.cpp b/src/gpu/GrPathProcessor.cpp index f5adfe7..6e11140 100644 --- a/src/gpu/GrPathProcessor.cpp +++ b/src/gpu/GrPathProcessor.cpp @@ -126,12 +126,12 @@ GrPathProcessor::GrPathProcessor(GrColor color, this->initClassID(); } -void GrPathProcessor::getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void GrPathProcessor::getGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLPathProcessor::GenKey(*this, caps, b); } -GrGLSLPrimitiveProcessor* GrPathProcessor::createGLInstance(const GrGLSLCaps& caps) const { +GrGLSLPrimitiveProcessor* GrPathProcessor::createGLSLInstance(const GrGLSLCaps& caps) const { SkASSERT(caps.pathRenderingSupport()); return new GrGLPathProcessor(); } diff --git a/src/gpu/GrPathProcessor.h b/src/gpu/GrPathProcessor.h index 8b1f1ab..3dce450 100644 --- a/src/gpu/GrPathProcessor.h +++ b/src/gpu/GrPathProcessor.h @@ -31,10 +31,10 @@ public: bool willUseGeoShader() const override { return false; } - virtual void getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override; + virtual void getGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override; - virtual GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps& caps) const override; + virtual GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps& caps) const override; bool hasTransformedLocalCoords() const override { return false; } diff --git a/src/gpu/GrPrimitiveProcessor.h b/src/gpu/GrPrimitiveProcessor.h index e15d2da..46136f0 100644 --- a/src/gpu/GrPrimitiveProcessor.h +++ b/src/gpu/GrPrimitiveProcessor.h @@ -190,14 +190,14 @@ public: * * TODO: A better name for this function would be "compute" instead of "get". */ - virtual void getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const = 0; + virtual void getGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const = 0; /** Returns a new instance of the appropriate *GL* implementation class for the given GrProcessor; caller is responsible for deleting the object. */ - virtual GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps& caps) const = 0; + virtual GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps& caps) const = 0; bool isPathRendering() const { return fIsPathRendering; } diff --git a/src/gpu/GrXferProcessor.cpp b/src/gpu/GrXferProcessor.cpp index a95445e..655fdfa 100644 --- a/src/gpu/GrXferProcessor.cpp +++ b/src/gpu/GrXferProcessor.cpp @@ -73,7 +73,7 @@ void GrXferProcessor::getBlendInfo(BlendInfo* blendInfo) const { } } -void GrXferProcessor::getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { +void GrXferProcessor::getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { uint32_t key = this->willReadDstColor() ? 0x1 : 0x0; if (key) { if (const GrTexture* dstTexture = this->getDstTexture()) { @@ -90,7 +90,7 @@ void GrXferProcessor::getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBu } } b->add32(key); - this->onGetGLProcessorKey(caps, b); + this->onGetGLSLProcessorKey(caps, b); } GrXferBarrierType GrXferProcessor::xferBarrierType(const GrRenderTarget* rt, diff --git a/src/gpu/batches/GrAAConvexPathRenderer.cpp b/src/gpu/batches/GrAAConvexPathRenderer.cpp index 36c1abf..d5522b1 100644 --- a/src/gpu/batches/GrAAConvexPathRenderer.cpp +++ b/src/gpu/batches/GrAAConvexPathRenderer.cpp @@ -541,9 +541,9 @@ public: const SkMatrix& localMatrix() const { return fLocalMatrix; } bool usesLocalCoords() const { return fUsesLocalCoords; } - class GLProcessor : public GrGLSLGeometryProcessor { + class GLSLProcessor : public GrGLSLGeometryProcessor { public: - GLProcessor() + GLSLProcessor() : fColor(GrColor_ILLEGAL) {} void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override { @@ -630,12 +630,12 @@ public: typedef GrGLSLGeometryProcessor INHERITED; }; - void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { - GLProcessor::GenKey(*this, caps, b); + void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { + GLSLProcessor::GenKey(*this, caps, b); } - GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override { - return new GLProcessor(); + GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override { + return new GLSLProcessor(); } private: diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp index 57b6ed4..7385d8b 100644 --- a/src/gpu/effects/GrBezierEffect.cpp +++ b/src/gpu/effects/GrBezierEffect.cpp @@ -182,12 +182,12 @@ void GrGLConicEffect::GenKey(const GrGeometryProcessor& gp, GrConicEffect::~GrConicEffect() {} -void GrConicEffect::getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void GrConicEffect::getGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLConicEffect::GenKey(*this, caps, b); } -GrGLSLPrimitiveProcessor* GrConicEffect::createGLInstance(const GrGLSLCaps&) const { +GrGLSLPrimitiveProcessor* GrConicEffect::createGLSLInstance(const GrGLSLCaps&) const { return new GrGLConicEffect(*this); } @@ -383,12 +383,12 @@ void GrGLQuadEffect::GenKey(const GrGeometryProcessor& gp, GrQuadEffect::~GrQuadEffect() {} -void GrQuadEffect::getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void GrQuadEffect::getGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLQuadEffect::GenKey(*this, caps, b); } -GrGLSLPrimitiveProcessor* GrQuadEffect::createGLInstance(const GrGLSLCaps&) const { +GrGLSLPrimitiveProcessor* GrQuadEffect::createGLSLInstance(const GrGLSLCaps&) const { return new GrGLQuadEffect(*this); } @@ -600,11 +600,11 @@ void GrGLCubicEffect::GenKey(const GrGeometryProcessor& gp, GrCubicEffect::~GrCubicEffect() {} -void GrCubicEffect::getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { +void GrCubicEffect::getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GrGLCubicEffect::GenKey(*this, caps, b); } -GrGLSLPrimitiveProcessor* GrCubicEffect::createGLInstance(const GrGLSLCaps&) const { +GrGLSLPrimitiveProcessor* GrCubicEffect::createGLSLInstance(const GrGLSLCaps&) const { return new GrGLCubicEffect(*this); } diff --git a/src/gpu/effects/GrBezierEffect.h b/src/gpu/effects/GrBezierEffect.h index 0f1ee74..ddb249b 100644 --- a/src/gpu/effects/GrBezierEffect.h +++ b/src/gpu/effects/GrBezierEffect.h @@ -103,9 +103,9 @@ public: bool usesLocalCoords() const { return fUsesLocalCoords; } uint8_t coverageScale() const { return fCoverageScale; } - void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; + void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; + GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override; private: GrConicEffect(GrColor, const SkMatrix& viewMatrix, uint8_t coverage, GrPrimitiveEdgeType, @@ -183,9 +183,9 @@ public: bool usesLocalCoords() const { return fUsesLocalCoords; } uint8_t coverageScale() const { return fCoverageScale; } - void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; + void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; + GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override; private: GrQuadEffect(GrColor, const SkMatrix& viewMatrix, uint8_t coverage, GrPrimitiveEdgeType, @@ -255,9 +255,9 @@ public: bool colorIgnored() const { return GrColor_ILLEGAL == fColor; } const SkMatrix& viewMatrix() const { return fViewMatrix; } - void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; + void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; + GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override; private: GrCubicEffect(GrColor, const SkMatrix& viewMatrix, GrPrimitiveEdgeType); diff --git a/src/gpu/effects/GrBicubicEffect.cpp b/src/gpu/effects/GrBicubicEffect.cpp index dedb927..ba8eff3 100644 --- a/src/gpu/effects/GrBicubicEffect.cpp +++ b/src/gpu/effects/GrBicubicEffect.cpp @@ -152,12 +152,12 @@ GrBicubicEffect::GrBicubicEffect(GrTexture* texture, GrBicubicEffect::~GrBicubicEffect() { } -void GrBicubicEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void GrBicubicEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLBicubicEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* GrBicubicEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrBicubicEffect::onCreateGLSLInstance() const { return new GrGLBicubicEffect(*this); } diff --git a/src/gpu/effects/GrBicubicEffect.h b/src/gpu/effects/GrBicubicEffect.h index 67569d8..2087192 100644 --- a/src/gpu/effects/GrBicubicEffect.h +++ b/src/gpu/effects/GrBicubicEffect.h @@ -87,9 +87,9 @@ private: GrBicubicEffect(GrTexture*, const SkScalar coefficients[16], const SkMatrix &matrix, const SkRect& domain); - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor&) const override; diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp index b9c1c8d..3958ad6 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp @@ -146,11 +146,12 @@ GrBitmapTextGeoProc::GrBitmapTextGeoProc(GrColor color, GrTexture* texture, this->addTextureAccess(&fTextureAccess); } -void GrBitmapTextGeoProc::getGLProcessorKey(const GrGLSLCaps& caps,GrProcessorKeyBuilder* b) const { +void GrBitmapTextGeoProc::getGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLBitmapTextGeoProc::GenKey(*this, caps, b); } -GrGLSLPrimitiveProcessor* GrBitmapTextGeoProc::createGLInstance(const GrGLSLCaps& caps) const { +GrGLSLPrimitiveProcessor* GrBitmapTextGeoProc::createGLSLInstance(const GrGLSLCaps& caps) const { return new GrGLBitmapTextGeoProc(); } diff --git a/src/gpu/effects/GrBitmapTextGeoProc.h b/src/gpu/effects/GrBitmapTextGeoProc.h index ed04dff..5501d93 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.h +++ b/src/gpu/effects/GrBitmapTextGeoProc.h @@ -41,9 +41,9 @@ public: const SkMatrix& localMatrix() const { return fLocalMatrix; } bool usesLocalCoords() const { return fUsesLocalCoords; } - void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; + void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps& caps) const override; + GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps& caps) const override; private: GrBitmapTextGeoProc(GrColor, GrTexture* texture, const GrTextureParams& params, diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index 0273858..dfe3e04 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -142,12 +142,12 @@ const GrFragmentProcessor* GrConfigConversionEffect::TestCreate(GrProcessorTestD /////////////////////////////////////////////////////////////////////////////// -void GrConfigConversionEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void GrConfigConversionEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLConfigConversionEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* GrConfigConversionEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrConfigConversionEffect::onCreateGLSLInstance() const { return new GrGLConfigConversionEffect(*this); } diff --git a/src/gpu/effects/GrConfigConversionEffect.h b/src/gpu/effects/GrConfigConversionEffect.h index bf13afb..56beef9 100644 --- a/src/gpu/effects/GrConfigConversionEffect.h +++ b/src/gpu/effects/GrConfigConversionEffect.h @@ -56,9 +56,9 @@ private: PMConversion pmConversion, const SkMatrix& matrix); - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor&) const override; diff --git a/src/gpu/effects/GrConstColorProcessor.cpp b/src/gpu/effects/GrConstColorProcessor.cpp index 09aa75d..f379e58 100644 --- a/src/gpu/effects/GrConstColorProcessor.cpp +++ b/src/gpu/effects/GrConstColorProcessor.cpp @@ -92,11 +92,12 @@ void GrConstColorProcessor::onComputeInvariantOutput(GrInvariantOutput* inout) c } } -void GrConstColorProcessor::onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder* b) const { +void GrConstColorProcessor::onGetGLSLProcessorKey(const GrGLSLCaps&, + GrProcessorKeyBuilder* b) const { b->add32(fMode); } -GrGLSLFragmentProcessor* GrConstColorProcessor::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrConstColorProcessor::onCreateGLSLInstance() const { return new GLConstColorProcessor; } diff --git a/src/gpu/effects/GrConvexPolyEffect.cpp b/src/gpu/effects/GrConvexPolyEffect.cpp index 3beecb4..69dbafd 100644 --- a/src/gpu/effects/GrConvexPolyEffect.cpp +++ b/src/gpu/effects/GrConvexPolyEffect.cpp @@ -26,7 +26,7 @@ public: const char* name() const override { return "AARect"; } - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; private: AARectEffect(GrPrimitiveEdgeType edgeType, const SkRect& rect) @@ -35,7 +35,7 @@ private: this->setWillReadFragmentPosition(); } - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; bool onIsEqual(const GrFragmentProcessor& other) const override { const AARectEffect& aare = other.cast(); @@ -156,11 +156,11 @@ void GLAARectEffect::GenKey(const GrProcessor& processor, const GrGLSLCaps&, b->add32(aare.getEdgeType()); } -void AARectEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { +void AARectEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLAARectEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* AARectEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* AARectEffect::onCreateGLSLInstance() const { return new GLAARectEffect(*this); } @@ -303,12 +303,12 @@ void GrConvexPolyEffect::onComputeInvariantOutput(GrInvariantOutput* inout) cons inout->mulByUnknownSingleComponent(); } -void GrConvexPolyEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void GrConvexPolyEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLConvexPolyEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* GrConvexPolyEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrConvexPolyEffect::onCreateGLSLInstance() const { return new GrGLConvexPolyEffect(*this); } diff --git a/src/gpu/effects/GrConvexPolyEffect.h b/src/gpu/effects/GrConvexPolyEffect.h index 6622ca3..316f111 100644 --- a/src/gpu/effects/GrConvexPolyEffect.h +++ b/src/gpu/effects/GrConvexPolyEffect.h @@ -72,9 +72,9 @@ public: private: GrConvexPolyEffect(GrPrimitiveEdgeType edgeType, int n, const SkScalar edges[]); - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor& other) const override; diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index 55b44b7..f26ddd1 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -194,12 +194,12 @@ GrConvolutionEffect::GrConvolutionEffect(GrTexture* texture, GrConvolutionEffect::~GrConvolutionEffect() { } -void GrConvolutionEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void GrConvolutionEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLConvolutionEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* GrConvolutionEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrConvolutionEffect::onCreateGLSLInstance() const { return new GrGLConvolutionEffect(*this); } diff --git a/src/gpu/effects/GrConvolutionEffect.h b/src/gpu/effects/GrConvolutionEffect.h index 0396415..af58021 100644 --- a/src/gpu/effects/GrConvolutionEffect.h +++ b/src/gpu/effects/GrConvolutionEffect.h @@ -80,9 +80,9 @@ private: bool useBounds, float bounds[2]); - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor&) const override; diff --git a/src/gpu/effects/GrCoverageSetOpXP.cpp b/src/gpu/effects/GrCoverageSetOpXP.cpp index 98bab25..86cd502 100644 --- a/src/gpu/effects/GrCoverageSetOpXP.cpp +++ b/src/gpu/effects/GrCoverageSetOpXP.cpp @@ -25,7 +25,7 @@ public: const char* name() const override { return "Coverage Set Op"; } - GrGLSLXferProcessor* createGLInstance() const override; + GrGLSLXferProcessor* createGLSLInstance() const override; bool invertCoverage() const { return fInvertCoverage; } @@ -38,7 +38,7 @@ private: GrColor* color, const GrCaps& caps) override; - void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; void onGetBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const override; @@ -97,11 +97,12 @@ CoverageSetOpXP::CoverageSetOpXP(SkRegion::Op regionOp, bool invertCoverage) CoverageSetOpXP::~CoverageSetOpXP() { } -void CoverageSetOpXP::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { +void CoverageSetOpXP::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GLCoverageSetOpXP::GenKey(*this, caps, b); } -GrGLSLXferProcessor* CoverageSetOpXP::createGLInstance() const { +GrGLSLXferProcessor* CoverageSetOpXP::createGLSLInstance() const { return new GLCoverageSetOpXP(*this); } diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp index ff163e2..1bfc0b7 100644 --- a/src/gpu/effects/GrCustomXfermode.cpp +++ b/src/gpu/effects/GrCustomXfermode.cpp @@ -88,7 +88,7 @@ public: const char* name() const override { return "Custom Xfermode"; } - GrGLSLXferProcessor* createGLInstance() const override; + GrGLSLXferProcessor* createGLSLInstance() const override; SkXfermode::Mode mode() const { return fMode; } bool hasHWBlendEquation() const { return -1 != static_cast(fHWBlendEquation); } @@ -105,7 +105,7 @@ private: GrColor* overrideColor, const GrCaps& caps) override; - void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; GrXferBarrierType onXferBarrier(const GrRenderTarget*, const GrCaps&) const override; @@ -175,11 +175,11 @@ private: /////////////////////////////////////////////////////////////////////////////// -void CustomXP::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { +void CustomXP::onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLCustomXP::GenKey(*this, caps, b); } -GrGLSLXferProcessor* CustomXP::createGLInstance() const { +GrGLSLXferProcessor* CustomXP::createGLSLInstance() const { SkASSERT(this->willReadDstColor() != this->hasHWBlendEquation()); return new GLCustomXP(*this); } diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp index c74ae6b..a4efd02 100644 --- a/src/gpu/effects/GrDashingEffect.cpp +++ b/src/gpu/effects/GrDashingEffect.cpp @@ -790,9 +790,9 @@ public: bool usesLocalCoords() const { return fUsesLocalCoords; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder* b) const override; + void getGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder* b) const override; - GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; + GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override; private: DashingCircleEffect(GrColor, DashAAMode aaMode, const SkMatrix& localMatrix, @@ -929,11 +929,12 @@ GrGeometryProcessor* DashingCircleEffect::Create(GrColor color, return new DashingCircleEffect(color, aaMode, localMatrix, usesLocalCoords); } -void DashingCircleEffect::getGLProcessorKey(const GrGLSLCaps& caps,GrProcessorKeyBuilder* b) const { +void DashingCircleEffect::getGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GLDashingCircleEffect::GenKey(*this, caps, b); } -GrGLSLPrimitiveProcessor* DashingCircleEffect::createGLInstance(const GrGLSLCaps&) const { +GrGLSLPrimitiveProcessor* DashingCircleEffect::createGLSLInstance(const GrGLSLCaps&) const { return new GLDashingCircleEffect(); } @@ -1001,9 +1002,9 @@ public: bool usesLocalCoords() const { return fUsesLocalCoords; } - void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; + void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; + GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override; private: DashingLineEffect(GrColor, DashAAMode aaMode, const SkMatrix& localMatrix, @@ -1153,12 +1154,12 @@ GrGeometryProcessor* DashingLineEffect::Create(GrColor color, return new DashingLineEffect(color, aaMode, localMatrix, usesLocalCoords); } -void DashingLineEffect::getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void DashingLineEffect::getGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GLDashingLineEffect::GenKey(*this, caps, b); } -GrGLSLPrimitiveProcessor* DashingLineEffect::createGLInstance(const GrGLSLCaps&) const { +GrGLSLPrimitiveProcessor* DashingLineEffect::createGLSLInstance(const GrGLSLCaps&) const { return new GLDashingLineEffect(); } diff --git a/src/gpu/effects/GrDisableColorXP.cpp b/src/gpu/effects/GrDisableColorXP.cpp index 9cfcaaf..792d146 100644 --- a/src/gpu/effects/GrDisableColorXP.cpp +++ b/src/gpu/effects/GrDisableColorXP.cpp @@ -24,7 +24,7 @@ public: const char* name() const override { return "Disable Color"; } - GrGLSLXferProcessor* createGLInstance() const override; + GrGLSLXferProcessor* createGLSLInstance() const override; private: DisableColorXP(); @@ -37,7 +37,7 @@ private: return GrXferProcessor::kIgnoreColor_OptFlag | GrXferProcessor::kIgnoreCoverage_OptFlag; } - void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; void onGetBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const override; @@ -78,11 +78,11 @@ DisableColorXP::DisableColorXP() { this->initClassID(); } -void DisableColorXP::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { +void DisableColorXP::onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLDisableColorXP::GenKey(*this, caps, b); } -GrGLSLXferProcessor* DisableColorXP::createGLInstance() const { return new GLDisableColorXP(*this); } +GrGLSLXferProcessor* DisableColorXP::createGLSLInstance() const { return new GLDisableColorXP(*this); } void DisableColorXP::onGetBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const { blendInfo->fWriteColor = false; diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.cpp b/src/gpu/effects/GrDistanceFieldGeoProc.cpp index 50b4597..3cd9812 100644 --- a/src/gpu/effects/GrDistanceFieldGeoProc.cpp +++ b/src/gpu/effects/GrDistanceFieldGeoProc.cpp @@ -234,12 +234,12 @@ GrDistanceFieldA8TextGeoProc::GrDistanceFieldA8TextGeoProc(GrColor color, this->addTextureAccess(&fTextureAccess); } -void GrDistanceFieldA8TextGeoProc::getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void GrDistanceFieldA8TextGeoProc::getGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLDistanceFieldA8TextGeoProc::GenKey(*this, caps, b); } -GrGLSLPrimitiveProcessor* GrDistanceFieldA8TextGeoProc::createGLInstance(const GrGLSLCaps&) const { +GrGLSLPrimitiveProcessor* GrDistanceFieldA8TextGeoProc::createGLSLInstance(const GrGLSLCaps&) const { return new GrGLDistanceFieldA8TextGeoProc(); } @@ -451,12 +451,12 @@ GrDistanceFieldPathGeoProc::GrDistanceFieldPathGeoProc( this->addTextureAccess(&fTextureAccess); } -void GrDistanceFieldPathGeoProc::getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void GrDistanceFieldPathGeoProc::getGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLDistanceFieldPathGeoProc::GenKey(*this, caps, b); } -GrGLSLPrimitiveProcessor* GrDistanceFieldPathGeoProc::createGLInstance(const GrGLSLCaps&) const { +GrGLSLPrimitiveProcessor* GrDistanceFieldPathGeoProc::createGLSLInstance(const GrGLSLCaps&) const { return new GrGLDistanceFieldPathGeoProc(); } @@ -721,12 +721,12 @@ GrDistanceFieldLCDTextGeoProc::GrDistanceFieldLCDTextGeoProc( this->addTextureAccess(&fTextureAccess); } -void GrDistanceFieldLCDTextGeoProc::getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void GrDistanceFieldLCDTextGeoProc::getGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLDistanceFieldLCDTextGeoProc::GenKey(*this, caps, b); } -GrGLSLPrimitiveProcessor* GrDistanceFieldLCDTextGeoProc::createGLInstance(const GrGLSLCaps&) const { +GrGLSLPrimitiveProcessor* GrDistanceFieldLCDTextGeoProc::createGLSLInstance(const GrGLSLCaps&) const { return new GrGLDistanceFieldLCDTextGeoProc(); } diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.h b/src/gpu/effects/GrDistanceFieldGeoProc.h index 20b52c8..e17a0ce 100644 --- a/src/gpu/effects/GrDistanceFieldGeoProc.h +++ b/src/gpu/effects/GrDistanceFieldGeoProc.h @@ -79,9 +79,9 @@ public: #endif uint32_t getFlags() const { return fFlags; } - void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; + void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; + GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override; private: GrDistanceFieldA8TextGeoProc(GrColor, const SkMatrix& viewMatrix, @@ -138,9 +138,9 @@ public: uint32_t getFlags() const { return fFlags; } bool usesLocalCoords() const { return fUsesLocalCoords; } - void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; + void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; + GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override; private: GrDistanceFieldPathGeoProc(GrColor, const SkMatrix& viewMatrix, GrTexture* texture, @@ -205,9 +205,9 @@ public: uint32_t getFlags() const { return fFlags; } bool usesLocalCoords() const { return fUsesLocalCoords; } - void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; + void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; + GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override; private: GrDistanceFieldLCDTextGeoProc(GrColor, const SkMatrix& viewMatrix, diff --git a/src/gpu/effects/GrDitherEffect.cpp b/src/gpu/effects/GrDitherEffect.cpp index 692d873..e6f3fbe 100644 --- a/src/gpu/effects/GrDitherEffect.cpp +++ b/src/gpu/effects/GrDitherEffect.cpp @@ -31,9 +31,9 @@ private: this->setWillReadFragmentPosition(); } - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; // All dither effects are equal bool onIsEqual(const GrFragmentProcessor&) const override { return true; } @@ -92,12 +92,12 @@ void GLDitherEffect::emitCode(EmitArgs& args) { ////////////////////////////////////////////////////////////////////////////// -void DitherEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void DitherEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GLDitherEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* DitherEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* DitherEffect::onCreateGLSLInstance() const { return new GLDitherEffect(*this); } diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp index 98611f9..c188baf 100644 --- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp +++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp @@ -155,12 +155,12 @@ GrMatrixConvolutionEffect::GrMatrixConvolutionEffect(GrTexture* texture, GrMatrixConvolutionEffect::~GrMatrixConvolutionEffect() { } -void GrMatrixConvolutionEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void GrMatrixConvolutionEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLMatrixConvolutionEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* GrMatrixConvolutionEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrMatrixConvolutionEffect::onCreateGLSLInstance() const { return new GrGLMatrixConvolutionEffect(*this); } diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.h b/src/gpu/effects/GrMatrixConvolutionEffect.h index 6f6ca9d..b114abe 100644 --- a/src/gpu/effects/GrMatrixConvolutionEffect.h +++ b/src/gpu/effects/GrMatrixConvolutionEffect.h @@ -66,9 +66,9 @@ private: GrTextureDomain::Mode tileMode, bool convolveAlpha); - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor&) const override; diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp index 16e1c09..7d44fee 100644 --- a/src/gpu/effects/GrOvalEffect.cpp +++ b/src/gpu/effects/GrOvalEffect.cpp @@ -33,9 +33,9 @@ public: private: CircleEffect(GrPrimitiveEdgeType, const SkPoint& center, SkScalar radius); - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor&) const override; @@ -174,12 +174,12 @@ void GLCircleEffect::onSetData(const GrGLSLProgramDataManager& pdman, /////////////////////////////////////////////////////////////////////////////////////////////////// -void CircleEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void CircleEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GLCircleEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* CircleEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* CircleEffect::onCreateGLSLInstance() const { return new GLCircleEffect(*this); } @@ -202,9 +202,9 @@ public: private: EllipseEffect(GrPrimitiveEdgeType, const SkPoint& center, SkScalar rx, SkScalar ry); - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor&) const override; @@ -351,12 +351,12 @@ void GLEllipseEffect::onSetData(const GrGLSLProgramDataManager& pdman, /////////////////////////////////////////////////////////////////////////////////////////////////// -void EllipseEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void EllipseEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GLEllipseEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* EllipseEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* EllipseEffect::onCreateGLSLInstance() const { return new GLEllipseEffect(*this); } diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp index 41ced0f..2f05647 100644 --- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp +++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp @@ -347,7 +347,7 @@ public: const char* name() const override { return "Porter Duff"; } - GrGLSLXferProcessor* createGLInstance() const override; + GrGLSLXferProcessor* createGLSLInstance() const override; BlendFormula getBlendFormula() const { return fBlendFormula; } @@ -358,7 +358,7 @@ private: GrColor* overrideColor, const GrCaps& caps) override; - void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; bool onHasSecondaryOutput() const override { return fBlendFormula.hasSecondaryOutput(); } @@ -459,12 +459,12 @@ private: /////////////////////////////////////////////////////////////////////////////// -void PorterDuffXferProcessor::onGetGLProcessorKey(const GrGLSLCaps&, - GrProcessorKeyBuilder* b) const { +void PorterDuffXferProcessor::onGetGLSLProcessorKey(const GrGLSLCaps&, + GrProcessorKeyBuilder* b) const { GLPorterDuffXferProcessor::GenKey(*this, b); } -GrGLSLXferProcessor* PorterDuffXferProcessor::createGLInstance() const { +GrGLSLXferProcessor* PorterDuffXferProcessor::createGLSLInstance() const { return new GLPorterDuffXferProcessor; } @@ -512,7 +512,7 @@ public: const char* name() const override { return "Porter Duff Shader"; } - GrGLSLXferProcessor* createGLInstance() const override; + GrGLSLXferProcessor* createGLSLInstance() const override; SkXfermode::Mode getXfermode() const { return fXfermode; } @@ -522,7 +522,7 @@ private: return kNone_OptFlags; } - void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; bool onIsEqual(const GrXferProcessor& xpBase) const override { const ShaderPDXferProcessor& xp = xpBase.cast(); @@ -559,12 +559,12 @@ private: /////////////////////////////////////////////////////////////////////////////// -void ShaderPDXferProcessor::onGetGLProcessorKey(const GrGLSLCaps&, - GrProcessorKeyBuilder* b) const { +void ShaderPDXferProcessor::onGetGLSLProcessorKey(const GrGLSLCaps&, + GrProcessorKeyBuilder* b) const { GLShaderPDXferProcessor::GenKey(*this, b); } -GrGLSLXferProcessor* ShaderPDXferProcessor::createGLInstance() const { +GrGLSLXferProcessor* ShaderPDXferProcessor::createGLSLInstance() const { return new GLShaderPDXferProcessor; } @@ -578,7 +578,7 @@ public: const char* name() const override { return "Porter Duff LCD"; } - GrGLSLXferProcessor* createGLInstance() const override; + GrGLSLXferProcessor* createGLSLInstance() const override; private: PDLCDXferProcessor(GrColor blendConstant, uint8_t alpha); @@ -589,7 +589,7 @@ private: GrColor* overrideColor, const GrCaps& caps) override; - void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; void onGetBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const override { blendInfo->fSrcBlend = kConstC_GrBlendCoeff; @@ -663,12 +663,12 @@ GrXferProcessor* PDLCDXferProcessor::Create(SkXfermode::Mode xfermode, PDLCDXferProcessor::~PDLCDXferProcessor() { } -void PDLCDXferProcessor::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void PDLCDXferProcessor::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GLPDLCDXferProcessor::GenKey(*this, caps, b); } -GrGLSLXferProcessor* PDLCDXferProcessor::createGLInstance() const { +GrGLSLXferProcessor* PDLCDXferProcessor::createGLSLInstance() const { return new GLPDLCDXferProcessor(*this); } diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp index 8b3b83d..c5c5efd 100644 --- a/src/gpu/effects/GrRRectEffect.cpp +++ b/src/gpu/effects/GrRRectEffect.cpp @@ -60,9 +60,9 @@ public: private: CircularRRectEffect(GrPrimitiveEdgeType, uint32_t circularCornerFlags, const SkRRect&); - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor& other) const override; @@ -364,12 +364,12 @@ void GLCircularRRectEffect::onSetData(const GrGLSLProgramDataManager& pdman, //////////////////////////////////////////////////////////////////////////////////////////////////// -void CircularRRectEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void CircularRRectEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GLCircularRRectEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* CircularRRectEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* CircularRRectEffect::onCreateGLSLInstance() const { return new GLCircularRRectEffect(*this); } @@ -390,9 +390,9 @@ public: private: EllipticalRRectEffect(GrPrimitiveEdgeType, const SkRRect&); - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor& other) const override; @@ -615,12 +615,12 @@ void GLEllipticalRRectEffect::onSetData(const GrGLSLProgramDataManager& pdman, //////////////////////////////////////////////////////////////////////////////////////////////////// -void EllipticalRRectEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void EllipticalRRectEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GLEllipticalRRectEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* EllipticalRRectEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* EllipticalRRectEffect::onCreateGLSLInstance() const { return new GLEllipticalRRectEffect(*this); } diff --git a/src/gpu/effects/GrSimpleTextureEffect.cpp b/src/gpu/effects/GrSimpleTextureEffect.cpp index 0b03c99..9811155 100644 --- a/src/gpu/effects/GrSimpleTextureEffect.cpp +++ b/src/gpu/effects/GrSimpleTextureEffect.cpp @@ -36,12 +36,12 @@ void GrSimpleTextureEffect::onComputeInvariantOutput(GrInvariantOutput* inout) c this->updateInvariantOutputForModulation(inout); } -void GrSimpleTextureEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void GrSimpleTextureEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLSimpleTextureEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* GrSimpleTextureEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrSimpleTextureEffect::onCreateGLSLInstance() const { return new GrGLSimpleTextureEffect(*this); } diff --git a/src/gpu/effects/GrSimpleTextureEffect.h b/src/gpu/effects/GrSimpleTextureEffect.h index e421162..18a8a78 100644 --- a/src/gpu/effects/GrSimpleTextureEffect.h +++ b/src/gpu/effects/GrSimpleTextureEffect.h @@ -63,9 +63,9 @@ private: this->initClassID(); } - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor& other) const override { return true; } diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp index 42d6d70..e9c80c8 100644 --- a/src/gpu/effects/GrTextureDomain.cpp +++ b/src/gpu/effects/GrTextureDomain.cpp @@ -247,12 +247,12 @@ GrTextureDomainEffect::GrTextureDomainEffect(GrTexture* texture, GrTextureDomainEffect::~GrTextureDomainEffect() {} -void GrTextureDomainEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { +void GrTextureDomainEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { GrGLTextureDomainEffect::GenKey(*this, caps, b); } -GrGLSLFragmentProcessor* GrTextureDomainEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrTextureDomainEffect::onCreateGLSLInstance() const { return new GrGLTextureDomainEffect(*this); } diff --git a/src/gpu/effects/GrTextureDomain.h b/src/gpu/effects/GrTextureDomain.h index a215def..aa1db00 100644 --- a/src/gpu/effects/GrTextureDomain.h +++ b/src/gpu/effects/GrTextureDomain.h @@ -187,9 +187,9 @@ private: GrTextureParams::FilterMode, GrCoordSet); - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor&) const override; diff --git a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp index a705df5..3462944 100644 --- a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp +++ b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp @@ -29,7 +29,7 @@ public: const char* name() const override { return "ComposeTwo"; } - void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { + void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { b->add32(fMode); } @@ -46,7 +46,7 @@ protected: } private: - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; SkXfermode::Mode fMode; @@ -81,7 +81,7 @@ const GrFragmentProcessor* ComposeTwoFragmentProcessor::TestCreate(GrProcessorTe return new ComposeTwoFragmentProcessor(fpA, fpB, mode); } -GrGLSLFragmentProcessor* ComposeTwoFragmentProcessor::onCreateGLInstance() const{ +GrGLSLFragmentProcessor* ComposeTwoFragmentProcessor::onCreateGLSLInstance() const{ return new GLComposeTwoFragmentProcessor(*this); } @@ -150,7 +150,7 @@ public: const char* name() const override { return "ComposeOne"; } - void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { + void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { GR_STATIC_ASSERT((SkXfermode::kLastMode & SK_MaxU16) == SkXfermode::kLastMode); b->add32(fMode | (fChild << 16)); } @@ -202,7 +202,7 @@ protected: } private: - GrGLSLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; SkXfermode::Mode fMode; Child fChild; @@ -264,7 +264,7 @@ const GrFragmentProcessor* ComposeOneFragmentProcessor::TestCreate(GrProcessorTe return new ComposeOneFragmentProcessor(dst, mode, child); } -GrGLSLFragmentProcessor* ComposeOneFragmentProcessor::onCreateGLInstance() const { +GrGLSLFragmentProcessor* ComposeOneFragmentProcessor::onCreateGLSLInstance() const { return new GLComposeOneFragmentProcessor(*this); } diff --git a/src/gpu/effects/GrYUVtoRGBEffect.cpp b/src/gpu/effects/GrYUVtoRGBEffect.cpp index e282512..58b9a0f 100644 --- a/src/gpu/effects/GrYUVtoRGBEffect.cpp +++ b/src/gpu/effects/GrYUVtoRGBEffect.cpp @@ -52,7 +52,7 @@ public: return fColorSpace; } - class GLProcessor : public GrGLSLFragmentProcessor { + class GLSLProcessor : public GrGLSLFragmentProcessor { public: static const float kJPEGConversionMatrix[16]; static const float kRec601ConversionMatrix[16]; @@ -61,7 +61,7 @@ public: // this class always generates the same code. static void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*) {} - GLProcessor(const GrProcessor&) {} + GLSLProcessor(const GrProcessor&) {} virtual void emitCode(EmitArgs& args) override { GrGLSLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder(); @@ -125,11 +125,13 @@ private: this->addTextureAccess(&fVAccess); } - GrGLSLFragmentProcessor* onCreateGLInstance() const override { return new GLProcessor(*this); } + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { + return new GLSLProcessor(*this); + } - virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override { - GLProcessor::GenKey(*this, caps, b); + virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override { + GLSLProcessor::GenKey(*this, caps, b); } bool onIsEqual(const GrFragmentProcessor& sBase) const override { @@ -154,17 +156,17 @@ private: typedef GrFragmentProcessor INHERITED; }; -const float YUVtoRGBEffect::GLProcessor::kJPEGConversionMatrix[16] = { +const float YUVtoRGBEffect::GLSLProcessor::kJPEGConversionMatrix[16] = { 1.0f, 0.0f, 1.402f, -0.701f, 1.0f, -0.34414f, -0.71414f, 0.529f, 1.0f, 1.772f, 0.0f, -0.886f, 0.0f, 0.0f, 0.0f, 1.0}; -const float YUVtoRGBEffect::GLProcessor::kRec601ConversionMatrix[16] = { +const float YUVtoRGBEffect::GLSLProcessor::kRec601ConversionMatrix[16] = { 1.164f, 0.0f, 1.596f, -0.87075f, 1.164f, -0.391f, -0.813f, 0.52925f, 1.164f, 2.018f, 0.0f, -1.08175f, 0.0f, 0.0f, 0.0f, 1.0}; -const float YUVtoRGBEffect::GLProcessor::kRec709ConversionMatrix[16] = { +const float YUVtoRGBEffect::GLSLProcessor::kRec709ConversionMatrix[16] = { 1.164f, 0.0f, 1.793f, -0.96925f, 1.164f, -0.213f, -0.533f, 0.30025f, 1.164f, 2.112f, 0.0f, -1.12875f, diff --git a/src/gpu/gl/GrGLProgramDesc.cpp b/src/gpu/gl/GrGLProgramDesc.cpp index 7c482d5..172aca7 100644 --- a/src/gpu/gl/GrGLProgramDesc.cpp +++ b/src/gpu/gl/GrGLProgramDesc.cpp @@ -88,7 +88,7 @@ static bool get_frag_proc_and_meta_keys(const GrPrimitiveProcessor& primProc, } } - fp.getGLProcessorKey(*caps.glslCaps(), b); + fp.getGLSLProcessorKey(*caps.glslCaps(), b); //**** use glslCaps here? return get_meta_key(fp, caps, primProc.getTransformKey(fp.coordTransforms(), @@ -113,7 +113,7 @@ bool GrGLProgramDescBuilder::Build(GrProgramDesc* desc, GrProcessorKeyBuilder b(&glDesc->key()); - primProc.getGLProcessorKey(*gpu->glCaps().glslCaps(), &b); + primProc.getGLSLProcessorKey(*gpu->glCaps().glslCaps(), &b); //**** use glslCaps here? if (!get_meta_key(primProc, gpu->glCaps(), 0, &b)) { glDesc->key().reset(); @@ -129,7 +129,7 @@ bool GrGLProgramDescBuilder::Build(GrProgramDesc* desc, } const GrXferProcessor& xp = *pipeline.getXferProcessor(); - xp.getGLProcessorKey(*gpu->glCaps().glslCaps(), &b); + xp.getGLSLProcessorKey(*gpu->glCaps().glslCaps(), &b); //**** use glslCaps here? if (!get_meta_key(xp, gpu->glCaps(), 0, &b)) { glDesc->key().reset(); diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index f5108c2..9f28e3f 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -254,7 +254,7 @@ void GrGLProgramBuilder::emitAndInstallProc(const GrFragmentProcessor& fp, const char* inColor) { GrGLInstalledFragProc* ifp = new GrGLInstalledFragProc; - ifp->fGLProc.reset(fp.createGLInstance()); + ifp->fGLProc.reset(fp.createGLSLInstance()); SkSTArray<4, GrGLSLTextureSampler> samplers(fp.numTextures()); this->emitSamplers(fp, &samplers, ifp); @@ -279,7 +279,7 @@ void GrGLProgramBuilder::emitAndInstallProc(const GrPrimitiveProcessor& gp, SkASSERT(!fGeometryProcessor); fGeometryProcessor = new GrGLInstalledGeoProc; - fGeometryProcessor->fGLProc.reset(gp.createGLInstance(*fGpu->glCaps().glslCaps())); + fGeometryProcessor->fGLProc.reset(gp.createGLSLInstance(*fGpu->glCaps().glslCaps())); SkSTArray<4, GrGLSLTextureSampler> samplers(gp.numTextures()); this->emitSamplers(gp, &samplers, fGeometryProcessor); @@ -302,7 +302,7 @@ void GrGLProgramBuilder::emitAndInstallXferProc(const GrXferProcessor& xp, SkASSERT(!fXferProcessor); fXferProcessor = new GrGLInstalledXferProc; - fXferProcessor->fGLProc.reset(xp.createGLInstance()); + fXferProcessor->fGLProc.reset(xp.createGLSLInstance()); // Enable dual source secondary output if we have one if (xp.hasSecondaryOutput()) { diff --git a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h index b98f702..924e311 100644 --- a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h +++ b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h @@ -146,7 +146,7 @@ private: const char* getPrimaryColorOutputName() const; const char* getSecondaryColorOutputName() const; - // As GLProcessors emit code, there are some conditions we need to verify. We use the below + // As GLSLProcessors emit code, there are some conditions we need to verify. We use the below // state to track this. The reset call is called per processor emitted. bool hasReadDstColor() const { return fHasReadDstColor; } bool hasReadFragmentPosition() const { return fHasReadFragmentPosition; } diff --git a/src/gpu/glsl/GrGLSLShaderBuilder.h b/src/gpu/glsl/GrGLSLShaderBuilder.h index 8927303..fde48dc 100644 --- a/src/gpu/glsl/GrGLSLShaderBuilder.h +++ b/src/gpu/glsl/GrGLSLShaderBuilder.h @@ -63,7 +63,7 @@ public: GrSLType coordType = kVec2f_GrSLType); /** - * Called by GrGLProcessors to add code to one of the shaders. + * Called by GrGLSLProcessors to add code to one of the shaders. */ void codeAppendf(const char format[], ...) SK_PRINTF_LIKE(2, 3) { va_list args; diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index 81ce227..ce247df 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -74,7 +74,7 @@ public: const char* name() const override { return "Big Ole Key"; } - GrGLSLFragmentProcessor* onCreateGLInstance() const override { + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { return new GLBigKeyProcessor(*this); } @@ -82,8 +82,8 @@ private: BigKeyProcessor() { this->initClassID(); } - virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override { + virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override { GLBigKeyProcessor::GenKey(*this, caps, b); } bool onIsEqual(const GrFragmentProcessor&) const override { return true; } @@ -110,7 +110,7 @@ public: const char* name() const override { return "Block Input"; } - GrGLSLFragmentProcessor* onCreateGLInstance() const override { return new GLFP; } + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { return new GLFP; } private: class GLFP : public GrGLSLFragmentProcessor { @@ -128,7 +128,7 @@ private: this->registerChildProcessor(child); } - void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {} + void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {} bool onIsEqual(const GrFragmentProcessor&) const override { return true; }