diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-07-27 16:16:25 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-27 22:16:06 +0000 |
| commit | 16d8ec66cdce2f30ce89b87066d3ac7a244c460d (patch) | |
| tree | c1428954ad363f7e2b6ce13bbb1640911c7a8262 /src/gpu/glsl/GrGLSLProgramBuilder.cpp | |
| parent | 713195071dc7bdeddec2d1c9fab9b3720f049f07 (diff) | |
Pull non-substantive changes out of omnibus GrSurface CL
https://skia-review.googlesource.com/c/26363 (Remove origin field from GrSurface) is
already too large. This pulls some of the cosmetic changes out for separate review.
Change-Id: I1d8b95522144b2f4cbd916ef38faa3dde6f78087
Reviewed-on: https://skia-review.googlesource.com/27840
Reviewed-by: Brian Salomon <bsalomon@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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/src/gpu/glsl/GrGLSLProgramBuilder.cpp index 0d87c4f5a2..5c78c07fc2 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.cpp +++ b/src/gpu/glsl/GrGLSLProgramBuilder.cpp @@ -231,7 +231,7 @@ void GrGLSLProgramBuilder::emitAndInstallXferProc(const SkString& colorIn, dstTextureSamplerHandle = this->emitSampler(dstTexture->texturePriv().samplerType(), dstTexture->config(), "DstTextureSampler", kFragment_GrShaderFlag); - dstTextureOrigin = dstTexture->origin(); + dstTextureOrigin = fPipeline.dstTextureProxy()->origin(); SkASSERT(kTextureExternalSampler_GrSLType != dstTexture->texturePriv().samplerType()); } |