diff options
| author |  Mike Klein <mtklein@google.com> | 2017-04-17 18:04:41 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-17 18:04:46 +0000 |
| commit | e186cfd15f2df43415ae024185bdcf5baa955ec9 (patch) | |
| tree | a595d33b0925711ac5189ecaceb9eb7e015d5e54 /src/gpu/GrProcessor.cpp | |
| parent | 215989330c1895a8bd4c00ba767dae6cc79b17ba (diff) | |
Revert "Split cleanup changes out of bigger CL"
This reverts commit cd11c809f206af0da3ce1779dee3c91193baa7b0.
Reason for revert: assert(rtp->getLastOpList())
Original change's description:
> Split cleanup changes out of bigger CL
>
> This are split out of: https://skia-review.googlesource.com/c/11581/ (Split up opLists)
>
> TBR=bsalomon@google.com
>
> Change-Id: I1239e806a30a93d3c17ad933f118b98a5077dd3a
> Reviewed-on: https://skia-review.googlesource.com/13585
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ia3ef7322fe830a6a4dc29226ce931d35d181c6e0
Reviewed-on: https://skia-review.googlesource.com/13641
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/gpu/GrProcessor.cpp')
| -rw-r--r-- | src/gpu/GrProcessor.cpp | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp index 4856c42a34..7c1052886d 100644 --- a/src/gpu/GrProcessor.cpp +++ b/src/gpu/GrProcessor.cpp @@ -204,6 +204,18 @@ 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) { @@ -218,7 +230,16 @@ GrResourceIOProcessor::TextureSampler::TextureSampler(GrResourceProvider* resour this->reset(resourceProvider, std::move(proxy), filterMode, tileXAndY, visibility); } -// MDB TODO: remove this! +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; +} + void GrResourceIOProcessor::TextureSampler::reset(GrTexture* texture, GrSamplerParams::FilterMode filterMode, SkShader::TileMode tileXAndY, |