diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-09-15 11:42:17 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-15 18:50:54 +0000 |
| commit | 05d5a13fea6246648de7e41358ed338d53c85ea2 (patch) | |
| tree | 695fdbeae1116f8ce813288e47b31c2a99f28f1f /src/gpu/glsl/GrGLSLProgramBuilder.cpp | |
| parent | 49f1f34438d3431f6d7e32847accd2ba96948a73 (diff) | |
Revert "Revert "Switched highp float to highfloat and mediump float to half.""
This reverts commit 1d816b92bb7cf2258007f3f74ffd143b89f25d01.
Bug: skia:
Change-Id: I388b5e5e9bf619db48297a80c9a80c039f26c9f1
Reviewed-on: https://skia-review.googlesource.com/46464
Reviewed-by: Brian Salomon <bsalomon@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 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/src/gpu/glsl/GrGLSLProgramBuilder.cpp index bb3dc4f0a9..c2a0d64e5a 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.cpp +++ b/src/gpu/glsl/GrGLSLProgramBuilder.cpp @@ -82,8 +82,7 @@ void GrGLSLProgramBuilder::emitAndInstallPrimProc(const GrPrimitiveProcessor& pr rtAdjustVisibility |= kGeometry_GrShaderFlag; } fUniformHandles.fRTAdjustmentUni = this->uniformHandler()->addUniform(rtAdjustVisibility, - kVec4f_GrSLType, - kHigh_GrSLPrecision, + kHighFloat4_GrSLType, "rtAdjustment"); const char* rtAdjustName = this->uniformHandler()->getUniformCStr(fUniformHandles.fRTAdjustmentUni); @@ -455,7 +454,7 @@ void GrGLSLProgramBuilder::nameExpression(SkString* output, const char* baseName } else { this->nameVariable(&outName, '\0', baseName); } - fFS.codeAppendf("float4 %s;", outName.c_str()); + fFS.codeAppendf("half4 %s;", outName.c_str()); *output = outName; } @@ -468,7 +467,7 @@ void GrGLSLProgramBuilder::addRTHeightUniform(const char* name) { GrGLSLUniformHandler* uniformHandler = this->uniformHandler(); fUniformHandles.fRTHeightUni = uniformHandler->internalAddUniformArray(kFragment_GrShaderFlag, - kFloat_GrSLType, kDefault_GrSLPrecision, + kHalf_GrSLType, kDefault_GrSLPrecision, name, false, 0, nullptr); } |