diff options
| author |  egdaniel <egdaniel@google.com> | 2015-11-06 06:57:12 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-11-06 06:57:12 -0800 |
| commit | f3bace939287ca7bb02eaeb38ab51939d7e1ae98 (patch) | |
| tree | 3d53664dc0fae8509d3577015ebaed95e36c92da /src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp | |
| parent | cf1d19805a289c612532cf2d4505bb348b78ba77 (diff) | |
Add addFragPosUniform to GrGLrogramBuilder
BUG=skia:
Review URL: https://codereview.chromium.org/1434483002
Diffstat (limited to 'src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp')
| -rw-r--r-- | src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp b/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp index eea8850f8f..d06c2f3488 100644 --- a/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp +++ b/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp @@ -143,17 +143,15 @@ const char* GrGLFragmentShaderBuilder::fragmentPosition() { static const char* kTempName = "tmpXYFragCoord"; static const char* kCoordName = "fragCoordYDown"; if (!fSetupFragPosition) { - // temporarily change the stage index because we're inserting non-stage code. - GrGLProgramBuilder::AutoStageRestore asr(fProgramBuilder); SkASSERT(!fProgramBuilder->fUniformHandles.fRTHeightUni.isValid()); const char* rtHeightName; fProgramBuilder->fUniformHandles.fRTHeightUni = - fProgramBuilder->addUniform(GrGLProgramBuilder::kFragment_Visibility, - kFloat_GrSLType, - kDefault_GrSLPrecision, - "RTHeight", - &rtHeightName); + fProgramBuilder->addFragPosUniform(GrGLProgramBuilder::kFragment_Visibility, + kFloat_GrSLType, + kDefault_GrSLPrecision, + "RTHeight", + &rtHeightName); // The Adreno compiler seems to be very touchy about access to "gl_FragCoord". // Accessing glFragCoord.zw can cause a program to fail to link. Additionally, |