diff options
author | Robert Phillips <robertphillips@google.com> | 2017-04-17 14:18:34 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-18 11:43:17 +0000 |
commit | f5442bb4c152e7c8138c83d27140e55d846f7ea5 (patch) | |
tree | 9ff66ac0e928c8cfa325e6bb741cb230ecf584a2 /src/gpu/GrProcessor.cpp | |
parent | c1b879f11b937142f5478bd3b416b26be93dea23 (diff) |
Split cleanup changes out of bigger CL (take 2)
This are split out of: https://skia-review.googlesource.com/c/11581/ (Split up opLists)
This is a reland of: https://skia-review.googlesource.com/c/13585/ (Split cleanup changes out of bigger CL)
TBR=bsalomon@google.com
Change-Id: Id0d5c764953230412e78ae6aa654f8dfae998c60
Reviewed-on: https://skia-review.googlesource.com/13643
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrProcessor.cpp')
-rw-r--r-- | src/gpu/GrProcessor.cpp | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp index 7c1052886d..4856c42a34 100644 --- a/src/gpu/GrProcessor.cpp +++ b/src/gpu/GrProcessor.cpp @@ -204,18 +204,6 @@ bool GrResourceIOProcessor::hasSameSamplersAndAccesses(const GrResourceIOProcess GrResourceIOProcessor::TextureSampler::TextureSampler() {} -GrResourceIOProcessor::TextureSampler::TextureSampler(GrTexture* texture, - const GrSamplerParams& params) { - this->reset(texture, params); -} - -GrResourceIOProcessor::TextureSampler::TextureSampler(GrTexture* texture, - GrSamplerParams::FilterMode filterMode, - SkShader::TileMode tileXAndY, - GrShaderFlags visibility) { - this->reset(texture, filterMode, tileXAndY, visibility); -} - GrResourceIOProcessor::TextureSampler::TextureSampler(GrResourceProvider* resourceProvider, sk_sp<GrTextureProxy> proxy, const GrSamplerParams& params) { @@ -230,16 +218,7 @@ GrResourceIOProcessor::TextureSampler::TextureSampler(GrResourceProvider* resour this->reset(resourceProvider, std::move(proxy), filterMode, tileXAndY, visibility); } -void GrResourceIOProcessor::TextureSampler::reset(GrTexture* texture, - const GrSamplerParams& params, - GrShaderFlags visibility) { - SkASSERT(texture); - fTexture.set(SkRef(texture), kRead_GrIOType); - fParams = params; - fParams.setFilterMode(SkTMin(params.filterMode(), texture->texturePriv().highestFilterMode())); - fVisibility = visibility; -} - +// MDB TODO: remove this! void GrResourceIOProcessor::TextureSampler::reset(GrTexture* texture, GrSamplerParams::FilterMode filterMode, SkShader::TileMode tileXAndY, |