commit feb8507f4b528d8900b0c4d680294e527c71c592
author Jiacheng Lu <lujc@google.com> Tue Sep 03 13:22:04 2019 -0400
committer Commit Bot <commit-bot@chromium.org> Tue Sep 03 18:44:57 2019 +0000
tree 55bfe164d2b96363eee672cc9933085822c85380
parent 050b124d7838d8a13ae2d3c052fd1be9c369e37d

Use VertexArrayID in place of GLuint handle

Bug: angleproject:3804
Change-Id: I0454533eff13218a6aa1e1672ffcd0e76aedb399
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1769716
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/validationES2.cpp

diff --git a/src/libANGLE/validationES2.cpp b/src/libANGLE/validationES2.cpp
index b1f5981..2de9e8f 100644
--- a/src/libANGLE/validationES2.cpp
+++ b/src/libANGLE/validationES2.cpp
@@ -2082,7 +2082,7 @@
                                           defaultFramebuffer);
 }
 
-bool ValidateBindVertexArrayOES(Context *context, GLuint array)
+bool ValidateBindVertexArrayOES(Context *context, VertexArrayID array)
 {
     if (!context->getExtensions().vertexArrayObject)
     {
@@ -2093,7 +2093,7 @@
     return ValidateBindVertexArrayBase(context, array);
 }
 
-bool ValidateDeleteVertexArraysOES(Context *context, GLsizei n, const GLuint *arrays)
+bool ValidateDeleteVertexArraysOES(Context *context, GLsizei n, const VertexArrayID *arrays)
 {
     if (!context->getExtensions().vertexArrayObject)
     {
@@ -2104,7 +2104,7 @@
     return ValidateGenOrDelete(context, n);
 }
 
-bool ValidateGenVertexArraysOES(Context *context, GLsizei n, GLuint *arrays)
+bool ValidateGenVertexArraysOES(Context *context, GLsizei n, VertexArrayID *arrays)
 {
     if (!context->getExtensions().vertexArrayObject)
     {
@@ -2115,7 +2115,7 @@
     return ValidateGenOrDelete(context, n);
 }
 
-bool ValidateIsVertexArrayOES(Context *context, GLuint array)
+bool ValidateIsVertexArrayOES(Context *context, VertexArrayID array)
 {
     if (!context->getExtensions().vertexArrayObject)
     {
@@ -2431,7 +2431,7 @@
             return true;
 
         case GL_VERTEX_ARRAY:
-            if (context->getVertexArray(name) == nullptr)
+            if (context->getVertexArray({name}) == nullptr)
             {
                 context->validationError(GL_INVALID_VALUE, kInvalidVertexArrayName);
                 return false;