commit 50b3fe89428fddbf8f3f4ff135195f89ce385acc
author Geoff Lang <geofflang@chromium.org> Tue Dec 08 14:49:12 2015 +0000
committer Geoff Lang <geofflang@chromium.org> Tue Dec 08 14:49:35 2015 +0000
tree b9568dd9721b002b495f077826fa0f4e5c6431a9
parent 6c9b2ae9fe99de0ae4fc1abfa7a520dcdf5a6950

Revert "Don't allocate VertexArray or TransformFeedback objects until binding."

This reverts commit 070c0124be642383220ca44f795225b89d56f13b.

Change-Id: I4ffa528f63311615bb4e22593c6e8a0ec424cd2d
Reviewed-on: https://chromium-review.googlesource.com/316780
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/validationES.cpp

diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
index d5e7fba..4af2ac0 100644
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -2191,7 +2191,9 @@
 
 bool ValidateBindVertexArrayBase(Context *context, GLuint array)
 {
-    if (!context->isVertexArrayGenerated(array))
+    VertexArray *vao = context->getVertexArray(array);
+
+    if (!vao)
     {
         // The default VAO should always exist
         ASSERT(array != 0);