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.cpp | |
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.cpp')
-rw-r--r-- | src/gpu/GrProcessor.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp index 51cfdfb73c..bff33489fa 100644 --- a/src/gpu/GrProcessor.cpp +++ b/src/gpu/GrProcessor.cpp @@ -136,8 +136,7 @@ void GrResourceIOProcessor::addBufferAccess(const BufferAccess* access) { fBufferAccesses.push_back(access); } -void GrResourceIOProcessor::addImageStorageAccess(GrResourceProvider* resourceProvider, - const ImageStorageAccess* access) { +void GrResourceIOProcessor::addImageStorageAccess(const ImageStorageAccess* access) { fImageStorageAccesses.push_back(access); } @@ -223,22 +222,19 @@ bool GrResourceIOProcessor::hasSameSamplersAndAccesses(const GrResourceIOProcess GrResourceIOProcessor::TextureSampler::TextureSampler() {} -GrResourceIOProcessor::TextureSampler::TextureSampler(GrResourceProvider* resourceProvider, - sk_sp<GrTextureProxy> proxy, +GrResourceIOProcessor::TextureSampler::TextureSampler(sk_sp<GrTextureProxy> proxy, const GrSamplerParams& params) { - this->reset(resourceProvider, std::move(proxy), params); + this->reset(std::move(proxy), params); } -GrResourceIOProcessor::TextureSampler::TextureSampler(GrResourceProvider* resourceProvider, - sk_sp<GrTextureProxy> proxy, +GrResourceIOProcessor::TextureSampler::TextureSampler(sk_sp<GrTextureProxy> proxy, GrSamplerParams::FilterMode filterMode, SkShader::TileMode tileXAndY, GrShaderFlags visibility) { - this->reset(resourceProvider, std::move(proxy), filterMode, tileXAndY, visibility); + this->reset(std::move(proxy), filterMode, tileXAndY, visibility); } -void GrResourceIOProcessor::TextureSampler::reset(GrResourceProvider* resourceProvider, - sk_sp<GrTextureProxy> proxy, +void GrResourceIOProcessor::TextureSampler::reset(sk_sp<GrTextureProxy> proxy, const GrSamplerParams& params, GrShaderFlags visibility) { fParams = params; @@ -247,8 +243,7 @@ void GrResourceIOProcessor::TextureSampler::reset(GrResourceProvider* resourcePr fVisibility = visibility; } -void GrResourceIOProcessor::TextureSampler::reset(GrResourceProvider* resourceProvider, - sk_sp<GrTextureProxy> proxy, +void GrResourceIOProcessor::TextureSampler::reset(sk_sp<GrTextureProxy> proxy, GrSamplerParams::FilterMode filterMode, SkShader::TileMode tileXAndY, GrShaderFlags visibility) { |