Make VertexBinding's member variables private
The patch decorates all members in VertexBinding as private and limits
access to them only through getters and setters. This makes it easier to
debug and keep track of any assignments to the class members.
BUG=angleproject:2062
TEST=angle_end2end_tests
Change-Id: Iddd49063d060f136bc9cf11c313a5af0931d433c
Reviewed-on: https://chromium-review.googlesource.com/530786
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
index 36746cf..1cc3882 100644
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -59,7 +59,7 @@
const VertexBinding &binding = vertexBindings[attrib.bindingIndex];
// If we have no buffer, then we either get an error, or there are no more checks to be
// done.
- gl::Buffer *buffer = binding.buffer.get();
+ gl::Buffer *buffer = binding.getBuffer().get();
if (!buffer)
{
if (webglCompatibility || !state.areClientArraysEnabled())
@@ -91,13 +91,14 @@
}
GLint maxVertexElement = 0;
- if (binding.divisor == 0)
+ GLuint divisor = binding.getDivisor();
+ if (divisor == 0)
{
maxVertexElement = maxVertex;
}
else
{
- maxVertexElement = (primcount - 1) / binding.divisor;
+ maxVertexElement = (primcount - 1) / divisor;
}
// We do manual overflow checks here instead of using safe_math.h because it was
@@ -893,7 +894,7 @@
{
const VertexAttribute &attrib = attribs[attributeIndex];
const VertexBinding &binding = bindings[attrib.bindingIndex];
- if (program->isAttribLocationActive(attributeIndex) && binding.divisor == 0)
+ if (program->isAttribLocationActive(attributeIndex) && binding.getDivisor() == 0)
{
return true;
}