diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-05-15 14:56:51 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-17 12:17:03 +0000 |
| commit | 87f7f1c3ce519115141b40f1d8faede437c8f357 (patch) | |
| tree | e35d12c8ae40e0192e8af889ca848d3c5f60eed9 /src/gpu/glsl/GrGLSLProgramBuilder.cpp | |
| parent | 1314918f903f0a1b40c2695f2b27737e9a8b443a (diff) | |
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>
Diffstat (limited to 'src/gpu/glsl/GrGLSLProgramBuilder.cpp')
| -rw-r--r-- | src/gpu/glsl/GrGLSLProgramBuilder.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/src/gpu/glsl/GrGLSLProgramBuilder.cpp index 96b3359d4e..2a895125e8 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.cpp +++ b/src/gpu/glsl/GrGLSLProgramBuilder.cpp @@ -237,7 +237,10 @@ void GrGLSLProgramBuilder::emitAndInstallXferProc(const SkString& colorIn, SamplerHandle dstTextureSamplerHandle; GrSurfaceOrigin dstTextureOrigin = kTopLeft_GrSurfaceOrigin; - if (GrTexture* dstTexture = fPipeline.dstTexture()) { + + if (GrTextureProxy* dstTextureProxy = fPipeline.dstTextureProxy()) { + GrTexture* dstTexture = dstTextureProxy->priv().peekTexture(); + // GrProcessor::TextureSampler sampler(dstTexture); SkString name("DstTextureSampler"); dstTextureSamplerHandle = |