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/GrGLSLUniformHandler.h | |
| 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/GrGLSLUniformHandler.h')
| -rw-r--r-- | src/gpu/glsl/GrGLSLUniformHandler.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/gpu/glsl/GrGLSLUniformHandler.h b/src/gpu/glsl/GrGLSLUniformHandler.h index cf80c3ff0a..84bbfa104c 100644 --- a/src/gpu/glsl/GrGLSLUniformHandler.h +++ b/src/gpu/glsl/GrGLSLUniformHandler.h @@ -38,6 +38,13 @@ 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, @@ -49,6 +56,16 @@ 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; /** |