diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2016-12-12 15:33:30 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-13 14:28:53 +0000 |
| commit | 941e7e2c9567ab1d8a3b2d1b0e3db71ee5eb75c9 (patch) | |
| tree | 7f0ad6c5b2c3772d2c83be545fe04c53044746bd /src/gpu/glsl/GrGLSLProgramBuilder.cpp | |
| parent | 3dc73f3596d93a89f71b0c7e96d5d63dafeaf378 (diff) | |
re-land of added sk_FragCoord support to skslc
BUG=skia:
Change-Id: Ifac1aa39839058787ad1794200c3dbb93c147a69
Reviewed-on: https://skia-review.googlesource.com/5850
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 590439d629..1182996b4c 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.cpp +++ b/src/gpu/glsl/GrGLSLProgramBuilder.cpp @@ -470,13 +470,13 @@ void GrGLSLProgramBuilder::addRTAdjustmentUniform(GrSLPrecision precision, outName); } -void GrGLSLProgramBuilder::addRTHeightUniform(const char* name, const char** outName) { +void GrGLSLProgramBuilder::addRTHeightUniform(const char* name) { SkASSERT(!fUniformHandles.fRTHeightUni.isValid()); GrGLSLUniformHandler* uniformHandler = this->uniformHandler(); fUniformHandles.fRTHeightUni = uniformHandler->internalAddUniformArray(kFragment_GrShaderFlag, kFloat_GrSLType, kDefault_GrSLPrecision, - name, false, 0, outName); + name, false, 0, nullptr); } void GrGLSLProgramBuilder::cleanupFragmentProcessors() { |