commit dd34b3b9b707c93b3323ac857793ddeae5f7a777
author Jamie Madill <jmadill@chromium.org> Wed Jan 16 09:59:54 2019 -0500
committer Commit Bot <commit-bot@chromium.org> Wed Jan 16 18:25:16 2019 +0000
tree c563fbad6f1b741adac67e9a4c8329cbd7f0c4ed
parent a5d2d55d2a27987b893e1b37f320a3c8eeaae4d3

Pack VertexAttribType enum.

This improves performance slightly in vertex array format checks.
Instead of needing to switch on GLenum values we can use packed arrays
and tables to determine the values we need.

Does not significantly affect performance but will enable future work.

Bug: angleproject:3074
Change-Id: I6f4821a463e9b41fe3f8c8967eb3ed4c1d6b84be
Reviewed-on: https://chromium-review.googlesource.com/c/1393903
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/validationES.cpp

diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
index cb1876f..976241a 100644
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -982,7 +982,7 @@
 }
 
 bool ValidateWebGLVertexAttribPointer(Context *context,
-                                      GLenum type,
+                                      VertexAttribType type,
                                       GLboolean normalized,
                                       GLsizei stride,
                                       const void *ptr,
@@ -4803,7 +4803,7 @@
 bool ValidateVertexFormatBase(Context *context,
                               GLuint attribIndex,
                               GLint size,
-                              GLenum type,
+                              VertexAttribType type,
                               GLboolean pureInteger)
 {
     const Caps &caps = context->getCaps();
@@ -4819,16 +4819,17 @@
         return false;
     }
 
+    // This validation could be improved using a table and better encapsulation.
     switch (type)
     {
-        case GL_BYTE:
-        case GL_UNSIGNED_BYTE:
-        case GL_SHORT:
-        case GL_UNSIGNED_SHORT:
+        case VertexAttribType::Byte:
+        case VertexAttribType::UnsignedByte:
+        case VertexAttribType::Short:
+        case VertexAttribType::UnsignedShort:
             break;
 
-        case GL_INT:
-        case GL_UNSIGNED_INT:
+        case VertexAttribType::Int:
+        case VertexAttribType::UnsignedInt:
             if (context->getClientMajorVersion() < 3)
             {
                 context->validationError(GL_INVALID_ENUM, kEnumRequiresGLES30);
@@ -4836,8 +4837,8 @@
             }
             break;
 
-        case GL_FIXED:
-        case GL_FLOAT:
+        case VertexAttribType::Fixed:
+        case VertexAttribType::Float:
             if (pureInteger)
             {
                 context->validationError(GL_INVALID_ENUM, kInvalidTypePureInt);
@@ -4845,7 +4846,7 @@
             }
             break;
 
-        case GL_HALF_FLOAT:
+        case VertexAttribType::HalfFloat:
             if (context->getClientMajorVersion() < 3)
             {
                 context->validationError(GL_INVALID_ENUM, kEnumRequiresGLES30);
@@ -4858,8 +4859,8 @@
             }
             break;
 
-        case GL_INT_2_10_10_10_REV:
-        case GL_UNSIGNED_INT_2_10_10_10_REV:
+        case VertexAttribType::Int2101010:
+        case VertexAttribType::UnsignedInt2101010:
             if (context->getClientMajorVersion() < 3)
             {
                 context->validationError(GL_INVALID_ENUM, kEnumRequiresGLES30);