Update FunctionsGL to load OpenGL ES entry points.

src/libANGLE/renderer/gl/FunctionsGL.cpp

@@ -760,7 +760,9 @@ FunctionsGL::FunctionsGL()
       vertexArrayBindingDivisor(nullptr),
       vertexArrayElementBuffer(nullptr),
       vertexArrayVertexBuffer(nullptr),
-      vertexArrayVertexBuffers(nullptr)
+      vertexArrayVertexBuffers(nullptr),
+      blendBarrier(nullptr),
+      primitiveBoundingBox(nullptr)
 {
 }
 
@@ -776,7 +778,7 @@ void FunctionsGL::initialize()
     GetGLVersion(getString, &version, &standard);
 
     // Grab the GL extensions
-    if (isAtLeastGL(gl::Version(3, 0)))
+    if (isAtLeastGL(gl::Version(3, 0)) || isAtLeastGLES(gl::Version(3, 0)))
     {
         AssignGLEntryPoint(loadProcAddress("glGetStringi"), &getStringi);
         extensions = GetIndexedExtensions(getIntegerv, getStringi);
@@ -787,6 +789,25 @@ void FunctionsGL::initialize()
         angle::SplitStringAlongWhitespace(std::string(exts), &extensions);
     }
 
+    // Load the entry points
+    switch (standard)
+    {
+        case STANDARD_GL_DESKTOP:
+            initializeProcsDesktopGL();
+            break;
+
+        case STANDARD_GL_ES:
+            initializeProcsGLES();
+            break;
+
+        default:
+            UNREACHABLE();
+            break;
+    }
+}
+
+void FunctionsGL::initializeProcsDesktopGL()
+{
     // Check the context profile
     profile = 0;
     if (isAtLeastGL(gl::Version(3, 2)))
@@ -1684,6 +1705,454 @@ void FunctionsGL::initialize()
     // clang-format on
 }
 
