diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-05-17 13:00:14 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-17 13:00:27 +0000 |
| commit | c375704a20a811b9b8d294533f166bed44b7618d (patch) | |
| tree | 3cb4421a3ba854b3daca374dc5b58ab981fbed6c /src/gpu/glsl/GrGLSLProgramBuilder.cpp | |
| parent | a6f68d38606effe69d5d2027a6330543dc7bd408 (diff) | |
Revert "Convert DstTexture to DstProxy"
This reverts commit 87f7f1c3ce519115141b40f1d8faede437c8f357.
Reason for revert: grumble, grumble
Original change's description:
> Convert DstTexture to DstProxy
>
> The last GrTexture-based TextureSampler::reset call must be removed before the TextureSamplers can become purely GrTextureProxy-backed
>
> Split out of: https://skia-review.googlesource.com/c/10484/ (Omnibus: Push instantiation of GrTextures later (post TextureSampler))
>
> Change-Id: Ic1435177d8b5d9bd3fc38b4903c9baae8205cfb0
> Reviewed-on: https://skia-review.googlesource.com/16908
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
>
TBR=egdaniel@google.com,robertphillips@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I9af52bb222bd2d8cc696250a9efb62afb80edba1
Reviewed-on: https://skia-review.googlesource.com/17203
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/glsl/GrGLSLProgramBuilder.cpp')
| -rw-r--r-- | src/gpu/glsl/GrGLSLProgramBuilder.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/src/gpu/glsl/GrGLSLProgramBuilder.cpp index 2a895125e8..96b3359d4e 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.cpp +++ b/src/gpu/glsl/GrGLSLProgramBuilder.cpp @@ -237,10 +237,7 @@ void GrGLSLProgramBuilder::emitAndInstallXferProc(const SkString& colorIn, SamplerHandle dstTextureSamplerHandle; GrSurfaceOrigin dstTextureOrigin = kTopLeft_GrSurfaceOrigin; - - if (GrTextureProxy* dstTextureProxy = fPipeline.dstTextureProxy()) { - GrTexture* dstTexture = dstTextureProxy->priv().peekTexture(); - + if (GrTexture* dstTexture = fPipeline.dstTexture()) { // GrProcessor::TextureSampler sampler(dstTexture); SkString name("DstTextureSampler"); dstTextureSamplerHandle = |