diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-06-15 12:07:18 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-15 17:18:19 +0000 |
| commit | fbcef6eb8abad142daf45418516550f7635b4a52 (patch) | |
| tree | 1fb2b2a1df72ba87ec05a91bd1cd271e24b5544e /src/gpu/GrProcessor.h | |
| parent | baaf439eb5d08097d794f13800e5bf7ce8885f95 (diff) | |
Clean up GrResourceProvider usage
The only substantive changes are the removal of GrProxy instantiation in:
SkGpuBlurUtils::GaussianBlur
GrSimpleTextureEffect::Make*
Change-Id: I10970609693bd6ff5b3a3c21b41d82642bb277bc
Reviewed-on: https://skia-review.googlesource.com/19965
Reviewed-by: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrProcessor.h')
| -rw-r--r-- | src/gpu/GrProcessor.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/gpu/GrProcessor.h b/src/gpu/GrProcessor.h index f186af5591..b7abf2fbe2 100644 --- a/src/gpu/GrProcessor.h +++ b/src/gpu/GrProcessor.h @@ -190,7 +190,7 @@ protected: */ void addTextureSampler(const TextureSampler*); void addBufferAccess(const BufferAccess*); - void addImageStorageAccess(GrResourceProvider* resourceProvider, const ImageStorageAccess*); + void addImageStorageAccess(const ImageStorageAccess*); bool hasSameSamplersAndAccesses(const GrResourceIOProcessor&) const; @@ -219,15 +219,14 @@ public: */ TextureSampler(); - // MDB TODO: ultimately we shouldn't need the resource provider parameter - TextureSampler(GrResourceProvider*, sk_sp<GrTextureProxy>, const GrSamplerParams&); - explicit TextureSampler(GrResourceProvider*, sk_sp<GrTextureProxy>, + TextureSampler(sk_sp<GrTextureProxy>, const GrSamplerParams&); + explicit TextureSampler(sk_sp<GrTextureProxy>, GrSamplerParams::FilterMode = GrSamplerParams::kNone_FilterMode, SkShader::TileMode tileXAndY = SkShader::kClamp_TileMode, GrShaderFlags visibility = kFragment_GrShaderFlag); - void reset(GrResourceProvider*, sk_sp<GrTextureProxy>, const GrSamplerParams&, + void reset(sk_sp<GrTextureProxy>, const GrSamplerParams&, GrShaderFlags visibility = kFragment_GrShaderFlag); - void reset(GrResourceProvider*, sk_sp<GrTextureProxy>, + void reset(sk_sp<GrTextureProxy>, GrSamplerParams::FilterMode = GrSamplerParams::kNone_FilterMode, SkShader::TileMode tileXAndY = SkShader::kClamp_TileMode, GrShaderFlags visibility = kFragment_GrShaderFlag); |