rename GrShaderDataManager -> GrProcessorDataManager
BUG=skia:
Review URL: https://codereview.chromium.org/1228683002
diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp
index 258a1f8..80c179c 100644
--- a/src/core/SkBitmapProcShader.cpp
+++ b/src/core/SkBitmapProcShader.cpp
@@ -365,7 +365,8 @@
bool SkBitmapProcShader::asFragmentProcessor(GrContext* context, const SkPaint& paint,
const SkMatrix& viewM,
const SkMatrix* localMatrix, GrColor* paintColor,
- GrShaderDataManager*, GrFragmentProcessor** fp) const {
+ GrProcessorDataManager*,
+ GrFragmentProcessor** fp) const {
SkMatrix matrix;
matrix.setIDiv(fRawBitmap.width(), fRawBitmap.height());
@@ -451,7 +452,7 @@
#else
bool SkBitmapProcShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&,
- const SkMatrix*, GrColor*, GrShaderDataManager*,
+ const SkMatrix*, GrColor*, GrProcessorDataManager*,
GrFragmentProcessor**) const {
SkDEBUGFAIL("Should not call in GPU-less build");
return false;
diff --git a/src/core/SkBitmapProcShader.h b/src/core/SkBitmapProcShader.h
index 6cdde15..b76a6fe 100644
--- a/src/core/SkBitmapProcShader.h
+++ b/src/core/SkBitmapProcShader.h
@@ -32,7 +32,8 @@
bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM, const SkMatrix*,
- GrColor*, GrShaderDataManager*, GrFragmentProcessor**) const override;
+ GrColor*, GrProcessorDataManager*,
+ GrFragmentProcessor**) const override;
class BitmapProcShaderContext : public SkShader::Context {
public:
diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp
index a707232..8e01090 100644
--- a/src/core/SkColorFilter.cpp
+++ b/src/core/SkColorFilter.cpp
@@ -62,10 +62,10 @@
#endif
#if SK_SUPPORT_GPU
- bool asFragmentProcessors(GrContext* context, GrShaderDataManager* shaderDataManager,
+ bool asFragmentProcessors(GrContext* context, GrProcessorDataManager* procDataManager,
SkTDArray<GrFragmentProcessor*>* array) const override {
- bool hasFrags = fInner->asFragmentProcessors(context, shaderDataManager, array);
- hasFrags |= fOuter->asFragmentProcessors(context, shaderDataManager, array);
+ bool hasFrags = fInner->asFragmentProcessors(context, procDataManager, array);
+ hasFrags |= fOuter->asFragmentProcessors(context, procDataManager, array);
return hasFrags;
}
#endif
diff --git a/src/core/SkColorShader.h b/src/core/SkColorShader.h
index de3916d..ee196c0 100644
--- a/src/core/SkColorShader.h
+++ b/src/core/SkColorShader.h
@@ -55,7 +55,7 @@
GradientType asAGradient(GradientInfo* info) const override;
bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM,
- const SkMatrix*, GrColor*, GrShaderDataManager*,
+ const SkMatrix*, GrColor*, GrProcessorDataManager*,
GrFragmentProcessor**) const override;
SK_TO_STRING_OVERRIDE()
diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp
index 1586a3f..8a3fbb4 100644
--- a/src/core/SkImageFilter.cpp
+++ b/src/core/SkImageFilter.cpp
@@ -276,7 +276,7 @@
SkMatrix matrix(ctx.ctm());
matrix.postTranslate(SkIntToScalar(-bounds.left()), SkIntToScalar(-bounds.top()));
GrPaint paint;
- if (this->asFragmentProcessor(&fp, paint.getShaderDataManager(), srcTexture, matrix, bounds)) {
+ if (this->asFragmentProcessor(&fp, paint.getProcessorDataManager(), srcTexture, matrix, bounds)) {
SkASSERT(fp);
paint.addColorProcessor(fp)->unref();
@@ -374,7 +374,7 @@
return true;
}
-bool SkImageFilter::asFragmentProcessor(GrFragmentProcessor**, GrShaderDataManager*, GrTexture*,
+bool SkImageFilter::asFragmentProcessor(GrFragmentProcessor**, GrProcessorDataManager*, GrTexture*,
const SkMatrix&, const SkIRect&) const {
return false;
}
diff --git a/src/core/SkLocalMatrixShader.h b/src/core/SkLocalMatrixShader.h
index ddb5de8..a145432 100644
--- a/src/core/SkLocalMatrixShader.h
+++ b/src/core/SkLocalMatrixShader.h
@@ -36,20 +36,20 @@
virtual bool asFragmentProcessor(GrContext* context, const SkPaint& paint,
const SkMatrix& viewM, const SkMatrix* localMatrix,
- GrColor* grColor, GrShaderDataManager* shaderDataManager,
+ GrColor* grColor, GrProcessorDataManager* procDataManager,
GrFragmentProcessor** fp) const override {
SkMatrix tmp = this->getLocalMatrix();
if (localMatrix) {
tmp.preConcat(*localMatrix);
}
return fProxyShader->asFragmentProcessor(context, paint, viewM, &tmp, grColor,
- shaderDataManager, fp);
+ procDataManager, fp);
}
#else
virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&,
- const SkMatrix*, GrColor*, GrShaderDataManager*,
+ const SkMatrix*, GrColor*, GrProcessorDataManager*,
GrFragmentProcessor**) const override {
SkDEBUGFAIL("Should not call in GPU-less build");
return false;
diff --git a/src/core/SkPictureShader.cpp b/src/core/SkPictureShader.cpp
index 4cf35c7..e04e248 100644
--- a/src/core/SkPictureShader.cpp
+++ b/src/core/SkPictureShader.cpp
@@ -336,7 +336,7 @@
bool SkPictureShader::asFragmentProcessor(GrContext* context, const SkPaint& paint,
const SkMatrix& viewM, const SkMatrix* localMatrix,
GrColor* paintColor,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
GrFragmentProcessor** fp) const {
int maxTextureSize = 0;
if (context) {
@@ -347,11 +347,11 @@
return false;
}
return bitmapShader->asFragmentProcessor(context, paint, viewM, NULL, paintColor,
- shaderDataManager, fp);
+ procDataManager, fp);
}
#else
bool SkPictureShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&,
- const SkMatrix*, GrColor*, GrShaderDataManager*,
+ const SkMatrix*, GrColor*, GrProcessorDataManager*,
GrFragmentProcessor**) const {
SkDEBUGFAIL("Should not call in GPU-less build");
return false;
diff --git a/src/core/SkPictureShader.h b/src/core/SkPictureShader.h
index 4576446..31a60fd 100644
--- a/src/core/SkPictureShader.h
+++ b/src/core/SkPictureShader.h
@@ -31,7 +31,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPictureShader)
bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM, const SkMatrix*,
- GrColor*, GrShaderDataManager*, GrFragmentProcessor**) const override;
+ GrColor*, GrProcessorDataManager*,
+ GrFragmentProcessor**) const override;
protected:
SkPictureShader(SkReadBuffer&);
diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp
index d1f6611..e5c879e 100644
--- a/src/core/SkShader.cpp
+++ b/src/core/SkShader.cpp
@@ -215,7 +215,8 @@
}
bool SkShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, const SkMatrix*,
- GrColor*, GrShaderDataManager*, GrFragmentProcessor**) const {
+ GrColor*, GrProcessorDataManager*,
+ GrFragmentProcessor**) const {
return false;
}
@@ -346,8 +347,8 @@
#include "SkGr.h"
bool SkColorShader::asFragmentProcessor(GrContext*, const SkPaint& paint, const SkMatrix&,
- const SkMatrix*, GrColor* paintColor, GrShaderDataManager*,
- GrFragmentProcessor** fp) const {
+ const SkMatrix*, GrColor* paintColor,
+ GrProcessorDataManager*, GrFragmentProcessor** fp) const {
*fp = NULL;
SkColor skColor = fColor;
U8CPU newA = SkMulDiv255Round(SkColorGetA(fColor), paint.getAlpha());
@@ -358,7 +359,7 @@
#else
bool SkColorShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&,
- const SkMatrix*, GrColor*, GrShaderDataManager*,
+ const SkMatrix*, GrColor*, GrProcessorDataManager*,
GrFragmentProcessor**) const {
SkDEBUGFAIL("Should not call in GPU-less build");
return false;
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp
index 3ebd24c..e0124b9 100644
--- a/src/core/SkXfermode.cpp
+++ b/src/core/SkXfermode.cpp
@@ -658,7 +658,7 @@
return false;
}
-bool SkXfermode::asFragmentProcessor(GrFragmentProcessor**, GrShaderDataManager*,
+bool SkXfermode::asFragmentProcessor(GrFragmentProcessor**, GrProcessorDataManager*,
GrTexture*) const {
return false;
}
@@ -929,12 +929,12 @@
#include "effects/GrCustomXfermode.h"
bool SkProcCoeffXfermode::asFragmentProcessor(GrFragmentProcessor** fp,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
GrTexture* background) const {
if (GrCustomXfermode::IsSupportedMode(fMode)) {
if (fp) {
- SkASSERT(shaderDataManager);
- *fp = GrCustomXfermode::CreateFP(shaderDataManager, fMode, background);
+ SkASSERT(procDataManager);
+ *fp = GrCustomXfermode::CreateFP(procDataManager, fMode, background);
SkASSERT(*fp);
}
return true;
diff --git a/src/core/SkXfermode_proccoeff.h b/src/core/SkXfermode_proccoeff.h
index 79e2a1b..bbd274d 100644
--- a/src/core/SkXfermode_proccoeff.h
+++ b/src/core/SkXfermode_proccoeff.h
@@ -44,7 +44,7 @@
bool isOpaque(SkXfermode::SrcColorOpacity opacityType) const override;
#if SK_SUPPORT_GPU
- bool asFragmentProcessor(GrFragmentProcessor**, GrShaderDataManager*,
+ bool asFragmentProcessor(GrFragmentProcessor**, GrProcessorDataManager*,
GrTexture* background) const override;
bool asXPFactory(GrXPFactory**) const override;
diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp
index 36c046b..237949c 100644
--- a/src/effects/SkAlphaThresholdFilter.cpp
+++ b/src/effects/SkAlphaThresholdFilter.cpp
@@ -28,7 +28,7 @@
bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
SkBitmap* result, SkIPoint* offset) const override;
#if SK_SUPPORT_GPU
- bool asFragmentProcessor(GrFragmentProcessor**, GrShaderDataManager*, GrTexture*,
+ bool asFragmentProcessor(GrFragmentProcessor**, GrProcessorDataManager*, GrTexture*,
const SkMatrix&, const SkIRect& bounds) const override;
#endif
@@ -62,12 +62,12 @@
class AlphaThresholdEffect : public GrFragmentProcessor {
public:
- static GrFragmentProcessor* Create(GrShaderDataManager* shaderDataManager,
+ static GrFragmentProcessor* Create(GrProcessorDataManager* procDataManager,
GrTexture* texture,
GrTexture* maskTexture,
float innerThreshold,
float outerThreshold) {
- return SkNEW_ARGS(AlphaThresholdEffect, (shaderDataManager,
+ return SkNEW_ARGS(AlphaThresholdEffect, (procDataManager,
texture,
maskTexture,
innerThreshold,
@@ -86,7 +86,7 @@
GrGLFragmentProcessor* createGLInstance() const override;
private:
- AlphaThresholdEffect(GrShaderDataManager*,
+ AlphaThresholdEffect(GrProcessorDataManager*,
GrTexture* texture,
GrTexture* maskTexture,
float innerThreshold,
@@ -212,7 +212,7 @@
GrTexture* maskTex = d->fTextures[GrProcessorUnitTest::kAlphaTextureIdx];
float innerThresh = d->fRandom->nextUScalar1();
float outerThresh = d->fRandom->nextUScalar1();
- return AlphaThresholdEffect::Create(d->fShaderDataManager, bmpTex, maskTex, innerThresh,
+ return AlphaThresholdEffect::Create(d->fProcDataManager, bmpTex, maskTex, innerThresh,
outerThresh);
}
@@ -266,7 +266,7 @@
#if SK_SUPPORT_GPU
bool SkAlphaThresholdFilterImpl::asFragmentProcessor(GrFragmentProcessor** fp,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
GrTexture* texture,
const SkMatrix& in_matrix,
const SkIRect&) const {
@@ -304,7 +304,7 @@
}
}
- *fp = AlphaThresholdEffect::Create(shaderDataManager,
+ *fp = AlphaThresholdEffect::Create(procDataManager,
texture,
maskTexture,
fInnerThreshold,
diff --git a/src/effects/SkArithmeticMode.cpp b/src/effects/SkArithmeticMode.cpp
index 944707d..bd5bf46 100644
--- a/src/effects/SkArithmeticMode.cpp
+++ b/src/effects/SkArithmeticMode.cpp
@@ -31,7 +31,7 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkArithmeticMode_scalar)
#if SK_SUPPORT_GPU
- bool asFragmentProcessor(GrFragmentProcessor**, GrShaderDataManager*,
+ bool asFragmentProcessor(GrFragmentProcessor**, GrProcessorDataManager*,
GrTexture* background) const override;
bool asXPFactory(GrXPFactory**) const override;
@@ -236,10 +236,10 @@
#if SK_SUPPORT_GPU
bool SkArithmeticMode_scalar::asFragmentProcessor(GrFragmentProcessor** fp,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
GrTexture* background) const {
if (fp) {
- *fp = GrArithmeticFP::Create(shaderDataManager,
+ *fp = GrArithmeticFP::Create(procDataManager,
SkScalarToFloat(fK[0]),
SkScalarToFloat(fK[1]),
SkScalarToFloat(fK[2]),
diff --git a/src/effects/SkArithmeticMode_gpu.cpp b/src/effects/SkArithmeticMode_gpu.cpp
index 007ff26..17b17ff 100644
--- a/src/effects/SkArithmeticMode_gpu.cpp
+++ b/src/effects/SkArithmeticMode_gpu.cpp
@@ -101,7 +101,7 @@
///////////////////////////////////////////////////////////////////////////////
-GrArithmeticFP::GrArithmeticFP(GrShaderDataManager*, float k1, float k2, float k3, float k4,
+GrArithmeticFP::GrArithmeticFP(GrProcessorDataManager*, float k1, float k2, float k3, float k4,
bool enforcePMColor, GrTexture* background)
: fK1(k1), fK2(k2), fK3(k3), fK4(k4), fEnforcePMColor(enforcePMColor) {
this->initClassID<GrArithmeticFP>();
@@ -146,7 +146,7 @@
float k4 = d->fRandom->nextF();
bool enforcePMColor = d->fRandom->nextBool();
- return SkNEW_ARGS(GrArithmeticFP, (d->fShaderDataManager, k1, k2, k3, k4, enforcePMColor,
+ return SkNEW_ARGS(GrArithmeticFP, (d->fProcDataManager, k1, k2, k3, k4, enforcePMColor,
d->fTextures[0]));
}
diff --git a/src/effects/SkArithmeticMode_gpu.h b/src/effects/SkArithmeticMode_gpu.h
index a3c3d3b..b84df05 100644
--- a/src/effects/SkArithmeticMode_gpu.h
+++ b/src/effects/SkArithmeticMode_gpu.h
@@ -31,10 +31,10 @@
class GrArithmeticFP : public GrFragmentProcessor {
public:
- static GrFragmentProcessor* Create(GrShaderDataManager* shaderDataManager, float k1, float k2,
+ static GrFragmentProcessor* Create(GrProcessorDataManager* procDataManager, float k1, float k2,
float k3, float k4, bool enforcePMColor,
GrTexture* background) {
- return SkNEW_ARGS(GrArithmeticFP, (shaderDataManager, k1, k2, k3, k4, enforcePMColor,
+ return SkNEW_ARGS(GrArithmeticFP, (procDataManager, k1, k2, k3, k4, enforcePMColor,
background));
}
@@ -57,7 +57,7 @@
void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
- GrArithmeticFP(GrShaderDataManager*, float k1, float k2, float k3, float k4,
+ GrArithmeticFP(GrProcessorDataManager*, float k1, float k2, float k3, float k4,
bool enforcePMColor, GrTexture* background);
float fK1, fK2, fK3, fK4;
diff --git a/src/effects/SkColorCubeFilter.cpp b/src/effects/SkColorCubeFilter.cpp
index 32bbd2e..16010b4 100644
--- a/src/effects/SkColorCubeFilter.cpp
+++ b/src/effects/SkColorCubeFilter.cpp
@@ -337,7 +337,7 @@
const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
}
-bool SkColorCubeFilter::asFragmentProcessors(GrContext* context, GrShaderDataManager*,
+bool SkColorCubeFilter::asFragmentProcessors(GrContext* context, GrProcessorDataManager*,
SkTDArray<GrFragmentProcessor*>* array) const {
static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
GrUniqueKey key;
diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp
index f4a2260..7025715 100644
--- a/src/effects/SkColorFilters.cpp
+++ b/src/effects/SkColorFilters.cpp
@@ -359,7 +359,7 @@
return ModeColorFilterEffect::Create(color, mode);
}
-bool SkModeColorFilter::asFragmentProcessors(GrContext*, GrShaderDataManager*,
+bool SkModeColorFilter::asFragmentProcessors(GrContext*, GrProcessorDataManager*,
SkTDArray<GrFragmentProcessor*>* array) const {
if (SkXfermode::kDst_Mode != fMode) {
GrFragmentProcessor* frag = ModeColorFilterEffect::Create(SkColor2GrColor(fColor), fMode);
diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp
index 16275d5..99c29f9 100644
--- a/src/effects/SkColorMatrixFilter.cpp
+++ b/src/effects/SkColorMatrixFilter.cpp
@@ -539,7 +539,7 @@
return ColorMatrixEffect::Create(colorMatrix);
}
-bool SkColorMatrixFilter::asFragmentProcessors(GrContext*, GrShaderDataManager*,
+bool SkColorMatrixFilter::asFragmentProcessors(GrContext*, GrProcessorDataManager*,
SkTDArray<GrFragmentProcessor*>* array) const {
GrFragmentProcessor* frag = ColorMatrixEffect::Create(fMatrix);
if (frag) {
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
index 817206f..2f1d011 100644
--- a/src/effects/SkDisplacementMapEffect.cpp
+++ b/src/effects/SkDisplacementMapEffect.cpp
@@ -332,12 +332,12 @@
class GrDisplacementMapEffect : public GrFragmentProcessor {
public:
static GrFragmentProcessor* Create(
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
SkDisplacementMapEffect::ChannelSelectorType xChannelSelector,
SkDisplacementMapEffect::ChannelSelectorType yChannelSelector, SkVector scale,
GrTexture* displacement, const SkMatrix& offsetMatrix, GrTexture* color,
const SkISize& colorDimensions) {
- return SkNEW_ARGS(GrDisplacementMapEffect, (shaderDataManager,
+ return SkNEW_ARGS(GrDisplacementMapEffect, (procDataManager,
xChannelSelector,
yChannelSelector,
scale,
@@ -372,7 +372,7 @@
void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
- GrDisplacementMapEffect(GrShaderDataManager*,
+ GrDisplacementMapEffect(GrProcessorDataManager*,
SkDisplacementMapEffect::ChannelSelectorType xChannelSelector,
SkDisplacementMapEffect::ChannelSelectorType yChannelSelector,
const SkVector& scale,
@@ -449,7 +449,7 @@
SkIntToScalar(colorOffset.fY - displacementOffset.fY));
paint.addColorProcessor(
- GrDisplacementMapEffect::Create(paint.getShaderDataManager(),
+ GrDisplacementMapEffect::Create(paint.getProcessorDataManager(),
fXChannelSelector,
fYChannelSelector,
scale,
@@ -479,7 +479,7 @@
///////////////////////////////////////////////////////////////////////////////
GrDisplacementMapEffect::GrDisplacementMapEffect(
- GrShaderDataManager*,
+ GrProcessorDataManager*,
SkDisplacementMapEffect::ChannelSelectorType xChannelSelector,
SkDisplacementMapEffect::ChannelSelectorType yChannelSelector,
const SkVector& scale,
@@ -544,7 +544,7 @@
SkISize colorDimensions;
colorDimensions.fWidth = d->fRandom->nextRangeU(0, d->fTextures[texIdxColor]->width());
colorDimensions.fHeight = d->fRandom->nextRangeU(0, d->fTextures[texIdxColor]->height());
- return GrDisplacementMapEffect::Create(d->fShaderDataManager,
+ return GrDisplacementMapEffect::Create(d->fProcDataManager,
xChannelSelector, yChannelSelector, scale,
d->fTextures[texIdxDispl], SkMatrix::I(),
d->fTextures[texIdxColor], colorDimensions);
diff --git a/src/effects/SkLumaColorFilter.cpp b/src/effects/SkLumaColorFilter.cpp
index 021c3c1..05cbaaa 100644
--- a/src/effects/SkLumaColorFilter.cpp
+++ b/src/effects/SkLumaColorFilter.cpp
@@ -119,7 +119,7 @@
}
};
-bool SkLumaColorFilter::asFragmentProcessors(GrContext*, GrShaderDataManager*,
+bool SkLumaColorFilter::asFragmentProcessors(GrContext*, GrProcessorDataManager*,
SkTDArray<GrFragmentProcessor*>* array) const {
GrFragmentProcessor* frag = LumaColorFilterEffect::Create();
diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp
index ba704b3..d6ed6ee 100644
--- a/src/effects/SkMagnifierImageFilter.cpp
+++ b/src/effects/SkMagnifierImageFilter.cpp
@@ -273,7 +273,7 @@
}
#if SK_SUPPORT_GPU
-bool SkMagnifierImageFilter::asFragmentProcessor(GrFragmentProcessor** fp, GrShaderDataManager*,
+bool SkMagnifierImageFilter::asFragmentProcessor(GrFragmentProcessor** fp, GrProcessorDataManager*,
GrTexture* texture, const SkMatrix&,
const SkIRect&bounds) const {
if (fp) {
diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp
index 8855e3c..70e6740 100644
--- a/src/effects/SkMatrixConvolutionImageFilter.cpp
+++ b/src/effects/SkMatrixConvolutionImageFilter.cpp
@@ -348,7 +348,7 @@
}
bool SkMatrixConvolutionImageFilter::asFragmentProcessor(GrFragmentProcessor** fp,
- GrShaderDataManager*,
+ GrProcessorDataManager*,
GrTexture* texture,
const SkMatrix&,
const SkIRect& bounds) const {
diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp
index b661120..8288a53 100644
--- a/src/effects/SkPerlinNoiseShader.cpp
+++ b/src/effects/SkPerlinNoiseShader.cpp
@@ -515,13 +515,13 @@
class GrPerlinNoiseEffect : public GrFragmentProcessor {
public:
- static GrFragmentProcessor* Create(GrShaderDataManager* shaderDataManager,
+ static GrFragmentProcessor* Create(GrProcessorDataManager* procDataManager,
SkPerlinNoiseShader::Type type,
int numOctaves, bool stitchTiles,
SkPerlinNoiseShader::PaintingData* paintingData,
GrTexture* permutationsTexture, GrTexture* noiseTexture,
const SkMatrix& matrix, uint8_t alpha) {
- return SkNEW_ARGS(GrPerlinNoiseEffect, (shaderDataManager, type, numOctaves, stitchTiles,
+ return SkNEW_ARGS(GrPerlinNoiseEffect, (procDataManager, type, numOctaves, stitchTiles,
paintingData, permutationsTexture, noiseTexture,
matrix, alpha));
}
@@ -565,7 +565,7 @@
inout->setToUnknown(GrInvariantOutput::kWillNot_ReadInput);
}
- GrPerlinNoiseEffect(GrShaderDataManager*, SkPerlinNoiseShader::Type type,
+ GrPerlinNoiseEffect(GrProcessorDataManager*, SkPerlinNoiseShader::Type type,
int numOctaves, bool stitchTiles,
SkPerlinNoiseShader::PaintingData* paintingData,
GrTexture* permutationsTexture, GrTexture* noiseTexture,
@@ -625,7 +625,7 @@
GrPaint grPaint;
SkAssertResult(shader->asFragmentProcessor(d->fContext, paint,
GrTest::TestMatrix(d->fRandom), NULL,
- &paintColor, grPaint.getShaderDataManager(),
+ &paintColor, grPaint.getProcessorDataManager(),
&effect));
SkDELETE(shader);
@@ -946,7 +946,7 @@
const SkMatrix& viewM,
const SkMatrix* externalLocalMatrix,
GrColor* paintColor,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
GrFragmentProcessor** fp) const {
SkASSERT(context);
@@ -985,7 +985,7 @@
m.setTranslateX(-localMatrix.getTranslateX() + SK_Scalar1);
m.setTranslateY(-localMatrix.getTranslateY() + SK_Scalar1);
if ((permutationsTexture) && (noiseTexture)) {
- *fp = GrPerlinNoiseEffect::Create(shaderDataManager,
+ *fp = GrPerlinNoiseEffect::Create(procDataManager,
fType,
fNumOctaves,
fStitchTiles,
@@ -1002,7 +1002,7 @@
#else
bool SkPerlinNoiseShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&,
- const SkMatrix*, GrColor*, GrShaderDataManager*,
+ const SkMatrix*, GrColor*, GrProcessorDataManager*,
GrFragmentProcessor**) const {
SkDEBUGFAIL("Should not call in GPU-less build");
return false;
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp
index faffa4a..88ee5e4 100644
--- a/src/effects/SkTableColorFilter.cpp
+++ b/src/effects/SkTableColorFilter.cpp
@@ -50,7 +50,7 @@
SkColorFilter* newComposed(const SkColorFilter* inner) const override;
#if SK_SUPPORT_GPU
- bool asFragmentProcessors(GrContext*, GrShaderDataManager*,
+ bool asFragmentProcessors(GrContext*, GrProcessorDataManager*,
SkTDArray<GrFragmentProcessor*>*) const override;
#endif
@@ -574,7 +574,7 @@
));
SkTDArray<GrFragmentProcessor*> array;
- if (filter->asFragmentProcessors(d->fContext, d->fShaderDataManager, &array)) {
+ if (filter->asFragmentProcessors(d->fContext, d->fProcDataManager, &array)) {
SkASSERT(1 == array.count()); // TableColorFilter only returns 1
return array[0];
}
@@ -582,7 +582,7 @@
}
bool SkTable_ColorFilter::asFragmentProcessors(GrContext* context,
- GrShaderDataManager*,
+ GrProcessorDataManager*,
SkTDArray<GrFragmentProcessor*>* array) const {
SkBitmap bitmap;
this->asComponentTable(&bitmap);
diff --git a/src/effects/SkXfermodeImageFilter.cpp b/src/effects/SkXfermodeImageFilter.cpp
index 9728843..44908a9 100644
--- a/src/effects/SkXfermodeImageFilter.cpp
+++ b/src/effects/SkXfermodeImageFilter.cpp
@@ -167,7 +167,7 @@
}
GrPaint paint;
- if (!fMode || !fMode->asFragmentProcessor(&xferProcessor, paint.getShaderDataManager(),
+ if (!fMode || !fMode->asFragmentProcessor(&xferProcessor, paint.getProcessorDataManager(),
backgroundTex)) {
// canFilterImageGPU() should've taken care of this
SkASSERT(false);
diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp
index e7bc527..763cef5 100644
--- a/src/effects/gradients/SkGradientShader.cpp
+++ b/src/effects/gradients/SkGradientShader.cpp
@@ -1058,7 +1058,7 @@
/////////////////////////////////////////////////////////////////////
GrGradientEffect::GrGradientEffect(GrContext* ctx,
- GrShaderDataManager*,
+ GrProcessorDataManager*,
const SkGradientShaderBase& shader,
const SkMatrix& matrix,
SkShader::TileMode tileMode) {
diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h
index 9cd573a..9dc6b66 100644
--- a/src/effects/gradients/SkGradientShaderPriv.h
+++ b/src/effects/gradients/SkGradientShaderPriv.h
@@ -329,7 +329,7 @@
public:
GrGradientEffect(GrContext* ctx,
- GrShaderDataManager*,
+ GrProcessorDataManager*,
const SkGradientShaderBase& shader,
const SkMatrix& matrix,
SkShader::TileMode tileMode);
diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp
index 8e2edcf..e5d6c6e 100644
--- a/src/effects/gradients/SkLinearGradient.cpp
+++ b/src/effects/gradients/SkLinearGradient.cpp
@@ -489,11 +489,11 @@
public:
static GrFragmentProcessor* Create(GrContext* ctx,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
const SkLinearGradient& shader,
const SkMatrix& matrix,
SkShader::TileMode tm) {
- return SkNEW_ARGS(GrLinearGradient, (ctx, shaderDataManager, shader, matrix, tm));
+ return SkNEW_ARGS(GrLinearGradient, (ctx, procDataManager, shader, matrix, tm));
}
virtual ~GrLinearGradient() { }
@@ -511,11 +511,11 @@
private:
GrLinearGradient(GrContext* ctx,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
const SkLinearGradient& shader,
const SkMatrix& matrix,
SkShader::TileMode tm)
- : INHERITED(ctx, shaderDataManager, shader, matrix, tm) {
+ : INHERITED(ctx, procDataManager, shader, matrix, tm) {
this->initClassID<GrLinearGradient>();
}
GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
@@ -544,7 +544,7 @@
GrFragmentProcessor* fp;
SkAssertResult(shader->asFragmentProcessor(d->fContext, paint,
GrTest::TestMatrix(d->fRandom), NULL,
- &paintColor, d->fShaderDataManager, &fp));
+ &paintColor, d->fProcDataManager, &fp));
return fp;
}
@@ -568,7 +568,7 @@
bool SkLinearGradient::asFragmentProcessor(GrContext* context, const SkPaint& paint,
const SkMatrix& viewm, const SkMatrix* localMatrix,
GrColor* paintColor,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
GrFragmentProcessor** fp) const {
SkASSERT(context);
@@ -586,7 +586,7 @@
matrix.postConcat(fPtsToUnit);
*paintColor = SkColor2GrColorJustAlpha(paint.getColor());
- *fp = GrLinearGradient::Create(context, shaderDataManager, *this, matrix, fTileMode);
+ *fp = GrLinearGradient::Create(context, procDataManager, *this, matrix, fTileMode);
return true;
}
@@ -594,7 +594,7 @@
#else
bool SkLinearGradient::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&,
- const SkMatrix*, GrColor*, GrShaderDataManager*,
+ const SkMatrix*, GrColor*, GrProcessorDataManager*,
GrFragmentProcessor**) 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 902494e..2330f5b 100644
--- a/src/effects/gradients/SkLinearGradient.h
+++ b/src/effects/gradients/SkLinearGradient.h
@@ -31,7 +31,7 @@
BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const override;
GradientType asAGradient(GradientInfo* info) const override;
bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM,
- const SkMatrix*, GrColor*, GrShaderDataManager*,
+ const SkMatrix*, GrColor*, GrProcessorDataManager*,
GrFragmentProcessor**) const override;
SK_TO_STRING_OVERRIDE()
diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp
index 2a039df..d9f24c0 100644
--- a/src/effects/gradients/SkRadialGradient.cpp
+++ b/src/effects/gradients/SkRadialGradient.cpp
@@ -462,11 +462,11 @@
class GrRadialGradient : public GrGradientEffect {
public:
static GrFragmentProcessor* Create(GrContext* ctx,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
const SkRadialGradient& shader,
const SkMatrix& matrix,
SkShader::TileMode tm) {
- return SkNEW_ARGS(GrRadialGradient, (ctx, shaderDataManager, shader, matrix, tm));
+ return SkNEW_ARGS(GrRadialGradient, (ctx, procDataManager, shader, matrix, tm));
}
virtual ~GrRadialGradient() { }
@@ -484,11 +484,11 @@
private:
GrRadialGradient(GrContext* ctx,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
const SkRadialGradient& shader,
const SkMatrix& matrix,
SkShader::TileMode tm)
- : INHERITED(ctx, shaderDataManager, shader, matrix, tm) {
+ : INHERITED(ctx, procDataManager, shader, matrix, tm) {
this->initClassID<GrRadialGradient>();
}
@@ -518,7 +518,7 @@
GrFragmentProcessor* fp;
SkAssertResult(shader->asFragmentProcessor(d->fContext, paint,
GrTest::TestMatrix(d->fRandom), NULL,
- &paintColor, d->fShaderDataManager, &fp));
+ &paintColor, d->fProcDataManager, &fp));
return fp;
}
@@ -543,7 +543,7 @@
bool SkRadialGradient::asFragmentProcessor(GrContext* context, const SkPaint& paint,
const SkMatrix& viewM,
const SkMatrix* localMatrix, GrColor* paintColor,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
GrFragmentProcessor** fp) const {
SkASSERT(context);
@@ -561,7 +561,7 @@
matrix.postConcat(fPtsToUnit);
*paintColor = SkColor2GrColorJustAlpha(paint.getColor());
- *fp = GrRadialGradient::Create(context, shaderDataManager, *this, matrix, fTileMode);
+ *fp = GrRadialGradient::Create(context, procDataManager, *this, matrix, fTileMode);
return true;
}
@@ -569,7 +569,7 @@
#else
bool SkRadialGradient::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&,
- const SkMatrix*, GrColor*, GrShaderDataManager*,
+ const SkMatrix*, GrColor*, GrProcessorDataManager*,
GrFragmentProcessor**) 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 5921751..0e3a893 100644
--- a/src/effects/gradients/SkRadialGradient.h
+++ b/src/effects/gradients/SkRadialGradient.h
@@ -31,7 +31,7 @@
BitmapType asABitmap(SkBitmap* bitmap, SkMatrix* matrix, TileMode* xy) const override;
GradientType asAGradient(GradientInfo* info) const override;
bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM,
- const SkMatrix*, GrColor*, GrShaderDataManager*,
+ const SkMatrix*, GrColor*, GrProcessorDataManager*,
GrFragmentProcessor**) const override;
SK_TO_STRING_OVERRIDE()
diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp
index 95d8a2e..8a5de75 100644
--- a/src/effects/gradients/SkSweepGradient.cpp
+++ b/src/effects/gradients/SkSweepGradient.cpp
@@ -211,9 +211,9 @@
class GrSweepGradient : public GrGradientEffect {
public:
- static GrFragmentProcessor* Create(GrContext* ctx, GrShaderDataManager* shaderDataManager,
+ static GrFragmentProcessor* Create(GrContext* ctx, GrProcessorDataManager* procDataManager,
const SkSweepGradient& shader, const SkMatrix& m) {
- return SkNEW_ARGS(GrSweepGradient, (ctx, shaderDataManager, shader, m));
+ return SkNEW_ARGS(GrSweepGradient, (ctx, procDataManager, shader, m));
}
virtual ~GrSweepGradient() { }
@@ -230,10 +230,10 @@
private:
GrSweepGradient(GrContext* ctx,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
const SkSweepGradient& shader,
const SkMatrix& matrix)
- : INHERITED(ctx, shaderDataManager, shader, matrix, SkShader::kClamp_TileMode) {
+ : INHERITED(ctx, procDataManager, shader, matrix, SkShader::kClamp_TileMode) {
this->initClassID<GrSweepGradient>();
}
GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
@@ -260,7 +260,7 @@
GrColor paintColor;
SkAssertResult(shader->asFragmentProcessor(d->fContext, paint,
GrTest::TestMatrix(d->fRandom), NULL,
- &paintColor, d->fShaderDataManager, &fp));
+ &paintColor, d->fProcDataManager, &fp));
return fp;
}
@@ -295,7 +295,7 @@
bool SkSweepGradient::asFragmentProcessor(GrContext* context, const SkPaint& paint,
const SkMatrix& viewM,
const SkMatrix* localMatrix, GrColor* paintColor,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
GrFragmentProcessor** effect) const {
SkMatrix matrix;
@@ -311,7 +311,7 @@
}
matrix.postConcat(fPtsToUnit);
- *effect = GrSweepGradient::Create(context, shaderDataManager, *this, matrix);
+ *effect = GrSweepGradient::Create(context, procDataManager, *this, matrix);
*paintColor = SkColor2GrColorJustAlpha(paint.getColor());
return true;
@@ -320,7 +320,7 @@
#else
bool SkSweepGradient::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&,
- const SkMatrix*, GrColor*, GrShaderDataManager*,
+ const SkMatrix*, GrColor*, GrProcessorDataManager*,
GrFragmentProcessor**) 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 c254c59..e9d5fb7 100644
--- a/src/effects/gradients/SkSweepGradient.h
+++ b/src/effects/gradients/SkSweepGradient.h
@@ -33,7 +33,7 @@
GradientType asAGradient(GradientInfo* info) const override;
bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM,
- const SkMatrix*, GrColor*, GrShaderDataManager*,
+ const SkMatrix*, GrColor*, GrProcessorDataManager*,
GrFragmentProcessor**) const override;
SK_TO_STRING_OVERRIDE()
diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp
index 6e8fe4e..56b9458 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp
@@ -394,12 +394,12 @@
const SkMatrix& viewM,
const SkMatrix* localMatrix,
GrColor* paintColor,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
GrFragmentProcessor** fp) const {
SkASSERT(context);
SkASSERT(fPtsToUnit.isIdentity());
- *fp = Gr2PtConicalGradientEffect::Create(context, shaderDataManager, *this, fTileMode,
+ *fp = Gr2PtConicalGradientEffect::Create(context, procDataManager, *this, fTileMode,
localMatrix);
*paintColor = SkColor2GrColorJustAlpha(paint.getColor());
return true;
@@ -409,7 +409,7 @@
bool SkTwoPointConicalGradient::asFragmentProcessor(GrContext*, const SkPaint&,
const SkMatrix&, const SkMatrix*,
- GrColor*, GrShaderDataManager*,
+ GrColor*, GrProcessorDataManager*,
GrFragmentProcessor**) 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 eaa2519..010857c 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient.h
+++ b/src/effects/gradients/SkTwoPointConicalGradient.h
@@ -61,7 +61,7 @@
BitmapType asABitmap(SkBitmap* bitmap, SkMatrix* matrix, TileMode* xy) const override;
SkShader::GradientType asAGradient(GradientInfo* info) const override;
bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, const SkMatrix*,
- GrColor*, GrShaderDataManager*,
+ GrColor*, GrProcessorDataManager*,
GrFragmentProcessor**) const override;
bool isOpaque() const override;
diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
index 38b266d..1e4a060 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
@@ -59,11 +59,11 @@
public:
static GrFragmentProcessor* Create(GrContext* ctx,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
const SkTwoPointConicalGradient& shader,
const SkMatrix& matrix,
SkShader::TileMode tm) {
- return SkNEW_ARGS(Edge2PtConicalEffect, (ctx, shaderDataManager, shader, matrix, tm));
+ return SkNEW_ARGS(Edge2PtConicalEffect, (ctx, procDataManager, shader, matrix, tm));
}
virtual ~Edge2PtConicalEffect() {}
@@ -91,11 +91,11 @@
}
Edge2PtConicalEffect(GrContext* ctx,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
const SkTwoPointConicalGradient& shader,
const SkMatrix& matrix,
SkShader::TileMode tm)
- : INHERITED(ctx, shaderDataManager, shader, matrix, tm),
+ : INHERITED(ctx, procDataManager, shader, matrix, tm),
fCenterX1(shader.getCenterX1()),
fRadius0(shader.getStartRadius()),
fDiffRadius(shader.getDiffRadius()){
@@ -218,7 +218,7 @@
GrColor paintColor;
SkAssertResult(shader->asFragmentProcessor(d->fContext, paint,
GrTest::TestMatrix(d->fRandom), NULL,
- &paintColor, d->fShaderDataManager, &fp));
+ &paintColor, d->fProcDataManager, &fp));
return fp;
}
@@ -379,12 +379,12 @@
public:
static GrFragmentProcessor* Create(GrContext* ctx,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
const SkTwoPointConicalGradient& shader,
const SkMatrix& matrix,
SkShader::TileMode tm,
SkScalar focalX) {
- return SkNEW_ARGS(FocalOutside2PtConicalEffect, (ctx, shaderDataManager, shader, matrix, tm,
+ return SkNEW_ARGS(FocalOutside2PtConicalEffect, (ctx, procDataManager, shader, matrix, tm,
focalX));
}
@@ -410,12 +410,12 @@
}
FocalOutside2PtConicalEffect(GrContext* ctx,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
const SkTwoPointConicalGradient& shader,
const SkMatrix& matrix,
SkShader::TileMode tm,
SkScalar focalX)
- : INHERITED(ctx, shaderDataManager, shader, matrix, tm)
+ : INHERITED(ctx, procDataManager, shader, matrix, tm)
, fFocalX(focalX)
, fIsFlipped(shader.isFlippedGrad()) {
this->initClassID<FocalOutside2PtConicalEffect>();
@@ -507,7 +507,7 @@
GrPaint grPaint;
SkAssertResult(shader->asFragmentProcessor(d->fContext, paint,
GrTest::TestMatrix(d->fRandom), NULL,
- &paintColor, d->fShaderDataManager,
+ &paintColor, d->fProcDataManager,
&effect));
return effect;
}
@@ -604,12 +604,12 @@
public:
static GrFragmentProcessor* Create(GrContext* ctx,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
const SkTwoPointConicalGradient& shader,
const SkMatrix& matrix,
SkShader::TileMode tm,
SkScalar focalX) {
- return SkNEW_ARGS(FocalInside2PtConicalEffect, (ctx, shaderDataManager, shader, matrix, tm,
+ return SkNEW_ARGS(FocalInside2PtConicalEffect, (ctx, procDataManager, shader, matrix, tm,
focalX));
}
@@ -635,12 +635,12 @@
}
FocalInside2PtConicalEffect(GrContext* ctx,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
const SkTwoPointConicalGradient& shader,
const SkMatrix& matrix,
SkShader::TileMode tm,
SkScalar focalX)
- : INHERITED(ctx, shaderDataManager, shader, matrix, tm), fFocalX(focalX) {
+ : INHERITED(ctx, procDataManager, shader, matrix, tm), fFocalX(focalX) {
this->initClassID<FocalInside2PtConicalEffect>();
}
@@ -728,7 +728,7 @@
GrFragmentProcessor* fp;
SkAssertResult(shader->asFragmentProcessor(d->fContext, paint,
GrTest::TestMatrix(d->fRandom), NULL,
- &paintColor, d->fShaderDataManager, &fp));
+ &paintColor, d->fProcDataManager, &fp));
return fp;
}
@@ -851,12 +851,12 @@
public:
static GrFragmentProcessor* Create(GrContext* ctx,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
const SkTwoPointConicalGradient& shader,
const SkMatrix& matrix,
SkShader::TileMode tm,
const CircleConicalInfo& info) {
- return SkNEW_ARGS(CircleInside2PtConicalEffect, (ctx, shaderDataManager, shader, matrix, tm,
+ return SkNEW_ARGS(CircleInside2PtConicalEffect, (ctx, procDataManager, shader, matrix, tm,
info));
}
@@ -886,12 +886,12 @@
}
CircleInside2PtConicalEffect(GrContext* ctx,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
const SkTwoPointConicalGradient& shader,
const SkMatrix& matrix,
SkShader::TileMode tm,
const CircleConicalInfo& info)
- : INHERITED(ctx, shaderDataManager, shader, matrix, tm), fInfo(info) {
+ : INHERITED(ctx, procDataManager, shader, matrix, tm), fInfo(info) {
this->initClassID<CircleInside2PtConicalEffect>();
}
@@ -984,7 +984,7 @@
GrFragmentProcessor* fp;
SkAssertResult(shader->asFragmentProcessor(d->fContext, paint,
GrTest::TestMatrix(d->fRandom), NULL,
- &paintColor, d->fShaderDataManager, &fp));
+ &paintColor, d->fProcDataManager, &fp));
return fp;
}
@@ -1076,12 +1076,12 @@
public:
static GrFragmentProcessor* Create(GrContext* ctx,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
const SkTwoPointConicalGradient& shader,
const SkMatrix& matrix,
SkShader::TileMode tm,
const CircleConicalInfo& info) {
- return SkNEW_ARGS(CircleOutside2PtConicalEffect, (ctx, shaderDataManager, shader, matrix,
+ return SkNEW_ARGS(CircleOutside2PtConicalEffect, (ctx, procDataManager, shader, matrix,
tm, info));
}
@@ -1114,12 +1114,12 @@
}
CircleOutside2PtConicalEffect(GrContext* ctx,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
const SkTwoPointConicalGradient& shader,
const SkMatrix& matrix,
SkShader::TileMode tm,
const CircleConicalInfo& info)
- : INHERITED(ctx, shaderDataManager, shader, matrix, tm), fInfo(info) {
+ : INHERITED(ctx, procDataManager, shader, matrix, tm), fInfo(info) {
this->initClassID<CircleOutside2PtConicalEffect>();
if (shader.getStartRadius() != shader.getEndRadius()) {
fTLimit = shader.getStartRadius() / (shader.getStartRadius() - shader.getEndRadius());
@@ -1224,7 +1224,7 @@
GrFragmentProcessor* fp;
SkAssertResult(shader->asFragmentProcessor(d->fContext, paint,
GrTest::TestMatrix(d->fRandom), NULL,
- &paintColor, d->fShaderDataManager, &fp));
+ &paintColor, d->fProcDataManager, &fp));
return fp;
}
@@ -1339,7 +1339,7 @@
//////////////////////////////////////////////////////////////////////////////
GrFragmentProcessor* Gr2PtConicalGradientEffect::Create(GrContext* ctx,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
const SkTwoPointConicalGradient& shader,
SkShader::TileMode tm,
const SkMatrix* localMatrix) {
@@ -1359,13 +1359,13 @@
SkScalar focalX;
ConicalType type = set_matrix_focal_conical(shader, &matrix, &focalX);
if (type == kInside_ConicalType) {
- return FocalInside2PtConicalEffect::Create(ctx, shaderDataManager, shader, matrix, tm,
+ return FocalInside2PtConicalEffect::Create(ctx, procDataManager, shader, matrix, tm,
focalX);
} else if(type == kEdge_ConicalType) {
set_matrix_edge_conical(shader, &matrix);
- return Edge2PtConicalEffect::Create(ctx, shaderDataManager, shader, matrix, tm);
+ return Edge2PtConicalEffect::Create(ctx, procDataManager, shader, matrix, tm);
} else {
- return FocalOutside2PtConicalEffect::Create(ctx, shaderDataManager, shader, matrix, tm,
+ return FocalOutside2PtConicalEffect::Create(ctx, procDataManager, shader, matrix, tm,
focalX);
}
}
@@ -1374,13 +1374,13 @@
ConicalType type = set_matrix_circle_conical(shader, &matrix, &info);
if (type == kInside_ConicalType) {
- return CircleInside2PtConicalEffect::Create(ctx, shaderDataManager, shader, matrix, tm,
+ return CircleInside2PtConicalEffect::Create(ctx, procDataManager, shader, matrix, tm,
info);
} else if (type == kEdge_ConicalType) {
set_matrix_edge_conical(shader, &matrix);
- return Edge2PtConicalEffect::Create(ctx, shaderDataManager, shader, matrix, tm);
+ return Edge2PtConicalEffect::Create(ctx, procDataManager, shader, matrix, tm);
} else {
- return CircleOutside2PtConicalEffect::Create(ctx, shaderDataManager, shader, matrix, tm,
+ return CircleOutside2PtConicalEffect::Create(ctx, procDataManager, shader, matrix, tm,
info);
}
}
diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.h b/src/effects/gradients/SkTwoPointConicalGradient_gpu.h
index 928e530..3ab5b29 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.h
+++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.h
@@ -18,7 +18,7 @@
* Creates an effect that produces a two point conical gradient based on the
* shader passed in.
*/
- GrFragmentProcessor* Create(GrContext* ctx,GrShaderDataManager* shaderDataManager,
+ GrFragmentProcessor* Create(GrContext* ctx,GrProcessorDataManager* procDataManager,
const SkTwoPointConicalGradient& shader,
SkShader::TileMode tm, const SkMatrix* localMatrix);
};
diff --git a/src/gpu/GrShaderDataManager.cpp b/src/gpu/GrProcessorDataManager.cpp
similarity index 80%
rename from src/gpu/GrShaderDataManager.cpp
rename to src/gpu/GrProcessorDataManager.cpp
index 8497f31..addf4d8 100644
--- a/src/gpu/GrShaderDataManager.cpp
+++ b/src/gpu/GrProcessorDataManager.cpp
@@ -5,4 +5,4 @@
* found in the LICENSE file.
*/
-#include "GrShaderDataManager.h"
+#include "GrProcessorDataManager.h"
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index b7568c3..a703146 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -720,7 +720,7 @@
} else {
SkTDArray<GrFragmentProcessor*> array;
// return false if failed?
- if (colorFilter->asFragmentProcessors(context, grPaint->getShaderDataManager(),
+ if (colorFilter->asFragmentProcessors(context, grPaint->getProcessorDataManager(),
&array)) {
for (int i = 0; i < array.count(); ++i) {
grPaint->addColorProcessor(array[i]);
@@ -772,7 +772,7 @@
// the first color effect on the GrPaint.
GrFragmentProcessor* fp = NULL;
if (!shader->asFragmentProcessor(context, skPaint, viewM, NULL, &paintColor,
- grPaint->getShaderDataManager(), &fp)) {
+ grPaint->getProcessorDataManager(), &fp)) {
return false;
}
if (fp) {
diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp
index c1ff3af..7fc65a4 100644
--- a/src/gpu/effects/GrCustomXfermode.cpp
+++ b/src/gpu/effects/GrCustomXfermode.cpp
@@ -431,12 +431,12 @@
// Fragment Processor
///////////////////////////////////////////////////////////////////////////////
-GrFragmentProcessor* GrCustomXfermode::CreateFP(GrShaderDataManager* shaderDataManager,
+GrFragmentProcessor* GrCustomXfermode::CreateFP(GrProcessorDataManager* procDataManager,
SkXfermode::Mode mode, GrTexture* background) {
if (!GrCustomXfermode::IsSupportedMode(mode)) {
return NULL;
} else {
- return SkNEW_ARGS(GrCustomXferFP, (shaderDataManager, mode, background));
+ return SkNEW_ARGS(GrCustomXferFP, (procDataManager, mode, background));
}
}
@@ -479,7 +479,7 @@
///////////////////////////////////////////////////////////////////////////////
-GrCustomXferFP::GrCustomXferFP(GrShaderDataManager*, SkXfermode::Mode mode, GrTexture* background)
+GrCustomXferFP::GrCustomXferFP(GrProcessorDataManager*, SkXfermode::Mode mode, GrTexture* background)
: fMode(mode) {
this->initClassID<GrCustomXferFP>();
@@ -512,7 +512,7 @@
GrFragmentProcessor* GrCustomXferFP::TestCreate(GrProcessorTestData* d) {
int mode = d->fRandom->nextRangeU(SkXfermode::kLastCoeffMode + 1, SkXfermode::kLastSeparableMode);
- return SkNEW_ARGS(GrCustomXferFP, (d->fShaderDataManager, static_cast<SkXfermode::Mode>(mode),
+ return SkNEW_ARGS(GrCustomXferFP, (d->fProcDataManager, static_cast<SkXfermode::Mode>(mode),
d->fTextures[0]));
}
diff --git a/src/gpu/effects/GrCustomXfermodePriv.h b/src/gpu/effects/GrCustomXfermodePriv.h
index b92debb..ab9d041 100644
--- a/src/gpu/effects/GrCustomXfermodePriv.h
+++ b/src/gpu/effects/GrCustomXfermodePriv.h
@@ -27,7 +27,7 @@
class GrCustomXferFP : public GrFragmentProcessor {
public:
- GrCustomXferFP(GrShaderDataManager*, SkXfermode::Mode mode, GrTexture* background);
+ GrCustomXferFP(GrProcessorDataManager*, SkXfermode::Mode mode, GrTexture* background);
void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;