commit 3f5726805388571cc5182cf1dc9d86e258412271
author Jamie Madill <jmadill@chromium.org> Tue Apr 26 13:41:36 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Sat Apr 30 03:08:42 2016 +0000
tree b1b65873eeb2e186b1bc9df28ae392b1cbabd0a1
parent 15243d9b3754c1894ec828b1d11c78221bcfeb2b

Rename gl::VertexArray::Data to gl::VertexArrayState.

BUG=angleproject:1363

Change-Id: I5acf670bd88988941676cc9bc75606d55cca224e
Reviewed-on: https://chromium-review.googlesource.com/340744
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/VertexArray.cpp

diff --git a/src/libANGLE/VertexArray.cpp b/src/libANGLE/VertexArray.cpp
index a1ca19a..8f56f55 100644
--- a/src/libANGLE/VertexArray.cpp
+++ b/src/libANGLE/VertexArray.cpp
@@ -14,12 +14,12 @@
 namespace gl
 {
 
-VertexArray::Data::Data(size_t maxAttribs)
+VertexArrayState::VertexArrayState(size_t maxAttribs)
     : mLabel(), mVertexAttributes(maxAttribs), mMaxEnabledAttribute(0)
 {
 }
 
-VertexArray::Data::~Data()
+VertexArrayState::~VertexArrayState()
 {
     for (size_t i = 0; i < getMaxAttribs(); i++)
     {
@@ -29,7 +29,7 @@
 }
 
 VertexArray::VertexArray(rx::ImplFactory *factory, GLuint id, size_t maxAttribs)
-    : mId(id), mData(maxAttribs), mVertexArray(factory->createVertexArray(mData))
+    : mId(id), mState(maxAttribs), mVertexArray(factory->createVertexArray(mState))
 {
 }
 
@@ -45,60 +45,60 @@
 
 void VertexArray::setLabel(const std::string &label)
 {
-    mData.mLabel = label;
+    mState.mLabel = label;
 }
 
 const std::string &VertexArray::getLabel() const
 {
-    return mData.mLabel;
+    return mState.mLabel;
 }
 
 void VertexArray::detachBuffer(GLuint bufferName)
 {
     for (size_t attribute = 0; attribute < getMaxAttribs(); attribute++)
     {
-        if (mData.mVertexAttributes[attribute].buffer.id() == bufferName)
+        if (mState.mVertexAttributes[attribute].buffer.id() == bufferName)
         {
-            mData.mVertexAttributes[attribute].buffer.set(nullptr);
+            mState.mVertexAttributes[attribute].buffer.set(nullptr);
         }
     }
 
-    if (mData.mElementArrayBuffer.id() == bufferName)
+    if (mState.mElementArrayBuffer.id() == bufferName)
     {
-        mData.mElementArrayBuffer.set(nullptr);
+        mState.mElementArrayBuffer.set(nullptr);
     }
 }
 
 const VertexAttribute &VertexArray::getVertexAttribute(size_t attributeIndex) const
 {
     ASSERT(attributeIndex < getMaxAttribs());
-    return mData.mVertexAttributes[attributeIndex];
+    return mState.mVertexAttributes[attributeIndex];
 }
 
 void VertexArray::setVertexAttribDivisor(size_t index, GLuint divisor)
 {
     ASSERT(index < getMaxAttribs());
-    mData.mVertexAttributes[index].divisor = divisor;
+    mState.mVertexAttributes[index].divisor = divisor;
     mDirtyBits.set(DIRTY_BIT_ATTRIB_0_DIVISOR + index);
 }
 
 void VertexArray::enableAttribute(size_t attributeIndex, bool enabledState)
 {
     ASSERT(attributeIndex < getMaxAttribs());
-    mData.mVertexAttributes[attributeIndex].enabled = enabledState;
+    mState.mVertexAttributes[attributeIndex].enabled = enabledState;
     mDirtyBits.set(DIRTY_BIT_ATTRIB_0_ENABLED + attributeIndex);
 
     // Update state cache
     if (enabledState)
     {
-        mData.mMaxEnabledAttribute = std::max(attributeIndex + 1, mData.mMaxEnabledAttribute);
+        mState.mMaxEnabledAttribute = std::max(attributeIndex + 1, mState.mMaxEnabledAttribute);
     }
-    else if (mData.mMaxEnabledAttribute == attributeIndex + 1)
+    else if (mState.mMaxEnabledAttribute == attributeIndex + 1)
     {
-        while (mData.mMaxEnabledAttribute > 0 &&
-               !mData.mVertexAttributes[mData.mMaxEnabledAttribute - 1].enabled)
+        while (mState.mMaxEnabledAttribute > 0 &&
+               !mState.mVertexAttributes[mState.mMaxEnabledAttribute - 1].enabled)
         {
-            --mData.mMaxEnabledAttribute;
+            --mState.mMaxEnabledAttribute;
         }
     }
 }
@@ -108,7 +108,7 @@
 {
     ASSERT(attributeIndex < getMaxAttribs());
 
-    VertexAttribute *attrib = &mData.mVertexAttributes[attributeIndex];
+    VertexAttribute *attrib = &mState.mVertexAttributes[attributeIndex];
 
     attrib->buffer.set(boundBuffer);
     attrib->size = size;
@@ -122,7 +122,7 @@
 
 void VertexArray::setElementArrayBuffer(Buffer *buffer)
 {
-    mData.mElementArrayBuffer.set(buffer);
+    mState.mElementArrayBuffer.set(buffer);
     mDirtyBits.set(DIRTY_BIT_ELEMENT_ARRAY_BUFFER);
 }