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

Enable the new Vertex Array Object entry points.

TRAC #23392

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 89672bd..e860dd6 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -9186,8 +9186,16 @@
                 return gl::error(GL_INVALID_OPERATION);
             }
 
-            // glBindVertexArray
-            UNIMPLEMENTED();
+            gl::VertexArray *vao = context->getVertexArray(array);
+
+            if (!vao)
+            {
+                // The default VAO should always exist
+                ASSERT(array != 0);
+                return gl::error(GL_INVALID_OPERATION);
+            }
+
+            context->bindVertexArray(array);
         }
     }
     catch(std::bad_alloc&)
@@ -9211,8 +9219,18 @@
                 return gl::error(GL_INVALID_OPERATION);
             }
 
-            // glDeleteVertexArrays
-            UNIMPLEMENTED();
+            if (n < 0)
+            {
+                return gl::error(GL_INVALID_VALUE);
+            }
+
+            for (int arrayIndex = 0; arrayIndex < n; arrayIndex++)
+            {
+                if (arrays[arrayIndex] != 0)
+                {
+                    context->deleteVertexArray(arrays[arrayIndex]);
+                }
+            }
         }
     }
     catch(std::bad_alloc&)
@@ -9236,8 +9254,15 @@
                 return gl::error(GL_INVALID_OPERATION);
             }
 
-            // glGenVertexArrays
-            UNIMPLEMENTED();
+            if (n < 0)
+            {
+                return gl::error(GL_INVALID_VALUE);
+            }
+
+            for (int arrayIndex = 0; arrayIndex < n; arrayIndex++)
+            {
+                arrays[arrayIndex] = context->createVertexArray();
+            }
         }
     }
     catch(std::bad_alloc&)
@@ -9261,8 +9286,14 @@
                 return gl::error(GL_INVALID_OPERATION, GL_FALSE);
             }
 
-            // glIsVertexArray
-            UNIMPLEMENTED();
+            if (array == 0)
+            {
+                return GL_FALSE;
+            }
+
+            gl::VertexArray *vao = context->getVertexArray(array);
+
+            return (vao != NULL ? GL_TRUE : GL_FALSE);
         }
     }
     catch(std::bad_alloc&)