src/effects/SkDisplacementMapEffect.cpp - Issue 1228683002: rename GrShaderDataManager -> GrProcessorDataManager

Unified Diff: src/effects/SkDisplacementMapEffect.cpp

Issue 1228683002: rename GrShaderDataManager -> GrProcessorDataManager (Closed) Base URL: https://skia.googlesource.com/skia.git@grfixuptests

Patch Set: rebase onto origin/master Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/effects/SkDisplacementMapEffect.cpp

diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp

index 817206ffa9e9c50b8bc8e441200ecfcb837c5d68..2f1d0119a3a9fceb59ee27d340041a496b4e1d71 100644

--- a/src/effects/SkDisplacementMapEffect.cpp

+++ b/src/effects/SkDisplacementMapEffect.cpp

@@ -332,12 +332,12 @@ private:

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 @@ private:

void onComputeInvariantOutput(GrInvariantOutput* inout) const override;

- GrDisplacementMapEffect(GrShaderDataManager*,

+ GrDisplacementMapEffect(GrProcessorDataManager*,

SkDisplacementMapEffect::ChannelSelectorType xChannelSelector,

SkDisplacementMapEffect::ChannelSelectorType yChannelSelector,

const SkVector& scale,

@@ -449,7 +449,7 @@ bool SkDisplacementMapEffect::filterImageGPU(Proxy* proxy, const SkBitmap& src,

SkIntToScalar(colorOffset.fY - displacementOffset.fY));

paint.addColorProcessor(

- GrDisplacementMapEffect::Create(paint.getShaderDataManager(),

+ GrDisplacementMapEffect::Create(paint.getProcessorDataManager(),

fXChannelSelector,

fYChannelSelector,

scale,

@@ -479,7 +479,7 @@ bool SkDisplacementMapEffect::filterImageGPU(Proxy* proxy, const SkBitmap& src,

///////////////////////////////////////////////////////////////////////////////

GrDisplacementMapEffect::GrDisplacementMapEffect(

- GrShaderDataManager*,

+ GrProcessorDataManager*,

SkDisplacementMapEffect::ChannelSelectorType xChannelSelector,

SkDisplacementMapEffect::ChannelSelectorType yChannelSelector,

const SkVector& scale,

@@ -544,7 +544,7 @@ GrFragmentProcessor* GrDisplacementMapEffect::TestCreate(GrProcessorTestData* d)

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);

« no previous file with comments | « src/effects/SkColorMatrixFilter.cpp ('k') | src/effects/SkLumaColorFilter.cpp » ('j') | no next file with comments »