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/vk/GrVkUniformHandler.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/vk/GrVkUniformHandler.cpp')
| -rw-r--r-- | src/gpu/vk/GrVkUniformHandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/vk/GrVkUniformHandler.cpp b/src/gpu/vk/GrVkUniformHandler.cpp index 8c4f8514b8..c64864b55a 100644 --- a/src/gpu/vk/GrVkUniformHandler.cpp +++ b/src/gpu/vk/GrVkUniformHandler.cpp @@ -208,7 +208,7 @@ void GrVkUniformHandler::appendUniformDecls(GrShaderFlags visibility, SkString* const UniformInfo& sampler = fSamplers[i]; SkASSERT(sampler.fVariable.getType() == kTexture2DSampler_GrSLType); if (visibility == sampler.fVisibility) { - sampler.fVariable.appendDecl(fProgramBuilder->glslCaps(), out); + sampler.fVariable.appendDecl(fProgramBuilder->shaderCaps(), out); out->append(";\n"); } } @@ -218,7 +218,7 @@ void GrVkUniformHandler::appendUniformDecls(GrShaderFlags visibility, SkString* const UniformInfo& localUniform = fUniforms[i]; if (visibility == localUniform.fVisibility) { if (GrSLTypeIsFloatType(localUniform.fVariable.getType())) { - localUniform.fVariable.appendDecl(fProgramBuilder->glslCaps(), &uniformsString); + localUniform.fVariable.appendDecl(fProgramBuilder->shaderCaps(), &uniformsString); uniformsString.append(";\n"); } } |