diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-08-17 11:07:59 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-17 15:08:17 +0000 |
| commit | 1d816b92bb7cf2258007f3f74ffd143b89f25d01 (patch) | |
| tree | 07fb1e8e2631208eb007a4abdfe130db91e6cfc2 /src/gpu/glsl/GrGLSLUniformHandler.h | |
| parent | 23f92277b916a4bdf11c320799ac9248af60a62e (diff) | |
Revert "Switched highp float to highfloat and mediump float to half."
This reverts commit 88d99c63878c2d3d340120f0321676f72afcb4f0.
Reason for revert: Believed to be causing unit test failures in Chrome roll:
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_android_rel_ng/builds/364433
https://luci-logdog.appspot.com/v/?s=chromium%2Fbb%2Ftryserver.chromium.android%2Flinux_android_rel_ng%2F364433%2F%2B%2Frecipes%2Fsteps%2Fcontent_browsertests__with_patch__on_Android%2F0%2Flogs%2FWebRtcCaptureFromElementBrowserTest.VerifyCanvasWebGLCaptureColor%2F0
Original change's description:
> Switched highp float to highfloat and mediump float to half.
>
> The ultimate goal is to end up with "float" and "half", but this
> intermediate step uses "highfloat" so that it is clear if I missed a
> "float" somewhere. Once this lands, a subsequent CL will switch all
> "highfloats" back to "floats".
>
> Bug: skia:
> Change-Id: Ia13225c7a0a0a2901e07665891c473d2500ddcca
> Reviewed-on: https://skia-review.googlesource.com/31000
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,csmartdalton@google.com,ethannicholas@google.com
Change-Id: I8bfa97547ac3920d433665f161d27df3f15c83aa
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/35705
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/glsl/GrGLSLUniformHandler.h')
| -rw-r--r-- | src/gpu/glsl/GrGLSLUniformHandler.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/gpu/glsl/GrGLSLUniformHandler.h b/src/gpu/glsl/GrGLSLUniformHandler.h index 84bbfa104c..cf80c3ff0a 100644 --- a/src/gpu/glsl/GrGLSLUniformHandler.h +++ b/src/gpu/glsl/GrGLSLUniformHandler.h @@ -38,13 +38,6 @@ public: return this->addUniformArray(visibility, type, precision, name, 0, outName); } - UniformHandle addUniform(uint32_t visibility, - GrSLType type, - const char* name, - const char** outName = nullptr) { - return this->addUniform(visibility, type, kDefault_GrSLPrecision, name, outName); - } - UniformHandle addUniformArray(uint32_t visibility, GrSLType type, GrSLPrecision precision, @@ -56,16 +49,6 @@ public: outName); } - UniformHandle addUniformArray(uint32_t visibility, - GrSLType type, - const char* name, - int arrayCount, - const char** outName = nullptr) { - SkASSERT(!GrSLTypeIsCombinedSamplerType(type)); - return this->internalAddUniformArray(visibility, type, kDefault_GrSLPrecision, name, true, - arrayCount, outName); - } - virtual const GrShaderVar& getUniformVariable(UniformHandle u) const = 0; /** |