diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-11-21 13:41:08 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-21 19:13:43 +0000 |
| commit | 99938a8ef24e2dd5b39f78638742e9b50ab6d9bf (patch) | |
| tree | e3842210db20a4574e9cec37ae7f049aaff27b65 /src/gpu/glsl/GrGLSLUniformHandler.h | |
| parent | d728f0c1a94fe926b59d8ebc9ae174019ccd3606 (diff) | |
Merge GrGLSLShaderVar and GrShaderVar
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5087
Change-Id: Ib8943a1da1ea495554feaf5b0992b94fbb9539ab
Reviewed-on: https://skia-review.googlesource.com/5087
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/gpu/glsl/GrGLSLUniformHandler.h')
| -rw-r--r-- | src/gpu/glsl/GrGLSLUniformHandler.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gpu/glsl/GrGLSLUniformHandler.h b/src/gpu/glsl/GrGLSLUniformHandler.h index 657be6a804..d49fbd4820 100644 --- a/src/gpu/glsl/GrGLSLUniformHandler.h +++ b/src/gpu/glsl/GrGLSLUniformHandler.h @@ -9,7 +9,8 @@ #define GrGLSLUniformHandler_DEFINED #include "GrGLSLProgramDataManager.h" -#include "GrGLSLShaderVar.h" +#include "GrShaderVar.h" +#include "GrSwizzle.h" class GrGLSLProgramBuilder; @@ -46,7 +47,7 @@ public: outName); } - virtual const GrGLSLShaderVar& getUniformVariable(UniformHandle u) const = 0; + virtual const GrShaderVar& getUniformVariable(UniformHandle u) const = 0; /** * Shortcut for getUniformVariable(u).c_str() @@ -60,7 +61,7 @@ protected: GrGLSLProgramBuilder* fProgramBuilder; private: - virtual const GrGLSLShaderVar& samplerVariable(SamplerHandle) const = 0; + virtual const GrShaderVar& samplerVariable(SamplerHandle) const = 0; virtual GrSwizzle samplerSwizzle(SamplerHandle) const = 0; virtual SamplerHandle addSampler(uint32_t visibility, GrSwizzle, GrSLType, GrSLPrecision, |