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/GrGLSLShaderBuilder.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/GrGLSLShaderBuilder.h')
| -rw-r--r-- | src/gpu/glsl/GrGLSLShaderBuilder.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/glsl/GrGLSLShaderBuilder.h b/src/gpu/glsl/GrGLSLShaderBuilder.h index 2ab0eecf91..17eb5a63cf 100644 --- a/src/gpu/glsl/GrGLSLShaderBuilder.h +++ b/src/gpu/glsl/GrGLSLShaderBuilder.h @@ -9,8 +9,8 @@ #define GrGLSLShaderBuilder_DEFINED #include "GrAllocator.h" +#include "GrShaderVar.h" #include "glsl/GrGLSLUniformHandler.h" -#include "glsl/GrGLSLShaderVar.h" #include "SkTDArray.h" #include <stdarg.h> @@ -118,7 +118,7 @@ public: /** * Appends a variable declaration to one of the shaders */ - void declAppend(const GrGLSLShaderVar& var); + void declAppend(const GrShaderVar& var); /** * Appends a precision qualifier followed by a space, if relevant for the GLSL version. @@ -129,7 +129,7 @@ public: void emitFunction(GrSLType returnType, const char* name, int argCnt, - const GrGLSLShaderVar* args, + const GrShaderVar* args, const char* body, SkString* outName); @@ -161,7 +161,7 @@ public: }; protected: - typedef GrTAllocator<GrGLSLShaderVar> VarArray; + typedef GrTAllocator<GrShaderVar> VarArray; void appendDecls(const VarArray& vars, SkString* out) const; /** |