commit a857c36bc1e9f1178c5eaa3e80bfe543a5408467
author Jamie Madill <jamie@nullspace.ca> Tue Jul 02 11:57:02 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:06:07 2013 -0400
tree 633ab6c066846d6745a6d4346baf6012250c2853
parent 879397104fa488dd59d9e318fd4b1f0ef65d17d0

Refactor VertexAttribute to split the "current value" for generic attributes into its own class.

VAOs in GLES 3 do not store the current values, so these must be handled separately from other Vertex
Attribute data.

TRAC #23390

Signed-off-by: Shannon Woods
Signed-off-by: Geoff Lang
Authored-by: Jamie Madill

src/libGLESv2/Context.cpp

diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index fd81f54..5694c02 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -244,9 +244,11 @@
         mIncompleteTextures[type].set(NULL);
     }
 
-    for (int i = 0; i < MAX_VERTEX_ATTRIBS; i++)
+    const GLfloat defaultFloatValues[] = { 0.0f, 0.0f, 0.0f, 1.0f };
+    for (int attribIndex = 0; attribIndex < MAX_VERTEX_ATTRIBS; attribIndex++)
     {
-        mState.vertexAttribute[i].mBoundBuffer.set(NULL);
+        mState.vertexAttribCurrentValues[attribIndex].setFloatValues(defaultFloatValues);
+        mState.vertexAttribute[attribIndex].mBoundBuffer.set(NULL);
     }
 
     for (int i = 0; i < QUERY_TYPE_COUNT; i++)
@@ -685,14 +687,22 @@
 
 void Context::setEnableVertexAttribArray(unsigned int attribNum, bool enabled)
 {
+    ASSERT(attribNum < MAX_VERTEX_ATTRIBS);
     mState.vertexAttribute[attribNum].mArrayEnabled = enabled;
 }
 
-const VertexAttribute &Context::getVertexAttribState(unsigned int attribNum)
+const VertexAttribute &Context::getVertexAttribState(unsigned int attribNum) const
 {
+    ASSERT(attribNum < MAX_VERTEX_ATTRIBS);
     return mState.vertexAttribute[attribNum];
 }
 
+const VertexAttribCurrentValueData &Context::getVertexAttribCurrentValue(unsigned int attribNum) const
+{
+    ASSERT(attribNum < MAX_VERTEX_ATTRIBS);
+    return mState.vertexAttribCurrentValues[attribNum];
+}
+
 void Context::setVertexAttribState(unsigned int attribNum, Buffer *boundBuffer, GLint size, GLenum type, bool normalized,
                                    bool pureInteger, GLsizei stride, const void *pointer)
 {
@@ -2256,7 +2266,7 @@
 
     ProgramBinary *programBinary = getCurrentProgramBinary();
 
-    GLenum err = mRenderer->applyVertexBuffer(programBinary, mState.vertexAttribute, first, count, instances);
+    GLenum err = mRenderer->applyVertexBuffer(programBinary, mState.vertexAttribute, mState.vertexAttribCurrentValues, first, count, instances);
     if (err != GL_NO_ERROR)
     {
         return gl::error(err);
@@ -2315,7 +2325,7 @@
     ProgramBinary *programBinary = getCurrentProgramBinary();
 
     GLsizei vertexCount = indexInfo.maxIndex - indexInfo.minIndex + 1;
-    err = mRenderer->applyVertexBuffer(programBinary, mState.vertexAttribute, indexInfo.minIndex, vertexCount, instances);
+    err = mRenderer->applyVertexBuffer(programBinary, mState.vertexAttribute, mState.vertexAttribCurrentValues, indexInfo.minIndex, vertexCount, instances);
     if (err != GL_NO_ERROR)
     {
         return gl::error(err);
@@ -2845,37 +2855,19 @@
 void Context::setVertexAttribf(GLuint index, const GLfloat values[4])
 {
     ASSERT(index < gl::MAX_VERTEX_ATTRIBS);
-
-    mState.vertexAttribute[index].mCurrentValue.FloatValues[0] = values[0];
-    mState.vertexAttribute[index].mCurrentValue.FloatValues[1] = values[1];
-    mState.vertexAttribute[index].mCurrentValue.FloatValues[2] = values[2];
-    mState.vertexAttribute[index].mCurrentValue.FloatValues[3] = values[3];
-    mState.vertexAttribute[index].mCurrentValue.Type = GL_FLOAT;
-    mState.vertexAttribute[index].mPureInteger = false;
+    mState.vertexAttribCurrentValues[index].setFloatValues(values);
 }
 
 void Context::setVertexAttribu(GLuint index, const GLuint values[4])
 {
     ASSERT(index < gl::MAX_VERTEX_ATTRIBS);
-
-    mState.vertexAttribute[index].mCurrentValue.UnsignedIntValues[0] = values[0];
-    mState.vertexAttribute[index].mCurrentValue.UnsignedIntValues[1] = values[1];
-    mState.vertexAttribute[index].mCurrentValue.UnsignedIntValues[2] = values[2];
-    mState.vertexAttribute[index].mCurrentValue.UnsignedIntValues[3] = values[3];
-    mState.vertexAttribute[index].mCurrentValue.Type = GL_UNSIGNED_INT;
-    mState.vertexAttribute[index].mPureInteger = true;
+    mState.vertexAttribCurrentValues[index].setUnsignedIntValues(values);
 }
 
 void Context::setVertexAttribi(GLuint index, const GLint values[4])
 {
     ASSERT(index < gl::MAX_VERTEX_ATTRIBS);
-
-    mState.vertexAttribute[index].mCurrentValue.IntValues[0] = values[0];
-    mState.vertexAttribute[index].mCurrentValue.IntValues[1] = values[1];
-    mState.vertexAttribute[index].mCurrentValue.IntValues[2] = values[2];
-    mState.vertexAttribute[index].mCurrentValue.IntValues[3] = values[3];
-    mState.vertexAttribute[index].mCurrentValue.Type = GL_INT;
-    mState.vertexAttribute[index].mPureInteger = true;
+    mState.vertexAttribCurrentValues[index].setIntValues(values);
 }
 
 void Context::setVertexAttribDivisor(GLuint index, GLuint divisor)