diff options
author | Brian Salomon <bsalomon@google.com> | 2016-11-29 13:43:46 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-29 20:17:48 +0000 |
commit | 1edc5b92fecefb79f01cf0e302646eacf32b06c7 (patch) | |
tree | aaffe2729d3801c4dfd4ecb64f9ac4c4f78d4ad9 /src/gpu/glsl/GrGLSLProgramBuilder.cpp | |
parent | a0c4c3407d57296eb914cd1c6e0f588f86fe8404 (diff) |
Rename vars and functions from 'glslcaps'->'shadercaps'
Change-Id: I34d226d866dd4ba8e5f33f95cb8cbf01292f9314
Reviewed-on: https://skia-review.googlesource.com/5312
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/glsl/GrGLSLProgramBuilder.cpp')
-rw-r--r-- | src/gpu/glsl/GrGLSLProgramBuilder.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/src/gpu/glsl/GrGLSLProgramBuilder.cpp index 40e5a43ded..590439d629 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.cpp +++ b/src/gpu/glsl/GrGLSLProgramBuilder.cpp @@ -364,22 +364,22 @@ void GrGLSLProgramBuilder::emitFSOutputSwizzle(bool hasSecondaryOutput) { } bool GrGLSLProgramBuilder::checkSamplerCounts() { - const GrShaderCaps& glslCaps = *this->shaderCaps(); - if (fNumVertexSamplers > glslCaps.maxVertexSamplers()) { + const GrShaderCaps& shaderCaps = *this->shaderCaps(); + if (fNumVertexSamplers > shaderCaps.maxVertexSamplers()) { GrCapsDebugf(this->caps(), "Program would use too many vertex samplers\n"); return false; } - if (fNumGeometrySamplers > glslCaps.maxGeometrySamplers()) { + if (fNumGeometrySamplers > shaderCaps.maxGeometrySamplers()) { GrCapsDebugf(this->caps(), "Program would use too many geometry samplers\n"); return false; } - if (fNumFragmentSamplers > glslCaps.maxFragmentSamplers()) { + if (fNumFragmentSamplers > shaderCaps.maxFragmentSamplers()) { GrCapsDebugf(this->caps(), "Program would use too many fragment samplers\n"); return false; } // If the same sampler is used in two different shaders, it counts as two combined samplers. int numCombinedSamplers = fNumVertexSamplers + fNumGeometrySamplers + fNumFragmentSamplers; - if (numCombinedSamplers > glslCaps.maxCombinedSamplers()) { + if (numCombinedSamplers > shaderCaps.maxCombinedSamplers()) { GrCapsDebugf(this->caps(), "Program would use too many combined samplers\n"); return false; } @@ -387,23 +387,23 @@ bool GrGLSLProgramBuilder::checkSamplerCounts() { } bool GrGLSLProgramBuilder::checkImageStorageCounts() { - const GrShaderCaps& glslCaps = *this->shaderCaps(); - if (fNumVertexImageStorages > glslCaps.maxVertexImageStorages()) { + const GrShaderCaps& shaderCaps = *this->shaderCaps(); + if (fNumVertexImageStorages > shaderCaps.maxVertexImageStorages()) { GrCapsDebugf(this->caps(), "Program would use too many vertex images\n"); return false; } - if (fNumGeometryImageStorages > glslCaps.maxGeometryImageStorages()) { + if (fNumGeometryImageStorages > shaderCaps.maxGeometryImageStorages()) { GrCapsDebugf(this->caps(), "Program would use too many geometry images\n"); return false; } - if (fNumFragmentImageStorages > glslCaps.maxFragmentImageStorages()) { + if (fNumFragmentImageStorages > shaderCaps.maxFragmentImageStorages()) { GrCapsDebugf(this->caps(), "Program would use too many fragment images\n"); return false; } // If the same image is used in two different shaders, it counts as two combined images. int numCombinedImages = fNumVertexImageStorages + fNumGeometryImageStorages + fNumFragmentImageStorages; - if (numCombinedImages > glslCaps.maxCombinedImageStorages()) { + if (numCombinedImages > shaderCaps.maxCombinedImageStorages()) { GrCapsDebugf(this->caps(), "Program would use too many combined images\n"); return false; } |