aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrProgramDesc.cpp
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2017-05-15 14:56:51 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-05-17 12:17:03 +0000
commit87f7f1c3ce519115141b40f1d8faede437c8f357 (patch)
treee35d12c8ae40e0192e8af889ca848d3c5f60eed9 /src/gpu/GrProgramDesc.cpp
parent1314918f903f0a1b40c2695f2b27737e9a8b443a (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/GrProgramDesc.cpp')
-rw-r--r--src/gpu/GrProgramDesc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrProgramDesc.cpp b/src/gpu/GrProgramDesc.cpp
index 41993e190d..8362e110c6 100644
--- a/src/gpu/GrProgramDesc.cpp
+++ b/src/gpu/GrProgramDesc.cpp
@@ -198,8 +198,8 @@ bool GrProgramDesc::Build(GrProgramDesc* desc,
const GrXferProcessor& xp = pipeline.getXferProcessor();
const GrSurfaceOrigin* originIfDstTexture = nullptr;
GrSurfaceOrigin origin;
- if (pipeline.dstTexture()) {
- origin = pipeline.dstTexture()->origin();
+ if (pipeline.dstTextureProxy()) {
+ origin = pipeline.dstTextureProxy()->origin();
originIfDstTexture = &origin;
}
xp.getGLSLProcessorKey(shaderCaps, &b, originIfDstTexture);