Add OES_draw_buffers_indexed autogenerated wrappers and validation redirects.

scripts/code_generation_hashes/GL_EGL_WGL_loader.json

@@ -6,7 +6,7 @@
   "scripts/generate_loader.py":
     "48c60c668bec42a80378179aae2acc61",
   "scripts/registry_xml.py":
-    "1b633c9481f0e8aa148e8690dfe91cda",
+    "06c837b395c8cd0c4fc937b193365042",
   "scripts/wgl.xml":
     "aa96419c582af2f6673430e2847693f4",
   "src/libEGL/egl_loader_autogen.cpp":
@@ -18,9 +18,9 @@
   "util/egl_loader_autogen.h":
     "55b54071e61b3e7beab28178dc20fd28",
   "util/gles_loader_autogen.cpp":
-    "5d066fcf01d897225820211035e2e748",
+    "919acbcf2ad24f5e080568e0822084ab",
   "util/gles_loader_autogen.h":
-    "b8814ac581daa3a2ac3ba0e84b02571b",
+    "834466280040f6110e0fb394bcfb1e42",
   "util/windows/wgl_loader_autogen.cpp":
     "c0d9a65eaa9aac356c6fd3f88638d2be",
   "util/windows/wgl_loader_autogen.h":

scripts/code_generation_hashes/GL_EGL_entry_points.json

@@ -12,7 +12,7 @@
   "scripts/gl_angle_ext.xml":
     "872ecabf7ca7767c7801ba835ddbd1eb",
   "scripts/registry_xml.py":
-    "1b633c9481f0e8aa148e8690dfe91cda",
+    "06c837b395c8cd0c4fc937b193365042",
   "scripts/wgl.xml":
     "aa96419c582af2f6673430e2847693f4",
   "src/libANGLE/Context_gl_1_0_autogen.h":
@@ -64,7 +64,7 @@
   "src/libANGLE/Context_gles_3_2_autogen.h":
     "e26f7ee7b59a89a4f5337171816b8336",
   "src/libANGLE/Context_gles_ext_autogen.h":
-    "88b35bb1ca47f74d17f39e40bc6714cb",
+    "3530773b0510e590e1120d4fccefe627",
   "src/libANGLE/capture_gles_1_0_autogen.cpp":
     "96fc0f501e2e696ab911dad8b400dfb2",
   "src/libANGLE/capture_gles_1_0_autogen.h":
@@ -86,13 +86,13 @@
   "src/libANGLE/capture_gles_3_2_autogen.h":
     "2fbca7168541c2e9ff8a055c256f8531",
   "src/libANGLE/capture_gles_ext_autogen.cpp":
-    "dd0bfd07e2981b04a10a084979c4566a",
+    "cfe15b1611dd9f9ee4d8f269ae060980",
   "src/libANGLE/capture_gles_ext_autogen.h":
-    "829ae7f3a6a36a747e1104b3a9f16f46",
+    "166e8203c8c07cf7536a28aecc678266",
   "src/libANGLE/entry_points_enum_autogen.cpp":
-    "fe353457d091e15d9da24d50b4fee576",
+    "51278d203e18d11b73d72a7488035b55",
   "src/libANGLE/entry_points_enum_autogen.h":
-    "05310685f81d72ef44657923ac339061",
+    "af0543f9f2fd8fc582629d65dab71e89",
   "src/libANGLE/frame_capture_replay_autogen.cpp":
     "c0d57704c21e0032a486a6195ddb87e4",
   "src/libANGLE/frame_capture_utils_autogen.cpp":
@@ -110,7 +110,7 @@
   "src/libANGLE/validationES3_autogen.h":
     "86ba503835328438158d9a464943f3bd",
   "src/libANGLE/validationESEXT_autogen.h":
-    "679656b99ca7fe2f7fed4dc6f929a2f0",
+    "e5bf1f86fe0530f353db5cd71176cde2",
   "src/libANGLE/validationGL11_autogen.h":
     "aadd145c1404de9c34d6b7c00404f10f",
   "src/libANGLE/validationGL12_autogen.h":
@@ -250,15 +250,15 @@
   "src/libGLESv2/entry_points_gles_3_2_autogen.h":
     "5798aa0a73af1d4ba5dfe99b6217a247",
   "src/libGLESv2/entry_points_gles_ext_autogen.cpp":
-    "b30524b202b51f61d6fa673158cc19b5",
+    "45a14fc2bf8ff2a2086251f823b72a9d",
   "src/libGLESv2/entry_points_gles_ext_autogen.h":
-    "d14fb18d0a56513c7e5602032455273e",
+    "4e79b0871b83ed48462ebfadbd996b7d",
   "src/libGLESv2/libGLESv2_autogen.cpp":
-    "20b8031a46b2aa0c8fcf3f70ad211298",
+    "518bc4a1f07b203940b2f4450d1ccd0e",
   "src/libGLESv2/libGLESv2_autogen.def":
-    "a93a298d95eed3cb981c4c888e9b54dc",
+    "1453a200bbb128967197d71ef2482298",
   "src/libGLESv2/libGLESv2_no_capture_autogen.def":
-    "e691456903b32371e6d802b3ef758a30",
+    "d2ea148f7ce199408ec0ae4e2c92ddb9",
   "src/libGLESv2/libGLESv2_with_capture_autogen.def":
-    "e1f9493acf270a66816d4e3d22b64abe"
+    "a6b7e119532a10458d4f44dbaac43655"
 }
\ No newline at end of file

scripts/code_generation_hashes/GLenum_value_to_string_map.json

@@ -6,7 +6,7 @@
   "scripts/gl_angle_ext.xml":
     "872ecabf7ca7767c7801ba835ddbd1eb",
   "scripts/registry_xml.py":
-    "1b633c9481f0e8aa148e8690dfe91cda",
+    "06c837b395c8cd0c4fc937b193365042",
   "src/libANGLE/gl_enum_utils_autogen.cpp":
     "cfc52f413272c061ee4a037876792726",
   "src/libANGLE/gl_enum_utils_autogen.h":

scripts/code_generation_hashes/proc_table.json

@@ -10,11 +10,11 @@
   "scripts/gl_angle_ext.xml":
     "872ecabf7ca7767c7801ba835ddbd1eb",
   "scripts/registry_xml.py":
-    "1b633c9481f0e8aa148e8690dfe91cda",
+    "06c837b395c8cd0c4fc937b193365042",
   "scripts/wgl.xml":
     "aa96419c582af2f6673430e2847693f4",
   "src/libGL/proc_table_wgl_autogen.cpp":
     "03c05f20c57c1de822b0ddaf6d4f9607",
   "src/libGLESv2/proc_table_egl_autogen.cpp":
-    "9300b58ce145e38666f4c5eaacfa138f"
+    "4b576066b0915f136df5479dbcef0852"
 }
\ No newline at end of file

scripts/registry_xml.py

