diff options
author | Brian Salomon <bsalomon@google.com> | 2016-11-29 13:43:05 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-29 19:32:31 +0000 |
commit | 94efbf51f5a88d9e8aa961d3fbe38c5e335d6108 (patch) | |
tree | 2723f6ec5bfc291d4a52adf961165e3e74a098ca /src/gpu/GrShaderVar.cpp | |
parent | e11b614795bbe707d131ad599ead5be452e7c06f (diff) |
Merge GrGLSLCaps into GrShaderCaps
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5121
Change-Id: If8d13638f80f42161cbc766a2666c5789e5772c8
Reviewed-on: https://skia-review.googlesource.com/5121
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrShaderVar.cpp')
-rw-r--r-- | src/gpu/GrShaderVar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrShaderVar.cpp b/src/gpu/GrShaderVar.cpp index 75142cab7f..da8bc7a934 100644 --- a/src/gpu/GrShaderVar.cpp +++ b/src/gpu/GrShaderVar.cpp @@ -7,7 +7,7 @@ #include "GrShaderVar.h" -#include "glsl/GrGLSLCaps.h" +#include "GrShaderCaps.h" static const char* type_modifier_string(GrShaderVar::TypeModifier t) { switch (t) { @@ -80,7 +80,7 @@ void GrShaderVar::setIOType(GrIOType ioType) { SkFAIL("Unknown io type."); } -void GrShaderVar::appendDecl(const GrGLSLCaps* glslCaps, SkString* out) const { +void GrShaderVar::appendDecl(const GrShaderCaps* glslCaps, SkString* out) const { SkASSERT(kDefault_GrSLPrecision == fPrecision || GrSLTypeAcceptsPrecision(fType)); SkString layout = fLayoutQualifier; if (!fLayoutQualifier.isEmpty()) { |