commit a7d05865b9282646f664867de5f3fc6b6892eb1c
author Jamie Madill <jamie@nullspace.ca> Tue Jul 02 11:57:06 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:06:08 2013 -0400
tree 61db54a006c4a529044e6b2b73293fa2739b5352
parent 30855b37b54d6bc1031632b51458588d41642e58

Add support for new GetAttrib queries for integer and unsigned integer vertex attributes.

TRAC #23391

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

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index c244817..89672bd 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -9619,8 +9619,30 @@
                 return gl::error(GL_INVALID_OPERATION);
             }
 
-            // glGetVertexAttribIiv
-            UNIMPLEMENTED();
+            if (index >= gl::MAX_VERTEX_ATTRIBS)
+            {
+                return gl::error(GL_INVALID_VALUE);
+            }
+
+            const gl::VertexAttribute &attribState = context->getVertexAttribState(index);
+
+            if (!validateGetVertexAttribParameters(pname, context->getClientVersion()))
+            {
+                return;
+            }
+
+            if (pname == GL_CURRENT_VERTEX_ATTRIB)
+            {
+                const gl::VertexAttribCurrentValueData &currentValueData = context->getVertexAttribCurrentValue(index);
+                for (int i = 0; i < 4; ++i)
+                {
+                    params[i] = currentValueData.IntValues[i];
+                }
+            }
+            else
+            {
+                *params = attribState.querySingleParameter<GLint>(pname);
+            }
         }
     }
     catch(std::bad_alloc&)
@@ -9645,8 +9667,30 @@
                 return gl::error(GL_INVALID_OPERATION);
             }
 
-            // glGetVertexAttribIuiv
-            UNIMPLEMENTED();
+            if (index >= gl::MAX_VERTEX_ATTRIBS)
+            {
+                return gl::error(GL_INVALID_VALUE);
+            }
+
+            const gl::VertexAttribute &attribState = context->getVertexAttribState(index);
+
+            if (!validateGetVertexAttribParameters(pname, context->getClientVersion()))
+            {
+                return;
+            }
+
+            if (pname == GL_CURRENT_VERTEX_ATTRIB)
+            {
+                const gl::VertexAttribCurrentValueData &currentValueData = context->getVertexAttribCurrentValue(index);
+                for (int i = 0; i < 4; ++i)
+                {
+                    params[i] = currentValueData.UnsignedIntValues[i];
+                }
+            }
+            else
+            {
+                *params = attribState.querySingleParameter<GLuint>(pname);
+            }
         }
     }
     catch(std::bad_alloc&)