Refactor ANGLE's extensions struct to more easily represent multiple

vendor extension Some extensions are available from multiple vendors with the same name, while minimizing the amount of duplicated code and validation errors. The anonymous struct allows individual vendor checks as well as an "*Any()" check to check for any version of the extension. Bug: angleproject:3104 Change-Id: Ib8b65cde850462d3746d9663496a595321817514 Reviewed-on: https://chromium-review.googlesource.com/c/1456619 Commit-Queue: Jonah Ryan-Davis <jonahr@google.com> Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Refactor ANGLE's extensions struct to more easily represent multiple
25686848 · Jonah Ryan-Davis · Commit Bot · c1c9fb1b · 25686848 · 25686848
Commit 25686848 authored Feb 07, 2019 by Jonah Ryan-Davis Committed by Commit Bot Feb 15, 2019
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 7 deletions

Caps.h src/libANGLE/Caps.h +2 -1

validationES.cpp src/libANGLE/validationES.cpp +1 -2

validationES3.cpp src/libANGLE/validationES3.cpp +2 -4

No files found.
--- a/src/libANGLE/Caps.h
+++ b/src/libANGLE/Caps.h
@@ -285,9 +285,10 @@ struct Extensions
    // GL_ANGLE_instanced_arrays
    bool instancedArraysANGLE;
    // GL_EXT_instanced_arrays
    bool instancedArraysEXT;
+    // Any version of the instanced arrays extension
+    bool instancedArraysAny() const { return (instancedArraysANGLE || instancedArraysEXT); }
    // GL_ANGLE_pack_reverse_row_order
    bool packReverseRowOrder;

--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -5262,8 +5262,7 @@ bool ValidateGetVertexAttribBase(Context *context,
                    GL_VERTEX_ATTRIB_ARRAY_DIVISOR == GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE,
                    "ANGLE extension enums not equal to GL enums.");
                if (context->getClientMajorVersion() < 3 &&
-                    !context->getExtensions().instancedArraysANGLE &&
+                    !context->getExtensions().instancedArraysAny())
-                    !context->getExtensions().instancedArraysEXT)
                {
                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
                    return false;

--- a/src/libANGLE/validationES3.cpp
+++ b/src/libANGLE/validationES3.cpp
@@ -3100,8 +3100,7 @@ bool ValidateMultiDrawArraysInstancedANGLE(Context *context,
    }
    if (context->getClientMajorVersion() < 3)
    {
-        if (!context->getExtensions().instancedArraysANGLE &&
+        if (!context->getExtensions().instancedArraysAny())
-            !context->getExtensions().instancedArraysEXT)
        {
            context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
            return false;
@@ -3137,8 +3136,7 @@ bool ValidateMultiDrawElementsInstancedANGLE(Context *context,
    }
    if (context->getClientMajorVersion() < 3)
    {
-        if (!context->getExtensions().instancedArraysANGLE &&
+        if (!context->getExtensions().instancedArraysAny())
-            !context->getExtensions().instancedArraysEXT)
        {
            context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
            return false;