diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-02-02 10:43:58 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-02 18:34:02 +0000 |
| commit | cae3a4c8ab7082df009a1e340f10292350e0c763 (patch) | |
| tree | 93b73dca6a37d1241a0ecc8819fdc3cf23f64cb0 /src/gpu/glsl/GrGLSLProgramBuilder.cpp | |
| parent | ebfbba9bbdacd754c8ad7429ee066f53f17bc66b (diff) | |
Revert "Replaced all calls to fragmentPosition() with sk_FragCoord"
This reverts commit de4d301881e7fd084f1f0b359ec6f9b2bf8bd4c5.
Reason for revert: several Chrome rendering bugs on Mac
BUG=skia:
Change-Id: I492082b0b7e7c902ede4b598c5809f604d210ce1
Reviewed-on: https://skia-review.googlesource.com/7887
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/gpu/glsl/GrGLSLProgramBuilder.cpp')
| -rw-r--r-- | src/gpu/glsl/GrGLSLProgramBuilder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/src/gpu/glsl/GrGLSLProgramBuilder.cpp index 2b8a3a7264..c8058251e1 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.cpp +++ b/src/gpu/glsl/GrGLSLProgramBuilder.cpp @@ -20,7 +20,7 @@ const int GrGLSLProgramBuilder::kVarsPerBlock = 8; GrGLSLProgramBuilder::GrGLSLProgramBuilder(const GrPipeline& pipeline, const GrPrimitiveProcessor& primProc, - GrProgramDesc* desc) + const GrProgramDesc& desc) : fVS(this) , fGS(this) , fFS(this) @@ -348,7 +348,7 @@ void GrGLSLProgramBuilder::emitImageStorage(const GrProcessor::ImageStorageAcces void GrGLSLProgramBuilder::emitFSOutputSwizzle(bool hasSecondaryOutput) { // Swizzle the fragment shader outputs if necessary. GrSwizzle swizzle; - swizzle.setFromKey(this->desc()->header().fOutputSwizzle); + swizzle.setFromKey(this->desc().header().fOutputSwizzle); if (swizzle != GrSwizzle::RGBA()) { fFS.codeAppendf("%s = %s.%s;", fFS.getPrimaryColorOutputName(), fFS.getPrimaryColorOutputName(), |