@@ -66,6 +66,7 @@ gles_extensions = [
     "GL_EXT_discard_framebuffer",
     "GL_EXT_disjoint_timer_query",
     "GL_EXT_draw_buffers",
+    "GL_EXT_draw_buffers_indexed",
     "GL_EXT_draw_elements_base_vertex",
     "GL_EXT_geometry_shader",
     "GL_EXT_instanced_arrays",
@@ -92,6 +93,7 @@ gles_extensions = [
     "GL_NV_fence",
     "GL_OES_compressed_ETC1_RGB8_texture",
     "GL_OES_depth32",
+    "GL_OES_draw_buffers_indexed",
     "GL_OES_draw_elements_base_vertex",
     "GL_OES_EGL_image",
     "GL_OES_get_program_binary",

src/libANGLE/Caps.h

@@ -300,6 +300,15 @@ struct Extensions
     // GL_EXT_draw_buffers
     bool drawBuffers = false;
 
+    // GL_EXT_draw_buffers_indexed
+    bool drawBuffersIndexedEXT = false;
+
+    // GL_OES_draw_buffers_indexed
+    bool drawBuffersIndexedOES = false;
+
+    // Any version of the draw_buffers_indexed
+    bool drawBuffersIndexedAny() const { return (drawBuffersIndexedEXT || drawBuffersIndexedOES); }
+
     // GL_EXT_texture_filter_anisotropic
     bool textureFilterAnisotropic = false;
     GLfloat maxTextureAnisotropy  = 0.0f;

src/libANGLE/Context_gles_ext_autogen.h

@@ -336,6 +336,7 @@
     void getQueryObjectui64v(QueryID idPacked, GLenum pname, GLuint64 *params);                    \
     void queryCounter(QueryID idPacked, QueryType targetPacked);                                   \
     /* GL_EXT_draw_buffers */                                                                      \
+    /* GL_EXT_draw_buffers_indexed */                                                              \
     /* GL_EXT_draw_elements_base_vertex */                                                         \
     void multiDrawElementsBaseVertex(PrimitiveMode modePacked, const GLsizei *count,               \
                                      DrawElementsType typePacked, const void *const *indices,      \
@@ -419,6 +420,7 @@
     void eGLImageTargetTexture2D(TextureType targetPacked, GLeglImageOES image);                   \
     /* GL_OES_compressed_ETC1_RGB8_texture */                                                      \
     /* GL_OES_depth32 */                                                                           \
+    /* GL_OES_draw_buffers_indexed */                                                              \
     /* GL_OES_draw_elements_base_vertex */                                                         \
     /* GL_OES_get_program_binary */                                                                \
     /* GL_OES_mapbuffer */                                                                         \

src/libANGLE/capture_gles_ext_autogen.h

@@ -1069,6 +1069,49 @@ angle::CallCapture CaptureDrawBuffersEXT(const State &glState,
                                          GLsizei n,
                                          const GLenum *bufs);
 
+// GL_EXT_draw_buffers_indexed
+angle::CallCapture CaptureBlendEquationSeparateiEXT(const State &glState,
+                                                    bool isCallValid,
+                                                    GLuint buf,
+                                                    GLenum modeRGB,
+                                                    GLenum modeAlpha);
+angle::CallCapture CaptureBlendEquationiEXT(const State &glState,
+                                            bool isCallValid,
+                                            GLuint buf,
+                                            GLenum mode);
+angle::CallCapture CaptureBlendFuncSeparateiEXT(const State &glState,
+                                                bool isCallValid,
+                                                GLuint buf,
+                                                GLenum srcRGB,
+                                                GLenum dstRGB,
+                                                GLenum srcAlpha,
+                                                GLenum dstAlpha);
+angle::CallCapture CaptureBlendFunciEXT(const State &glState,
+                                        bool isCallValid,
+                                        GLuint buf,
+                                        GLenum src,
+                                        GLenum dst);
+angle::CallCapture CaptureColorMaskiEXT(const State &glState,
+                                        bool isCallValid,
+                                        GLuint index,
+                                        GLboolean r,
+                                        GLboolean g,
+                                        GLboolean b,
+                                        GLboolean a);
+angle::CallCapture CaptureDisableiEXT(const State &glState,
+                                      bool isCallValid,
+                                      GLenum target,
+                                      GLuint index);
+angle::CallCapture CaptureEnableiEXT(const State &glState,
+                                     bool isCallValid,
+                                     GLenum target,
+                                     GLuint index);
+angle::CallCapture CaptureIsEnablediEXT(const State &glState,
+                                        bool isCallValid,
+                                        GLenum target,
+                                        GLuint index,
+                                        GLboolean returnValue);
+
 // GL_EXT_draw_elements_base_vertex
 angle::CallCapture CaptureDrawElementsBaseVertexEXT(const State &glState,
                                                     bool isCallValid,
@@ -1482,6 +1525,49 @@ angle::CallCapture CaptureEGLImageTargetTexture2DOES(const State &glState,
 
 // GL_OES_depth32
 
+// GL_OES_draw_buffers_indexed
+angle::CallCapture CaptureBlendEquationSeparateiOES(const State &glState,
+                                                    bool isCallValid,
+                                                    GLuint buf,
+                                                    GLenum modeRGB,
+                                                    GLenum modeAlpha);
+angle::CallCapture CaptureBlendEquationiOES(const State &glState,
+                                            bool isCallValid,
+                                            GLuint buf,
+                                            GLenum mode);
+angle::CallCapture CaptureBlendFuncSeparateiOES(const State &glState,
+                                                bool isCallValid,
+                                                GLuint buf,
+                                                GLenum srcRGB,
+                                                GLenum dstRGB,
+                                                GLenum srcAlpha,
+                                                GLenum dstAlpha);
+angle::CallCapture CaptureBlendFunciOES(const State &glState,
+                                        bool isCallValid,
+                                        GLuint buf,
+                                        GLenum src,
+                                        GLenum dst);
+angle::CallCapture CaptureColorMaskiOES(const State &glState,
+                                        bool isCallValid,
+                                        GLuint index,
+                                        GLboolean r,
+                                        GLboolean g,
+                                        GLboolean b,
+                                        GLboolean a);
+angle::CallCapture CaptureDisableiOES(const State &glState,
+                                      bool isCallValid,
+                                      GLenum target,
+                                      GLuint index);
+angle::CallCapture CaptureEnableiOES(const State &glState,
+                                     bool isCallValid,
+                                     GLenum target,
+                                     GLuint index);
+angle::CallCapture CaptureIsEnablediOES(const State &glState,
+                                        bool isCallValid,
+                                        GLenum target,
+                                        GLuint index,
+                                        GLboolean returnValue);
+
 // GL_OES_draw_elements_base_vertex
 angle::CallCapture CaptureDrawElementsBaseVertexOES(const State &glState,
                                                     bool isCallValid,

src/libANGLE/entry_points_enum_autogen.cpp

@@ -116,16 +116,32 @@ const char *GetEntryPointName(EntryPoint ep)
             return "glBlendEquationSeparate";
         case EntryPoint::BlendEquationSeparatei:
             return "glBlendEquationSeparatei";
+        case EntryPoint::BlendEquationSeparateiEXT:
+            return "glBlendEquationSeparateiEXT";
+        case EntryPoint::BlendEquationSeparateiOES:
+            return "glBlendEquationSeparateiOES";
         case EntryPoint::BlendEquationi:
             return "glBlendEquationi";
+        case EntryPoint::BlendEquationiEXT:
+            return "glBlendEquationiEXT";
+        case EntryPoint::BlendEquationiOES:
+            return "glBlendEquationiOES";
         case EntryPoint::BlendFunc:
             return "glBlendFunc";
         case EntryPoint::BlendFuncSeparate:
             return "glBlendFuncSeparate";
         case EntryPoint::BlendFuncSeparatei:
             return "glBlendFuncSeparatei";
+        case EntryPoint::BlendFuncSeparateiEXT:
+            return "glBlendFuncSeparateiEXT";
+        case EntryPoint::BlendFuncSeparateiOES:
+            return "glBlendFuncSeparateiOES";
         case EntryPoint::BlendFunci:
             return "glBlendFunci";
+        case EntryPoint::BlendFunciEXT:
+            return "glBlendFunciEXT";
+        case EntryPoint::BlendFunciOES:
+            return "glBlendFunciOES";
         case EntryPoint::BlitFramebuffer:
             return "glBlitFramebuffer";
         case EntryPoint::BlitFramebufferANGLE:
@@ -280,6 +296,10 @@ const char *GetEntryPointName(EntryPoint ep)
             return "glColorMask";
         case EntryPoint::ColorMaski:
             return "glColorMaski";
+        case EntryPoint::ColorMaskiEXT:
+            return "glColorMaskiEXT";
+        case EntryPoint::ColorMaskiOES:
+            return "glColorMaskiOES";
         case EntryPoint::ColorMaterial:
             return "glColorMaterial";
         case EntryPoint::ColorP3ui:
@@ -482,6 +502,10 @@ const char *GetEntryPointName(EntryPoint ep)
             return "glDisableVertexAttribArray";
         case EntryPoint::Disablei:
             return "glDisablei";
+        case EntryPoint::DisableiEXT:
+            return "glDisableiEXT";
+        case EntryPoint::DisableiOES:
+            return "glDisableiOES";
         case EntryPoint::DiscardFramebufferEXT:
             return "glDiscardFramebufferEXT";
         case EntryPoint::DispatchCompute:
@@ -590,6 +614,10 @@ const char *GetEntryPointName(EntryPoint ep)
             return "glEnableVertexAttribArray";
         case EntryPoint::Enablei:
             return "glEnablei";
+        case EntryPoint::EnableiEXT:
+            return "glEnableiEXT";
+        case EntryPoint::EnableiOES:
+            return "glEnableiOES";
         case EntryPoint::End:
             return "glEnd";
         case EntryPoint::EndConditionalRender:
@@ -1302,6 +1330,10 @@ const char *GetEntryPointName(EntryPoint ep)
             return "glIsEnabled";
         case EntryPoint::IsEnabledi:
             return "glIsEnabledi";
+        case EntryPoint::IsEnablediEXT:
+            return "glIsEnablediEXT";
+        case EntryPoint::IsEnablediOES:
+            return "glIsEnablediOES";
         case EntryPoint::IsFenceNV:
             return "glIsFenceNV";
         case EntryPoint::IsFramebuffer:

src/libANGLE/entry_points_enum_autogen.h

@@ -64,11 +64,19 @@ enum class EntryPoint
     BlendEquation,
     BlendEquationSeparate,
     BlendEquationSeparatei,
+    BlendEquationSeparateiEXT,
+    BlendEquationSeparateiOES,
     BlendEquationi,
+    BlendEquationiEXT,
+    BlendEquationiOES,
     BlendFunc,
     BlendFuncSeparate,
     BlendFuncSeparatei,
+    BlendFuncSeparateiEXT,
+    BlendFuncSeparateiOES,
     BlendFunci,
+    BlendFunciEXT,
+    BlendFunciOES,
     BlitFramebuffer,
     BlitFramebufferANGLE,
     BlitNamedFramebuffer,
@@ -146,6 +154,8 @@ enum class EntryPoint
     Color4x,
     ColorMask,
     ColorMaski,
+    ColorMaskiEXT,
+    ColorMaskiOES,
     ColorMaterial,
     ColorP3ui,
     ColorP3uiv,
@@ -247,6 +257,8 @@ enum class EntryPoint
     DisableVertexArrayAttrib,
     DisableVertexAttribArray,
     Disablei,
+    DisableiEXT,
+    DisableiOES,
     DiscardFramebufferEXT,
     DispatchCompute,
     DispatchComputeIndirect,
@@ -301,6 +313,8 @@ enum class EntryPoint
     EnableVertexArrayAttrib,
     EnableVertexAttribArray,
     Enablei,
+    EnableiEXT,
+    EnableiOES,
     End,
     EndConditionalRender,
     EndList,
@@ -657,6 +671,8 @@ enum class EntryPoint
     IsBuffer,
     IsEnabled,
     IsEnabledi,
+    IsEnablediEXT,
+    IsEnablediOES,
     IsFenceNV,
     IsFramebuffer,
     IsFramebufferOES,

src/libANGLE/validationESEXT.cpp

@@ -10,6 +10,7 @@
 #include "libANGLE/Context.h"
 #include "libANGLE/ErrorStrings.h"
 #include "libANGLE/validationES.h"
+#include "libANGLE/validationES32.h"
 
 namespace gl
 {
@@ -294,4 +295,206 @@ bool ValidateDrawRangeElementsBaseVertexOES(const Context *context,
     }
     return true;
 }
+
+bool ValidateBlendEquationSeparateiEXT(const Context *context,
+                                       GLuint buf,
+                                       GLenum modeRGB,
+                                       GLenum modeAlpha)
+{
+    if (!context->getExtensions().drawBuffersIndexedEXT)
+    {
+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
+        return false;
+    }
+
+    return ValidateBlendEquationSeparatei(context, buf, modeRGB, modeAlpha);
+}
+
+bool ValidateBlendEquationiEXT(const Context *context, GLuint buf, GLenum mode)
+{
+    if (!context->getExtensions().drawBuffersIndexedEXT)
+    {
+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
+        return false;
+    }
+
+    return ValidateBlendEquationi(context, buf, mode);
+}
+
+bool ValidateBlendFuncSeparateiEXT(const Context *context,
+                                   GLuint buf,
+                                   GLenum srcRGB,
+                                   GLenum dstRGB,
+                                   GLenum srcAlpha,
+                                   GLenum dstAlpha)
+{
+    if (!context->getExtensions().drawBuffersIndexedEXT)
+    {
+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
+        return false;
+    }
+
+    return ValidateBlendFuncSeparatei(context, buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+}
+
+bool ValidateBlendFunciEXT(const Context *context, GLuint buf, GLenum src, GLenum dst)
+{
+    if (!context->getExtensions().drawBuffersIndexedEXT)
+    {
+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
+        return false;
+    }
+
+    return ValidateBlendFunci(context, buf, src, dst);
+}
+
+bool ValidateColorMaskiEXT(const Context *context,
+                           GLuint index,
+                           GLboolean r,
+                           GLboolean g,
+                           GLboolean b,
+                           GLboolean a)
+{
+    if (!context->getExtensions().drawBuffersIndexedEXT)
+    {
+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
+        return false;
+    }
+
+    return ValidateColorMaski(context, index, r, g, b, a);
+}
+
+bool ValidateDisableiEXT(const Context *context, GLenum target, GLuint index)
+{
+    if (!context->getExtensions().drawBuffersIndexedEXT)
+    {
+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
+        return false;
+    }
+
+    return ValidateDisablei(context, target, index);
+}
+
+bool ValidateEnableiEXT(const Context *context, GLenum target, GLuint index)
+{
+    if (!context->getExtensions().drawBuffersIndexedEXT)
+    {
+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
+        return false;
+    }
+
+    return ValidateEnablei(context, target, index);
+}
+
+bool ValidateIsEnablediEXT(const Context *context, GLenum target, GLuint index)
+{
+    if (!context->getExtensions().drawBuffersIndexedEXT)
+    {
+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
+        return false;
+    }
+
+    return ValidateIsEnabledi(context, target, index);
+}
+
+bool ValidateBlendEquationSeparateiOES(const Context *context,
+                                       GLuint buf,
+                                       GLenum modeRGB,
+                                       GLenum modeAlpha)
+{
+    if (!context->getExtensions().drawBuffersIndexedOES)
+    {
+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
+        return false;
+    }
+
+    return ValidateBlendEquationSeparatei(context, buf, modeRGB, modeAlpha);
+}
+
+bool ValidateBlendEquationiOES(const Context *context, GLuint buf, GLenum mode)
+{
+    if (!context->getExtensions().drawBuffersIndexedOES)
+    {
+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
+        return false;
+    }
+
+    return ValidateBlendEquationi(context, buf, mode);
+}
+
+bool ValidateBlendFuncSeparateiOES(const Context *context,
+                                   GLuint buf,
+                                   GLenum srcRGB,
+                                   GLenum dstRGB,
+                                   GLenum srcAlpha,
+                                   GLenum dstAlpha)
+{
+    if (!context->getExtensions().drawBuffersIndexedOES)
+    {
+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
+        return false;
+    }
+
+    return ValidateBlendFuncSeparatei(context, buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+}
+
+bool ValidateBlendFunciOES(const Context *context, GLuint buf, GLenum src, GLenum dst)
+{
+    if (!context->getExtensions().drawBuffersIndexedOES)
+    {
+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
+        return false;
+    }
+
+    return ValidateBlendFunci(context, buf, src, dst);
+}
+
+bool ValidateColorMaskiOES(const Context *context,
+                           GLuint index,
+                           GLboolean r,
+                           GLboolean g,
+                           GLboolean b,
+                           GLboolean a)
+{
+    if (!context->getExtensions().drawBuffersIndexedOES)
+    {
+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
+        return false;
+    }
+
+    return ValidateColorMaski(context, index, r, g, b, a);
+}
+
+bool ValidateDisableiOES(const Context *context, GLenum target, GLuint index)
+{
+    if (!context->getExtensions().drawBuffersIndexedOES)
+    {
+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
+        return false;
+    }
+
+    return ValidateDisablei(context, target, index);
+}
+
+bool ValidateEnableiOES(const Context *context, GLenum target, GLuint index)
+{
+    if (!context->getExtensions().drawBuffersIndexedOES)
+    {
+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
+        return false;
+    }
+
+    return ValidateEnablei(context, target, index);
+}
+
+bool ValidateIsEnablediOES(const Context *context, GLenum target, GLuint index)
+{
+    if (!context->getExtensions().drawBuffersIndexedOES)
+    {
+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
+        return false;
+    }
+
+    return ValidateIsEnabledi(context, target, index);
+}
 }  // namespace gl

src/libANGLE/validationESEXT_autogen.h

@@ -876,6 +876,29 @@ bool ValidateQueryCounterEXT(const Context *context, QueryID idPacked, QueryType
 // GL_EXT_draw_buffers
 bool ValidateDrawBuffersEXT(const Context *context, GLsizei n, const GLenum *bufs);
 
+// GL_EXT_draw_buffers_indexed
+bool ValidateBlendEquationSeparateiEXT(const Context *context,
+                                       GLuint buf,
+                                       GLenum modeRGB,
+                                       GLenum modeAlpha);
+bool ValidateBlendEquationiEXT(const Context *context, GLuint buf, GLenum mode);
+bool ValidateBlendFuncSeparateiEXT(const Context *context,
+                                   GLuint buf,
+                                   GLenum srcRGB,
+                                   GLenum dstRGB,
+                                   GLenum srcAlpha,
+                                   GLenum dstAlpha);
+bool ValidateBlendFunciEXT(const Context *context, GLuint buf, GLenum src, GLenum dst);
+bool ValidateColorMaskiEXT(const Context *context,
+                           GLuint index,
+                           GLboolean r,
+                           GLboolean g,
+                           GLboolean b,
+                           GLboolean a);
+bool ValidateDisableiEXT(const Context *context, GLenum target, GLuint index);
+bool ValidateEnableiEXT(const Context *context, GLenum target, GLuint index);
+bool ValidateIsEnablediEXT(const Context *context, GLenum target, GLuint index);
+
 // GL_EXT_draw_elements_base_vertex
 bool ValidateDrawElementsBaseVertexEXT(const Context *context,
                                        PrimitiveMode modePacked,
@@ -1204,6 +1227,29 @@ bool ValidateEGLImageTargetTexture2DOES(const Context *context,
 
 // GL_OES_depth32
 
+// GL_OES_draw_buffers_indexed
+bool ValidateBlendEquationSeparateiOES(const Context *context,
+                                       GLuint buf,
+                                       GLenum modeRGB,
+                                       GLenum modeAlpha);
+bool ValidateBlendEquationiOES(const Context *context, GLuint buf, GLenum mode);
+bool ValidateBlendFuncSeparateiOES(const Context *context,
+                                   GLuint buf,
+                                   GLenum srcRGB,
+                                   GLenum dstRGB,
+                                   GLenum srcAlpha,
+                                   GLenum dstAlpha);
+bool ValidateBlendFunciOES(const Context *context, GLuint buf, GLenum src, GLenum dst);
+bool ValidateColorMaskiOES(const Context *context,
+                           GLuint index,
+                           GLboolean r,
+                           GLboolean g,
+                           GLboolean b,
+                           GLboolean a);
+bool ValidateDisableiOES(const Context *context, GLenum target, GLuint index);
+bool ValidateEnableiOES(const Context *context, GLenum target, GLuint index);
+bool ValidateIsEnablediOES(const Context *context, GLenum target, GLuint index);
+
 // GL_OES_draw_elements_base_vertex
 bool ValidateDrawElementsBaseVertexOES(const Context *context,
                                        PrimitiveMode modePacked,

src/libGLESv2/libGLESv2_autogen.cpp

@@ -4012,6 +4012,48 @@ void GL_APIENTRY glDrawBuffersEXT(GLsizei n, const GLenum *bufs)
     return gl::DrawBuffersEXT(n, bufs);
 }
 
+// GL_EXT_draw_buffers_indexed
+void GL_APIENTRY glBlendEquationSeparateiEXT(GLuint buf, GLenum modeRGB, GLenum modeAlpha)
+{
+    return gl::BlendEquationSeparateiEXT(buf, modeRGB, modeAlpha);
+}
+
+void GL_APIENTRY glBlendEquationiEXT(GLuint buf, GLenum mode)
+{
+    return gl::BlendEquationiEXT(buf, mode);
+}
+
+void GL_APIENTRY
+glBlendFuncSeparateiEXT(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
+{
+    return gl::BlendFuncSeparateiEXT(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+}
+
+void GL_APIENTRY glBlendFunciEXT(GLuint buf, GLenum src, GLenum dst)
+{
+    return gl::BlendFunciEXT(buf, src, dst);
+}
+
+void GL_APIENTRY glColorMaskiEXT(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
+{
+    return gl::ColorMaskiEXT(index, r, g, b, a);
+}
+
+void GL_APIENTRY glDisableiEXT(GLenum target, GLuint index)
+{
+    return gl::DisableiEXT(target, index);
+}
+
+void GL_APIENTRY glEnableiEXT(GLenum target, GLuint index)
+{
+    return gl::EnableiEXT(target, index);
+}
+
+GLboolean GL_APIENTRY glIsEnablediEXT(GLenum target, GLuint index)
+{
+    return gl::IsEnablediEXT(target, index);
+}
+
 // GL_EXT_draw_elements_base_vertex
 void GL_APIENTRY glDrawElementsBaseVertexEXT(GLenum mode,
                                              GLsizei count,
@@ -4500,6 +4542,48 @@ void GL_APIENTRY glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image
 
 // GL_OES_depth32
 
+// GL_OES_draw_buffers_indexed
+void GL_APIENTRY glBlendEquationSeparateiOES(GLuint buf, GLenum modeRGB, GLenum modeAlpha)
+{
+    return gl::BlendEquationSeparateiOES(buf, modeRGB, modeAlpha);
+}
+
+void GL_APIENTRY glBlendEquationiOES(GLuint buf, GLenum mode)
+{
+    return gl::BlendEquationiOES(buf, mode);
+}
+
+void GL_APIENTRY
+glBlendFuncSeparateiOES(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
+{
+    return gl::BlendFuncSeparateiOES(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+}
+
+void GL_APIENTRY glBlendFunciOES(GLuint buf, GLenum src, GLenum dst)
+{
+    return gl::BlendFunciOES(buf, src, dst);
+}
+
+void GL_APIENTRY glColorMaskiOES(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
+{
+    return gl::ColorMaskiOES(index, r, g, b, a);
+}
+
+void GL_APIENTRY glDisableiOES(GLenum target, GLuint index)
+{
+    return gl::DisableiOES(target, index);
+}
+
+void GL_APIENTRY glEnableiOES(GLenum target, GLuint index)
+{
+    return gl::EnableiOES(target, index);
+}
+
+GLboolean GL_APIENTRY glIsEnablediOES(GLenum target, GLuint index)
+{
+    return gl::IsEnablediOES(target, index);
+}
+
 // GL_OES_draw_elements_base_vertex
 void GL_APIENTRY glDrawElementsBaseVertexOES(GLenum mode,
                                              GLsizei count,
@@ -5154,11 +5238,37 @@ void GL_APIENTRY glBlendEquationSeparateiContextANGLE(GLeglContext ctx,
     return gl::BlendEquationSeparateiContextANGLE(ctx, buf, modeRGB, modeAlpha);
 }
 
+void GL_APIENTRY glBlendEquationSeparateiEXTContextANGLE(GLeglContext ctx,
+                                                         GLuint buf,
+                                                         GLenum modeRGB,
+                                                         GLenum modeAlpha)
+{
+    return gl::BlendEquationSeparateiEXTContextANGLE(ctx, buf, modeRGB, modeAlpha);
+}
+
+void GL_APIENTRY glBlendEquationSeparateiOESContextANGLE(GLeglContext ctx,
+                                                         GLuint buf,
+                                                         GLenum modeRGB,
+                                                         GLenum modeAlpha)
+{
+    return gl::BlendEquationSeparateiOESContextANGLE(ctx, buf, modeRGB, modeAlpha);
+}
+
 void GL_APIENTRY glBlendEquationiContextANGLE(GLeglContext ctx, GLuint buf, GLenum mode)
 {
     return gl::BlendEquationiContextANGLE(ctx, buf, mode);
 }
 
+void GL_APIENTRY glBlendEquationiEXTContextANGLE(GLeglContext ctx, GLuint buf, GLenum mode)
+{
+    return gl::BlendEquationiEXTContextANGLE(ctx, buf, mode);
+}
+
+void GL_APIENTRY glBlendEquationiOESContextANGLE(GLeglContext ctx, GLuint buf, GLenum mode)
+{
+    return gl::BlendEquationiOESContextANGLE(ctx, buf, mode);
+}
+
 void GL_APIENTRY glBlendFuncContextANGLE(GLeglContext ctx, GLenum sfactor, GLenum dfactor)
 {
     return gl::BlendFuncContextANGLE(ctx, sfactor, dfactor);
@@ -5184,11 +5294,41 @@ void GL_APIENTRY glBlendFuncSeparateiContextANGLE(GLeglContext ctx,
     return gl::BlendFuncSeparateiContextANGLE(ctx, buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
 }
 
+void GL_APIENTRY glBlendFuncSeparateiEXTContextANGLE(GLeglContext ctx,
+                                                     GLuint buf,
+                                                     GLenum srcRGB,
+                                                     GLenum dstRGB,
+                                                     GLenum srcAlpha,
+                                                     GLenum dstAlpha)
+{
+    return gl::BlendFuncSeparateiEXTContextANGLE(ctx, buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+}
+
+void GL_APIENTRY glBlendFuncSeparateiOESContextANGLE(GLeglContext ctx,
+                                                     GLuint buf,
+                                                     GLenum srcRGB,
+                                                     GLenum dstRGB,
+                                                     GLenum srcAlpha,
+                                                     GLenum dstAlpha)
+{
+    return gl::BlendFuncSeparateiOESContextANGLE(ctx, buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+}
+
 void GL_APIENTRY glBlendFunciContextANGLE(GLeglContext ctx, GLuint buf, GLenum src, GLenum dst)
 {
     return gl::BlendFunciContextANGLE(ctx, buf, src, dst);
 }
 
+void GL_APIENTRY glBlendFunciEXTContextANGLE(GLeglContext ctx, GLuint buf, GLenum src, GLenum dst)
+{
+    return gl::BlendFunciEXTContextANGLE(ctx, buf, src, dst);
+}
+
+void GL_APIENTRY glBlendFunciOESContextANGLE(GLeglContext ctx, GLuint buf, GLenum src, GLenum dst)
+{
+    return gl::BlendFunciOESContextANGLE(ctx, buf, src, dst);
+}
+
 void GL_APIENTRY glBlitFramebufferContextANGLE(GLeglContext ctx,
                                                GLint srcX0,
                                                GLint srcY0,
@@ -5383,6 +5523,26 @@ void GL_APIENTRY glColorMaskiContextANGLE(GLeglContext ctx,
     return gl::ColorMaskiContextANGLE(ctx, index, r, g, b, a);
 }
 
+void GL_APIENTRY glColorMaskiEXTContextANGLE(GLeglContext ctx,
+                                             GLuint index,
+                                             GLboolean r,
+                                             GLboolean g,
+                                             GLboolean b,
+                                             GLboolean a)
+{
+    return gl::ColorMaskiEXTContextANGLE(ctx, index, r, g, b, a);
+}
+
+void GL_APIENTRY glColorMaskiOESContextANGLE(GLeglContext ctx,
+                                             GLuint index,
+                                             GLboolean r,
+                                             GLboolean g,
+                                             GLboolean b,
+                                             GLboolean a)
+{
+    return gl::ColorMaskiOESContextANGLE(ctx, index, r, g, b, a);
+}
+
 void GL_APIENTRY glColorPointerContextANGLE(GLeglContext ctx,
                                             GLint size,
                                             GLenum type,
@@ -5835,6 +5995,16 @@ void GL_APIENTRY glDisableiContextANGLE(GLeglContext ctx, GLenum target, GLuint
     return gl::DisableiContextANGLE(ctx, target, index);
 }
 
+void GL_APIENTRY glDisableiEXTContextANGLE(GLeglContext ctx, GLenum target, GLuint index)
+{
+    return gl::DisableiEXTContextANGLE(ctx, target, index);
+}
+
+void GL_APIENTRY glDisableiOESContextANGLE(GLeglContext ctx, GLenum target, GLuint index)
+{
+    return gl::DisableiOESContextANGLE(ctx, target, index);
+}
+
 void GL_APIENTRY glDiscardFramebufferEXTContextANGLE(GLeglContext ctx,
                                                      GLenum target,
                                                      GLsizei numAttachments,
@@ -6158,6 +6328,16 @@ void GL_APIENTRY glEnableiContextANGLE(GLeglContext ctx, GLenum target, GLuint i
     return gl::EnableiContextANGLE(ctx, target, index);
 }
 
+void GL_APIENTRY glEnableiEXTContextANGLE(GLeglContext ctx, GLenum target, GLuint index)
+{
+    return gl::EnableiEXTContextANGLE(ctx, target, index);
+}
+
+void GL_APIENTRY glEnableiOESContextANGLE(GLeglContext ctx, GLenum target, GLuint index)
+{
+    return gl::EnableiOESContextANGLE(ctx, target, index);
+}
+
 void GL_APIENTRY glEndQueryContextANGLE(GLeglContext ctx, GLenum target)
 {
     return gl::EndQueryContextANGLE(ctx, target);
@@ -7469,6 +7649,16 @@ GLboolean GL_APIENTRY glIsEnablediContextANGLE(GLeglContext ctx, GLenum target,
     return gl::IsEnablediContextANGLE(ctx, target, index);
 }
 
+GLboolean GL_APIENTRY glIsEnablediEXTContextANGLE(GLeglContext ctx, GLenum target, GLuint index)
+{
+    return gl::IsEnablediEXTContextANGLE(ctx, target, index);
+}
+
+GLboolean GL_APIENTRY glIsEnablediOESContextANGLE(GLeglContext ctx, GLenum target, GLuint index)
+{
+    return gl::IsEnablediOESContextANGLE(ctx, target, index);
+}
+
 GLboolean GL_APIENTRY glIsFenceNVContextANGLE(GLeglContext ctx, GLuint fence)
 {
     return gl::IsFenceNVContextANGLE(ctx, fence);

src/libGLESv2/libGLESv2_autogen.def

@@ -659,6 +659,16 @@ EXPORTS
     ; GL_EXT_draw_buffers
     glDrawBuffersEXT
 
+    ; GL_EXT_draw_buffers_indexed
+    glBlendEquationSeparateiEXT
+    glBlendEquationiEXT
+    glBlendFuncSeparateiEXT
+    glBlendFunciEXT
+    glColorMaskiEXT
+    glDisableiEXT
+    glEnableiEXT
+    glIsEnablediEXT
+
     ; GL_EXT_draw_elements_base_vertex
     glDrawElementsBaseVertexEXT
     glDrawElementsInstancedBaseVertexEXT
@@ -774,6 +784,16 @@ EXPORTS
 
     ; GL_OES_depth32
 
+    ; GL_OES_draw_buffers_indexed
+    glBlendEquationSeparateiOES
+    glBlendEquationiOES
+    glBlendFuncSeparateiOES
+    glBlendFunciOES
+    glColorMaskiOES
+    glDisableiOES
+    glEnableiOES
+    glIsEnablediOES
+
     ; GL_OES_draw_elements_base_vertex
     glDrawElementsBaseVertexOES
     glDrawElementsInstancedBaseVertexOES
@@ -906,11 +926,19 @@ EXPORTS
     glBlendEquationContextANGLE
     glBlendEquationSeparateContextANGLE
     glBlendEquationSeparateiContextANGLE
+    glBlendEquationSeparateiEXTContextANGLE
+    glBlendEquationSeparateiOESContextANGLE
     glBlendEquationiContextANGLE
+    glBlendEquationiEXTContextANGLE
+    glBlendEquationiOESContextANGLE
     glBlendFuncContextANGLE
     glBlendFuncSeparateContextANGLE
     glBlendFuncSeparateiContextANGLE
+    glBlendFuncSeparateiEXTContextANGLE
+    glBlendFuncSeparateiOESContextANGLE
     glBlendFunciContextANGLE
+    glBlendFunciEXTContextANGLE
+    glBlendFunciOESContextANGLE
     glBlitFramebufferContextANGLE
     glBlitFramebufferANGLEContextANGLE
     glBufferDataContextANGLE
@@ -937,6 +965,8 @@ EXPORTS
     glColor4xContextANGLE
     glColorMaskContextANGLE
     glColorMaskiContextANGLE
+    glColorMaskiEXTContextANGLE
+    glColorMaskiOESContextANGLE
     glColorPointerContextANGLE
     glCompileShaderContextANGLE
     glCompressedCopyTextureCHROMIUMContextANGLE
@@ -1007,6 +1037,8 @@ EXPORTS
     glDisableExtensionANGLEContextANGLE
     glDisableVertexAttribArrayContextANGLE
     glDisableiContextANGLE
+    glDisableiEXTContextANGLE
+    glDisableiOESContextANGLE
     glDiscardFramebufferEXTContextANGLE
     glDispatchComputeContextANGLE
     glDispatchComputeIndirectContextANGLE
@@ -1048,6 +1080,8 @@ EXPORTS
     glEnableClientStateContextANGLE
     glEnableVertexAttribArrayContextANGLE
     glEnableiContextANGLE
+    glEnableiEXTContextANGLE
+    glEnableiOESContextANGLE
     glEndQueryContextANGLE
     glEndQueryEXTContextANGLE
     glEndTransformFeedbackContextANGLE
@@ -1273,6 +1307,8 @@ EXPORTS
     glIsBufferContextANGLE
     glIsEnabledContextANGLE
     glIsEnablediContextANGLE
+    glIsEnablediEXTContextANGLE
+    glIsEnablediOESContextANGLE
     glIsFenceNVContextANGLE
     glIsFramebufferContextANGLE
     glIsFramebufferOESContextANGLE

src/libGLESv2/libGLESv2_no_capture_autogen.def

@@ -659,6 +659,16 @@ EXPORTS
     ; GL_EXT_draw_buffers
     glDrawBuffersEXT
 
+    ; GL_EXT_draw_buffers_indexed
+    glBlendEquationSeparateiEXT
+    glBlendEquationiEXT
+    glBlendFuncSeparateiEXT
+    glBlendFunciEXT
+    glColorMaskiEXT
+    glDisableiEXT
+    glEnableiEXT
+    glIsEnablediEXT
+
     ; GL_EXT_draw_elements_base_vertex
     glDrawElementsBaseVertexEXT
     glDrawElementsInstancedBaseVertexEXT
@@ -774,6 +784,16 @@ EXPORTS
 
     ; GL_OES_depth32
 
+    ; GL_OES_draw_buffers_indexed
+    glBlendEquationSeparateiOES
+    glBlendEquationiOES
+    glBlendFuncSeparateiOES
+    glBlendFunciOES
+    glColorMaskiOES
+    glDisableiOES
+    glEnableiOES
+    glIsEnablediOES
+
     ; GL_OES_draw_elements_base_vertex
     glDrawElementsBaseVertexOES
     glDrawElementsInstancedBaseVertexOES
@@ -906,11 +926,19 @@ EXPORTS
     glBlendEquationContextANGLE
     glBlendEquationSeparateContextANGLE
     glBlendEquationSeparateiContextANGLE
+    glBlendEquationSeparateiEXTContextANGLE
+    glBlendEquationSeparateiOESContextANGLE
     glBlendEquationiContextANGLE
+    glBlendEquationiEXTContextANGLE
+    glBlendEquationiOESContextANGLE
     glBlendFuncContextANGLE
     glBlendFuncSeparateContextANGLE
     glBlendFuncSeparateiContextANGLE
+    glBlendFuncSeparateiEXTContextANGLE
+    glBlendFuncSeparateiOESContextANGLE
     glBlendFunciContextANGLE
+    glBlendFunciEXTContextANGLE
+    glBlendFunciOESContextANGLE
     glBlitFramebufferContextANGLE
     glBlitFramebufferANGLEContextANGLE
     glBufferDataContextANGLE
@@ -937,6 +965,8 @@ EXPORTS
     glColor4xContextANGLE
     glColorMaskContextANGLE
     glColorMaskiContextANGLE
+    glColorMaskiEXTContextANGLE
+    glColorMaskiOESContextANGLE
     glColorPointerContextANGLE
     glCompileShaderContextANGLE
     glCompressedCopyTextureCHROMIUMContextANGLE
@@ -1007,6 +1037,8 @@ EXPORTS
     glDisableExtensionANGLEContextANGLE
     glDisableVertexAttribArrayContextANGLE
     glDisableiContextANGLE
+    glDisableiEXTContextANGLE
+    glDisableiOESContextANGLE
     glDiscardFramebufferEXTContextANGLE
     glDispatchComputeContextANGLE
     glDispatchComputeIndirectContextANGLE
@@ -1048,6 +1080,8 @@ EXPORTS
     glEnableClientStateContextANGLE
     glEnableVertexAttribArrayContextANGLE
     glEnableiContextANGLE
+    glEnableiEXTContextANGLE
+    glEnableiOESContextANGLE
     glEndQueryContextANGLE
     glEndQueryEXTContextANGLE
     glEndTransformFeedbackContextANGLE
@@ -1273,6 +1307,8 @@ EXPORTS
     glIsBufferContextANGLE
     glIsEnabledContextANGLE
     glIsEnablediContextANGLE
+    glIsEnablediEXTContextANGLE
+    glIsEnablediOESContextANGLE
     glIsFenceNVContextANGLE
     glIsFramebufferContextANGLE
     glIsFramebufferOESContextANGLE

src/libGLESv2/libGLESv2_with_capture_autogen.def

@@ -659,6 +659,16 @@ EXPORTS
     ; GL_EXT_draw_buffers
     glDrawBuffersEXT
 
+    ; GL_EXT_draw_buffers_indexed
+    glBlendEquationSeparateiEXT
+    glBlendEquationiEXT
+    glBlendFuncSeparateiEXT
+    glBlendFunciEXT
+    glColorMaskiEXT
+    glDisableiEXT
+    glEnableiEXT
+    glIsEnablediEXT
+
     ; GL_EXT_draw_elements_base_vertex
     glDrawElementsBaseVertexEXT
     glDrawElementsInstancedBaseVertexEXT
@@ -774,6 +784,16 @@ EXPORTS
 
     ; GL_OES_depth32
 
+    ; GL_OES_draw_buffers_indexed
+    glBlendEquationSeparateiOES
+    glBlendEquationiOES
+    glBlendFuncSeparateiOES
+    glBlendFunciOES
+    glColorMaskiOES
+    glDisableiOES
+    glEnableiOES
+    glIsEnablediOES
+
     ; GL_OES_draw_elements_base_vertex
     glDrawElementsBaseVertexOES
     glDrawElementsInstancedBaseVertexOES
@@ -906,11 +926,19 @@ EXPORTS
     glBlendEquationContextANGLE
     glBlendEquationSeparateContextANGLE
     glBlendEquationSeparateiContextANGLE
+    glBlendEquationSeparateiEXTContextANGLE
+    glBlendEquationSeparateiOESContextANGLE
     glBlendEquationiContextANGLE
+    glBlendEquationiEXTContextANGLE
+    glBlendEquationiOESContextANGLE
     glBlendFuncContextANGLE
     glBlendFuncSeparateContextANGLE
     glBlendFuncSeparateiContextANGLE
+    glBlendFuncSeparateiEXTContextANGLE
+    glBlendFuncSeparateiOESContextANGLE
     glBlendFunciContextANGLE
+    glBlendFunciEXTContextANGLE
+    glBlendFunciOESContextANGLE
     glBlitFramebufferContextANGLE
     glBlitFramebufferANGLEContextANGLE
     glBufferDataContextANGLE
@@ -937,6 +965,8 @@ EXPORTS
     glColor4xContextANGLE
     glColorMaskContextANGLE
     glColorMaskiContextANGLE
+    glColorMaskiEXTContextANGLE
+    glColorMaskiOESContextANGLE
     glColorPointerContextANGLE
     glCompileShaderContextANGLE
     glCompressedCopyTextureCHROMIUMContextANGLE
@@ -1007,6 +1037,8 @@ EXPORTS
     glDisableExtensionANGLEContextANGLE
     glDisableVertexAttribArrayContextANGLE
     glDisableiContextANGLE
+    glDisableiEXTContextANGLE
+    glDisableiOESContextANGLE
     glDiscardFramebufferEXTContextANGLE
     glDispatchComputeContextANGLE
     glDispatchComputeIndirectContextANGLE
@@ -1048,6 +1080,8 @@ EXPORTS
     glEnableClientStateContextANGLE
     glEnableVertexAttribArrayContextANGLE
     glEnableiContextANGLE
+    glEnableiEXTContextANGLE
+    glEnableiOESContextANGLE
     glEndQueryContextANGLE
     glEndQueryEXTContextANGLE
     glEndTransformFeedbackContextANGLE
@@ -1273,6 +1307,8 @@ EXPORTS
     glIsBufferContextANGLE
     glIsEnabledContextANGLE
     glIsEnablediContextANGLE
+    glIsEnablediEXTContextANGLE
+    glIsEnablediOESContextANGLE
     glIsFenceNVContextANGLE
     glIsFramebufferContextANGLE
     glIsFramebufferOESContextANGLE

src/libGLESv2/proc_table_egl_autogen.cpp

@@ -188,10 +188,26 @@ ProcEntry g_procTable[] = {
     {"glBlendEquationContextANGLE", P(gl::BlendEquationContextANGLE)},
     {"glBlendEquationSeparate", P(gl::BlendEquationSeparate)},
     {"glBlendEquationSeparateContextANGLE", P(gl::BlendEquationSeparateContextANGLE)},
+    {"glBlendEquationSeparateiEXT", P(gl::BlendEquationSeparateiEXT)},
+    {"glBlendEquationSeparateiEXTContextANGLE", P(gl::BlendEquationSeparateiEXTContextANGLE)},
+    {"glBlendEquationSeparateiOES", P(gl::BlendEquationSeparateiOES)},
+    {"glBlendEquationSeparateiOESContextANGLE", P(gl::BlendEquationSeparateiOESContextANGLE)},
+    {"glBlendEquationiEXT", P(gl::BlendEquationiEXT)},
+    {"glBlendEquationiEXTContextANGLE", P(gl::BlendEquationiEXTContextANGLE)},
+    {"glBlendEquationiOES", P(gl::BlendEquationiOES)},
+    {"glBlendEquationiOESContextANGLE", P(gl::BlendEquationiOESContextANGLE)},
     {"glBlendFunc", P(gl::BlendFunc)},
     {"glBlendFuncContextANGLE", P(gl::BlendFuncContextANGLE)},
     {"glBlendFuncSeparate", P(gl::BlendFuncSeparate)},
     {"glBlendFuncSeparateContextANGLE", P(gl::BlendFuncSeparateContextANGLE)},
+    {"glBlendFuncSeparateiEXT", P(gl::BlendFuncSeparateiEXT)},
+    {"glBlendFuncSeparateiEXTContextANGLE", P(gl::BlendFuncSeparateiEXTContextANGLE)},
+    {"glBlendFuncSeparateiOES", P(gl::BlendFuncSeparateiOES)},
+    {"glBlendFuncSeparateiOESContextANGLE", P(gl::BlendFuncSeparateiOESContextANGLE)},
+    {"glBlendFunciEXT", P(gl::BlendFunciEXT)},
+    {"glBlendFunciEXTContextANGLE", P(gl::BlendFunciEXTContextANGLE)},
+    {"glBlendFunciOES", P(gl::BlendFunciOES)},
+    {"glBlendFunciOESContextANGLE", P(gl::BlendFunciOESContextANGLE)},
     {"glBlitFramebuffer", P(gl::BlitFramebuffer)},
     {"glBlitFramebufferANGLE", P(gl::BlitFramebufferANGLE)},
     {"glBlitFramebufferANGLEContextANGLE", P(gl::BlitFramebufferANGLEContextANGLE)},
@@ -242,6 +258,10 @@ ProcEntry g_procTable[] = {
     {"glColor4xContextANGLE", P(gl::Color4xContextANGLE)},
     {"glColorMask", P(gl::ColorMask)},
     {"glColorMaskContextANGLE", P(gl::ColorMaskContextANGLE)},
+    {"glColorMaskiEXT", P(gl::ColorMaskiEXT)},
+    {"glColorMaskiEXTContextANGLE", P(gl::ColorMaskiEXTContextANGLE)},
+    {"glColorMaskiOES", P(gl::ColorMaskiOES)},
+    {"glColorMaskiOESContextANGLE", P(gl::ColorMaskiOESContextANGLE)},
     {"glColorPointer", P(gl::ColorPointer)},
     {"glColorPointerContextANGLE", P(gl::ColorPointerContextANGLE)},
     {"glCompileShader", P(gl::CompileShader)},
@@ -379,6 +399,10 @@ ProcEntry g_procTable[] = {
     {"glDisableExtensionANGLEContextANGLE", P(gl::DisableExtensionANGLEContextANGLE)},
     {"glDisableVertexAttribArray", P(gl::DisableVertexAttribArray)},
     {"glDisableVertexAttribArrayContextANGLE", P(gl::DisableVertexAttribArrayContextANGLE)},
+    {"glDisableiEXT", P(gl::DisableiEXT)},
+    {"glDisableiEXTContextANGLE", P(gl::DisableiEXTContextANGLE)},
+    {"glDisableiOES", P(gl::DisableiOES)},
+    {"glDisableiOESContextANGLE", P(gl::DisableiOESContextANGLE)},
     {"glDiscardFramebufferEXT", P(gl::DiscardFramebufferEXT)},
     {"glDiscardFramebufferEXTContextANGLE", P(gl::DiscardFramebufferEXTContextANGLE)},
     {"glDispatchCompute", P(gl::DispatchCompute)},
@@ -461,6 +485,10 @@ ProcEntry g_procTable[] = {
     {"glEnableContextANGLE", P(gl::EnableContextANGLE)},
     {"glEnableVertexAttribArray", P(gl::EnableVertexAttribArray)},
     {"glEnableVertexAttribArrayContextANGLE", P(gl::EnableVertexAttribArrayContextANGLE)},
+    {"glEnableiEXT", P(gl::EnableiEXT)},
+    {"glEnableiEXTContextANGLE", P(gl::EnableiEXTContextANGLE)},
+    {"glEnableiOES", P(gl::EnableiOES)},
+    {"glEnableiOESContextANGLE", P(gl::EnableiOESContextANGLE)},
     {"glEndQuery", P(gl::EndQuery)},
     {"glEndQueryContextANGLE", P(gl::EndQueryContextANGLE)},
     {"glEndQueryEXT", P(gl::EndQueryEXT)},
@@ -919,6 +947,10 @@ ProcEntry g_procTable[] = {
     {"glIsBufferContextANGLE", P(gl::IsBufferContextANGLE)},
     {"glIsEnabled", P(gl::IsEnabled)},
     {"glIsEnabledContextANGLE", P(gl::IsEnabledContextANGLE)},
+    {"glIsEnablediEXT", P(gl::IsEnablediEXT)},
+    {"glIsEnablediEXTContextANGLE", P(gl::IsEnablediEXTContextANGLE)},
+    {"glIsEnablediOES", P(gl::IsEnablediOES)},
+    {"glIsEnablediOESContextANGLE", P(gl::IsEnablediOESContextANGLE)},
     {"glIsFenceNV", P(gl::IsFenceNV)},
     {"glIsFenceNVContextANGLE", P(gl::IsFenceNVContextANGLE)},
     {"glIsFramebuffer", P(gl::IsFramebuffer)},
@@ -1546,5 +1578,5 @@ ProcEntry g_procTable[] = {
     {"glWeightPointerOES", P(gl::WeightPointerOES)},
     {"glWeightPointerOESContextANGLE", P(gl::WeightPointerOESContextANGLE)}};
 
-size_t g_numProcs = 1440;
+size_t g_numProcs = 1472;
 }  // namespace egl

util/gles_loader_autogen.h

@@ -596,6 +596,14 @@ ANGLE_UTIL_EXPORT extern PFNGLGETQUERYIVEXTPROC glGetQueryivEXT;
 ANGLE_UTIL_EXPORT extern PFNGLISQUERYEXTPROC glIsQueryEXT;
 ANGLE_UTIL_EXPORT extern PFNGLQUERYCOUNTEREXTPROC glQueryCounterEXT;
 ANGLE_UTIL_EXPORT extern PFNGLDRAWBUFFERSEXTPROC glDrawBuffersEXT;
+ANGLE_UTIL_EXPORT extern PFNGLBLENDEQUATIONSEPARATEIEXTPROC glBlendEquationSeparateiEXT;
+ANGLE_UTIL_EXPORT extern PFNGLBLENDEQUATIONIEXTPROC glBlendEquationiEXT;
+ANGLE_UTIL_EXPORT extern PFNGLBLENDFUNCSEPARATEIEXTPROC glBlendFuncSeparateiEXT;
+ANGLE_UTIL_EXPORT extern PFNGLBLENDFUNCIEXTPROC glBlendFunciEXT;
+ANGLE_UTIL_EXPORT extern PFNGLCOLORMASKIEXTPROC glColorMaskiEXT;
+ANGLE_UTIL_EXPORT extern PFNGLDISABLEIEXTPROC glDisableiEXT;
+ANGLE_UTIL_EXPORT extern PFNGLENABLEIEXTPROC glEnableiEXT;
+ANGLE_UTIL_EXPORT extern PFNGLISENABLEDIEXTPROC glIsEnablediEXT;
 ANGLE_UTIL_EXPORT extern PFNGLDRAWELEMENTSBASEVERTEXEXTPROC glDrawElementsBaseVertexEXT;
 ANGLE_UTIL_EXPORT extern PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXEXTPROC
     glDrawElementsInstancedBaseVertexEXT;
@@ -661,6 +669,14 @@ ANGLE_UTIL_EXPORT extern PFNGLTESTFENCENVPROC glTestFenceNV;
 ANGLE_UTIL_EXPORT extern PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC
     glEGLImageTargetRenderbufferStorageOES;
 ANGLE_UTIL_EXPORT extern PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES;
+ANGLE_UTIL_EXPORT extern PFNGLBLENDEQUATIONSEPARATEIOESPROC glBlendEquationSeparateiOES;
+ANGLE_UTIL_EXPORT extern PFNGLBLENDEQUATIONIOESPROC glBlendEquationiOES;
+ANGLE_UTIL_EXPORT extern PFNGLBLENDFUNCSEPARATEIOESPROC glBlendFuncSeparateiOES;
+ANGLE_UTIL_EXPORT extern PFNGLBLENDFUNCIOESPROC glBlendFunciOES;
+ANGLE_UTIL_EXPORT extern PFNGLCOLORMASKIOESPROC glColorMaskiOES;
+ANGLE_UTIL_EXPORT extern PFNGLDISABLEIOESPROC glDisableiOES;
+ANGLE_UTIL_EXPORT extern PFNGLENABLEIOESPROC glEnableiOES;
+ANGLE_UTIL_EXPORT extern PFNGLISENABLEDIOESPROC glIsEnablediOES;
 ANGLE_UTIL_EXPORT extern PFNGLDRAWELEMENTSBASEVERTEXOESPROC glDrawElementsBaseVertexOES;
 ANGLE_UTIL_EXPORT extern PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXOESPROC
     glDrawElementsInstancedBaseVertexOES;
@@ -1465,6 +1481,16 @@ ANGLE_UTIL_EXPORT extern PFNGLGETQUERYIVEXTCONTEXTANGLEPROC glGetQueryivEXTConte
 ANGLE_UTIL_EXPORT extern PFNGLISQUERYEXTCONTEXTANGLEPROC glIsQueryEXTContextANGLE;
 ANGLE_UTIL_EXPORT extern PFNGLQUERYCOUNTEREXTCONTEXTANGLEPROC glQueryCounterEXTContextANGLE;
 ANGLE_UTIL_EXPORT extern PFNGLDRAWBUFFERSEXTCONTEXTANGLEPROC glDrawBuffersEXTContextANGLE;
+ANGLE_UTIL_EXPORT extern PFNGLBLENDEQUATIONSEPARATEIEXTCONTEXTANGLEPROC
+    glBlendEquationSeparateiEXTContextANGLE;
+ANGLE_UTIL_EXPORT extern PFNGLBLENDEQUATIONIEXTCONTEXTANGLEPROC glBlendEquationiEXTContextANGLE;
+ANGLE_UTIL_EXPORT extern PFNGLBLENDFUNCSEPARATEIEXTCONTEXTANGLEPROC
+    glBlendFuncSeparateiEXTContextANGLE;
+ANGLE_UTIL_EXPORT extern PFNGLBLENDFUNCIEXTCONTEXTANGLEPROC glBlendFunciEXTContextANGLE;
+ANGLE_UTIL_EXPORT extern PFNGLCOLORMASKIEXTCONTEXTANGLEPROC glColorMaskiEXTContextANGLE;
+ANGLE_UTIL_EXPORT extern PFNGLDISABLEIEXTCONTEXTANGLEPROC glDisableiEXTContextANGLE;
+ANGLE_UTIL_EXPORT extern PFNGLENABLEIEXTCONTEXTANGLEPROC glEnableiEXTContextANGLE;
+ANGLE_UTIL_EXPORT extern PFNGLISENABLEDIEXTCONTEXTANGLEPROC glIsEnablediEXTContextANGLE;
 ANGLE_UTIL_EXPORT extern PFNGLDRAWELEMENTSBASEVERTEXEXTCONTEXTANGLEPROC
     glDrawElementsBaseVertexEXTContextANGLE;
 ANGLE_UTIL_EXPORT extern PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXEXTCONTEXTANGLEPROC
@@ -1556,6 +1582,16 @@ ANGLE_UTIL_EXPORT extern PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESCONTEXTANGLEPR
     glEGLImageTargetRenderbufferStorageOESContextANGLE;
 ANGLE_UTIL_EXPORT extern PFNGLEGLIMAGETARGETTEXTURE2DOESCONTEXTANGLEPROC
     glEGLImageTargetTexture2DOESContextANGLE;
+ANGLE_UTIL_EXPORT extern PFNGLBLENDEQUATIONSEPARATEIOESCONTEXTANGLEPROC
+    glBlendEquationSeparateiOESContextANGLE;
+ANGLE_UTIL_EXPORT extern PFNGLBLENDEQUATIONIOESCONTEXTANGLEPROC glBlendEquationiOESContextANGLE;
+ANGLE_UTIL_EXPORT extern PFNGLBLENDFUNCSEPARATEIOESCONTEXTANGLEPROC
+    glBlendFuncSeparateiOESContextANGLE;
+ANGLE_UTIL_EXPORT extern PFNGLBLENDFUNCIOESCONTEXTANGLEPROC glBlendFunciOESContextANGLE;
+ANGLE_UTIL_EXPORT extern PFNGLCOLORMASKIOESCONTEXTANGLEPROC glColorMaskiOESContextANGLE;
+ANGLE_UTIL_EXPORT extern PFNGLDISABLEIOESCONTEXTANGLEPROC glDisableiOESContextANGLE;
+ANGLE_UTIL_EXPORT extern PFNGLENABLEIOESCONTEXTANGLEPROC glEnableiOESContextANGLE;
+ANGLE_UTIL_EXPORT extern PFNGLISENABLEDIOESCONTEXTANGLEPROC glIsEnablediOESContextANGLE;
 ANGLE_UTIL_EXPORT extern PFNGLDRAWELEMENTSBASEVERTEXOESCONTEXTANGLEPROC
     glDrawElementsBaseVertexOESContextANGLE;
 ANGLE_UTIL_EXPORT extern PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXOESCONTEXTANGLEPROC