diff options
author | Robert Phillips <robertphillips@google.com> | 2017-08-25 08:45:21 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-25 15:19:27 +0000 |
commit | 8296e752fa1803dcb8cf97d6ab10bb4f5f5f51f0 (patch) | |
tree | 7251f087721b2578152647b1c9e17d7dbf581dbc /src/gpu/GrShaderVar.cpp | |
parent | c8323aa51ab27259076532ba081d2ed5c26aedfc (diff) |
Switch atlas clients over to using absolute texture coordinates (take 2)
This is a prerequisite for being able to resize the atlas with impunity.
Change-Id: Iccc9c7ced43f38a7d8483a7bd12a458d59a3453a
Reviewed-on: https://skia-review.googlesource.com/38362
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrShaderVar.cpp')
-rw-r--r-- | src/gpu/GrShaderVar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/GrShaderVar.cpp b/src/gpu/GrShaderVar.cpp index e6d774c329..09e98f82c0 100644 --- a/src/gpu/GrShaderVar.cpp +++ b/src/gpu/GrShaderVar.cpp @@ -99,18 +99,18 @@ void GrShaderVar::appendDecl(const GrShaderCaps* shaderCaps, SkString* out) cons if (this->isArray()) { if (this->isUnsizedArray()) { out->appendf("%s %s[]", - GrGLSLTypeString(effectiveType), + GrGLSLTypeString(shaderCaps, effectiveType), this->getName().c_str()); } else { SkASSERT(this->getArrayCount() > 0); out->appendf("%s %s[%d]", - GrGLSLTypeString(effectiveType), + GrGLSLTypeString(shaderCaps, effectiveType), this->getName().c_str(), this->getArrayCount()); } } else { out->appendf("%s %s", - GrGLSLTypeString(effectiveType), + GrGLSLTypeString(shaderCaps, effectiveType), this->getName().c_str()); } } |