+void FunctionsGL::initializeProcsGLES()
+{
+    // No profiles in GLES
+    profile = 0;
+
+    // clang-format off
+
+    // GL_OES_texture_3D
+    AssignGLExtensionEntryPoint(extensions, "GL_OES_texture_3D", loadProcAddress("glTexImage3DOES"), &texImage3D);
+    AssignGLExtensionEntryPoint(extensions, "GL_OES_texture_3D", loadProcAddress("glTexSubImage3DOES"), &texSubImage3D);
+    AssignGLExtensionEntryPoint(extensions, "GL_OES_texture_3D", loadProcAddress("glCopyTexSubImage3DOES"), &copyTexSubImage3D);
+
+    // GL_NV_fence
+    AssignGLExtensionEntryPoint(extensions, "GL_NV_fence", loadProcAddress("glDeleteFencesNV"), &deleteFencesNV);
+    AssignGLExtensionEntryPoint(extensions, "GL_NV_fence", loadProcAddress("glGenFencesNV"), &genFencesNV);
+    AssignGLExtensionEntryPoint(extensions, "GL_NV_fence", loadProcAddress("glIsFenceNV"), &isFenceNV);
+    AssignGLExtensionEntryPoint(extensions, "GL_NV_fence", loadProcAddress("glTestFenceNV"), &testFenceNV);
+    AssignGLExtensionEntryPoint(extensions, "GL_NV_fence", loadProcAddress("glGetFenceivNV"), &getFenceivNV);
+    AssignGLExtensionEntryPoint(extensions, "GL_NV_fence", loadProcAddress("glFinishFenceNV"), &finishFenceNV);
+    AssignGLExtensionEntryPoint(extensions, "GL_NV_fence", loadProcAddress("glSetFenceNV"), &setFenceNV);
+
+    // GL_EXT_texture_storage
+    AssignGLExtensionEntryPoint(extensions, "GL_EXT_texture_storage", loadProcAddress("glTexStorage2DEXT"), &texStorage2D);
+    AssignGLExtensionEntryPoint(extensions, "GL_EXT_texture_storage GL_OES_texture3D", loadProcAddress("glTexStorage3DEXT"), &texStorage3D);
+
+    // GL_OES_vertex_array_object
+    AssignGLExtensionEntryPoint(extensions, "GL_OES_vertex_array_object", loadProcAddress("glBindVertexArray"), &bindVertexArray);
+    AssignGLExtensionEntryPoint(extensions, "GL_OES_vertex_array_object", loadProcAddress("glDeleteVertexArrays"), &deleteVertexArrays);
+    AssignGLExtensionEntryPoint(extensions, "GL_OES_vertex_array_object", loadProcAddress("glGenVertexArrays"), &genVertexArrays);
+    AssignGLExtensionEntryPoint(extensions, "GL_OES_vertex_array_object", loadProcAddress("glIsVertexArray"), &isVertexArray);
+
+    // GL_EXT_map_buffer_range
+    AssignGLExtensionEntryPoint(extensions, "GL_EXT_map_buffer_range", loadProcAddress("glMapBufferRangeEXT"), &mapBufferRange);
+    AssignGLExtensionEntryPoint(extensions, "GL_EXT_map_buffer_range", loadProcAddress("glFlushMappedBufferRangeEXT"), &flushMappedBufferRange);
+    AssignGLExtensionEntryPoint(extensions, "GL_EXT_map_buffer_range", loadProcAddress("glUnmapBufferOES"), &unmapBuffer);
+
+    // GL_OES_mapbuffer
+    AssignGLExtensionEntryPoint(extensions, "GL_OES_mapbuffer", loadProcAddress("glMapBufferOES"), &mapBuffer);
+    AssignGLExtensionEntryPoint(extensions, "GL_OES_mapbuffer", loadProcAddress("glUnmapBufferOES"), &unmapBuffer);
+
+    // GL_KHR_debug
+    AssignGLExtensionEntryPoint(extensions, "GL_KHR_debug", loadProcAddress("glDebugMessageControl"), &debugMessageControl);
+    AssignGLExtensionEntryPoint(extensions, "GL_KHR_debug", loadProcAddress("glDebugMessageInsert"), &debugMessageInsert);
+    AssignGLExtensionEntryPoint(extensions, "GL_KHR_debug", loadProcAddress("glDebugMessageCallback"), &debugMessageCallback);
+    AssignGLExtensionEntryPoint(extensions, "GL_KHR_debug", loadProcAddress("glGetDebugMessageLog"), &getDebugMessageLog);
+    AssignGLExtensionEntryPoint(extensions, "GL_KHR_debug", loadProcAddress("glGetPointerv"), &getPointerv);
+    AssignGLExtensionEntryPoint(extensions, "GL_KHR_debug", loadProcAddress("glPushDebugGroup"), &pushDebugGroup);
+    AssignGLExtensionEntryPoint(extensions, "GL_KHR_debug", loadProcAddress("glPopDebugGroup"), &popDebugGroup);
+    AssignGLExtensionEntryPoint(extensions, "GL_KHR_debug", loadProcAddress("glObjectLabel"), &objectLabel);
+    AssignGLExtensionEntryPoint(extensions, "GL_KHR_debug", loadProcAddress("glGetObjectLabel"), &getObjectLabel);
+    AssignGLExtensionEntryPoint(extensions, "GL_KHR_debug", loadProcAddress("glObjectPtrLabel"), &objectPtrLabel);
+    AssignGLExtensionEntryPoint(extensions, "GL_KHR_debug", loadProcAddress("glGetObjectPtrLabel"), &getObjectPtrLabel);
+
+    // GL_EXT_draw_instanced
+    AssignGLExtensionEntryPoint(extensions, "GL_EXT_draw_instanced", loadProcAddress("glVertexAttribDivisorEXT"), &vertexAttribDivisor);
+    AssignGLExtensionEntryPoint(extensions, "GL_EXT_draw_instanced", loadProcAddress("glDrawArraysInstancedEXT"), &drawArraysInstanced);
+    AssignGLExtensionEntryPoint(extensions, "GL_EXT_draw_instanced", loadProcAddress("glDrawElementsInstancedEXT"), &drawElementsInstanced);
+
+    // GL_EXT_occlusion_query_boolean
+    AssignGLExtensionEntryPoint(extensions, "GL_EXT_occlusion_query_boolean", loadProcAddress("glGenQueriesEXT"), &genQueries);
+    AssignGLExtensionEntryPoint(extensions, "GL_EXT_occlusion_query_boolean", loadProcAddress("glDeleteQueriesEXT"), &deleteQueries);
+    AssignGLExtensionEntryPoint(extensions, "GL_EXT_occlusion_query_boolean", loadProcAddress("glIsQueryEXT"), &isQuery);
+    AssignGLExtensionEntryPoint(extensions, "GL_EXT_occlusion_query_boolean", loadProcAddress("glBeginQueryEXT"), &beginQuery);
+    AssignGLExtensionEntryPoint(extensions, "GL_EXT_occlusion_query_boolean", loadProcAddress("glEndQueryEXT"), &endQuery);
+    AssignGLExtensionEntryPoint(extensions, "GL_EXT_occlusion_query_boolean", loadProcAddress("glGetQueryivEXT"), &getQueryiv);
+    AssignGLExtensionEntryPoint(extensions, "GL_EXT_occlusion_query_boolean", loadProcAddress("glGetQueryObjectuivEXT"), &getQueryObjectuiv);
+
+    // 2.0
+    if (isAtLeastGLES(gl::Version(2, 0)))
+    {
+        AssignGLEntryPoint(loadProcAddress("glActiveTexture"), &activeTexture);
+        AssignGLEntryPoint(loadProcAddress("glAttachShader"), &attachShader);
+        AssignGLEntryPoint(loadProcAddress("glBindAttribLocation"), &bindAttribLocation);
+        AssignGLEntryPoint(loadProcAddress("glBindBuffer"), &bindBuffer);
+        AssignGLEntryPoint(loadProcAddress("glBindFramebuffer"), &bindFramebuffer);
+        AssignGLEntryPoint(loadProcAddress("glBindRenderbuffer"), &bindRenderbuffer);
+        AssignGLEntryPoint(loadProcAddress("glBindTexture"), &bindTexture);
+        AssignGLEntryPoint(loadProcAddress("glBlendColor"), &blendColor);
+        AssignGLEntryPoint(loadProcAddress("glBlendEquation"), &blendEquation);
+        AssignGLEntryPoint(loadProcAddress("glBlendEquationSeparate"), &blendEquationSeparate);
+        AssignGLEntryPoint(loadProcAddress("glBlendFunc"), &blendFunc);
+        AssignGLEntryPoint(loadProcAddress("glBlendFuncSeparate"), &blendFuncSeparate);
+        AssignGLEntryPoint(loadProcAddress("glBufferData"), &bufferData);
+        AssignGLEntryPoint(loadProcAddress("glBufferSubData"), &bufferSubData);
+        AssignGLEntryPoint(loadProcAddress("glCheckFramebufferStatus"), &checkFramebufferStatus);
+        AssignGLEntryPoint(loadProcAddress("glClear"), &clear);
+        AssignGLEntryPoint(loadProcAddress("glClearColor"), &clearColor);
+        AssignGLEntryPoint(loadProcAddress("glClearDepthf"), &clearDepthf);
+        AssignGLEntryPoint(loadProcAddress("glClearStencil"), &clearStencil);
+        AssignGLEntryPoint(loadProcAddress("glColorMask"), &colorMask);
+        AssignGLEntryPoint(loadProcAddress("glCompileShader"), &compileShader);
+        AssignGLEntryPoint(loadProcAddress("glCompressedTexImage2D"), &compressedTexImage2D);
+        AssignGLEntryPoint(loadProcAddress("glCompressedTexSubImage2D"), &compressedTexSubImage2D);
+        AssignGLEntryPoint(loadProcAddress("glCopyTexImage2D"), &copyTexImage2D);
+        AssignGLEntryPoint(loadProcAddress("glCopyTexSubImage2D"), &copyTexSubImage2D);
+        AssignGLEntryPoint(loadProcAddress("glCreateProgram"), &createProgram);
+        AssignGLEntryPoint(loadProcAddress("glCreateShader"), &createShader);
+        AssignGLEntryPoint(loadProcAddress("glCullFace"), &cullFace);
+        AssignGLEntryPoint(loadProcAddress("glDeleteBuffers"), &deleteBuffers);
+        AssignGLEntryPoint(loadProcAddress("glDeleteFramebuffers"), &deleteFramebuffers);
+        AssignGLEntryPoint(loadProcAddress("glDeleteProgram"), &deleteProgram);
+        AssignGLEntryPoint(loadProcAddress("glDeleteRenderbuffers"), &deleteRenderbuffers);
+        AssignGLEntryPoint(loadProcAddress("glDeleteShader"), &deleteShader);
+        AssignGLEntryPoint(loadProcAddress("glDeleteTextures"), &deleteTextures);
+        AssignGLEntryPoint(loadProcAddress("glDepthFunc"), &depthFunc);
+        AssignGLEntryPoint(loadProcAddress("glDepthMask"), &depthMask);
+        AssignGLEntryPoint(loadProcAddress("glDepthRangef"), &depthRangef);
+        AssignGLEntryPoint(loadProcAddress("glDetachShader"), &detachShader);
+        AssignGLEntryPoint(loadProcAddress("glDisable"), &disable);
+        AssignGLEntryPoint(loadProcAddress("glDisableVertexAttribArray"), &disableVertexAttribArray);
+        AssignGLEntryPoint(loadProcAddress("glDrawArrays"), &drawArrays);
+        AssignGLEntryPoint(loadProcAddress("glDrawElements"), &drawElements);
+        AssignGLEntryPoint(loadProcAddress("glEnable"), &enable);
+        AssignGLEntryPoint(loadProcAddress("glEnableVertexAttribArray"), &enableVertexAttribArray);
+        AssignGLEntryPoint(loadProcAddress("glFinish"), &finish);
+        AssignGLEntryPoint(loadProcAddress("glFlush"), &flush);
+        AssignGLEntryPoint(loadProcAddress("glFramebufferRenderbuffer"), &framebufferRenderbuffer);
+        AssignGLEntryPoint(loadProcAddress("glFramebufferTexture2D"), &framebufferTexture2D);
+        AssignGLEntryPoint(loadProcAddress("glFrontFace"), &frontFace);
+        AssignGLEntryPoint(loadProcAddress("glGenBuffers"), &genBuffers);
+        AssignGLEntryPoint(loadProcAddress("glGenerateMipmap"), &generateMipmap);
+        AssignGLEntryPoint(loadProcAddress("glGenFramebuffers"), &genFramebuffers);
+        AssignGLEntryPoint(loadProcAddress("glGenRenderbuffers"), &genRenderbuffers);
+        AssignGLEntryPoint(loadProcAddress("glGenTextures"), &genTextures);
+        AssignGLEntryPoint(loadProcAddress("glGetActiveAttrib"), &getActiveAttrib);
+        AssignGLEntryPoint(loadProcAddress("glGetActiveUniform"), &getActiveUniform);
+        AssignGLEntryPoint(loadProcAddress("glGetAttachedShaders"), &getAttachedShaders);
+        AssignGLEntryPoint(loadProcAddress("glGetAttribLocation"), &getAttribLocation);
+        AssignGLEntryPoint(loadProcAddress("glGetBooleanv"), &getBooleanv);
+        AssignGLEntryPoint(loadProcAddress("glGetBufferParameteriv"), &getBufferParameteriv);
+        AssignGLEntryPoint(loadProcAddress("glGetError"), &getError);
+        AssignGLEntryPoint(loadProcAddress("glGetFloatv"), &getFloatv);
+        AssignGLEntryPoint(loadProcAddress("glGetFramebufferAttachmentParameteriv"), &getFramebufferAttachmentParameteriv);
+        AssignGLEntryPoint(loadProcAddress("glGetIntegerv"), &getIntegerv);
+        AssignGLEntryPoint(loadProcAddress("glGetProgramiv"), &getProgramiv);
+        AssignGLEntryPoint(loadProcAddress("glGetProgramInfoLog"), &getProgramInfoLog);
+        AssignGLEntryPoint(loadProcAddress("glGetRenderbufferParameteriv"), &getRenderbufferParameteriv);
+        AssignGLEntryPoint(loadProcAddress("glGetShaderiv"), &getShaderiv);
+        AssignGLEntryPoint(loadProcAddress("glGetShaderInfoLog"), &getShaderInfoLog);
+        AssignGLEntryPoint(loadProcAddress("glGetShaderPrecisionFormat"), &getShaderPrecisionFormat);
+        AssignGLEntryPoint(loadProcAddress("glGetShaderSource"), &getShaderSource);
+        AssignGLEntryPoint(loadProcAddress("glGetString"), &getString);
+        AssignGLEntryPoint(loadProcAddress("glGetTexParameterfv"), &getTexParameterfv);
+        AssignGLEntryPoint(loadProcAddress("glGetTexParameteriv"), &getTexParameteriv);
+        AssignGLEntryPoint(loadProcAddress("glGetUniformfv"), &getUniformfv);
+        AssignGLEntryPoint(loadProcAddress("glGetUniformiv"), &getUniformiv);
+        AssignGLEntryPoint(loadProcAddress("glGetUniformLocation"), &getUniformLocation);
+        AssignGLEntryPoint(loadProcAddress("glGetVertexAttribfv"), &getVertexAttribfv);
+        AssignGLEntryPoint(loadProcAddress("glGetVertexAttribiv"), &getVertexAttribiv);
+        AssignGLEntryPoint(loadProcAddress("glGetVertexAttribPointerv"), &getVertexAttribPointerv);
+        AssignGLEntryPoint(loadProcAddress("glHint"), &hint);
+        AssignGLEntryPoint(loadProcAddress("glIsBuffer"), &isBuffer);
+        AssignGLEntryPoint(loadProcAddress("glIsEnabled"), &isEnabled);
+        AssignGLEntryPoint(loadProcAddress("glIsFramebuffer"), &isFramebuffer);
+        AssignGLEntryPoint(loadProcAddress("glIsProgram"), &isProgram);
+        AssignGLEntryPoint(loadProcAddress("glIsRenderbuffer"), &isRenderbuffer);
+        AssignGLEntryPoint(loadProcAddress("glIsShader"), &isShader);
+        AssignGLEntryPoint(loadProcAddress("glIsTexture"), &isTexture);
+        AssignGLEntryPoint(loadProcAddress("glLineWidth"), &lineWidth);
+        AssignGLEntryPoint(loadProcAddress("glLinkProgram"), &linkProgram);
+        AssignGLEntryPoint(loadProcAddress("glPixelStorei"), &pixelStorei);
+        AssignGLEntryPoint(loadProcAddress("glPolygonOffset"), &polygonOffset);
+        AssignGLEntryPoint(loadProcAddress("glReadPixels"), &readPixels);
+        AssignGLEntryPoint(loadProcAddress("glReleaseShaderCompiler"), &releaseShaderCompiler);
+        AssignGLEntryPoint(loadProcAddress("glRenderbufferStorage"), &renderbufferStorage);
+        AssignGLEntryPoint(loadProcAddress("glSampleCoverage"), &sampleCoverage);
+        AssignGLEntryPoint(loadProcAddress("glScissor"), &scissor);
+        AssignGLEntryPoint(loadProcAddress("glShaderBinary"), &shaderBinary);
+        AssignGLEntryPoint(loadProcAddress("glShaderSource"), &shaderSource);
+        AssignGLEntryPoint(loadProcAddress("glStencilFunc"), &stencilFunc);
+        AssignGLEntryPoint(loadProcAddress("glStencilFuncSeparate"), &stencilFuncSeparate);
+        AssignGLEntryPoint(loadProcAddress("glStencilMask"), &stencilMask);
+        AssignGLEntryPoint(loadProcAddress("glStencilMaskSeparate"), &stencilMaskSeparate);
+        AssignGLEntryPoint(loadProcAddress("glStencilOp"), &stencilOp);
+        AssignGLEntryPoint(loadProcAddress("glStencilOpSeparate"), &stencilOpSeparate);
+        AssignGLEntryPoint(loadProcAddress("glTexImage2D"), &texImage2D);
+        AssignGLEntryPoint(loadProcAddress("glTexParameterf"), &texParameterf);
+        AssignGLEntryPoint(loadProcAddress("glTexParameterfv"), &texParameterfv);
+        AssignGLEntryPoint(loadProcAddress("glTexParameteri"), &texParameteri);
+        AssignGLEntryPoint(loadProcAddress("glTexParameteriv"), &texParameteriv);
+        AssignGLEntryPoint(loadProcAddress("glTexSubImage2D"), &texSubImage2D);
+        AssignGLEntryPoint(loadProcAddress("glUniform1f"), &uniform1f);
+        AssignGLEntryPoint(loadProcAddress("glUniform1fv"), &uniform1fv);
+        AssignGLEntryPoint(loadProcAddress("glUniform1i"), &uniform1i);
+        AssignGLEntryPoint(loadProcAddress("glUniform1iv"), &uniform1iv);
+        AssignGLEntryPoint(loadProcAddress("glUniform2f"), &uniform2f);
+        AssignGLEntryPoint(loadProcAddress("glUniform2fv"), &uniform2fv);
+        AssignGLEntryPoint(loadProcAddress("glUniform2i"), &uniform2i);
+        AssignGLEntryPoint(loadProcAddress("glUniform2iv"), &uniform2iv);
+        AssignGLEntryPoint(loadProcAddress("glUniform3f"), &uniform3f);
+        AssignGLEntryPoint(loadProcAddress("glUniform3fv"), &uniform3fv);
+        AssignGLEntryPoint(loadProcAddress("glUniform3i"), &uniform3i);
+        AssignGLEntryPoint(loadProcAddress("glUniform3iv"), &uniform3iv);
+        AssignGLEntryPoint(loadProcAddress("glUniform4f"), &uniform4f);
+        AssignGLEntryPoint(loadProcAddress("glUniform4fv"), &uniform4fv);
+        AssignGLEntryPoint(loadProcAddress("glUniform4i"), &uniform4i);
+        AssignGLEntryPoint(loadProcAddress("glUniform4iv"), &uniform4iv);
+        AssignGLEntryPoint(loadProcAddress("glUniformMatrix2fv"), &uniformMatrix2fv);
+        AssignGLEntryPoint(loadProcAddress("glUniformMatrix3fv"), &uniformMatrix3fv);
+        AssignGLEntryPoint(loadProcAddress("glUniformMatrix4fv"), &uniformMatrix4fv);
+        AssignGLEntryPoint(loadProcAddress("glUseProgram"), &useProgram);
+        AssignGLEntryPoint(loadProcAddress("glValidateProgram"), &validateProgram);
+        AssignGLEntryPoint(loadProcAddress("glVertexAttrib1f"), &vertexAttrib1f);
+        AssignGLEntryPoint(loadProcAddress("glVertexAttrib1fv"), &vertexAttrib1fv);
+        AssignGLEntryPoint(loadProcAddress("glVertexAttrib2f"), &vertexAttrib2f);
+        AssignGLEntryPoint(loadProcAddress("glVertexAttrib2fv"), &vertexAttrib2fv);
+        AssignGLEntryPoint(loadProcAddress("glVertexAttrib3f"), &vertexAttrib3f);
+        AssignGLEntryPoint(loadProcAddress("glVertexAttrib3fv"), &vertexAttrib3fv);
+        AssignGLEntryPoint(loadProcAddress("glVertexAttrib4f"), &vertexAttrib4f);
+        AssignGLEntryPoint(loadProcAddress("glVertexAttrib4fv"), &vertexAttrib4fv);
+        AssignGLEntryPoint(loadProcAddress("glVertexAttribPointer"), &vertexAttribPointer);
+        AssignGLEntryPoint(loadProcAddress("glViewport"), &viewport);
+    }
+
+    // 3.0
+    if (isAtLeastGLES(gl::Version(3, 0)))
+    {
+        AssignGLEntryPoint(loadProcAddress("glReadBuffer"), &readBuffer);
+        AssignGLEntryPoint(loadProcAddress("glDrawRangeElements"), &drawRangeElements);
+        AssignGLEntryPoint(loadProcAddress("glTexImage3D"), &texImage3D);
+        AssignGLEntryPoint(loadProcAddress("glTexSubImage3D"), &texSubImage3D);
+        AssignGLEntryPoint(loadProcAddress("glCopyTexSubImage3D"), &copyTexSubImage3D);
+        AssignGLEntryPoint(loadProcAddress("glCompressedTexImage3D"), &compressedTexImage3D);
+        AssignGLEntryPoint(loadProcAddress("glCompressedTexSubImage3D"), &compressedTexSubImage3D);
+        AssignGLEntryPoint(loadProcAddress("glGenQueries"), &genQueries);
+        AssignGLEntryPoint(loadProcAddress("glDeleteQueries"), &deleteQueries);
+        AssignGLEntryPoint(loadProcAddress("glIsQuery"), &isQuery);
+        AssignGLEntryPoint(loadProcAddress("glBeginQuery"), &beginQuery);
+        AssignGLEntryPoint(loadProcAddress("glEndQuery"), &endQuery);
+        AssignGLEntryPoint(loadProcAddress("glGetQueryiv"), &getQueryiv);
+        AssignGLEntryPoint(loadProcAddress("glGetQueryObjectuiv"), &getQueryObjectuiv);
+        AssignGLEntryPoint(loadProcAddress("glUnmapBuffer"), &unmapBuffer);
+        AssignGLEntryPoint(loadProcAddress("glGetBufferPointerv"), &getBufferPointerv);
+        AssignGLEntryPoint(loadProcAddress("glDrawBuffers"), &drawBuffers);
+        AssignGLEntryPoint(loadProcAddress("glUniformMatrix2x3fv"), &uniformMatrix2x3fv);
+        AssignGLEntryPoint(loadProcAddress("glUniformMatrix3x2fv"), &uniformMatrix3x2fv);
+        AssignGLEntryPoint(loadProcAddress("glUniformMatrix2x4fv"), &uniformMatrix2x4fv);
+        AssignGLEntryPoint(loadProcAddress("glUniformMatrix4x2fv"), &uniformMatrix4x2fv);
+        AssignGLEntryPoint(loadProcAddress("glUniformMatrix3x4fv"), &uniformMatrix3x4fv);
+        AssignGLEntryPoint(loadProcAddress("glUniformMatrix4x3fv"), &uniformMatrix4x3fv);
+        AssignGLEntryPoint(loadProcAddress("glBlitFramebuffer"), &blitFramebuffer);
+        AssignGLEntryPoint(loadProcAddress("glRenderbufferStorageMultisample"), &renderbufferStorageMultisample);
+        AssignGLEntryPoint(loadProcAddress("glFramebufferTextureLayer"), &framebufferTextureLayer);
+        AssignGLEntryPoint(loadProcAddress("glMapBufferRange"), &mapBufferRange);
+        AssignGLEntryPoint(loadProcAddress("glFlushMappedBufferRange"), &flushMappedBufferRange);
+        AssignGLEntryPoint(loadProcAddress("glBindVertexArray"), &bindVertexArray);
+        AssignGLEntryPoint(loadProcAddress("glDeleteVertexArrays"), &deleteVertexArrays);
+        AssignGLEntryPoint(loadProcAddress("glGenVertexArrays"), &genVertexArrays);
+        AssignGLEntryPoint(loadProcAddress("glIsVertexArray"), &isVertexArray);
+        AssignGLEntryPoint(loadProcAddress("glGetIntegeri_v"), &getIntegeri_v);
+        AssignGLEntryPoint(loadProcAddress("glBeginTransformFeedback"), &beginTransformFeedback);
+        AssignGLEntryPoint(loadProcAddress("glEndTransformFeedback"), &endTransformFeedback);
+        AssignGLEntryPoint(loadProcAddress("glBindBufferRange"), &bindBufferRange);
+        AssignGLEntryPoint(loadProcAddress("glBindBufferBase"), &bindBufferBase);
+        AssignGLEntryPoint(loadProcAddress("glTransformFeedbackVaryings"), &transformFeedbackVaryings);
+        AssignGLEntryPoint(loadProcAddress("glGetTransformFeedbackVarying"), &getTransformFeedbackVarying);
+        AssignGLEntryPoint(loadProcAddress("glVertexAttribIPointer"), &vertexAttribIPointer);
+        AssignGLEntryPoint(loadProcAddress("glGetVertexAttribIiv"), &getVertexAttribIiv);
+        AssignGLEntryPoint(loadProcAddress("glGetVertexAttribIuiv"), &getVertexAttribIuiv);
+        AssignGLEntryPoint(loadProcAddress("glVertexAttribI4i"), &vertexAttribI4i);
+        AssignGLEntryPoint(loadProcAddress("glVertexAttribI4ui"), &vertexAttribI4ui);
+        AssignGLEntryPoint(loadProcAddress("glVertexAttribI4iv"), &vertexAttribI4iv);
+        AssignGLEntryPoint(loadProcAddress("glVertexAttribI4uiv"), &vertexAttribI4uiv);
+        AssignGLEntryPoint(loadProcAddress("glGetUniformuiv"), &getUniformuiv);
+        AssignGLEntryPoint(loadProcAddress("glGetFragDataLocation"), &getFragDataLocation);
+        AssignGLEntryPoint(loadProcAddress("glUniform1ui"), &uniform1ui);
+        AssignGLEntryPoint(loadProcAddress("glUniform2ui"), &uniform2ui);
+        AssignGLEntryPoint(loadProcAddress("glUniform3ui"), &uniform3ui);
+        AssignGLEntryPoint(loadProcAddress("glUniform4ui"), &uniform4ui);
+        AssignGLEntryPoint(loadProcAddress("glUniform1uiv"), &uniform1uiv);
+        AssignGLEntryPoint(loadProcAddress("glUniform2uiv"), &uniform2uiv);
+        AssignGLEntryPoint(loadProcAddress("glUniform3uiv"), &uniform3uiv);
+        AssignGLEntryPoint(loadProcAddress("glUniform4uiv"), &uniform4uiv);
+        AssignGLEntryPoint(loadProcAddress("glClearBufferiv"), &clearBufferiv);
+        AssignGLEntryPoint(loadProcAddress("glClearBufferuiv"), &clearBufferuiv);
+        AssignGLEntryPoint(loadProcAddress("glClearBufferfv"), &clearBufferfv);
+        AssignGLEntryPoint(loadProcAddress("glClearBufferfi"), &clearBufferfi);
+        AssignGLEntryPoint(loadProcAddress("glGetStringi"), &getStringi);
+        AssignGLEntryPoint(loadProcAddress("glCopyBufferSubData"), &copyBufferSubData);
+        AssignGLEntryPoint(loadProcAddress("glGetUniformIndices"), &getUniformIndices);
+        AssignGLEntryPoint(loadProcAddress("glGetActiveUniformsiv"), &getActiveUniformsiv);
+        AssignGLEntryPoint(loadProcAddress("glGetUniformBlockIndex"), &getUniformBlockIndex);
+        AssignGLEntryPoint(loadProcAddress("glGetActiveUniformBlockiv"), &getActiveUniformBlockiv);
+        AssignGLEntryPoint(loadProcAddress("glGetActiveUniformBlockName"), &getActiveUniformBlockName);
+        AssignGLEntryPoint(loadProcAddress("glUniformBlockBinding"), &uniformBlockBinding);
+        AssignGLEntryPoint(loadProcAddress("glDrawArraysInstanced"), &drawArraysInstanced);
+        AssignGLEntryPoint(loadProcAddress("glDrawElementsInstanced"), &drawElementsInstanced);
+        AssignGLEntryPoint(loadProcAddress("glFenceSync"), &fenceSync);
+        AssignGLEntryPoint(loadProcAddress("glIsSync"), &isSync);
+        AssignGLEntryPoint(loadProcAddress("glDeleteSync"), &deleteSync);
+        AssignGLEntryPoint(loadProcAddress("glClientWaitSync"), &clientWaitSync);
+        AssignGLEntryPoint(loadProcAddress("glWaitSync"), &waitSync);
+        AssignGLEntryPoint(loadProcAddress("glGetInteger64v"), &getInteger64v);
+        AssignGLEntryPoint(loadProcAddress("glGetSynciv"), &getSynciv);
+        AssignGLEntryPoint(loadProcAddress("glGetInteger64i_v"), &getInteger64i_v);
+        AssignGLEntryPoint(loadProcAddress("glGetBufferParameteri64v"), &getBufferParameteri64v);
+        AssignGLEntryPoint(loadProcAddress("glGenSamplers"), &genSamplers);
+        AssignGLEntryPoint(loadProcAddress("glDeleteSamplers"), &deleteSamplers);
+        AssignGLEntryPoint(loadProcAddress("glIsSampler"), &isSampler);
+        AssignGLEntryPoint(loadProcAddress("glBindSampler"), &bindSampler);
+        AssignGLEntryPoint(loadProcAddress("glSamplerParameteri"), &samplerParameteri);
+        AssignGLEntryPoint(loadProcAddress("glSamplerParameteriv"), &samplerParameteriv);
+        AssignGLEntryPoint(loadProcAddress("glSamplerParameterf"), &samplerParameterf);
+        AssignGLEntryPoint(loadProcAddress("glSamplerParameterfv"), &samplerParameterfv);
+        AssignGLEntryPoint(loadProcAddress("glGetSamplerParameteriv"), &getSamplerParameteriv);
+        AssignGLEntryPoint(loadProcAddress("glGetSamplerParameterfv"), &getSamplerParameterfv);
+        AssignGLEntryPoint(loadProcAddress("glVertexAttribDivisor"), &vertexAttribDivisor);
+        AssignGLEntryPoint(loadProcAddress("glBindTransformFeedback"), &bindTransformFeedback);
+        AssignGLEntryPoint(loadProcAddress("glDeleteTransformFeedbacks"), &deleteTransformFeedbacks);
+        AssignGLEntryPoint(loadProcAddress("glGenTransformFeedbacks"), &genTransformFeedbacks);
+        AssignGLEntryPoint(loadProcAddress("glIsTransformFeedback"), &isTransformFeedback);
+        AssignGLEntryPoint(loadProcAddress("glPauseTransformFeedback"), &pauseTransformFeedback);
+        AssignGLEntryPoint(loadProcAddress("glResumeTransformFeedback"), &resumeTransformFeedback);
+        AssignGLEntryPoint(loadProcAddress("glGetProgramBinary"), &getProgramBinary);
+        AssignGLEntryPoint(loadProcAddress("glProgramBinary"), &programBinary);
+        AssignGLEntryPoint(loadProcAddress("glProgramParameteri"), &programParameteri);
+        AssignGLEntryPoint(loadProcAddress("glInvalidateFramebuffer"), &invalidateFramebuffer);
+        AssignGLEntryPoint(loadProcAddress("glInvalidateSubFramebuffer"), &invalidateSubFramebuffer);
+        AssignGLEntryPoint(loadProcAddress("glTexStorage2D"), &texStorage2D);
+        AssignGLEntryPoint(loadProcAddress("glTexStorage3D"), &texStorage3D);
+        AssignGLEntryPoint(loadProcAddress("glGetInternalformativ"), &getInternalformativ);
+    }
+
+    // 3.1
+    if (isAtLeastGLES(gl::Version(3, 1)))
+    {
+        AssignGLEntryPoint(loadProcAddress("glDispatchCompute"), &dispatchCompute);
+        AssignGLEntryPoint(loadProcAddress("glDispatchComputeIndirect"), &dispatchComputeIndirect);
+        AssignGLEntryPoint(loadProcAddress("glDrawArraysIndirect"), &drawArraysIndirect);
+        AssignGLEntryPoint(loadProcAddress("glDrawElementsIndirect"), &drawElementsIndirect);
+        AssignGLEntryPoint(loadProcAddress("glFramebufferParameteri"), &framebufferParameteri);
+        AssignGLEntryPoint(loadProcAddress("glGetFramebufferParameteriv"), &getFramebufferParameteriv);
+        AssignGLEntryPoint(loadProcAddress("glGetProgramInterfaceiv"), &getProgramInterfaceiv);
+        AssignGLEntryPoint(loadProcAddress("glGetProgramResourceIndex"), &getProgramResourceIndex);
+        AssignGLEntryPoint(loadProcAddress("glGetProgramResourceName"), &getProgramResourceName);
+        AssignGLEntryPoint(loadProcAddress("glGetProgramResourceiv"), &getProgramResourceiv);
+        AssignGLEntryPoint(loadProcAddress("glGetProgramResourceLocation"), &getProgramResourceLocation);
+        AssignGLEntryPoint(loadProcAddress("glUseProgramStages"), &useProgramStages);
+        AssignGLEntryPoint(loadProcAddress("glActiveShaderProgram"), &activeShaderProgram);
+        AssignGLEntryPoint(loadProcAddress("glCreateShaderProgramv"), &createShaderProgramv);
+        AssignGLEntryPoint(loadProcAddress("glBindProgramPipeline"), &bindProgramPipeline);
+        AssignGLEntryPoint(loadProcAddress("glDeleteProgramPipelines"), &deleteProgramPipelines);
+        AssignGLEntryPoint(loadProcAddress("glGenProgramPipelines"), &genProgramPipelines);
+        AssignGLEntryPoint(loadProcAddress("glIsProgramPipeline"), &isProgramPipeline);
+        AssignGLEntryPoint(loadProcAddress("glGetProgramPipelineiv"), &getProgramPipelineiv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform1i"), &programUniform1i);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform2i"), &programUniform2i);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform3i"), &programUniform3i);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform4i"), &programUniform4i);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform1ui"), &programUniform1ui);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform2ui"), &programUniform2ui);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform3ui"), &programUniform3ui);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform4ui"), &programUniform4ui);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform1f"), &programUniform1f);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform2f"), &programUniform2f);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform3f"), &programUniform3f);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform4f"), &programUniform4f);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform1iv"), &programUniform1iv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform2iv"), &programUniform2iv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform3iv"), &programUniform3iv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform4iv"), &programUniform4iv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform1uiv"), &programUniform1uiv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform2uiv"), &programUniform2uiv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform3uiv"), &programUniform3uiv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform4uiv"), &programUniform4uiv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform1fv"), &programUniform1fv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform2fv"), &programUniform2fv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform3fv"), &programUniform3fv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniform4fv"), &programUniform4fv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniformMatrix2fv"), &programUniformMatrix2fv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniformMatrix3fv"), &programUniformMatrix3fv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniformMatrix4fv"), &programUniformMatrix4fv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniformMatrix2x3fv"), &programUniformMatrix2x3fv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniformMatrix3x2fv"), &programUniformMatrix3x2fv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniformMatrix2x4fv"), &programUniformMatrix2x4fv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniformMatrix4x2fv"), &programUniformMatrix4x2fv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniformMatrix3x4fv"), &programUniformMatrix3x4fv);
+        AssignGLEntryPoint(loadProcAddress("glProgramUniformMatrix4x3fv"), &programUniformMatrix4x3fv);
+        AssignGLEntryPoint(loadProcAddress("glValidateProgramPipeline"), &validateProgramPipeline);
+        AssignGLEntryPoint(loadProcAddress("glGetProgramPipelineInfoLog"), &getProgramPipelineInfoLog);
+        AssignGLEntryPoint(loadProcAddress("glBindImageTexture"), &bindImageTexture);
+        AssignGLEntryPoint(loadProcAddress("glGetBooleani_v"), &getBooleani_v);
+        AssignGLEntryPoint(loadProcAddress("glMemoryBarrier"), &memoryBarrier);
+        AssignGLEntryPoint(loadProcAddress("glMemoryBarrierByRegion"), &memoryBarrierByRegion);
+        AssignGLEntryPoint(loadProcAddress("glTexStorage2DMultisample"), &texStorage2DMultisample);
+        AssignGLEntryPoint(loadProcAddress("glGetMultisamplefv"), &getMultisamplefv);
+        AssignGLEntryPoint(loadProcAddress("glSampleMaski"), &sampleMaski);
+        AssignGLEntryPoint(loadProcAddress("glGetTexLevelParameteriv"), &getTexLevelParameteriv);
+        AssignGLEntryPoint(loadProcAddress("glGetTexLevelParameterfv"), &getTexLevelParameterfv);
+        AssignGLEntryPoint(loadProcAddress("glBindVertexBuffer"), &bindVertexBuffer);
+        AssignGLEntryPoint(loadProcAddress("glVertexAttribFormat"), &vertexAttribFormat);
+        AssignGLEntryPoint(loadProcAddress("glVertexAttribIFormat"), &vertexAttribIFormat);
+        AssignGLEntryPoint(loadProcAddress("glVertexAttribBinding"), &vertexAttribBinding);
+        AssignGLEntryPoint(loadProcAddress("glVertexBindingDivisor"), &vertexBindingDivisor);
+    }
+
+    // 3.2
+    if (isAtLeastGLES(gl::Version(3, 2)))
+    {
+        AssignGLEntryPoint(loadProcAddress("glBlendBarrier"), &blendBarrier);
+        AssignGLEntryPoint(loadProcAddress("glCopyImageSubData"), &copyImageSubData);
+        AssignGLEntryPoint(loadProcAddress("glDebugMessageControl"), &debugMessageControl);
+        AssignGLEntryPoint(loadProcAddress("glDebugMessageInsert"), &debugMessageInsert);
+        AssignGLEntryPoint(loadProcAddress("glDebugMessageCallback"), &debugMessageCallback);
+        AssignGLEntryPoint(loadProcAddress("glGetDebugMessageLog"), &getDebugMessageLog);
+        AssignGLEntryPoint(loadProcAddress("glPushDebugGroup"), &pushDebugGroup);
+        AssignGLEntryPoint(loadProcAddress("glPopDebugGroup"), &popDebugGroup);
+        AssignGLEntryPoint(loadProcAddress("glObjectLabel"), &objectLabel);
+        AssignGLEntryPoint(loadProcAddress("glGetObjectLabel"), &getObjectLabel);
+        AssignGLEntryPoint(loadProcAddress("glObjectPtrLabel"), &objectPtrLabel);
+        AssignGLEntryPoint(loadProcAddress("glGetObjectPtrLabel"), &getObjectPtrLabel);
+        AssignGLEntryPoint(loadProcAddress("glGetPointerv"), &getPointerv);
+        AssignGLEntryPoint(loadProcAddress("glEnablei"), &enablei);
+        AssignGLEntryPoint(loadProcAddress("glDisablei"), &disablei);
+        AssignGLEntryPoint(loadProcAddress("glBlendEquationi"), &blendEquationi);
+        AssignGLEntryPoint(loadProcAddress("glBlendEquationSeparatei"), &blendEquationSeparatei);
+        AssignGLEntryPoint(loadProcAddress("glBlendFunci"), &blendFunci);
+        AssignGLEntryPoint(loadProcAddress("glBlendFuncSeparatei"), &blendFuncSeparatei);
+        AssignGLEntryPoint(loadProcAddress("glColorMaski"), &colorMaski);
+        AssignGLEntryPoint(loadProcAddress("glIsEnabledi"), &isEnabledi);
+        AssignGLEntryPoint(loadProcAddress("glDrawElementsBaseVertex"), &drawElementsBaseVertex);
+        AssignGLEntryPoint(loadProcAddress("glDrawRangeElementsBaseVertex"), &drawRangeElementsBaseVertex);
+        AssignGLEntryPoint(loadProcAddress("glDrawElementsInstancedBaseVertex"), &drawElementsInstancedBaseVertex);
+        AssignGLEntryPoint(loadProcAddress("glFramebufferTexture"), &framebufferTexture);
+        AssignGLEntryPoint(loadProcAddress("glPrimitiveBoundingBox"), &primitiveBoundingBox);
+        AssignGLEntryPoint(loadProcAddress("glGetGraphicsResetStatus"), &getGraphicsResetStatus);
+        AssignGLEntryPoint(loadProcAddress("glReadnPixels"), &readnPixels);
+        AssignGLEntryPoint(loadProcAddress("glGetnUniformfv"), &getnUniformfv);
+        AssignGLEntryPoint(loadProcAddress("glGetnUniformiv"), &getnUniformiv);
+        AssignGLEntryPoint(loadProcAddress("glGetnUniformuiv"), &getnUniformuiv);
+        AssignGLEntryPoint(loadProcAddress("glMinSampleShading"), &minSampleShading);
+        AssignGLEntryPoint(loadProcAddress("glPatchParameteri"), &patchParameteri);
+        AssignGLEntryPoint(loadProcAddress("glTexParameterIiv"), &texParameterIiv);
+        AssignGLEntryPoint(loadProcAddress("glTexParameterIuiv"), &texParameterIuiv);
+        AssignGLEntryPoint(loadProcAddress("glGetTexParameterIiv"), &getTexParameterIiv);
+        AssignGLEntryPoint(loadProcAddress("glGetTexParameterIuiv"), &getTexParameterIuiv);
+        AssignGLEntryPoint(loadProcAddress("glSamplerParameterIiv"), &samplerParameterIiv);
+        AssignGLEntryPoint(loadProcAddress("glSamplerParameterIuiv"), &samplerParameterIuiv);
+        AssignGLEntryPoint(loadProcAddress("glGetSamplerParameterIiv"), &getSamplerParameterIiv);
+        AssignGLEntryPoint(loadProcAddress("glGetSamplerParameterIuiv"), &getSamplerParameterIuiv);
+        AssignGLEntryPoint(loadProcAddress("glTexBuffer"), &texBuffer);
+        AssignGLEntryPoint(loadProcAddress("glTexBufferRange"), &texBufferRange);
+        AssignGLEntryPoint(loadProcAddress("glTexStorage3DMultisample"), &texStorage3DMultisample);
+    }
+
+    // clang-format on
+}
+
 bool FunctionsGL::isAtLeastGL(const gl::Version &glVersion) const
 {
     return standard == STANDARD_GL_DESKTOP && version >= glVersion;

src/libANGLE/renderer/gl/FunctionsGL.h

@@ -743,7 +743,14 @@ class FunctionsGL
     PFNGLVERTEXARRAYVERTEXBUFFERPROC vertexArrayVertexBuffer;
     PFNGLVERTEXARRAYVERTEXBUFFERSPROC vertexArrayVertexBuffers;
 
+    // ES 3.2
+    PFNGLBLENDBARRIERPROC blendBarrier;
+    PFNGLPRIMITIVEBOUNDINGBOXPROC primitiveBoundingBox;
+
   private:
+    void initializeProcsDesktopGL();
+    void initializeProcsGLES();
+
     virtual void *loadProcAddress(const std::string &function) = 0;
 };