From 8ea78d83dc4e8243c16eedf8100a3987c54123fa Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 24 Oct 2012 20:11:30 +0000 Subject: [PATCH] GrCustomStage Renaming Part 4 Rename a bunch of things found by searching for "custom". Review URL: https://codereview.appspot.com/6765048 git-svn-id: http://skia.googlecode.com/svn/trunk@6085 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/core/SkColorFilter.h | 2 +- include/core/SkImageFilter.h | 4 ++-- include/core/SkShader.h | 4 ++-- include/effects/SkColorMatrixFilter.h | 2 +- include/effects/SkMagnifierImageFilter.h | 4 ++-- include/effects/SkMatrixConvolutionImageFilter.h | 2 +- include/gpu/GrEffect.h | 8 ++++---- include/gpu/GrProgramStageFactory.h | 2 +- src/core/SkColorFilter.cpp | 2 +- src/core/SkImageFilter.cpp | 2 +- src/core/SkShader.cpp | 2 +- src/effects/SkColorMatrixFilter.cpp | 2 +- src/effects/SkLightingImageFilter.cpp | 12 ++++++------ src/effects/SkMagnifierImageFilter.cpp | 6 +++--- src/effects/SkMatrixConvolutionImageFilter.cpp | 4 ++-- src/effects/SkTableColorFilter.cpp | 6 +++--- src/effects/gradients/SkGradientShaderPriv.h | 2 +- src/effects/gradients/SkLinearGradient.cpp | 8 ++++---- src/effects/gradients/SkLinearGradient.h | 2 +- src/effects/gradients/SkRadialGradient.cpp | 8 ++++---- src/effects/gradients/SkRadialGradient.h | 2 +- src/effects/gradients/SkSweepGradient.cpp | 8 ++++---- src/effects/gradients/SkSweepGradient.h | 2 +- src/effects/gradients/SkTwoPointConicalGradient.cpp | 10 +++++----- src/effects/gradients/SkTwoPointConicalGradient.h | 2 +- src/effects/gradients/SkTwoPointRadialGradient.cpp | 10 +++++----- src/effects/gradients/SkTwoPointRadialGradient.h | 2 +- src/gpu/GrEffect.cpp | 6 +++--- src/gpu/SkGpuDevice.cpp | 10 +++++----- src/gpu/gl/GrGLProgramStage.h | 8 ++++---- src/gpu/gl/GrGLShaderBuilder.cpp | 4 ++-- src/gpu/gl/GrGLUniformManager.cpp | 2 +- 32 files changed, 75 insertions(+), 75 deletions(-) diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h index d470672a3f..b54d5f5d21 100644 --- a/include/core/SkColorFilter.h +++ b/include/core/SkColorFilter.h @@ -118,7 +118,7 @@ public: /** A subclass may implement this factory function to work with the GPU backend. If the return is non-NULL then the caller owns a ref on the returned object. */ - virtual GrEffect* asNewCustomStage(GrContext*) const; + virtual GrEffect* asNewEffect(GrContext*) const; SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP() protected: diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h index f37d5a39fa..4c7501979f 100644 --- a/include/core/SkImageFilter.h +++ b/include/core/SkImageFilter.h @@ -90,12 +90,12 @@ public: * in it. The caller assumes ownership of the stage, and it is up to the * caller to unref it. */ - virtual bool asNewCustomStage(GrEffect** stage, GrTexture*) const; + virtual bool asNewEffect(GrEffect** stage, GrTexture*) const; /** * Returns true if the filter can be processed on the GPU. This is most * often used for multi-pass effects, where intermediate results must be - * rendered to textures. For single-pass effects, use asNewCustomStage(). + * rendered to textures. For single-pass effects, use asNewEffect(). * The default implementation returns false. */ virtual bool canFilterImageGPU() const; diff --git a/include/core/SkShader.h b/include/core/SkShader.h index 23e095029b..7329c1bf4c 100644 --- a/include/core/SkShader.h +++ b/include/core/SkShader.h @@ -307,12 +307,12 @@ public: /** * If the shader subclass has a GrEffect implementation, this installs - * a custom stage on the sampler. A GrContext pointer is required since custom + * an effect on the sampler. A GrContext pointer is required since custom * stages may need to create textures. The sampler parameter is necessary to set a * texture matrix. It will eventually be removed and this function will operate as a * GrEffect factory. */ - virtual bool asNewCustomStage(GrContext* context, GrSamplerState* sampler) const; + virtual bool asNewEffect(GrContext* context, GrSamplerState* sampler) const; ////////////////////////////////////////////////////////////////////////// // Factory methods for stock shaders diff --git a/include/effects/SkColorMatrixFilter.h b/include/effects/SkColorMatrixFilter.h index 3ab253ab2b..799cf8c16d 100644 --- a/include/effects/SkColorMatrixFilter.h +++ b/include/effects/SkColorMatrixFilter.h @@ -22,7 +22,7 @@ public: virtual uint32_t getFlags() SK_OVERRIDE; virtual bool asColorMatrix(SkScalar matrix[20]) SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual GrEffect* asNewCustomStage(GrContext*) const SK_OVERRIDE; + virtual GrEffect* asNewEffect(GrContext*) const SK_OVERRIDE; #endif struct State { diff --git a/include/effects/SkMagnifierImageFilter.h b/include/effects/SkMagnifierImageFilter.h index 26cb1a88bb..21ab894663 100644 --- a/include/effects/SkMagnifierImageFilter.h +++ b/include/effects/SkMagnifierImageFilter.h @@ -16,8 +16,8 @@ class SK_API SkMagnifierImageFilter : public SkImageFilter { public: SkMagnifierImageFilter(SkRect srcRect, SkScalar inset); - virtual bool asNewCustomStage(GrEffect** stage, - GrTexture* texture) const SK_OVERRIDE; + virtual bool asNewEffect(GrEffect** stage, + GrTexture* texture) const SK_OVERRIDE; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMagnifierImageFilter) diff --git a/include/effects/SkMatrixConvolutionImageFilter.h b/include/effects/SkMatrixConvolutionImageFilter.h index bdeaad3048..c0a5fd72a3 100644 --- a/include/effects/SkMatrixConvolutionImageFilter.h +++ b/include/effects/SkMatrixConvolutionImageFilter.h @@ -62,7 +62,7 @@ protected: SkBitmap* result, SkIPoint* loc) SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual bool asNewCustomStage(GrEffect** stage, GrTexture*) const SK_OVERRIDE; + virtual bool asNewEffect(GrEffect** stage, GrTexture*) const SK_OVERRIDE; #endif private: diff --git a/include/gpu/GrEffect.h b/include/gpu/GrEffect.h index c5af2b9b56..7574958f46 100644 --- a/include/gpu/GrEffect.h +++ b/include/gpu/GrEffect.h @@ -5,8 +5,8 @@ * found in the LICENSE file. */ -#ifndef GrCustomStage_DEFINED -#define GrCustomStage_DEFINED +#ifndef GrEffect_DEFINED +#define GrEffect_DEFINED #include "GrRefCnt.h" #include "GrNoncopyable.h" @@ -50,11 +50,11 @@ public: GrGLProgramStage created by the factory. Example: - class MyCustomStage : public GrEffect { + class MyCustomEffect : public GrEffect { ... virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE { - return GrTProgramStageFactory::getInstance(); + return GrTProgramStageFactory::getInstance(); } ... }; diff --git a/include/gpu/GrProgramStageFactory.h b/include/gpu/GrProgramStageFactory.h index 385ebfe43a..1a4f07814a 100644 --- a/include/gpu/GrProgramStageFactory.h +++ b/include/gpu/GrProgramStageFactory.h @@ -80,7 +80,7 @@ public: /** Returns a value that idenitifes the GLSL shader code generated by a GrEffect. This enables caching of generated shaders. Part of the - id identifies the GrCustomShader subclass. The remainder is based + id identifies the GrEffect subclass. The remainder is based on the aspects of the GrEffect object's configuration that affect GLSL code generation. */ virtual StageKey glStageKey(const GrEffect& stage, diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp index 6dbaf020e5..6d9f4ba3a6 100644 --- a/src/core/SkColorFilter.cpp +++ b/src/core/SkColorFilter.cpp @@ -40,7 +40,7 @@ SkColor SkColorFilter::filterColor(SkColor c) { return SkUnPreMultiply::PMColorToColor(dst); } -GrEffect* SkColorFilter::asNewCustomStage(GrContext*) const { +GrEffect* SkColorFilter::asNewEffect(GrContext*) const { return NULL; } diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp index 81b5b5afd6..05e682c63c 100644 --- a/src/core/SkImageFilter.cpp +++ b/src/core/SkImageFilter.cpp @@ -117,7 +117,7 @@ bool SkImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm, return true; } -bool SkImageFilter::asNewCustomStage(GrEffect**, GrTexture*) const { +bool SkImageFilter::asNewEffect(GrEffect**, GrTexture*) const { return false; } diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp index 7e3a92bc57..50546ffcc3 100644 --- a/src/core/SkShader.cpp +++ b/src/core/SkShader.cpp @@ -205,7 +205,7 @@ SkShader::GradientType SkShader::asAGradient(GradientInfo* info) const { return kNone_GradientType; } -bool SkShader::asNewCustomStage(GrContext*, GrSamplerState*) const { +bool SkShader::asNewEffect(GrContext*, GrSamplerState*) const { return false; } diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp index cd7f1551fa..be766f2a0f 100644 --- a/src/effects/SkColorMatrixFilter.cpp +++ b/src/effects/SkColorMatrixFilter.cpp @@ -424,7 +424,7 @@ GrEffect* ColorMatrixEffect::TestCreate(SkRandom* random, return SkNEW_ARGS(ColorMatrixEffect, (colorMatrix)); } -GrEffect* SkColorMatrixFilter::asNewCustomStage(GrContext*) const { +GrEffect* SkColorMatrixFilter::asNewEffect(GrContext*) const { return SkNEW_ARGS(ColorMatrixEffect, (fMatrix)); } diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index 267ce99a54..702fb123cd 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -264,7 +264,7 @@ public: SkScalar kd, SkImageFilter* input); SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDiffuseLightingImageFilter) - virtual bool asNewCustomStage(GrEffect** stage, GrTexture*) const SK_OVERRIDE; + virtual bool asNewEffect(GrEffect** stage, GrTexture*) const SK_OVERRIDE; SkScalar kd() const { return fKD; } protected: @@ -284,7 +284,7 @@ public: SkSpecularLightingImageFilter(SkLight* light, SkScalar surfaceScale, SkScalar ks, SkScalar shininess, SkImageFilter* input); SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSpecularLightingImageFilter) - virtual bool asNewCustomStage(GrEffect** stage, GrTexture*) const SK_OVERRIDE; + virtual bool asNewEffect(GrEffect** stage, GrTexture*) const SK_OVERRIDE; SkScalar ks() const { return fKS; } SkScalar shininess() const { return fShininess; } @@ -821,8 +821,8 @@ bool SkDiffuseLightingImageFilter::onFilterImage(Proxy*, return true; } -bool SkDiffuseLightingImageFilter::asNewCustomStage(GrEffect** stage, - GrTexture* texture) const { +bool SkDiffuseLightingImageFilter::asNewEffect(GrEffect** stage, + GrTexture* texture) const { #if SK_SUPPORT_GPU if (stage) { SkScalar scale = SkScalarMul(surfaceScale(), SkIntToScalar(255)); @@ -890,8 +890,8 @@ bool SkSpecularLightingImageFilter::onFilterImage(Proxy*, return true; } -bool SkSpecularLightingImageFilter::asNewCustomStage(GrEffect** stage, - GrTexture* texture) const { +bool SkSpecularLightingImageFilter::asNewEffect(GrEffect** stage, + GrTexture* texture) const { #if SK_SUPPORT_GPU if (stage) { SkScalar scale = SkScalarMul(surfaceScale(), SkIntToScalar(255)); diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp index c25e951ccf..5a81465ec4 100644 --- a/src/effects/SkMagnifierImageFilter.cpp +++ b/src/effects/SkMagnifierImageFilter.cpp @@ -202,7 +202,7 @@ GrEffect* GrMagnifierEffect::TestCreate(SkRandom* random, inset)); GrSamplerState sampler; GrEffect* stage; - filter->asNewCustomStage(&stage, textures[0]); + filter->asNewEffect(&stage, textures[0]); GrAssert(NULL != stage); return stage; } @@ -243,8 +243,8 @@ SkMagnifierImageFilter::SkMagnifierImageFilter(SkRect srcRect, SkScalar inset) SkASSERT(srcRect.x() >= 0 && srcRect.y() >= 0 && inset >= 0); } -bool SkMagnifierImageFilter::asNewCustomStage(GrEffect** stage, - GrTexture* texture) const { +bool SkMagnifierImageFilter::asNewEffect(GrEffect** stage, + GrTexture* texture) const { #if SK_SUPPORT_GPU if (stage) { *stage = diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp index 988c9018cb..ae16aef456 100644 --- a/src/effects/SkMatrixConvolutionImageFilter.cpp +++ b/src/effects/SkMatrixConvolutionImageFilter.cpp @@ -521,8 +521,8 @@ GrEffect* GrMatrixConvolutionEffect::TestCreate(SkRandom* random, } -bool SkMatrixConvolutionImageFilter::asNewCustomStage(GrEffect** stage, - GrTexture* texture) const { +bool SkMatrixConvolutionImageFilter::asNewEffect(GrEffect** stage, + GrTexture* texture) const { bool ok = fKernelSize.width() * fKernelSize.height() <= MAX_KERNEL_SIZE; if (ok && stage) { *stage = SkNEW_ARGS(GrMatrixConvolutionEffect, (texture, diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index 1412952ef7..1e7a8b6f7f 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -41,7 +41,7 @@ public: virtual bool asComponentTable(SkBitmap* table) const SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual GrEffect* asNewCustomStage(GrContext* context) const SK_OVERRIDE; + virtual GrEffect* asNewEffect(GrContext* context) const SK_OVERRIDE; #endif virtual void filterSpan(const SkPMColor src[], int count, @@ -350,10 +350,10 @@ GrEffect* ColorTableEffect::TestCreate(SkRandom* random, return SkNEW_ARGS(ColorTableEffect, (textures[GrEffectUnitTest::kAlphaTextureIdx])); } -GrEffect* SkTable_ColorFilter::asNewCustomStage(GrContext* context) const { +GrEffect* SkTable_ColorFilter::asNewEffect(GrContext* context) const { SkBitmap bitmap; this->asComponentTable(&bitmap); - // passing NULL because this custom effect does no tiling or filtering. + // passing NULL because this effect does no tiling or filtering. GrTexture* texture = GrLockCachedBitmapTexture(context, bitmap, NULL); GrEffect* stage = SkNEW_ARGS(ColorTableEffect, (texture)); diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h index 96709c9916..a1b3776fc1 100644 --- a/src/effects/gradients/SkGradientShaderPriv.h +++ b/src/effects/gradients/SkGradientShaderPriv.h @@ -270,7 +270,7 @@ private: /////////////////////////////////////////////////////////////////////////////// -// Base class for GL gradient custom stages +// Base class for GL gradient effects class GrGLGradientStage : public GrGLLegacyProgramStage { public: diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp index 2de4fc6187..8219388f0f 100644 --- a/src/effects/gradients/SkLinearGradient.cpp +++ b/src/effects/gradients/SkLinearGradient.cpp @@ -539,9 +539,9 @@ GrEffect* GrLinearGradient::TestCreate(SkRandom* random, colors, stops, colorCount, tm)); GrSamplerState sampler; - shader->asNewCustomStage(context, &sampler); + shader->asNewEffect(context, &sampler); GrAssert(NULL != sampler.getEffect()); - // const_cast and ref is a hack! Will remove when asNewCustomStage returns GrEffect* + // const_cast and ref is a hack! Will remove when asNewEffect returns GrEffect* sampler.getEffect()->ref(); return const_cast(sampler.getEffect()); } @@ -559,7 +559,7 @@ void GrGLLinearGradient::emitFS(GrGLShaderBuilder* builder, ///////////////////////////////////////////////////////////////////// -bool SkLinearGradient::asNewCustomStage(GrContext* context, GrSamplerState* sampler) const { +bool SkLinearGradient::asNewEffect(GrContext* context, GrSamplerState* sampler) const { SkASSERT(NULL != context && NULL != sampler); SkAutoTUnref stage(SkNEW_ARGS(GrLinearGradient, (context, *this, fTileMode))); @@ -580,7 +580,7 @@ bool SkLinearGradient::asNewCustomStage(GrContext* context, GrSamplerState* samp #else -bool SkLinearGradient::asNewCustomStage(GrContext*, GrSamplerState*) const { +bool SkLinearGradient::asNewEffect(GrContext*, GrSamplerState*) const { SkDEBUGFAIL("Should not call in GPU-less build"); return false; } diff --git a/src/effects/gradients/SkLinearGradient.h b/src/effects/gradients/SkLinearGradient.h index fe60543d52..e0e75b4b6c 100644 --- a/src/effects/gradients/SkLinearGradient.h +++ b/src/effects/gradients/SkLinearGradient.h @@ -22,7 +22,7 @@ public: virtual void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE; virtual BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const SK_OVERRIDE; virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; - virtual bool asNewCustomStage(GrContext* context, GrSamplerState* sampler) const SK_OVERRIDE; + virtual bool asNewEffect(GrContext* context, GrSamplerState* sampler) const SK_OVERRIDE; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLinearGradient) diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp index dbf5e7e009..1008c87d6e 100644 --- a/src/effects/gradients/SkRadialGradient.cpp +++ b/src/effects/gradients/SkRadialGradient.cpp @@ -538,9 +538,9 @@ GrEffect* GrRadialGradient::TestCreate(SkRandom* random, colors, stops, colorCount, tm)); GrSamplerState sampler; - shader->asNewCustomStage(context, &sampler); + shader->asNewEffect(context, &sampler); GrAssert(NULL != sampler.getEffect()); - // const_cast and ref is a hack! Will remove when asNewCustomStage returns GrEffect* + // const_cast and ref is a hack! Will remove when asNewEffect returns GrEffect* sampler.getEffect()->ref(); return const_cast(sampler.getEffect()); } @@ -558,7 +558,7 @@ void GrGLRadialGradient::emitFS(GrGLShaderBuilder* builder, ///////////////////////////////////////////////////////////////////// -bool SkRadialGradient::asNewCustomStage(GrContext* context, GrSamplerState* sampler) const { +bool SkRadialGradient::asNewEffect(GrContext* context, GrSamplerState* sampler) const { SkASSERT(NULL != context && NULL != sampler); SkAutoTUnref stage(SkNEW_ARGS(GrRadialGradient, (context, *this, fTileMode))); @@ -578,7 +578,7 @@ bool SkRadialGradient::asNewCustomStage(GrContext* context, GrSamplerState* samp #else -bool SkRadialGradient::asNewCustomStage(GrContext*, GrSamplerState*) const { +bool SkRadialGradient::asNewEffect(GrContext*, GrSamplerState*) const { SkDEBUGFAIL("Should not call in GPU-less build"); return false; } diff --git a/src/effects/gradients/SkRadialGradient.h b/src/effects/gradients/SkRadialGradient.h index fc17520e29..9384793d27 100644 --- a/src/effects/gradients/SkRadialGradient.h +++ b/src/effects/gradients/SkRadialGradient.h @@ -24,7 +24,7 @@ public: SkMatrix* matrix, TileMode* xy) const SK_OVERRIDE; virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; - virtual bool asNewCustomStage(GrContext* context, GrSamplerState* sampler) const SK_OVERRIDE; + virtual bool asNewEffect(GrContext* context, GrSamplerState* sampler) const SK_OVERRIDE; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkRadialGradient) diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp index 11e1a78a13..0678f3bebb 100644 --- a/src/effects/gradients/SkSweepGradient.cpp +++ b/src/effects/gradients/SkSweepGradient.cpp @@ -444,9 +444,9 @@ GrEffect* GrSweepGradient::TestCreate(SkRandom* random, SkAutoTUnref shader(SkGradientShader::CreateSweep(center.fX, center.fY, colors, stops, colorCount)); GrSamplerState sampler; - shader->asNewCustomStage(context, &sampler); + shader->asNewEffect(context, &sampler); GrAssert(NULL != sampler.getEffect()); - // const_cast and ref is a hack! Will remove when asNewCustomStage returns GrEffect* + // const_cast and ref is a hack! Will remove when asNewEffect returns GrEffect* sampler.getEffect()->ref(); return const_cast(sampler.getEffect()); } @@ -465,7 +465,7 @@ void GrGLSweepGradient::emitFS(GrGLShaderBuilder* builder, ///////////////////////////////////////////////////////////////////// -bool SkSweepGradient::asNewCustomStage(GrContext* context, GrSamplerState* sampler) const { +bool SkSweepGradient::asNewEffect(GrContext* context, GrSamplerState* sampler) const { SkAutoTUnref stage(SkNEW_ARGS(GrSweepGradient, (context, *this))); @@ -485,7 +485,7 @@ bool SkSweepGradient::asNewCustomStage(GrContext* context, GrSamplerState* sampl #else -bool SkSweepGradient::asNewCustomStage(GrContext*, GrSamplerState*) const { +bool SkSweepGradient::asNewEffect(GrContext*, GrSamplerState*) const { SkDEBUGFAIL("Should not call in GPU-less build"); return false; } diff --git a/src/effects/gradients/SkSweepGradient.h b/src/effects/gradients/SkSweepGradient.h index 8e42be0921..c685cd924e 100644 --- a/src/effects/gradients/SkSweepGradient.h +++ b/src/effects/gradients/SkSweepGradient.h @@ -24,7 +24,7 @@ public: virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; - virtual bool asNewCustomStage(GrContext* context, GrSamplerState* sampler) const SK_OVERRIDE; + virtual bool asNewEffect(GrContext* context, GrSamplerState* sampler) const SK_OVERRIDE; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSweepGradient) diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp index 4e85c73367..13f3dbb7f1 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp @@ -438,9 +438,9 @@ GrEffect* GrConical2Gradient::TestCreate(SkRandom* random, colors, stops, colorCount, tm)); GrSamplerState sampler; - shader->asNewCustomStage(context, &sampler); + shader->asNewEffect(context, &sampler); GrAssert(NULL != sampler.getEffect()); - // const_cast and ref is a hack! Will remove when asNewCustomStage returns GrEffect* + // const_cast and ref is a hack! Will remove when asNewEffect returns GrEffect* sampler.getEffect()->ref(); return const_cast(sampler.getEffect()); } @@ -669,8 +669,8 @@ GrEffect::StageKey GrGLConical2Gradient::GenKey(const GrEffect& s, const GrGLCap ///////////////////////////////////////////////////////////////////// -bool SkTwoPointConicalGradient::asNewCustomStage(GrContext* context, - GrSamplerState* sampler) const { +bool SkTwoPointConicalGradient::asNewEffect(GrContext* context, + GrSamplerState* sampler) const { SkASSERT(NULL != context && NULL != sampler); SkMatrix matrix; @@ -700,7 +700,7 @@ bool SkTwoPointConicalGradient::asNewCustomStage(GrContext* context, #else -bool SkTwoPointConicalGradient::asNewCustomStage(GrContext*, GrSamplerState*) const { +bool SkTwoPointConicalGradient::asNewEffect(GrContext*, GrSamplerState*) const { SkDEBUGFAIL("Should not call in GPU-less build"); return false; } diff --git a/src/effects/gradients/SkTwoPointConicalGradient.h b/src/effects/gradients/SkTwoPointConicalGradient.h index 40544919c3..398735ddb1 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.h +++ b/src/effects/gradients/SkTwoPointConicalGradient.h @@ -61,7 +61,7 @@ public: SkMatrix* matrix, TileMode* xy) const; virtual SkShader::GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; - virtual bool asNewCustomStage(GrContext* context, GrSamplerState* sampler) const SK_OVERRIDE; + virtual bool asNewEffect(GrContext* context, GrSamplerState* sampler) const SK_OVERRIDE; SkScalar getCenterX1() const { return SkPoint::Distance(fCenter1, fCenter2); } SkScalar getStartRadius() const { return fRadius1; } diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp index d4ce9fa931..d7651ff594 100644 --- a/src/effects/gradients/SkTwoPointRadialGradient.cpp +++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp @@ -472,9 +472,9 @@ GrEffect* GrRadial2Gradient::TestCreate(SkRandom* random, colors, stops, colorCount, tm)); GrSamplerState sampler; - shader->asNewCustomStage(context, &sampler); + shader->asNewEffect(context, &sampler); GrAssert(NULL != sampler.getEffect()); - // const_cast and ref is a hack! Will remove when asNewCustomStage returns GrEffect* + // const_cast and ref is a hack! Will remove when asNewEffect returns GrEffect* sampler.getEffect()->ref(); return const_cast(sampler.getEffect()); } @@ -642,8 +642,8 @@ GrEffect::StageKey GrGLRadial2Gradient::GenKey(const GrEffect& s, const GrGLCaps ///////////////////////////////////////////////////////////////////// -bool SkTwoPointRadialGradient::asNewCustomStage(GrContext* context, - GrSamplerState* sampler) const { +bool SkTwoPointRadialGradient::asNewEffect(GrContext* context, + GrSamplerState* sampler) const { SkASSERT(NULL != context && NULL != sampler); SkScalar diffLen = fDiff.length(); SkMatrix matrix; @@ -671,7 +671,7 @@ bool SkTwoPointRadialGradient::asNewCustomStage(GrContext* context, #else -bool SkTwoPointRadialGradient::asNewCustomStage(GrContext*, GrSamplerState*) const { +bool SkTwoPointRadialGradient::asNewEffect(GrContext*, GrSamplerState*) const { SkDEBUGFAIL("Should not call in GPU-less build"); return false; } diff --git a/src/effects/gradients/SkTwoPointRadialGradient.h b/src/effects/gradients/SkTwoPointRadialGradient.h index adbb602265..2810f43f33 100644 --- a/src/effects/gradients/SkTwoPointRadialGradient.h +++ b/src/effects/gradients/SkTwoPointRadialGradient.h @@ -23,7 +23,7 @@ public: SkMatrix* matrix, TileMode* xy) const SK_OVERRIDE; virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; - virtual bool asNewCustomStage(GrContext* context, GrSamplerState* sampler) const SK_OVERRIDE; + virtual bool asNewEffect(GrContext* context, GrSamplerState* sampler) const SK_OVERRIDE; virtual void shadeSpan(int x, int y, SkPMColor* dstCParam, int count) SK_OVERRIDE; diff --git a/src/gpu/GrEffect.cpp b/src/gpu/GrEffect.cpp index 7997fb05e0..352d43cb11 100644 --- a/src/gpu/GrEffect.cpp +++ b/src/gpu/GrEffect.cpp @@ -19,7 +19,7 @@ SkTArray* GrEffectTestFactory::GetFactories() { } #endif -class GrCustomStage_Globals { +class GrEffect_Globals { public: static GrMemoryPool* GetTLS() { return (GrMemoryPool*)SkTLS::Get(CreateTLS, DeleteTLS); @@ -69,9 +69,9 @@ const GrTextureAccess& GrEffect::textureAccess(int index) const { } void * GrEffect::operator new(size_t size) { - return GrCustomStage_Globals::GetTLS()->allocate(size); + return GrEffect_Globals::GetTLS()->allocate(size); } void GrEffect::operator delete(void* target) { - GrCustomStage_Globals::GetTLS()->release(target); + GrEffect_Globals::GetTLS()->release(target); } diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index eae8ce867c..5cdecdb553 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -512,11 +512,11 @@ inline bool skPaint2GrPaintNoShader(SkGpuDevice* dev, SkColor filtered = colorFilter->filterColor(skPaint.getColor()); grPaint->setColor(SkColor2GrColor(filtered)); } else { - SkAutoTUnref stage(colorFilter->asNewCustomStage(dev->context())); + SkAutoTUnref stage(colorFilter->asNewEffect(dev->context())); if (NULL != stage.get()) { grPaint->colorSampler(kColorFilterTextureIdx)->setEffect(stage); } else { - // TODO: rewrite this using asNewCustomStage() + // TODO: rewrite this using asNewEffect() SkColor color; SkXfermode::Mode filterMode; if (colorFilter->asColorMode(&color, &filterMode)) { @@ -552,7 +552,7 @@ inline bool skPaint2GrPaintShader(SkGpuDevice* dev, } GrSamplerState* sampler = grPaint->colorSampler(kShaderTextureIdx); - if (shader->asNewCustomStage(dev->context(), sampler)) { + if (shader->asNewEffect(dev->context(), sampler)) { return true; } @@ -1482,7 +1482,7 @@ static GrTexture* filter_texture(SkDevice* device, GrContext* context, // filter. Also set the clip wide open and the matrix to identity. GrContext::AutoWideOpenIdentityDraw awo(context, NULL); texture = filter->onFilterImageGPU(&proxy, texture, rect); - } else if (filter->asNewCustomStage(&stage, texture)) { + } else if (filter->asNewEffect(&stage, texture)) { GrAutoScratchTexture dst(context, desc); apply_effect(context, texture, dst.texture(), rect, stage); texture = dst.detach(); @@ -1624,7 +1624,7 @@ void SkGpuDevice::drawDevice(const SkDraw& draw, SkDevice* device, } bool SkGpuDevice::canHandleImageFilter(SkImageFilter* filter) { - if (!filter->asNewCustomStage(NULL, NULL) && + if (!filter->asNewEffect(NULL, NULL) && !filter->canFilterImageGPU()) { return false; } diff --git a/src/gpu/gl/GrGLProgramStage.h b/src/gpu/gl/GrGLProgramStage.h index 37d0b039a7..300e6f1af6 100644 --- a/src/gpu/gl/GrGLProgramStage.h +++ b/src/gpu/gl/GrGLProgramStage.h @@ -5,8 +5,8 @@ * found in the LICENSE file. */ -#ifndef GrGLCustomStage_DEFINED -#define GrGLCustomStage_DEFINED +#ifndef GrGLProgramStage_DEFINED +#define GrGLProgramStage_DEFINED #include "GrAllocator.h" #include "GrEffect.h" @@ -24,8 +24,8 @@ class GrGLTexture; GLSL code that implements a GrEffect and for uploading uniforms at draw time. They also must have a function: static inline StageKey GenKey(const GrEffect&, const GrGLCaps&) - that is used to implement a program cache. When two GrCustomEffects produce the same key this - means that their GrGLProgramStages would emit the same GLSL code. + that is used to implement a program cache. When two GrEffects produce the same key this means + that their GrGLProgramStages would emit the same GLSL code. These objects are created by the factory object returned by the GrEffect::getFactory(). */ diff --git a/src/gpu/gl/GrGLShaderBuilder.cpp b/src/gpu/gl/GrGLShaderBuilder.cpp index 217b874769..394b42fa09 100644 --- a/src/gpu/gl/GrGLShaderBuilder.cpp +++ b/src/gpu/gl/GrGLShaderBuilder.cpp @@ -100,8 +100,8 @@ GrGLShaderBuilder::GrGLShaderBuilder(const GrGLContextInfo& ctx, GrGLUniformMana void GrGLShaderBuilder::setupTextureAccess(const char* varyingFSName, GrSLType varyingType) { // FIXME: We don't know how the effect will manipulate the coords. So we give up on using - // projective texturing and always give the stage 2D coords. This will be fixed when custom - // stages are responsible for setting up their own tex coords / tex matrices. + // projective texturing and always give the stage 2D coords. This will be fixed when effects + // are responsible for setting up their own tex coords / tex matrices. switch (varyingType) { case kVec2f_GrSLType: fDefaultTexCoordsName = varyingFSName; diff --git a/src/gpu/gl/GrGLUniformManager.cpp b/src/gpu/gl/GrGLUniformManager.cpp index 06ce2db6ed..684ef8c37e 100644 --- a/src/gpu/gl/GrGLUniformManager.cpp +++ b/src/gpu/gl/GrGLUniformManager.cpp @@ -170,7 +170,7 @@ void GrGLUniformManager::setMatrix3f(UniformHandle u, const GrGLfloat matrix[]) const Uniform& uni = fUniforms[handle_to_index(u)]; GrAssert(uni.fType == kMat33f_GrSLType); GrAssert(GrGLShaderVar::kNonArray == uni.fArrayCount); - // TODO: Re-enable this assert once texture matrices aren't forced on all custom effects + // TODO: Re-enable this assert once texture matrices aren't forced on all effects // GrAssert(kUnusedUniform != uni.fFSLocation || kUnusedUniform != uni.fVSLocation); if (kUnusedUniform != uni.fFSLocation) { GR_GL_CALL(fContext.interface(), UniformMatrix3fv(uni.fFSLocation, 1, false, matrix)); -- 2.34.1