chromium/src
0
Fork 0
Code Activity

Remove ARB extensions support from GL bindings: Part XIV.

Browse Source 
* GL_APPLE_fence
* GL_APPLE_sync
* GL_APPLE_vertex_array_object

This is part of
https://chromium-review.googlesource.com/c/chromium/src/+/4355969

The original CL caused many command buffer unit tests failing.

I believe it is due to the test setups are wrong, but fixing all
of them in one CL is too much.

Splitting into multiple ones, so it's easier to read and review.

TEST=bots

Change-Id: I18f10bfba24c553c25d798f44637a6125e42e3c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5666462
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Auto-Submit: Zhenyao Mo <zmo@chromium.org>
Commit-Queue: Zhenyao Mo <zmo@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1322267}
This commit is contained in:
Zhenyao Mo
2024-07-02 17:16:45 +00:00
committed by Chromium LUCI CQ
parent 6a2821d83a
commit 39cb85e4d5
15 changed files with 5 additions and 743 deletions

2
ui/gl/BUILD.gn

@ -290,8 +290,6 @@ component("gl") {
"egl_surface_io_surface.cc",
"egl_surface_io_surface.h",
"gl_display_egl.mm",
"gl_fence_apple.cc",
"gl_fence_apple.h",
]
# Do not compile with ARC because //gpu/command_buffer code is not able to

67
ui/gl/generate_bindings.py

@ -134,9 +134,7 @@ GL_FUNCTIONS = [
{ 'return_type': 'void',
'known_as': 'glBindVertexArrayOES',
'versions': [{ 'name': 'glBindVertexArray' },
{ 'name': 'glBindVertexArrayOES' },
{ 'name': 'glBindVertexArrayAPPLE',
'extensions': ['GL_APPLE_vertex_array_object'] }],
{ 'name': 'glBindVertexArrayOES' }],
'arguments': 'GLuint array' },
{ 'return_type': 'void',
'names': ['glBindVertexBuffer'],
@ -270,10 +268,6 @@ GL_FUNCTIONS = [
{ 'return_type': 'GLenum',
'names': ['glClientWaitSync'],
'arguments': 'GLsync sync, GLbitfield flags, GLuint64 timeout', },
{ 'return_type': 'GLenum',
'versions': [{ 'name': 'glClientWaitSyncAPPLE',
'extensions': ['GL_APPLE_sync'] }],
'arguments': 'GLsync sync, GLbitfield flags, GLuint64 timeout', },
{ 'return_type': 'void',
'versions': [{'name': 'glClipControlEXT',
'extensions': ['GL_EXT_clip_control']}],
@ -420,11 +414,6 @@ GL_FUNCTIONS = [
'names': ['glDeleteBuffers'],
'known_as': 'glDeleteBuffersARB',
'arguments': 'GLsizei n, const GLuint* buffers', },
{ 'return_type': 'void',
'known_as': 'glDeleteFencesAPPLE',
'versions': [{ 'name': 'glDeleteFencesAPPLE',
'extensions': ['GL_APPLE_fence'] }],
'arguments': 'GLsizei n, const GLuint* fences', },
{ 'return_type': 'void',
'names': ['glDeleteFencesNV'],
'arguments': 'GLsizei n, const GLuint* fences', },
@ -462,10 +451,6 @@ GL_FUNCTIONS = [
{ 'return_type': 'void',
'names': ['glDeleteSync'],
'arguments': 'GLsync sync', },
{ 'return_type': 'void',
'versions': [{ 'name': 'glDeleteSyncAPPLE',
'extensions': ['GL_APPLE_sync'] }],
'arguments': 'GLsync sync', },
{ 'return_type': 'void',
'names': ['glDeleteTextures'],
'arguments': 'GLsizei n, const GLuint* textures', },
@ -475,9 +460,7 @@ GL_FUNCTIONS = [
{ 'return_type': 'void',
'known_as': 'glDeleteVertexArraysOES',
'versions': [{ 'name': 'glDeleteVertexArrays' },
{ 'name': 'glDeleteVertexArraysOES' },
{ 'name': 'glDeleteVertexArraysAPPLE',
'extensions': ['GL_APPLE_vertex_array_object'] }],
{ 'name': 'glDeleteVertexArraysOES' }],
'arguments': 'GLsizei n, const GLuint* arrays' },
{ 'return_type': 'void',
'names': ['glDepthFunc'],
@ -616,18 +599,9 @@ GL_FUNCTIONS = [
{ 'return_type': 'GLsync',
'names': ['glFenceSync'],
'arguments': 'GLenum condition, GLbitfield flags', },
{ 'return_type': 'GLsync',
'versions': [{ 'name': 'glFenceSyncAPPLE',
'extensions': ['GL_APPLE_sync'] }],
'arguments': 'GLenum condition, GLbitfield flags', },
{ 'return_type': 'void',
'names': ['glFinish'],
'arguments': 'void', },
{ 'return_type': 'void',
'known_as': 'glFinishFenceAPPLE',
'versions': [{ 'name': 'glFinishFenceAPPLE',
'extensions': ['GL_APPLE_fence'] }],
'arguments': 'GLuint fence', },
{ 'return_type': 'void',
'names': ['glFinishFenceNV'],
'arguments': 'GLuint fence', },
@ -706,11 +680,6 @@ GL_FUNCTIONS = [
{ 'return_type': 'void',
'names': ['glGenerateMipmapEXT', 'glGenerateMipmap'],
'arguments': 'GLenum target', },
{ 'return_type': 'void',
'known_as': 'glGenFencesAPPLE',
'versions': [{ 'name': 'glGenFencesAPPLE',
'extensions': ['GL_APPLE_fence'] }],
'arguments': 'GLsizei n, GLuint* fences', },
{ 'return_type': 'void',
'names': ['glGenFencesNV'],
'arguments': 'GLsizei n, GLuint* fences', },
@ -743,9 +712,7 @@ GL_FUNCTIONS = [
{ 'return_type': 'void',
'known_as': 'glGenVertexArraysOES',
'versions': [{ 'name': 'glGenVertexArrays' },
{ 'name': 'glGenVertexArraysOES' },
{ 'name': 'glGenVertexArraysAPPLE',
'extensions': ['GL_APPLE_vertex_array_object'] }],
{ 'name': 'glGenVertexArraysOES' }],
'arguments': 'GLsizei n, GLuint* arrays', },
{ 'return_type': 'void',
'names': ['glGetActiveAttrib'],
@ -1371,11 +1338,6 @@ GL_FUNCTIONS = [
{ 'name': 'glIsEnablediOES', 'extensions': ['GL_OES_draw_buffers_indexed'] }
],
'arguments': 'GLenum target, GLuint index', },
{ 'return_type': 'GLboolean',
'known_as': 'glIsFenceAPPLE',
'versions': [{ 'name': 'glIsFenceAPPLE',
'extensions': ['GL_APPLE_fence'] }],
'arguments': 'GLuint fence', },
{ 'return_type': 'GLboolean',
'names': ['glIsFenceNV'],
'arguments': 'GLuint fence', },
@ -1405,10 +1367,6 @@ GL_FUNCTIONS = [
{ 'return_type': 'GLboolean',
'names': ['glIsSync'],
'arguments': 'GLsync sync', },
{ 'return_type': 'GLboolean',
'versions': [{ 'name': 'glIsSyncAPPLE',
'extensions': ['GL_APPLE_sync'] }],
'arguments': 'GLsync sync', },
{ 'return_type': 'GLboolean',
'names': ['glIsTexture'],
'arguments': 'GLuint texture', },
@ -1418,9 +1376,7 @@ GL_FUNCTIONS = [
{ 'return_type': 'GLboolean',
'known_as': 'glIsVertexArrayOES',
'versions': [{ 'name': 'glIsVertexArray' },
{ 'name': 'glIsVertexArrayOES' },
{ 'name': 'glIsVertexArrayAPPLE',
'extensions': ['GL_APPLE_vertex_array_object'] }],
{ 'name': 'glIsVertexArrayOES' }],
'arguments': 'GLuint array' },
{ 'return_type': 'void',
'names': ['glLineWidth'],
@ -1802,11 +1758,6 @@ GL_FUNCTIONS = [
{ 'return_type': 'void',
'names': ['glScissor'],
'arguments': 'GLint x, GLint y, GLsizei width, GLsizei height', },
{ 'return_type': 'void',
'known_as': 'glSetFenceAPPLE',
'versions': [{ 'name': 'glSetFenceAPPLE',
'extensions': ['GL_APPLE_fence'] }],
'arguments': 'GLuint fence', },
{ 'return_type': 'void',
'names': ['glSetFenceNV'],
'arguments': 'GLuint fence, GLenum condition', },
@ -1864,11 +1815,6 @@ GL_FUNCTIONS = [
{ 'return_type': 'void',
'names': ['glStencilOpSeparate'],
'arguments': 'GLenum face, GLenum fail, GLenum zfail, GLenum zpass', },
{ 'return_type': 'GLboolean',
'known_as': 'glTestFenceAPPLE',
'versions': [{ 'name': 'glTestFenceAPPLE',
'extensions': ['GL_APPLE_fence'] }],
'arguments': 'GLuint fence', },
{ 'return_type': 'GLboolean',
'names': ['glTestFenceNV'],
'arguments': 'GLuint fence', },
@ -2208,11 +2154,6 @@ GL_FUNCTIONS = [
'names': ['glWaitSync'],
'arguments':
'GLsync sync, GLbitfield flags, GLuint64 timeout', },
{ 'return_type': 'void',
'versions': [{ 'name': 'glWaitSyncAPPLE',
'extensions': ['GL_APPLE_sync'] }],
'arguments':
'GLsync sync, GLbitfield flags, GLuint64 timeout', },
{ 'return_type': 'void',
'names': ['glWindowRectanglesEXT'],
'arguments': 'GLenum mode, GLsizei n, const GLint* box', },

15
ui/gl/gl_bindings_api_autogen_gl.h

@ -140,9 +140,6 @@ void glClearTexSubImageFn(GLuint texture,
GLenum glClientWaitSyncFn(GLsync sync,
GLbitfield flags,
GLuint64 timeout) override;
GLenum glClientWaitSyncAPPLEFn(GLsync sync,
GLbitfield flags,
GLuint64 timeout) override;
void glClipControlEXTFn(GLenum origin, GLenum depth) override;
void glColorMaskFn(GLboolean red,
GLboolean green,
@ -308,7 +305,6 @@ void glDebugMessageInsertFn(GLenum source,
GLsizei length,
const char* buf) override;
void glDeleteBuffersARBFn(GLsizei n, const GLuint* buffers) override;
void glDeleteFencesAPPLEFn(GLsizei n, const GLuint* fences) override;
void glDeleteFencesNVFn(GLsizei n, const GLuint* fences) override;
void glDeleteFramebuffersEXTFn(GLsizei n, const GLuint* framebuffers) override;
void glDeleteMemoryObjectsEXTFn(GLsizei n,
@ -322,7 +318,6 @@ void glDeleteSamplersFn(GLsizei n, const GLuint* samplers) override;
void glDeleteSemaphoresEXTFn(GLsizei n, const GLuint* semaphores) override;
void glDeleteShaderFn(GLuint shader) override;
void glDeleteSyncFn(GLsync sync) override;
void glDeleteSyncAPPLEFn(GLsync sync) override;
void glDeleteTexturesFn(GLsizei n, const GLuint* textures) override;
void glDeleteTransformFeedbacksFn(GLsizei n, const GLuint* ids) override;
void glDeleteVertexArraysOESFn(GLsizei n, const GLuint* arrays) override;
@ -393,9 +388,7 @@ void glEndQueryFn(GLenum target) override;
void glEndTilingQCOMFn(GLbitfield preserveMask) override;
void glEndTransformFeedbackFn(void) override;
GLsync glFenceSyncFn(GLenum condition, GLbitfield flags) override;
GLsync glFenceSyncAPPLEFn(GLenum condition, GLbitfield flags) override;
void glFinishFn(void) override;
void glFinishFenceAPPLEFn(GLuint fence) override;
void glFinishFenceNVFn(GLuint fence) override;
void glFlushFn(void) override;
void glFlushMappedBufferRangeFn(GLenum target,
@ -448,7 +441,6 @@ void glFramebufferTexturePixelLocalStorageANGLEFn(GLint plane,
void glFrontFaceFn(GLenum mode) override;
void glGenBuffersARBFn(GLsizei n, GLuint* buffers) override;
void glGenerateMipmapEXTFn(GLenum target) override;
void glGenFencesAPPLEFn(GLsizei n, GLuint* fences) override;
void glGenFencesNVFn(GLsizei n, GLuint* fences) override;
void glGenFramebuffersEXTFn(GLsizei n, GLuint* framebuffers) override;
GLuint glGenProgramPipelinesFn(GLsizei n, GLuint* pipelines) override;
@ -949,7 +941,6 @@ void glInvalidateTextureANGLEFn(GLenum target) override;
GLboolean glIsBufferFn(GLuint buffer) override;
GLboolean glIsEnabledFn(GLenum cap) override;
GLboolean glIsEnablediOESFn(GLenum target, GLuint index) override;
GLboolean glIsFenceAPPLEFn(GLuint fence) override;
GLboolean glIsFenceNVFn(GLuint fence) override;
GLboolean glIsFramebufferEXTFn(GLuint framebuffer) override;
GLboolean glIsProgramFn(GLuint program) override;
@ -959,7 +950,6 @@ GLboolean glIsRenderbufferEXTFn(GLuint renderbuffer) override;
GLboolean glIsSamplerFn(GLuint sampler) override;
GLboolean glIsShaderFn(GLuint shader) override;
GLboolean glIsSyncFn(GLsync sync) override;
GLboolean glIsSyncAPPLEFn(GLsync sync) override;
GLboolean glIsTextureFn(GLuint texture) override;
GLboolean glIsTransformFeedbackFn(GLuint id) override;
GLboolean glIsVertexArrayOESFn(GLuint array) override;
@ -1270,7 +1260,6 @@ void glSamplerParameterivRobustANGLEFn(GLuint sampler,
GLsizei bufSize,
const GLint* param) override;
void glScissorFn(GLint x, GLint y, GLsizei width, GLsizei height) override;
void glSetFenceAPPLEFn(GLuint fence) override;
void glSetFenceNVFn(GLuint fence, GLenum condition) override;
void glShaderBinaryFn(GLsizei n,
const GLuint* shaders,
@ -1304,7 +1293,6 @@ void glStencilOpSeparateFn(GLenum face,
GLenum fail,
GLenum zfail,
GLenum zpass) override;
GLboolean glTestFenceAPPLEFn(GLuint fence) override;
GLboolean glTestFenceNVFn(GLuint fence) override;
void glTexBufferFn(GLenum target,
GLenum internalformat,
@ -1599,7 +1587,4 @@ void glWaitSemaphoreEXTFn(GLuint semaphore,
const GLuint* textures,
const GLenum* srcLayouts) override;
void glWaitSyncFn(GLsync sync, GLbitfield flags, GLuint64 timeout) override;
void glWaitSyncAPPLEFn(GLsync sync,
GLbitfield flags,
GLuint64 timeout) override;
void glWindowRectanglesEXTFn(GLenum mode, GLsizei n, const GLint* box) override;

307
ui/gl/gl_bindings_autogen_gl.cc

@ -321,10 +321,6 @@ void DriverGL::InitializeDynamicBindings(const GLVersionInfo* ver,
gfx::HasExtension(extensions, "GL_ANGLE_vulkan_image");
ext.b_GL_ANGLE_webgl_compatibility =
gfx::HasExtension(extensions, "GL_ANGLE_webgl_compatibility");
ext.b_GL_APPLE_fence = gfx::HasExtension(extensions, "GL_APPLE_fence");
ext.b_GL_APPLE_sync = gfx::HasExtension(extensions, "GL_APPLE_sync");
ext.b_GL_APPLE_vertex_array_object =
gfx::HasExtension(extensions, "GL_APPLE_vertex_array_object");
ext.b_GL_ARB_timer_query =
gfx::HasExtension(extensions, "GL_ARB_timer_query");
ext.b_GL_CHROMIUM_bind_uniform_location =
@ -556,9 +552,6 @@ void DriverGL::InitializeDynamicBindings(const GLVersionInfo* ver,
} else if (ext.b_GL_OES_vertex_array_object) {
fn.glBindVertexArrayOESFn = reinterpret_cast<glBindVertexArrayOESProc>(
GetGLProcAddress("glBindVertexArrayOES"));
} else if (ext.b_GL_APPLE_vertex_array_object) {
fn.glBindVertexArrayOESFn = reinterpret_cast<glBindVertexArrayOESProc>(
GetGLProcAddress("glBindVertexArrayAPPLE"));
}
if (ver->IsAtLeastGL(4u, 3u) || ver->IsAtLeastGLES(3u, 1u)) {
@ -680,11 +673,6 @@ void DriverGL::InitializeDynamicBindings(const GLVersionInfo* ver,
GetGLProcAddress("glClientWaitSync"));
}
if (ext.b_GL_APPLE_sync) {
fn.glClientWaitSyncAPPLEFn = reinterpret_cast<glClientWaitSyncAPPLEProc>(
GetGLProcAddress("glClientWaitSyncAPPLE"));
}
if (ext.b_GL_EXT_clip_control) {
fn.glClipControlEXTFn = reinterpret_cast<glClipControlEXTProc>(
GetGLProcAddress("glClipControlEXT"));
@ -789,11 +777,6 @@ void DriverGL::InitializeDynamicBindings(const GLVersionInfo* ver,
GetGLProcAddress("glDebugMessageInsertKHR"));
}
if (ext.b_GL_APPLE_fence) {
fn.glDeleteFencesAPPLEFn = reinterpret_cast<glDeleteFencesAPPLEProc>(
GetGLProcAddress("glDeleteFencesAPPLE"));
}
if (ext.b_GL_NV_fence) {
fn.glDeleteFencesNVFn = reinterpret_cast<glDeleteFencesNVProc>(
GetGLProcAddress("glDeleteFencesNV"));
@ -855,11 +838,6 @@ void DriverGL::InitializeDynamicBindings(const GLVersionInfo* ver,
reinterpret_cast<glDeleteSyncProc>(GetGLProcAddress("glDeleteSync"));
}
if (ext.b_GL_APPLE_sync) {
fn.glDeleteSyncAPPLEFn = reinterpret_cast<glDeleteSyncAPPLEProc>(
GetGLProcAddress("glDeleteSyncAPPLE"));
}
if (ver->IsAtLeastGL(4u, 0u) || ver->IsAtLeastGLES(3u, 0u)) {
fn.glDeleteTransformFeedbacksFn =
reinterpret_cast<glDeleteTransformFeedbacksProc>(
@ -874,10 +852,6 @@ void DriverGL::InitializeDynamicBindings(const GLVersionInfo* ver,
fn.glDeleteVertexArraysOESFn =
reinterpret_cast<glDeleteVertexArraysOESProc>(
GetGLProcAddress("glDeleteVertexArraysOES"));
} else if (ext.b_GL_APPLE_vertex_array_object) {
fn.glDeleteVertexArraysOESFn =
reinterpret_cast<glDeleteVertexArraysOESProc>(
GetGLProcAddress("glDeleteVertexArraysAPPLE"));
}
if (ver->IsAtLeastGL(4u, 1u) || ver->is_es) {
@ -1045,16 +1019,6 @@ void DriverGL::InitializeDynamicBindings(const GLVersionInfo* ver,
reinterpret_cast<glFenceSyncProc>(GetGLProcAddress("glFenceSync"));
}
if (ext.b_GL_APPLE_sync) {
fn.glFenceSyncAPPLEFn = reinterpret_cast<glFenceSyncAPPLEProc>(
GetGLProcAddress("glFenceSyncAPPLE"));
}
if (ext.b_GL_APPLE_fence) {
fn.glFinishFenceAPPLEFn = reinterpret_cast<glFinishFenceAPPLEProc>(
GetGLProcAddress("glFinishFenceAPPLE"));
}
if (ext.b_GL_NV_fence) {
fn.glFinishFenceNVFn = reinterpret_cast<glFinishFenceNVProc>(
GetGLProcAddress("glFinishFenceNV"));
@ -1172,11 +1136,6 @@ void DriverGL::InitializeDynamicBindings(const GLVersionInfo* ver,
GetGLProcAddress("glGenerateMipmapEXT"));
}
if (ext.b_GL_APPLE_fence) {
fn.glGenFencesAPPLEFn = reinterpret_cast<glGenFencesAPPLEProc>(
GetGLProcAddress("glGenFencesAPPLE"));
}
if (ext.b_GL_NV_fence) {
fn.glGenFencesNVFn =
reinterpret_cast<glGenFencesNVProc>(GetGLProcAddress("glGenFencesNV"));
@ -1234,9 +1193,6 @@ void DriverGL::InitializeDynamicBindings(const GLVersionInfo* ver,
} else if (ext.b_GL_OES_vertex_array_object) {
fn.glGenVertexArraysOESFn = reinterpret_cast<glGenVertexArraysOESProc>(
GetGLProcAddress("glGenVertexArraysOES"));
} else if (ext.b_GL_APPLE_vertex_array_object) {
fn.glGenVertexArraysOESFn = reinterpret_cast<glGenVertexArraysOESProc>(
GetGLProcAddress("glGenVertexArraysAPPLE"));
}
if (ver->IsAtLeastGL(3u, 1u) || ver->IsAtLeastGLES(3u, 0u)) {
@ -1919,11 +1875,6 @@ void DriverGL::InitializeDynamicBindings(const GLVersionInfo* ver,
GetGLProcAddress("glIsEnablediOES"));
}
if (ext.b_GL_APPLE_fence) {
fn.glIsFenceAPPLEFn = reinterpret_cast<glIsFenceAPPLEProc>(
GetGLProcAddress("glIsFenceAPPLE"));
}
if (ext.b_GL_NV_fence) {
fn.glIsFenceNVFn =
reinterpret_cast<glIsFenceNVProc>(GetGLProcAddress("glIsFenceNV"));
@ -1969,11 +1920,6 @@ void DriverGL::InitializeDynamicBindings(const GLVersionInfo* ver,
reinterpret_cast<glIsSyncProc>(GetGLProcAddress("glIsSync"));
}
if (ext.b_GL_APPLE_sync) {
fn.glIsSyncAPPLEFn =
reinterpret_cast<glIsSyncAPPLEProc>(GetGLProcAddress("glIsSyncAPPLE"));
}
if (ver->IsAtLeastGL(4u, 0u) || ver->IsAtLeastGLES(3u, 0u)) {
fn.glIsTransformFeedbackFn = reinterpret_cast<glIsTransformFeedbackProc>(
GetGLProcAddress("glIsTransformFeedback"));
@ -1985,9 +1931,6 @@ void DriverGL::InitializeDynamicBindings(const GLVersionInfo* ver,
} else if (ext.b_GL_OES_vertex_array_object) {
fn.glIsVertexArrayOESFn = reinterpret_cast<glIsVertexArrayOESProc>(
GetGLProcAddress("glIsVertexArrayOES"));
} else if (ext.b_GL_APPLE_vertex_array_object) {
fn.glIsVertexArrayOESFn = reinterpret_cast<glIsVertexArrayOESProc>(
GetGLProcAddress("glIsVertexArrayAPPLE"));
}
if (!ver->is_es) {
@ -2492,11 +2435,6 @@ void DriverGL::InitializeDynamicBindings(const GLVersionInfo* ver,
GetGLProcAddress("glSamplerParameterivRobustANGLE"));
}
if (ext.b_GL_APPLE_fence) {
fn.glSetFenceAPPLEFn = reinterpret_cast<glSetFenceAPPLEProc>(
GetGLProcAddress("glSetFenceAPPLE"));
}
if (ext.b_GL_NV_fence) {
fn.glSetFenceNVFn =
reinterpret_cast<glSetFenceNVProc>(GetGLProcAddress("glSetFenceNV"));
@ -2517,11 +2455,6 @@ void DriverGL::InitializeDynamicBindings(const GLVersionInfo* ver,
GetGLProcAddress("glStartTilingQCOM"));
}
if (ext.b_GL_APPLE_fence) {
fn.glTestFenceAPPLEFn = reinterpret_cast<glTestFenceAPPLEProc>(
GetGLProcAddress("glTestFenceAPPLE"));
}
if (ext.b_GL_NV_fence) {
fn.glTestFenceNVFn =
reinterpret_cast<glTestFenceNVProc>(GetGLProcAddress("glTestFenceNV"));
@ -2817,11 +2750,6 @@ void DriverGL::InitializeDynamicBindings(const GLVersionInfo* ver,
reinterpret_cast<glWaitSyncProc>(GetGLProcAddress("glWaitSync"));
}
if (ext.b_GL_APPLE_sync) {
fn.glWaitSyncAPPLEFn = reinterpret_cast<glWaitSyncAPPLEProc>(
GetGLProcAddress("glWaitSyncAPPLE"));
}
if (ext.b_GL_EXT_window_rectangles) {
fn.glWindowRectanglesEXTFn = reinterpret_cast<glWindowRectanglesEXTProc>(
GetGLProcAddress("glWindowRectanglesEXT"));
@ -3113,12 +3041,6 @@ GLenum GLApiBase::glClientWaitSyncFn(GLsync sync,
return driver_->fn.glClientWaitSyncFn(sync, flags, timeout);
}
GLenum GLApiBase::glClientWaitSyncAPPLEFn(GLsync sync,
GLbitfield flags,
GLuint64 timeout) {
return driver_->fn.glClientWaitSyncAPPLEFn(sync, flags, timeout);
}
void GLApiBase::glClipControlEXTFn(GLenum origin, GLenum depth) {
driver_->fn.glClipControlEXTFn(origin, depth);
}
@ -3388,10 +3310,6 @@ void GLApiBase::glDeleteBuffersARBFn(GLsizei n, const GLuint* buffers) {
driver_->fn.glDeleteBuffersARBFn(n, buffers);
}
void GLApiBase::glDeleteFencesAPPLEFn(GLsizei n, const GLuint* fences) {
driver_->fn.glDeleteFencesAPPLEFn(n, fences);
}
void GLApiBase::glDeleteFencesNVFn(GLsizei n, const GLuint* fences) {
driver_->fn.glDeleteFencesNVFn(n, fences);
}
@ -3439,10 +3357,6 @@ void GLApiBase::glDeleteSyncFn(GLsync sync) {
driver_->fn.glDeleteSyncFn(sync);
}
void GLApiBase::glDeleteSyncAPPLEFn(GLsync sync) {
driver_->fn.glDeleteSyncAPPLEFn(sync);
}
void GLApiBase::glDeleteTexturesFn(GLsizei n, const GLuint* textures) {
driver_->fn.glDeleteTexturesFn(n, textures);
}
@ -3625,18 +3539,10 @@ GLsync GLApiBase::glFenceSyncFn(GLenum condition, GLbitfield flags) {
return driver_->fn.glFenceSyncFn(condition, flags);
}
GLsync GLApiBase::glFenceSyncAPPLEFn(GLenum condition, GLbitfield flags) {
return driver_->fn.glFenceSyncAPPLEFn(condition, flags);
}
void GLApiBase::glFinishFn(void) {
driver_->fn.glFinishFn();
}
void GLApiBase::glFinishFenceAPPLEFn(GLuint fence) {
driver_->fn.glFinishFenceAPPLEFn(fence);
}
void GLApiBase::glFinishFenceNVFn(GLuint fence) {
driver_->fn.glFinishFenceNVFn(fence);
}
@ -3756,10 +3662,6 @@ void GLApiBase::glGenerateMipmapEXTFn(GLenum target) {
driver_->fn.glGenerateMipmapEXTFn(target);
}
void GLApiBase::glGenFencesAPPLEFn(GLsizei n, GLuint* fences) {
driver_->fn.glGenFencesAPPLEFn(n, fences);
}
void GLApiBase::glGenFencesNVFn(GLsizei n, GLuint* fences) {
driver_->fn.glGenFencesNVFn(n, fences);
}
@ -4774,10 +4676,6 @@ GLboolean GLApiBase::glIsEnablediOESFn(GLenum target, GLuint index) {
return driver_->fn.glIsEnablediOESFn(target, index);
}
GLboolean GLApiBase::glIsFenceAPPLEFn(GLuint fence) {
return driver_->fn.glIsFenceAPPLEFn(fence);
}
GLboolean GLApiBase::glIsFenceNVFn(GLuint fence) {
return driver_->fn.glIsFenceNVFn(fence);
}
@ -4814,10 +4712,6 @@ GLboolean GLApiBase::glIsSyncFn(GLsync sync) {
return driver_->fn.glIsSyncFn(sync);
}
GLboolean GLApiBase::glIsSyncAPPLEFn(GLsync sync) {
return driver_->fn.glIsSyncAPPLEFn(sync);
}
GLboolean GLApiBase::glIsTextureFn(GLuint texture) {
return driver_->fn.glIsTextureFn(texture);
}
@ -5444,10 +5338,6 @@ void GLApiBase::glScissorFn(GLint x, GLint y, GLsizei width, GLsizei height) {
driver_->fn.glScissorFn(x, y, width, height);
}
void GLApiBase::glSetFenceAPPLEFn(GLuint fence) {
driver_->fn.glSetFenceAPPLEFn(fence);
}
void GLApiBase::glSetFenceNVFn(GLuint fence, GLenum condition) {
driver_->fn.glSetFenceNVFn(fence, condition);
}
@ -5515,10 +5405,6 @@ void GLApiBase::glStencilOpSeparateFn(GLenum face,
driver_->fn.glStencilOpSeparateFn(face, fail, zfail, zpass);
}
GLboolean GLApiBase::glTestFenceAPPLEFn(GLuint fence) {
return driver_->fn.glTestFenceAPPLEFn(fence);
}
GLboolean GLApiBase::glTestFenceNVFn(GLuint fence) {
return driver_->fn.glTestFenceNVFn(fence);
}
@ -6126,12 +6012,6 @@ void GLApiBase::glWaitSyncFn(GLsync sync, GLbitfield flags, GLuint64 timeout) {
driver_->fn.glWaitSyncFn(sync, flags, timeout);
}
void GLApiBase::glWaitSyncAPPLEFn(GLsync sync,
GLbitfield flags,
GLuint64 timeout) {
driver_->fn.glWaitSyncAPPLEFn(sync, flags, timeout);
}
void GLApiBase::glWindowRectanglesEXTFn(GLenum mode,
GLsizei n,
const GLint* box) {
@ -6473,13 +6353,6 @@ GLenum TraceGLApi::glClientWaitSyncFn(GLsync sync,
return gl_api_->glClientWaitSyncFn(sync, flags, timeout);
}
GLenum TraceGLApi::glClientWaitSyncAPPLEFn(GLsync sync,
GLbitfield flags,
GLuint64 timeout) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glClientWaitSyncAPPLE");
return gl_api_->glClientWaitSyncAPPLEFn(sync, flags, timeout);
}
void TraceGLApi::glClipControlEXTFn(GLenum origin, GLenum depth) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glClipControlEXT");
gl_api_->glClipControlEXTFn(origin, depth);
@ -6779,11 +6652,6 @@ void TraceGLApi::glDeleteBuffersARBFn(GLsizei n, const GLuint* buffers) {
gl_api_->glDeleteBuffersARBFn(n, buffers);
}
void TraceGLApi::glDeleteFencesAPPLEFn(GLsizei n, const GLuint* fences) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glDeleteFencesAPPLE");
gl_api_->glDeleteFencesAPPLEFn(n, fences);
}
void TraceGLApi::glDeleteFencesNVFn(GLsizei n, const GLuint* fences) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glDeleteFencesNV");
gl_api_->glDeleteFencesNVFn(n, fences);
@ -6843,11 +6711,6 @@ void TraceGLApi::glDeleteSyncFn(GLsync sync) {
gl_api_->glDeleteSyncFn(sync);
}
void TraceGLApi::glDeleteSyncAPPLEFn(GLsync sync) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glDeleteSyncAPPLE");
gl_api_->glDeleteSyncAPPLEFn(sync);
}
void TraceGLApi::glDeleteTexturesFn(GLsizei n, const GLuint* textures) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glDeleteTextures");
gl_api_->glDeleteTexturesFn(n, textures);
@ -7075,21 +6938,11 @@ GLsync TraceGLApi::glFenceSyncFn(GLenum condition, GLbitfield flags) {
return gl_api_->glFenceSyncFn(condition, flags);
}
GLsync TraceGLApi::glFenceSyncAPPLEFn(GLenum condition, GLbitfield flags) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glFenceSyncAPPLE");
return gl_api_->glFenceSyncAPPLEFn(condition, flags);
}
void TraceGLApi::glFinishFn(void) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glFinish");
gl_api_->glFinishFn();
}
void TraceGLApi::glFinishFenceAPPLEFn(GLuint fence) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glFinishFenceAPPLE");
gl_api_->glFinishFenceAPPLEFn(fence);
}
void TraceGLApi::glFinishFenceNVFn(GLuint fence) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glFinishFenceNV");
gl_api_->glFinishFenceNVFn(fence);
@ -7239,11 +7092,6 @@ void TraceGLApi::glGenerateMipmapEXTFn(GLenum target) {
gl_api_->glGenerateMipmapEXTFn(target);
}
void TraceGLApi::glGenFencesAPPLEFn(GLsizei n, GLuint* fences) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glGenFencesAPPLE");
gl_api_->glGenFencesAPPLEFn(n, fences);
}
void TraceGLApi::glGenFencesNVFn(GLsizei n, GLuint* fences) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glGenFencesNV");
gl_api_->glGenFencesNVFn(n, fences);
@ -8451,11 +8299,6 @@ GLboolean TraceGLApi::glIsEnablediOESFn(GLenum target, GLuint index) {
return gl_api_->glIsEnablediOESFn(target, index);
}
GLboolean TraceGLApi::glIsFenceAPPLEFn(GLuint fence) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glIsFenceAPPLE");
return gl_api_->glIsFenceAPPLEFn(fence);
}
GLboolean TraceGLApi::glIsFenceNVFn(GLuint fence) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glIsFenceNV");
return gl_api_->glIsFenceNVFn(fence);
@ -8501,11 +8344,6 @@ GLboolean TraceGLApi::glIsSyncFn(GLsync sync) {
return gl_api_->glIsSyncFn(sync);
}
GLboolean TraceGLApi::glIsSyncAPPLEFn(GLsync sync) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glIsSyncAPPLE");
return gl_api_->glIsSyncAPPLEFn(sync);
}
GLboolean TraceGLApi::glIsTextureFn(GLuint texture) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glIsTexture");
return gl_api_->glIsTextureFn(texture);
@ -9247,11 +9085,6 @@ void TraceGLApi::glScissorFn(GLint x, GLint y, GLsizei width, GLsizei height) {
gl_api_->glScissorFn(x, y, width, height);
}
void TraceGLApi::glSetFenceAPPLEFn(GLuint fence) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glSetFenceAPPLE");
gl_api_->glSetFenceAPPLEFn(fence);
}
void TraceGLApi::glSetFenceNVFn(GLuint fence, GLenum condition) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glSetFenceNV");
gl_api_->glSetFenceNVFn(fence, condition);
@ -9330,11 +9163,6 @@ void TraceGLApi::glStencilOpSeparateFn(GLenum face,
gl_api_->glStencilOpSeparateFn(face, fail, zfail, zpass);
}
GLboolean TraceGLApi::glTestFenceAPPLEFn(GLuint fence) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glTestFenceAPPLE");
return gl_api_->glTestFenceAPPLEFn(fence);
}
GLboolean TraceGLApi::glTestFenceNVFn(GLuint fence) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glTestFenceNV");
return gl_api_->glTestFenceNVFn(fence);
@ -10037,13 +9865,6 @@ void TraceGLApi::glWaitSyncFn(GLsync sync, GLbitfield flags, GLuint64 timeout) {
gl_api_->glWaitSyncFn(sync, flags, timeout);
}
void TraceGLApi::glWaitSyncAPPLEFn(GLsync sync,
GLbitfield flags,
GLuint64 timeout) {
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glWaitSyncAPPLE");
gl_api_->glWaitSyncAPPLEFn(sync, flags, timeout);
}
void TraceGLApi::glWindowRectanglesEXTFn(GLenum mode,
GLsizei n,
const GLint* box) {
@ -10461,16 +10282,6 @@ GLenum LogGLApi::glClientWaitSyncFn(GLsync sync,
return result;
}
GLenum LogGLApi::glClientWaitSyncAPPLEFn(GLsync sync,
GLbitfield flags,
GLuint64 timeout) {
GL_SERVICE_LOG("glClientWaitSyncAPPLE" << "(" << sync << ", " << flags << ", "
<< timeout << ")");
GLenum result = gl_api_->glClientWaitSyncAPPLEFn(sync, flags, timeout);
GL_SERVICE_LOG("GL_RESULT: " << result);
return result;
}
void LogGLApi::glClipControlEXTFn(GLenum origin, GLenum depth) {
GL_SERVICE_LOG("glClipControlEXT" << "(" << GLEnums::GetStringEnum(origin)
<< ", " << GLEnums::GetStringEnum(depth)
@ -10865,13 +10676,6 @@ void LogGLApi::glDeleteBuffersARBFn(GLsizei n, const GLuint* buffers) {
gl_api_->glDeleteBuffersARBFn(n, buffers);
}
void LogGLApi::glDeleteFencesAPPLEFn(GLsizei n, const GLuint* fences) {
GL_SERVICE_LOG("glDeleteFencesAPPLE" << "(" << n << ", "
<< static_cast<const void*>(fences)
<< ")");
gl_api_->glDeleteFencesAPPLEFn(n, fences);
}
void LogGLApi::glDeleteFencesNVFn(GLsizei n, const GLuint* fences) {
GL_SERVICE_LOG("glDeleteFencesNV" << "(" << n << ", "
<< static_cast<const void*>(fences) << ")");
@ -10944,11 +10748,6 @@ void LogGLApi::glDeleteSyncFn(GLsync sync) {
gl_api_->glDeleteSyncFn(sync);
}
void LogGLApi::glDeleteSyncAPPLEFn(GLsync sync) {
GL_SERVICE_LOG("glDeleteSyncAPPLE" << "(" << sync << ")");
gl_api_->glDeleteSyncAPPLEFn(sync);
}
void LogGLApi::glDeleteTexturesFn(GLsizei n, const GLuint* textures) {
GL_SERVICE_LOG("glDeleteTextures" << "(" << n << ", "
<< static_cast<const void*>(textures)
@ -11212,24 +11011,11 @@ GLsync LogGLApi::glFenceSyncFn(GLenum condition, GLbitfield flags) {
return result;
}
GLsync LogGLApi::glFenceSyncAPPLEFn(GLenum condition, GLbitfield flags) {
GL_SERVICE_LOG("glFenceSyncAPPLE" << "(" << GLEnums::GetStringEnum(condition)
<< ", " << flags << ")");
GLsync result = gl_api_->glFenceSyncAPPLEFn(condition, flags);
GL_SERVICE_LOG("GL_RESULT: " << result);
return result;
}
void LogGLApi::glFinishFn(void) {
GL_SERVICE_LOG("glFinish" << "(" << ")");
gl_api_->glFinishFn();
}
void LogGLApi::glFinishFenceAPPLEFn(GLuint fence) {
GL_SERVICE_LOG("glFinishFenceAPPLE" << "(" << fence << ")");
gl_api_->glFinishFenceAPPLEFn(fence);
}
void LogGLApi::glFinishFenceNVFn(GLuint fence) {
GL_SERVICE_LOG("glFinishFenceNV" << "(" << fence << ")");
gl_api_->glFinishFenceNVFn(fence);
@ -11403,12 +11189,6 @@ void LogGLApi::glGenerateMipmapEXTFn(GLenum target) {
gl_api_->glGenerateMipmapEXTFn(target);
}
void LogGLApi::glGenFencesAPPLEFn(GLsizei n, GLuint* fences) {
GL_SERVICE_LOG("glGenFencesAPPLE" << "(" << n << ", "
<< static_cast<const void*>(fences) << ")");
gl_api_->glGenFencesAPPLEFn(n, fences);
}
void LogGLApi::glGenFencesNVFn(GLsizei n, GLuint* fences) {
GL_SERVICE_LOG("glGenFencesNV" << "(" << n << ", "
<< static_cast<const void*>(fences) << ")");
@ -12960,13 +12740,6 @@ GLboolean LogGLApi::glIsEnablediOESFn(GLenum target, GLuint index) {
return result;
}
GLboolean LogGLApi::glIsFenceAPPLEFn(GLuint fence) {
GL_SERVICE_LOG("glIsFenceAPPLE" << "(" << fence << ")");
GLboolean result = gl_api_->glIsFenceAPPLEFn(fence);
GL_SERVICE_LOG("GL_RESULT: " << result);
return result;
}
GLboolean LogGLApi::glIsFenceNVFn(GLuint fence) {
GL_SERVICE_LOG("glIsFenceNV" << "(" << fence << ")");
GLboolean result = gl_api_->glIsFenceNVFn(fence);
@ -13030,13 +12803,6 @@ GLboolean LogGLApi::glIsSyncFn(GLsync sync) {
return result;
}
GLboolean LogGLApi::glIsSyncAPPLEFn(GLsync sync) {
GL_SERVICE_LOG("glIsSyncAPPLE" << "(" << sync << ")");
GLboolean result = gl_api_->glIsSyncAPPLEFn(sync);
GL_SERVICE_LOG("GL_RESULT: " << result);
return result;
}
GLboolean LogGLApi::glIsTextureFn(GLuint texture) {
GL_SERVICE_LOG("glIsTexture" << "(" << texture << ")");
GLboolean result = gl_api_->glIsTextureFn(texture);
@ -13945,11 +13711,6 @@ void LogGLApi::glScissorFn(GLint x, GLint y, GLsizei width, GLsizei height) {
gl_api_->glScissorFn(x, y, width, height);
}
void LogGLApi::glSetFenceAPPLEFn(GLuint fence) {
GL_SERVICE_LOG("glSetFenceAPPLE" << "(" << fence << ")");
gl_api_->glSetFenceAPPLEFn(fence);
}
void LogGLApi::glSetFenceNVFn(GLuint fence, GLenum condition) {
GL_SERVICE_LOG("glSetFenceNV" << "(" << fence << ", "
<< GLEnums::GetStringEnum(condition) << ")");
@ -14066,13 +13827,6 @@ void LogGLApi::glStencilOpSeparateFn(GLenum face,
gl_api_->glStencilOpSeparateFn(face, fail, zfail, zpass);
}
GLboolean LogGLApi::glTestFenceAPPLEFn(GLuint fence) {
GL_SERVICE_LOG("glTestFenceAPPLE" << "(" << fence << ")");
GLboolean result = gl_api_->glTestFenceAPPLEFn(fence);
GL_SERVICE_LOG("GL_RESULT: " << result);
return result;
}
GLboolean LogGLApi::glTestFenceNVFn(GLuint fence) {
GL_SERVICE_LOG("glTestFenceNV" << "(" << fence << ")");
GLboolean result = gl_api_->glTestFenceNVFn(fence);
@ -14936,14 +14690,6 @@ void LogGLApi::glWaitSyncFn(GLsync sync, GLbitfield flags, GLuint64 timeout) {
gl_api_->glWaitSyncFn(sync, flags, timeout);
}
void LogGLApi::glWaitSyncAPPLEFn(GLsync sync,
GLbitfield flags,
GLuint64 timeout) {
GL_SERVICE_LOG("glWaitSyncAPPLE" << "(" << sync << ", " << flags << ", "
<< timeout << ")");
gl_api_->glWaitSyncAPPLEFn(sync, flags, timeout);
}
void LogGLApi::glWindowRectanglesEXTFn(GLenum mode,
GLsizei n,
const GLint* box) {
@ -15246,13 +14992,6 @@ GLenum NoContextGLApi::glClientWaitSyncFn(GLsync sync,
return static_cast<GLenum>(0);
}
GLenum NoContextGLApi::glClientWaitSyncAPPLEFn(GLsync sync,
GLbitfield flags,
GLuint64 timeout) {
NoContextHelper("glClientWaitSyncAPPLE");
return static_cast<GLenum>(0);
}
void NoContextGLApi::glClipControlEXTFn(GLenum origin, GLenum depth) {
NoContextHelper("glClipControlEXT");
}
@ -15504,10 +15243,6 @@ void NoContextGLApi::glDeleteBuffersARBFn(GLsizei n, const GLuint* buffers) {
NoContextHelper("glDeleteBuffersARB");
}
void NoContextGLApi::glDeleteFencesAPPLEFn(GLsizei n, const GLuint* fences) {
NoContextHelper("glDeleteFencesAPPLE");
}
void NoContextGLApi::glDeleteFencesNVFn(GLsizei n, const GLuint* fences) {
NoContextHelper("glDeleteFencesNV");
}
@ -15557,10 +15292,6 @@ void NoContextGLApi::glDeleteSyncFn(GLsync sync) {
NoContextHelper("glDeleteSync");
}
void NoContextGLApi::glDeleteSyncAPPLEFn(GLsync sync) {
NoContextHelper("glDeleteSyncAPPLE");
}
void NoContextGLApi::glDeleteTexturesFn(GLsizei n, const GLuint* textures) {
NoContextHelper("glDeleteTextures");
}
@ -15745,19 +15476,10 @@ GLsync NoContextGLApi::glFenceSyncFn(GLenum condition, GLbitfield flags) {
return nullptr;
}
GLsync NoContextGLApi::glFenceSyncAPPLEFn(GLenum condition, GLbitfield flags) {
NoContextHelper("glFenceSyncAPPLE");
return nullptr;
}
void NoContextGLApi::glFinishFn(void) {
NoContextHelper("glFinish");
}
void NoContextGLApi::glFinishFenceAPPLEFn(GLuint fence) {
NoContextHelper("glFinishFenceAPPLE");
}
void NoContextGLApi::glFinishFenceNVFn(GLuint fence) {
NoContextHelper("glFinishFenceNV");
}
@ -15871,10 +15593,6 @@ void NoContextGLApi::glGenerateMipmapEXTFn(GLenum target) {
NoContextHelper("glGenerateMipmapEXT");
}
void NoContextGLApi::glGenFencesAPPLEFn(GLsizei n, GLuint* fences) {
NoContextHelper("glGenFencesAPPLE");
}
void NoContextGLApi::glGenFencesNVFn(GLsizei n, GLuint* fences) {
NoContextHelper("glGenFencesNV");
}
@ -16858,11 +16576,6 @@ GLboolean NoContextGLApi::glIsEnablediOESFn(GLenum target, GLuint index) {
return GL_FALSE;
}
GLboolean NoContextGLApi::glIsFenceAPPLEFn(GLuint fence) {
NoContextHelper("glIsFenceAPPLE");
return GL_FALSE;
}
GLboolean NoContextGLApi::glIsFenceNVFn(GLuint fence) {
NoContextHelper("glIsFenceNV");
return GL_FALSE;
@ -16908,11 +16621,6 @@ GLboolean NoContextGLApi::glIsSyncFn(GLsync sync) {
return GL_FALSE;
}
GLboolean NoContextGLApi::glIsSyncAPPLEFn(GLsync sync) {
NoContextHelper("glIsSyncAPPLE");
return GL_FALSE;
}
GLboolean NoContextGLApi::glIsTextureFn(GLuint texture) {
NoContextHelper("glIsTexture");
return GL_FALSE;
@ -17530,10 +17238,6 @@ void NoContextGLApi::glScissorFn(GLint x,
NoContextHelper("glScissor");
}
void NoContextGLApi::glSetFenceAPPLEFn(GLuint fence) {
NoContextHelper("glSetFenceAPPLE");
}
void NoContextGLApi::glSetFenceNVFn(GLuint fence, GLenum condition) {
NoContextHelper("glSetFenceNV");
}
@ -17600,11 +17304,6 @@ void NoContextGLApi::glStencilOpSeparateFn(GLenum face,
NoContextHelper("glStencilOpSeparate");
}
GLboolean NoContextGLApi::glTestFenceAPPLEFn(GLuint fence) {
NoContextHelper("glTestFenceAPPLE");
return GL_FALSE;
}
GLboolean NoContextGLApi::glTestFenceNVFn(GLuint fence) {
NoContextHelper("glTestFenceNV");
return GL_FALSE;
@ -18213,12 +17912,6 @@ void NoContextGLApi::glWaitSyncFn(GLsync sync,
NoContextHelper("glWaitSync");
}
void NoContextGLApi::glWaitSyncAPPLEFn(GLsync sync,
GLbitfield flags,
GLuint64 timeout) {
NoContextHelper("glWaitSyncAPPLE");
}
void NoContextGLApi::glWindowRectanglesEXTFn(GLenum mode,
GLsizei n,
const GLint* box) {

58
ui/gl/gl_bindings_autogen_gl.h

@ -162,9 +162,6 @@ typedef void(GL_BINDING_CALL* glClearTexSubImageProc)(GLuint texture,
typedef GLenum(GL_BINDING_CALL* glClientWaitSyncProc)(GLsync sync,
GLbitfield flags,
GLuint64 timeout);
typedef GLenum(GL_BINDING_CALL* glClientWaitSyncAPPLEProc)(GLsync sync,
GLbitfield flags,
GLuint64 timeout);
typedef void(GL_BINDING_CALL* glClipControlEXTProc)(GLenum origin,
GLenum depth);
typedef void(GL_BINDING_CALL* glColorMaskProc)(GLboolean red,
@ -342,8 +339,6 @@ typedef void(GL_BINDING_CALL* glDebugMessageInsertProc)(GLenum source,
const char* buf);
typedef void(GL_BINDING_CALL* glDeleteBuffersARBProc)(GLsizei n,
const GLuint* buffers);
typedef void(GL_BINDING_CALL* glDeleteFencesAPPLEProc)(GLsizei n,
const GLuint* fences);
typedef void(GL_BINDING_CALL* glDeleteFencesNVProc)(GLsizei n,
const GLuint* fences);
typedef void(GL_BINDING_CALL* glDeleteFramebuffersEXTProc)(
@ -368,7 +363,6 @@ typedef void(GL_BINDING_CALL* glDeleteSemaphoresEXTProc)(
const GLuint* semaphores);
typedef void(GL_BINDING_CALL* glDeleteShaderProc)(GLuint shader);
typedef void(GL_BINDING_CALL* glDeleteSyncProc)(GLsync sync);
typedef void(GL_BINDING_CALL* glDeleteSyncAPPLEProc)(GLsync sync);
typedef void(GL_BINDING_CALL* glDeleteTexturesProc)(GLsizei n,
const GLuint* textures);
typedef void(GL_BINDING_CALL* glDeleteTransformFeedbacksProc)(
@ -459,10 +453,7 @@ typedef void(GL_BINDING_CALL* glEndTilingQCOMProc)(GLbitfield preserveMask);
typedef void(GL_BINDING_CALL* glEndTransformFeedbackProc)(void);
typedef GLsync(GL_BINDING_CALL* glFenceSyncProc)(GLenum condition,
GLbitfield flags);
typedef GLsync(GL_BINDING_CALL* glFenceSyncAPPLEProc)(GLenum condition,
GLbitfield flags);
typedef void(GL_BINDING_CALL* glFinishProc)(void);
typedef void(GL_BINDING_CALL* glFinishFenceAPPLEProc)(GLuint fence);
typedef void(GL_BINDING_CALL* glFinishFenceNVProc)(GLuint fence);
typedef void(GL_BINDING_CALL* glFlushProc)(void);
typedef void(GL_BINDING_CALL* glFlushMappedBufferRangeProc)(GLenum target,
@ -524,7 +515,6 @@ typedef void(GL_BINDING_CALL* glFramebufferTexturePixelLocalStorageANGLEProc)(
typedef void(GL_BINDING_CALL* glFrontFaceProc)(GLenum mode);
typedef void(GL_BINDING_CALL* glGenBuffersARBProc)(GLsizei n, GLuint* buffers);
typedef void(GL_BINDING_CALL* glGenerateMipmapEXTProc)(GLenum target);
typedef void(GL_BINDING_CALL* glGenFencesAPPLEProc)(GLsizei n, GLuint* fences);
typedef void(GL_BINDING_CALL* glGenFencesNVProc)(GLsizei n, GLuint* fences);
typedef void(GL_BINDING_CALL* glGenFramebuffersEXTProc)(GLsizei n,
GLuint* framebuffers);
@ -1129,7 +1119,6 @@ typedef GLboolean(GL_BINDING_CALL* glIsBufferProc)(GLuint buffer);
typedef GLboolean(GL_BINDING_CALL* glIsEnabledProc)(GLenum cap);
typedef GLboolean(GL_BINDING_CALL* glIsEnablediOESProc)(GLenum target,
GLuint index);
typedef GLboolean(GL_BINDING_CALL* glIsFenceAPPLEProc)(GLuint fence);
typedef GLboolean(GL_BINDING_CALL* glIsFenceNVProc)(GLuint fence);
typedef GLboolean(GL_BINDING_CALL* glIsFramebufferEXTProc)(GLuint framebuffer);
typedef GLboolean(GL_BINDING_CALL* glIsProgramProc)(GLuint program);
@ -1140,7 +1129,6 @@ typedef GLboolean(GL_BINDING_CALL* glIsRenderbufferEXTProc)(
typedef GLboolean(GL_BINDING_CALL* glIsSamplerProc)(GLuint sampler);
typedef GLboolean(GL_BINDING_CALL* glIsShaderProc)(GLuint shader);
typedef GLboolean(GL_BINDING_CALL* glIsSyncProc)(GLsync sync);
typedef GLboolean(GL_BINDING_CALL* glIsSyncAPPLEProc)(GLsync sync);
typedef GLboolean(GL_BINDING_CALL* glIsTextureProc)(GLuint texture);
typedef GLboolean(GL_BINDING_CALL* glIsTransformFeedbackProc)(GLuint id);
typedef GLboolean(GL_BINDING_CALL* glIsVertexArrayOESProc)(GLuint array);
@ -1493,7 +1481,6 @@ typedef void(GL_BINDING_CALL* glScissorProc)(GLint x,
GLint y,
GLsizei width,
GLsizei height);
typedef void(GL_BINDING_CALL* glSetFenceAPPLEProc)(GLuint fence);
typedef void(GL_BINDING_CALL* glSetFenceNVProc)(GLuint fence, GLenum condition);
typedef void(GL_BINDING_CALL* glShaderBinaryProc)(GLsizei n,
const GLuint* shaders,
@ -1533,7 +1520,6 @@ typedef void(GL_BINDING_CALL* glStencilOpSeparateProc)(GLenum face,
GLenum fail,
GLenum zfail,
GLenum zpass);
typedef GLboolean(GL_BINDING_CALL* glTestFenceAPPLEProc)(GLuint fence);
typedef GLboolean(GL_BINDING_CALL* glTestFenceNVProc)(GLuint fence);
typedef void(GL_BINDING_CALL* glTexBufferProc)(GLenum target,
GLenum internalformat,
@ -1905,9 +1891,6 @@ typedef void(GL_BINDING_CALL* glWaitSemaphoreEXTProc)(GLuint semaphore,
typedef void(GL_BINDING_CALL* glWaitSyncProc)(GLsync sync,
GLbitfield flags,
GLuint64 timeout);
typedef void(GL_BINDING_CALL* glWaitSyncAPPLEProc)(GLsync sync,
GLbitfield flags,
GLuint64 timeout);
typedef void(GL_BINDING_CALL* glWindowRectanglesEXTProc)(GLenum mode,
GLsizei n,
const GLint* box);
@ -1934,9 +1917,6 @@ struct ExtensionsGL {
bool b_GL_ANGLE_translated_shader_source;
bool b_GL_ANGLE_vulkan_image;
bool b_GL_ANGLE_webgl_compatibility;
bool b_GL_APPLE_fence;
bool b_GL_APPLE_sync;
bool b_GL_APPLE_vertex_array_object;
bool b_GL_ARB_timer_query;
bool b_GL_CHROMIUM_bind_uniform_location;
bool b_GL_CHROMIUM_copy_texture;
@ -2048,7 +2028,6 @@ struct ProcsGL {
glClearTexImageProc glClearTexImageFn;
glClearTexSubImageProc glClearTexSubImageFn;
glClientWaitSyncProc glClientWaitSyncFn;
glClientWaitSyncAPPLEProc glClientWaitSyncAPPLEFn;
glClipControlEXTProc glClipControlEXTFn;
glColorMaskProc glColorMaskFn;
glColorMaskiOESProc glColorMaskiOESFn;
@ -2078,7 +2057,6 @@ struct ProcsGL {
glDebugMessageControlProc glDebugMessageControlFn;
glDebugMessageInsertProc glDebugMessageInsertFn;
glDeleteBuffersARBProc glDeleteBuffersARBFn;
glDeleteFencesAPPLEProc glDeleteFencesAPPLEFn;
glDeleteFencesNVProc glDeleteFencesNVFn;
glDeleteFramebuffersEXTProc glDeleteFramebuffersEXTFn;
glDeleteMemoryObjectsEXTProc glDeleteMemoryObjectsEXTFn;
@ -2090,7 +2068,6 @@ struct ProcsGL {
glDeleteSemaphoresEXTProc glDeleteSemaphoresEXTFn;
glDeleteShaderProc glDeleteShaderFn;
glDeleteSyncProc glDeleteSyncFn;
glDeleteSyncAPPLEProc glDeleteSyncAPPLEFn;
glDeleteTexturesProc glDeleteTexturesFn;
glDeleteTransformFeedbacksProc glDeleteTransformFeedbacksFn;
glDeleteVertexArraysOESProc glDeleteVertexArraysOESFn;
@ -2130,9 +2107,7 @@ struct ProcsGL {
glEndTilingQCOMProc glEndTilingQCOMFn;
glEndTransformFeedbackProc glEndTransformFeedbackFn;
glFenceSyncProc glFenceSyncFn;
glFenceSyncAPPLEProc glFenceSyncAPPLEFn;
glFinishProc glFinishFn;
glFinishFenceAPPLEProc glFinishFenceAPPLEFn;
glFinishFenceNVProc glFinishFenceNVFn;
glFlushProc glFlushFn;
glFlushMappedBufferRangeProc glFlushMappedBufferRangeFn;
@ -2160,7 +2135,6 @@ struct ProcsGL {
glFrontFaceProc glFrontFaceFn;
glGenBuffersARBProc glGenBuffersARBFn;
glGenerateMipmapEXTProc glGenerateMipmapEXTFn;
glGenFencesAPPLEProc glGenFencesAPPLEFn;
glGenFencesNVProc glGenFencesNVFn;
glGenFramebuffersEXTProc glGenFramebuffersEXTFn;
glGenProgramPipelinesProc glGenProgramPipelinesFn;
@ -2315,7 +2289,6 @@ struct ProcsGL {
glIsBufferProc glIsBufferFn;
glIsEnabledProc glIsEnabledFn;
glIsEnablediOESProc glIsEnablediOESFn;
glIsFenceAPPLEProc glIsFenceAPPLEFn;
glIsFenceNVProc glIsFenceNVFn;
glIsFramebufferEXTProc glIsFramebufferEXTFn;
glIsProgramProc glIsProgramFn;
@ -2325,7 +2298,6 @@ struct ProcsGL {
glIsSamplerProc glIsSamplerFn;
glIsShaderProc glIsShaderFn;
glIsSyncProc glIsSyncFn;
glIsSyncAPPLEProc glIsSyncAPPLEFn;
glIsTextureProc glIsTextureFn;
glIsTransformFeedbackProc glIsTransformFeedbackFn;
glIsVertexArrayOESProc glIsVertexArrayOESFn;
@ -2423,7 +2395,6 @@ struct ProcsGL {
glSamplerParameterivProc glSamplerParameterivFn;
glSamplerParameterivRobustANGLEProc glSamplerParameterivRobustANGLEFn;
glScissorProc glScissorFn;
glSetFenceAPPLEProc glSetFenceAPPLEFn;
glSetFenceNVProc glSetFenceNVFn;
glShaderBinaryProc glShaderBinaryFn;
glShaderSourceProc glShaderSourceFn;
@ -2435,7 +2406,6 @@ struct ProcsGL {
glStencilMaskSeparateProc glStencilMaskSeparateFn;
glStencilOpProc glStencilOpFn;
glStencilOpSeparateProc glStencilOpSeparateFn;
glTestFenceAPPLEProc glTestFenceAPPLEFn;
glTestFenceNVProc glTestFenceNVFn;
glTexBufferProc glTexBufferFn;
glTexBufferRangeProc glTexBufferRangeFn;
@ -2523,7 +2493,6 @@ struct ProcsGL {
glViewportProc glViewportFn;
glWaitSemaphoreEXTProc glWaitSemaphoreEXTFn;
glWaitSyncProc glWaitSyncFn;
glWaitSyncAPPLEProc glWaitSyncAPPLEFn;
glWindowRectanglesEXTProc glWindowRectanglesEXTFn;
};
@ -2667,9 +2636,6 @@ class GL_EXPORT GLApi {
virtual GLenum glClientWaitSyncFn(GLsync sync,
GLbitfield flags,
GLuint64 timeout) = 0;
virtual GLenum glClientWaitSyncAPPLEFn(GLsync sync,
GLbitfield flags,
GLuint64 timeout) = 0;
virtual void glClipControlEXTFn(GLenum origin, GLenum depth) = 0;
virtual void glColorMaskFn(GLboolean red,
GLboolean green,
@ -2835,7 +2801,6 @@ class GL_EXPORT GLApi {
GLsizei length,
const char* buf) = 0;
virtual void glDeleteBuffersARBFn(GLsizei n, const GLuint* buffers) = 0;
virtual void glDeleteFencesAPPLEFn(GLsizei n, const GLuint* fences) = 0;
virtual void glDeleteFencesNVFn(GLsizei n, const GLuint* fences) = 0;
virtual void glDeleteFramebuffersEXTFn(GLsizei n,
const GLuint* framebuffers) = 0;
@ -2851,7 +2816,6 @@ class GL_EXPORT GLApi {
virtual void glDeleteSemaphoresEXTFn(GLsizei n, const GLuint* semaphores) = 0;
virtual void glDeleteShaderFn(GLuint shader) = 0;
virtual void glDeleteSyncFn(GLsync sync) = 0;
virtual void glDeleteSyncAPPLEFn(GLsync sync) = 0;
virtual void glDeleteTexturesFn(GLsizei n, const GLuint* textures) = 0;
virtual void glDeleteTransformFeedbacksFn(GLsizei n, const GLuint* ids) = 0;
virtual void glDeleteVertexArraysOESFn(GLsizei n, const GLuint* arrays) = 0;
@ -2925,9 +2889,7 @@ class GL_EXPORT GLApi {
virtual void glEndTilingQCOMFn(GLbitfield preserveMask) = 0;
virtual void glEndTransformFeedbackFn(void) = 0;
virtual GLsync glFenceSyncFn(GLenum condition, GLbitfield flags) = 0;
virtual GLsync glFenceSyncAPPLEFn(GLenum condition, GLbitfield flags) = 0;
virtual void glFinishFn(void) = 0;
virtual void glFinishFenceAPPLEFn(GLuint fence) = 0;
virtual void glFinishFenceNVFn(GLuint fence) = 0;
virtual void glFlushFn(void) = 0;
virtual void glFlushMappedBufferRangeFn(GLenum target,
@ -2984,7 +2946,6 @@ class GL_EXPORT GLApi {
virtual void glFrontFaceFn(GLenum mode) = 0;
virtual void glGenBuffersARBFn(GLsizei n, GLuint* buffers) = 0;
virtual void glGenerateMipmapEXTFn(GLenum target) = 0;
virtual void glGenFencesAPPLEFn(GLsizei n, GLuint* fences) = 0;
virtual void glGenFencesNVFn(GLsizei n, GLuint* fences) = 0;
virtual void glGenFramebuffersEXTFn(GLsizei n, GLuint* framebuffers) = 0;
virtual GLuint glGenProgramPipelinesFn(GLsizei n, GLuint* pipelines) = 0;
@ -3508,7 +3469,6 @@ class GL_EXPORT GLApi {
virtual GLboolean glIsBufferFn(GLuint buffer) = 0;
virtual GLboolean glIsEnabledFn(GLenum cap) = 0;
virtual GLboolean glIsEnablediOESFn(GLenum target, GLuint index) = 0;
virtual GLboolean glIsFenceAPPLEFn(GLuint fence) = 0;
virtual GLboolean glIsFenceNVFn(GLuint fence) = 0;
virtual GLboolean glIsFramebufferEXTFn(GLuint framebuffer) = 0;
virtual GLboolean glIsProgramFn(GLuint program) = 0;
@ -3518,7 +3478,6 @@ class GL_EXPORT GLApi {
virtual GLboolean glIsSamplerFn(GLuint sampler) = 0;
virtual GLboolean glIsShaderFn(GLuint shader) = 0;
virtual GLboolean glIsSyncFn(GLsync sync) = 0;
virtual GLboolean glIsSyncAPPLEFn(GLsync sync) = 0;
virtual GLboolean glIsTextureFn(GLuint texture) = 0;
virtual GLboolean glIsTransformFeedbackFn(GLuint id) = 0;
virtual GLboolean glIsVertexArrayOESFn(GLuint array) = 0;
@ -3843,7 +3802,6 @@ class GL_EXPORT GLApi {
GLsizei bufSize,
const GLint* param) = 0;
virtual void glScissorFn(GLint x, GLint y, GLsizei width, GLsizei height) = 0;
virtual void glSetFenceAPPLEFn(GLuint fence) = 0;
virtual void glSetFenceNVFn(GLuint fence, GLenum condition) = 0;
virtual void glShaderBinaryFn(GLsizei n,
const GLuint* shaders,
@ -3877,7 +3835,6 @@ class GL_EXPORT GLApi {
GLenum fail,
GLenum zfail,
GLenum zpass) = 0;
virtual GLboolean glTestFenceAPPLEFn(GLuint fence) = 0;
virtual GLboolean glTestFenceNVFn(GLuint fence) = 0;
virtual void glTexBufferFn(GLenum target,
GLenum internalformat,
@ -4219,9 +4176,6 @@ class GL_EXPORT GLApi {
virtual void glWaitSyncFn(GLsync sync,
GLbitfield flags,
GLuint64 timeout) = 0;
virtual void glWaitSyncAPPLEFn(GLsync sync,
GLbitfield flags,
GLuint64 timeout) = 0;
virtual void glWindowRectanglesEXTFn(GLenum mode,
GLsizei n,
const GLint* box) = 0;
@ -4293,8 +4247,6 @@ class GL_EXPORT GLApi {
#define glClearTexImage ::gl::g_current_gl_context->glClearTexImageFn
#define glClearTexSubImage ::gl::g_current_gl_context->glClearTexSubImageFn
#define glClientWaitSync ::gl::g_current_gl_context->glClientWaitSyncFn
#define glClientWaitSyncAPPLE \
::gl::g_current_gl_context->glClientWaitSyncAPPLEFn
#define glClipControlEXT ::gl::g_current_gl_context->glClipControlEXTFn
#define glColorMask ::gl::g_current_gl_context->glColorMaskFn
#define glColorMaskiOES ::gl::g_current_gl_context->glColorMaskiOESFn
@ -4336,7 +4288,6 @@ class GL_EXPORT GLApi {
::gl::g_current_gl_context->glDebugMessageControlFn
#define glDebugMessageInsert ::gl::g_current_gl_context->glDebugMessageInsertFn
#define glDeleteBuffersARB ::gl::g_current_gl_context->glDeleteBuffersARBFn
#define glDeleteFencesAPPLE ::gl::g_current_gl_context->glDeleteFencesAPPLEFn
#define glDeleteFencesNV ::gl::g_current_gl_context->glDeleteFencesNVFn
#define glDeleteFramebuffersEXT \
::gl::g_current_gl_context->glDeleteFramebuffersEXTFn
@ -4353,7 +4304,6 @@ class GL_EXPORT GLApi {
::gl::g_current_gl_context->glDeleteSemaphoresEXTFn
#define glDeleteShader ::gl::g_current_gl_context->glDeleteShaderFn
#define glDeleteSync ::gl::g_current_gl_context->glDeleteSyncFn
#define glDeleteSyncAPPLE ::gl::g_current_gl_context->glDeleteSyncAPPLEFn
#define glDeleteTextures ::gl::g_current_gl_context->glDeleteTexturesFn
#define glDeleteTransformFeedbacks \
::gl::g_current_gl_context->glDeleteTransformFeedbacksFn
@ -4407,9 +4357,7 @@ class GL_EXPORT GLApi {
#define glEndTransformFeedback \
::gl::g_current_gl_context->glEndTransformFeedbackFn
#define glFenceSync ::gl::g_current_gl_context->glFenceSyncFn
#define glFenceSyncAPPLE ::gl::g_current_gl_context->glFenceSyncAPPLEFn
#define glFinish ::gl::g_current_gl_context->glFinishFn
#define glFinishFenceAPPLE ::gl::g_current_gl_context->glFinishFenceAPPLEFn
#define glFinishFenceNV ::gl::g_current_gl_context->glFinishFenceNVFn
#define glFlush ::gl::g_current_gl_context->glFlushFn
#define glFlushMappedBufferRange \
@ -4443,7 +4391,6 @@ class GL_EXPORT GLApi {
#define glFrontFace ::gl::g_current_gl_context->glFrontFaceFn
#define glGenBuffersARB ::gl::g_current_gl_context->glGenBuffersARBFn
#define glGenerateMipmapEXT ::gl::g_current_gl_context->glGenerateMipmapEXTFn
#define glGenFencesAPPLE ::gl::g_current_gl_context->glGenFencesAPPLEFn
#define glGenFencesNV ::gl::g_current_gl_context->glGenFencesNVFn
#define glGenFramebuffersEXT ::gl::g_current_gl_context->glGenFramebuffersEXTFn
#define glGenProgramPipelines \
@ -4681,7 +4628,6 @@ class GL_EXPORT GLApi {
#define glIsBuffer ::gl::g_current_gl_context->glIsBufferFn
#define glIsEnabled ::gl::g_current_gl_context->glIsEnabledFn
#define glIsEnablediOES ::gl::g_current_gl_context->glIsEnablediOESFn
#define glIsFenceAPPLE ::gl::g_current_gl_context->glIsFenceAPPLEFn
#define glIsFenceNV ::gl::g_current_gl_context->glIsFenceNVFn
#define glIsFramebufferEXT ::gl::g_current_gl_context->glIsFramebufferEXTFn
#define glIsProgram ::gl::g_current_gl_context->glIsProgramFn
@ -4691,7 +4637,6 @@ class GL_EXPORT GLApi {
#define glIsSampler ::gl::g_current_gl_context->glIsSamplerFn
#define glIsShader ::gl::g_current_gl_context->glIsShaderFn
#define glIsSync ::gl::g_current_gl_context->glIsSyncFn
#define glIsSyncAPPLE ::gl::g_current_gl_context->glIsSyncAPPLEFn
#define glIsTexture ::gl::g_current_gl_context->glIsTextureFn
#define glIsTransformFeedback \
::gl::g_current_gl_context->glIsTransformFeedbackFn
@ -4825,7 +4770,6 @@ class GL_EXPORT GLApi {
#define glSamplerParameterivRobustANGLE \
::gl::g_current_gl_context->glSamplerParameterivRobustANGLEFn
#define glScissor ::gl::g_current_gl_context->glScissorFn
#define glSetFenceAPPLE ::gl::g_current_gl_context->glSetFenceAPPLEFn
#define glSetFenceNV ::gl::g_current_gl_context->glSetFenceNVFn
#define glShaderBinary ::gl::g_current_gl_context->glShaderBinaryFn
#define glShaderSource ::gl::g_current_gl_context->glShaderSourceFn
@ -4839,7 +4783,6 @@ class GL_EXPORT GLApi {
::gl::g_current_gl_context->glStencilMaskSeparateFn
#define glStencilOp ::gl::g_current_gl_context->glStencilOpFn
#define glStencilOpSeparate ::gl::g_current_gl_context->glStencilOpSeparateFn
#define glTestFenceAPPLE ::gl::g_current_gl_context->glTestFenceAPPLEFn
#define glTestFenceNV ::gl::g_current_gl_context->glTestFenceNVFn
#define glTexBuffer ::gl::g_current_gl_context->glTexBufferFn
#define glTexBufferRange ::gl::g_current_gl_context->glTexBufferRangeFn
@ -4947,7 +4890,6 @@ class GL_EXPORT GLApi {
#define glViewport ::gl::g_current_gl_context->glViewportFn
#define glWaitSemaphoreEXT ::gl::g_current_gl_context->glWaitSemaphoreEXTFn
#define glWaitSync ::gl::g_current_gl_context->glWaitSyncFn
#define glWaitSyncAPPLE ::gl::g_current_gl_context->glWaitSyncAPPLEFn
#define glWindowRectanglesEXT \
::gl::g_current_gl_context->glWindowRectanglesEXTFn

119
ui/gl/gl_bindings_autogen_mock.cc

@ -248,12 +248,6 @@ void GL_BINDING_CALL MockGLInterface::Mock_glBindVertexArray(GLuint array) {
interface_->BindVertexArrayOES(array);
}
void GL_BINDING_CALL
MockGLInterface::Mock_glBindVertexArrayAPPLE(GLuint array) {
MakeGlMockFunctionUnique("glBindVertexArrayAPPLE");
interface_->BindVertexArrayOES(array);
}
void GL_BINDING_CALL MockGLInterface::Mock_glBindVertexArrayOES(GLuint array) {
MakeGlMockFunctionUnique("glBindVertexArrayOES");
interface_->BindVertexArrayOES(array);
@ -584,14 +578,6 @@ MockGLInterface::Mock_glClientWaitSync(GLsync sync,
return interface_->ClientWaitSync(sync, flags, timeout);
}
GLenum GL_BINDING_CALL
MockGLInterface::Mock_glClientWaitSyncAPPLE(GLsync sync,
GLbitfield flags,
GLuint64 timeout) {
MakeGlMockFunctionUnique("glClientWaitSyncAPPLE");
return interface_->ClientWaitSyncAPPLE(sync, flags, timeout);
}
void GL_BINDING_CALL MockGLInterface::Mock_glClipControlEXT(GLenum origin,
GLenum depth) {
MakeGlMockFunctionUnique("glClipControlEXT");
@ -945,12 +931,6 @@ MockGLInterface::Mock_glDeleteBuffers(GLsizei n, const GLuint* buffers) {
interface_->DeleteBuffersARB(n, buffers);
}
void GL_BINDING_CALL
MockGLInterface::Mock_glDeleteFencesAPPLE(GLsizei n, const GLuint* fences) {
MakeGlMockFunctionUnique("glDeleteFencesAPPLE");
interface_->DeleteFencesAPPLE(n, fences);
}
void GL_BINDING_CALL
MockGLInterface::Mock_glDeleteFencesNV(GLsizei n, const GLuint* fences) {
MakeGlMockFunctionUnique("glDeleteFencesNV");
@ -1039,11 +1019,6 @@ void GL_BINDING_CALL MockGLInterface::Mock_glDeleteSync(GLsync sync) {
interface_->DeleteSync(sync);
}
void GL_BINDING_CALL MockGLInterface::Mock_glDeleteSyncAPPLE(GLsync sync) {
MakeGlMockFunctionUnique("glDeleteSyncAPPLE");
interface_->DeleteSyncAPPLE(sync);
}
void GL_BINDING_CALL
MockGLInterface::Mock_glDeleteTextures(GLsizei n, const GLuint* textures) {
MakeGlMockFunctionUnique("glDeleteTextures");
@ -1062,13 +1037,6 @@ MockGLInterface::Mock_glDeleteVertexArrays(GLsizei n, const GLuint* arrays) {
interface_->DeleteVertexArraysOES(n, arrays);
}
void GL_BINDING_CALL
MockGLInterface::Mock_glDeleteVertexArraysAPPLE(GLsizei n,
const GLuint* arrays) {
MakeGlMockFunctionUnique("glDeleteVertexArraysAPPLE");
interface_->DeleteVertexArraysOES(n, arrays);
}
void GL_BINDING_CALL
MockGLInterface::Mock_glDeleteVertexArraysOES(GLsizei n, const GLuint* arrays) {
MakeGlMockFunctionUnique("glDeleteVertexArraysOES");
@ -1403,22 +1371,11 @@ GLsync GL_BINDING_CALL MockGLInterface::Mock_glFenceSync(GLenum condition,
return interface_->FenceSync(condition, flags);
}
GLsync GL_BINDING_CALL
MockGLInterface::Mock_glFenceSyncAPPLE(GLenum condition, GLbitfield flags) {
MakeGlMockFunctionUnique("glFenceSyncAPPLE");
return interface_->FenceSyncAPPLE(condition, flags);
}
void GL_BINDING_CALL MockGLInterface::Mock_glFinish(void) {
MakeGlMockFunctionUnique("glFinish");
interface_->Finish();
}
void GL_BINDING_CALL MockGLInterface::Mock_glFinishFenceAPPLE(GLuint fence) {
MakeGlMockFunctionUnique("glFinishFenceAPPLE");
interface_->FinishFenceAPPLE(fence);
}
void GL_BINDING_CALL MockGLInterface::Mock_glFinishFenceNV(GLuint fence) {
MakeGlMockFunctionUnique("glFinishFenceNV");
interface_->FinishFenceNV(fence);
@ -1617,12 +1574,6 @@ void GL_BINDING_CALL MockGLInterface::Mock_glGenBuffers(GLsizei n,
interface_->GenBuffersARB(n, buffers);
}
void GL_BINDING_CALL MockGLInterface::Mock_glGenFencesAPPLE(GLsizei n,
GLuint* fences) {
MakeGlMockFunctionUnique("glGenFencesAPPLE");
interface_->GenFencesAPPLE(n, fences);
}
void GL_BINDING_CALL MockGLInterface::Mock_glGenFencesNV(GLsizei n,
GLuint* fences) {
MakeGlMockFunctionUnique("glGenFencesNV");
@ -1701,12 +1652,6 @@ void GL_BINDING_CALL MockGLInterface::Mock_glGenVertexArrays(GLsizei n,
interface_->GenVertexArraysOES(n, arrays);
}
void GL_BINDING_CALL
MockGLInterface::Mock_glGenVertexArraysAPPLE(GLsizei n, GLuint* arrays) {
MakeGlMockFunctionUnique("glGenVertexArraysAPPLE");
interface_->GenVertexArraysOES(n, arrays);
}
void GL_BINDING_CALL
MockGLInterface::Mock_glGenVertexArraysOES(GLsizei n, GLuint* arrays) {
MakeGlMockFunctionUnique("glGenVertexArraysOES");
@ -3096,11 +3041,6 @@ GLboolean GL_BINDING_CALL MockGLInterface::Mock_glIsEnablediOES(GLenum target,
return interface_->IsEnablediOES(target, index);
}
GLboolean GL_BINDING_CALL MockGLInterface::Mock_glIsFenceAPPLE(GLuint fence) {
MakeGlMockFunctionUnique("glIsFenceAPPLE");
return interface_->IsFenceAPPLE(fence);
}
GLboolean GL_BINDING_CALL MockGLInterface::Mock_glIsFenceNV(GLuint fence) {
MakeGlMockFunctionUnique("glIsFenceNV");
return interface_->IsFenceNV(fence);
@ -3166,11 +3106,6 @@ GLboolean GL_BINDING_CALL MockGLInterface::Mock_glIsSync(GLsync sync) {
return interface_->IsSync(sync);
}
GLboolean GL_BINDING_CALL MockGLInterface::Mock_glIsSyncAPPLE(GLsync sync) {
MakeGlMockFunctionUnique("glIsSyncAPPLE");
return interface_->IsSyncAPPLE(sync);
}
GLboolean GL_BINDING_CALL MockGLInterface::Mock_glIsTexture(GLuint texture) {
MakeGlMockFunctionUnique("glIsTexture");
return interface_->IsTexture(texture);
@ -3187,12 +3122,6 @@ GLboolean GL_BINDING_CALL MockGLInterface::Mock_glIsVertexArray(GLuint array) {
return interface_->IsVertexArrayOES(array);
}
GLboolean GL_BINDING_CALL
MockGLInterface::Mock_glIsVertexArrayAPPLE(GLuint array) {
MakeGlMockFunctionUnique("glIsVertexArrayAPPLE");
return interface_->IsVertexArrayOES(array);
}
GLboolean GL_BINDING_CALL
MockGLInterface::Mock_glIsVertexArrayOES(GLuint array) {
MakeGlMockFunctionUnique("glIsVertexArrayOES");
@ -4071,11 +4000,6 @@ void GL_BINDING_CALL MockGLInterface::Mock_glScissor(GLint x,
interface_->Scissor(x, y, width, height);
}
void GL_BINDING_CALL MockGLInterface::Mock_glSetFenceAPPLE(GLuint fence) {
MakeGlMockFunctionUnique("glSetFenceAPPLE");
interface_->SetFenceAPPLE(fence);
}
void GL_BINDING_CALL MockGLInterface::Mock_glSetFenceNV(GLuint fence,
GLenum condition) {
MakeGlMockFunctionUnique("glSetFenceNV");
@ -4163,11 +4087,6 @@ void GL_BINDING_CALL MockGLInterface::Mock_glStencilOpSeparate(GLenum face,
interface_->StencilOpSeparate(face, fail, zfail, zpass);
}
GLboolean GL_BINDING_CALL MockGLInterface::Mock_glTestFenceAPPLE(GLuint fence) {
MakeGlMockFunctionUnique("glTestFenceAPPLE");
return interface_->TestFenceAPPLE(fence);
}
GLboolean GL_BINDING_CALL MockGLInterface::Mock_glTestFenceNV(GLuint fence) {
MakeGlMockFunctionUnique("glTestFenceNV");
return interface_->TestFenceNV(fence);
@ -5005,13 +4924,6 @@ void GL_BINDING_CALL MockGLInterface::Mock_glWaitSync(GLsync sync,
interface_->WaitSync(sync, flags, timeout);
}
void GL_BINDING_CALL MockGLInterface::Mock_glWaitSyncAPPLE(GLsync sync,
GLbitfield flags,
GLuint64 timeout) {
MakeGlMockFunctionUnique("glWaitSyncAPPLE");
interface_->WaitSyncAPPLE(sync, flags, timeout);
}
void GL_BINDING_CALL
MockGLInterface::Mock_glWindowRectanglesEXT(GLenum mode,
GLsizei n,
@ -5096,8 +5008,6 @@ MockGLInterface::GetGLProcAddress(const char* name) {
Mock_glBindUniformLocationCHROMIUM);
if (strcmp(name, "glBindVertexArray") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glBindVertexArray);
if (strcmp(name, "glBindVertexArrayAPPLE") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glBindVertexArrayAPPLE);
if (strcmp(name, "glBindVertexArrayOES") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glBindVertexArrayOES);
if (strcmp(name, "glBindVertexBuffer") == 0)
@ -5182,8 +5092,6 @@ MockGLInterface::GetGLProcAddress(const char* name) {
return reinterpret_cast<GLFunctionPointerType>(Mock_glClearTexSubImageEXT);
if (strcmp(name, "glClientWaitSync") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glClientWaitSync);
if (strcmp(name, "glClientWaitSyncAPPLE") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glClientWaitSyncAPPLE);
if (strcmp(name, "glClipControlEXT") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glClipControlEXT);
if (strcmp(name, "glColorMask") == 0)
@ -5257,8 +5165,6 @@ MockGLInterface::GetGLProcAddress(const char* name) {
Mock_glDebugMessageInsertKHR);
if (strcmp(name, "glDeleteBuffers") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glDeleteBuffers);
if (strcmp(name, "glDeleteFencesAPPLE") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glDeleteFencesAPPLE);
if (strcmp(name, "glDeleteFencesNV") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glDeleteFencesNV);
if (strcmp(name, "glDeleteFramebuffers") == 0)
@ -5291,8 +5197,6 @@ MockGLInterface::GetGLProcAddress(const char* name) {
return reinterpret_cast<GLFunctionPointerType>(Mock_glDeleteShader);
if (strcmp(name, "glDeleteSync") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glDeleteSync);
if (strcmp(name, "glDeleteSyncAPPLE") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glDeleteSyncAPPLE);
if (strcmp(name, "glDeleteTextures") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glDeleteTextures);
if (strcmp(name, "glDeleteTransformFeedbacks") == 0)
@ -5300,9 +5204,6 @@ MockGLInterface::GetGLProcAddress(const char* name) {
Mock_glDeleteTransformFeedbacks);
if (strcmp(name, "glDeleteVertexArrays") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glDeleteVertexArrays);
if (strcmp(name, "glDeleteVertexArraysAPPLE") == 0)
return reinterpret_cast<GLFunctionPointerType>(
Mock_glDeleteVertexArraysAPPLE);
if (strcmp(name, "glDeleteVertexArraysOES") == 0)
return reinterpret_cast<GLFunctionPointerType>(
Mock_glDeleteVertexArraysOES);
@ -5412,12 +5313,8 @@ MockGLInterface::GetGLProcAddress(const char* name) {
Mock_glEndTransformFeedbackEXT);
if (strcmp(name, "glFenceSync") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glFenceSync);
if (strcmp(name, "glFenceSyncAPPLE") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glFenceSyncAPPLE);
if (strcmp(name, "glFinish") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glFinish);
if (strcmp(name, "glFinishFenceAPPLE") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glFinishFenceAPPLE);
if (strcmp(name, "glFinishFenceNV") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glFinishFenceNV);
if (strcmp(name, "glFlush") == 0)
@ -5482,8 +5379,6 @@ MockGLInterface::GetGLProcAddress(const char* name) {
return reinterpret_cast<GLFunctionPointerType>(Mock_glFrontFace);
if (strcmp(name, "glGenBuffers") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glGenBuffers);
if (strcmp(name, "glGenFencesAPPLE") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glGenFencesAPPLE);
if (strcmp(name, "glGenFencesNV") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glGenFencesNV);
if (strcmp(name, "glGenFramebuffers") == 0)
@ -5511,8 +5406,6 @@ MockGLInterface::GetGLProcAddress(const char* name) {
Mock_glGenTransformFeedbacks);
if (strcmp(name, "glGenVertexArrays") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glGenVertexArrays);
if (strcmp(name, "glGenVertexArraysAPPLE") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glGenVertexArraysAPPLE);
if (strcmp(name, "glGenVertexArraysOES") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glGenVertexArraysOES);
if (strcmp(name, "glGenerateMipmap") == 0)
@ -5911,8 +5804,6 @@ MockGLInterface::GetGLProcAddress(const char* name) {
return reinterpret_cast<GLFunctionPointerType>(Mock_glIsEnabledi);
if (strcmp(name, "glIsEnablediOES") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glIsEnablediOES);
if (strcmp(name, "glIsFenceAPPLE") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glIsFenceAPPLE);
if (strcmp(name, "glIsFenceNV") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glIsFenceNV);
if (strcmp(name, "glIsFramebuffer") == 0)
@ -5937,16 +5828,12 @@ MockGLInterface::GetGLProcAddress(const char* name) {
return reinterpret_cast<GLFunctionPointerType>(Mock_glIsShader);
if (strcmp(name, "glIsSync") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glIsSync);
if (strcmp(name, "glIsSyncAPPLE") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glIsSyncAPPLE);
if (strcmp(name, "glIsTexture") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glIsTexture);
if (strcmp(name, "glIsTransformFeedback") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glIsTransformFeedback);
if (strcmp(name, "glIsVertexArray") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glIsVertexArray);
if (strcmp(name, "glIsVertexArrayAPPLE") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glIsVertexArrayAPPLE);
if (strcmp(name, "glIsVertexArrayOES") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glIsVertexArrayOES);
if (strcmp(name, "glLineWidth") == 0)
@ -6194,8 +6081,6 @@ MockGLInterface::GetGLProcAddress(const char* name) {
Mock_glSamplerParameterivRobustANGLE);
if (strcmp(name, "glScissor") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glScissor);
if (strcmp(name, "glSetFenceAPPLE") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glSetFenceAPPLE);
if (strcmp(name, "glSetFenceNV") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glSetFenceNV);
if (strcmp(name, "glShaderBinary") == 0)
@ -6218,8 +6103,6 @@ MockGLInterface::GetGLProcAddress(const char* name) {
return reinterpret_cast<GLFunctionPointerType>(Mock_glStencilOp);
if (strcmp(name, "glStencilOpSeparate") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glStencilOpSeparate);
if (strcmp(name, "glTestFenceAPPLE") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glTestFenceAPPLE);
if (strcmp(name, "glTestFenceNV") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glTestFenceNV);
if (strcmp(name, "glTexBuffer") == 0)
@ -6428,8 +6311,6 @@ MockGLInterface::GetGLProcAddress(const char* name) {
return reinterpret_cast<GLFunctionPointerType>(Mock_glWaitSemaphoreEXT);
if (strcmp(name, "glWaitSync") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glWaitSync);
if (strcmp(name, "glWaitSyncAPPLE") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glWaitSyncAPPLE);
if (strcmp(name, "glWindowRectanglesEXT") == 0)
return reinterpret_cast<GLFunctionPointerType>(Mock_glWindowRectanglesEXT);
return reinterpret_cast<GLFunctionPointerType>(&MockGlInvalidFunction);

23
ui/gl/gl_bindings_autogen_mock.h

@ -94,7 +94,6 @@ Mock_glBindUniformLocationCHROMIUM(GLuint program,
GLint location,
const char* name);
static void GL_BINDING_CALL Mock_glBindVertexArray(GLuint array);
static void GL_BINDING_CALL Mock_glBindVertexArrayAPPLE(GLuint array);
static void GL_BINDING_CALL Mock_glBindVertexArrayOES(GLuint array);
static void GL_BINDING_CALL Mock_glBindVertexBuffer(GLuint bindingindex,
GLuint buffer,
@ -244,9 +243,6 @@ static void GL_BINDING_CALL Mock_glClearTexSubImageEXT(GLuint texture,
static GLenum GL_BINDING_CALL Mock_glClientWaitSync(GLsync sync,
GLbitfield flags,
GLuint64 timeout);
static GLenum GL_BINDING_CALL Mock_glClientWaitSyncAPPLE(GLsync sync,
GLbitfield flags,
GLuint64 timeout);
static void GL_BINDING_CALL Mock_glClipControlEXT(GLenum origin, GLenum depth);
static void GL_BINDING_CALL Mock_glColorMask(GLboolean red,
GLboolean green,
@ -440,8 +436,6 @@ static void GL_BINDING_CALL Mock_glDebugMessageInsertKHR(GLenum source,
const char* buf);
static void GL_BINDING_CALL Mock_glDeleteBuffers(GLsizei n,
const GLuint* buffers);
static void GL_BINDING_CALL Mock_glDeleteFencesAPPLE(GLsizei n,
const GLuint* fences);
static void GL_BINDING_CALL Mock_glDeleteFencesNV(GLsizei n,
const GLuint* fences);
static void GL_BINDING_CALL
@ -466,15 +460,12 @@ static void GL_BINDING_CALL
Mock_glDeleteSemaphoresEXT(GLsizei n, const GLuint* semaphores);
static void GL_BINDING_CALL Mock_glDeleteShader(GLuint shader);
static void GL_BINDING_CALL Mock_glDeleteSync(GLsync sync);
static void GL_BINDING_CALL Mock_glDeleteSyncAPPLE(GLsync sync);
static void GL_BINDING_CALL Mock_glDeleteTextures(GLsizei n,
const GLuint* textures);
static void GL_BINDING_CALL Mock_glDeleteTransformFeedbacks(GLsizei n,
const GLuint* ids);
static void GL_BINDING_CALL Mock_glDeleteVertexArrays(GLsizei n,
const GLuint* arrays);
static void GL_BINDING_CALL
Mock_glDeleteVertexArraysAPPLE(GLsizei n, const GLuint* arrays);
static void GL_BINDING_CALL Mock_glDeleteVertexArraysOES(GLsizei n,
const GLuint* arrays);
static void GL_BINDING_CALL Mock_glDepthFunc(GLenum func);
@ -595,10 +586,7 @@ static void GL_BINDING_CALL Mock_glEndTransformFeedback(void);
static void GL_BINDING_CALL Mock_glEndTransformFeedbackEXT(void);
static GLsync GL_BINDING_CALL Mock_glFenceSync(GLenum condition,
GLbitfield flags);
static GLsync GL_BINDING_CALL Mock_glFenceSyncAPPLE(GLenum condition,
GLbitfield flags);
static void GL_BINDING_CALL Mock_glFinish(void);
static void GL_BINDING_CALL Mock_glFinishFenceAPPLE(GLuint fence);
static void GL_BINDING_CALL Mock_glFinishFenceNV(GLuint fence);
static void GL_BINDING_CALL Mock_glFlush(void);
static void GL_BINDING_CALL Mock_glFlushMappedBufferRange(GLenum target,
@ -679,7 +667,6 @@ Mock_glFramebufferTexturePixelLocalStorageANGLE(GLint plane,
GLint layer);
static void GL_BINDING_CALL Mock_glFrontFace(GLenum mode);
static void GL_BINDING_CALL Mock_glGenBuffers(GLsizei n, GLuint* buffers);
static void GL_BINDING_CALL Mock_glGenFencesAPPLE(GLsizei n, GLuint* fences);
static void GL_BINDING_CALL Mock_glGenFencesNV(GLsizei n, GLuint* fences);
static void GL_BINDING_CALL Mock_glGenFramebuffers(GLsizei n,
GLuint* framebuffers);
@ -700,8 +687,6 @@ static void GL_BINDING_CALL Mock_glGenTextures(GLsizei n, GLuint* textures);
static void GL_BINDING_CALL Mock_glGenTransformFeedbacks(GLsizei n,
GLuint* ids);
static void GL_BINDING_CALL Mock_glGenVertexArrays(GLsizei n, GLuint* arrays);
static void GL_BINDING_CALL Mock_glGenVertexArraysAPPLE(GLsizei n,
GLuint* arrays);
static void GL_BINDING_CALL Mock_glGenVertexArraysOES(GLsizei n,
GLuint* arrays);
static void GL_BINDING_CALL Mock_glGenerateMipmap(GLenum target);
@ -1343,7 +1328,6 @@ static GLboolean GL_BINDING_CALL Mock_glIsEnabled(GLenum cap);
static GLboolean GL_BINDING_CALL Mock_glIsEnabledi(GLenum target, GLuint index);
static GLboolean GL_BINDING_CALL Mock_glIsEnablediOES(GLenum target,
GLuint index);
static GLboolean GL_BINDING_CALL Mock_glIsFenceAPPLE(GLuint fence);
static GLboolean GL_BINDING_CALL Mock_glIsFenceNV(GLuint fence);
static GLboolean GL_BINDING_CALL Mock_glIsFramebuffer(GLuint framebuffer);
static GLboolean GL_BINDING_CALL Mock_glIsFramebufferEXT(GLuint framebuffer);
@ -1356,11 +1340,9 @@ static GLboolean GL_BINDING_CALL Mock_glIsRenderbufferEXT(GLuint renderbuffer);
static GLboolean GL_BINDING_CALL Mock_glIsSampler(GLuint sampler);
static GLboolean GL_BINDING_CALL Mock_glIsShader(GLuint shader);
static GLboolean GL_BINDING_CALL Mock_glIsSync(GLsync sync);
static GLboolean GL_BINDING_CALL Mock_glIsSyncAPPLE(GLsync sync);
static GLboolean GL_BINDING_CALL Mock_glIsTexture(GLuint texture);
static GLboolean GL_BINDING_CALL Mock_glIsTransformFeedback(GLuint id);
static GLboolean GL_BINDING_CALL Mock_glIsVertexArray(GLuint array);
static GLboolean GL_BINDING_CALL Mock_glIsVertexArrayAPPLE(GLuint array);
static GLboolean GL_BINDING_CALL Mock_glIsVertexArrayOES(GLuint array);
static void GL_BINDING_CALL Mock_glLineWidth(GLfloat width);
static void GL_BINDING_CALL Mock_glLinkProgram(GLuint program);
@ -1749,7 +1731,6 @@ static void GL_BINDING_CALL Mock_glScissor(GLint x,
GLint y,
GLsizei width,
GLsizei height);
static void GL_BINDING_CALL Mock_glSetFenceAPPLE(GLuint fence);
static void GL_BINDING_CALL Mock_glSetFenceNV(GLuint fence, GLenum condition);
static void GL_BINDING_CALL Mock_glShaderBinary(GLsizei n,
const GLuint* shaders,
@ -1788,7 +1769,6 @@ static void GL_BINDING_CALL Mock_glStencilOpSeparate(GLenum face,
GLenum fail,
GLenum zfail,
GLenum zpass);
static GLboolean GL_BINDING_CALL Mock_glTestFenceAPPLE(GLuint fence);
static GLboolean GL_BINDING_CALL Mock_glTestFenceNV(GLuint fence);
static void GL_BINDING_CALL Mock_glTexBuffer(GLenum target,
GLenum internalformat,
@ -2168,9 +2148,6 @@ static void GL_BINDING_CALL Mock_glWaitSemaphoreEXT(GLuint semaphore,
static void GL_BINDING_CALL Mock_glWaitSync(GLsync sync,
GLbitfield flags,
GLuint64 timeout);
static void GL_BINDING_CALL Mock_glWaitSyncAPPLE(GLsync sync,
GLbitfield flags,
GLuint64 timeout);
static void GL_BINDING_CALL Mock_glWindowRectanglesEXT(GLenum mode,
GLsizei n,
const GLint* box);

13
ui/gl/gl_fence.cc

@ -17,10 +17,6 @@
#include "ui/gl/gl_surface_egl.h"
#include "ui/gl/gl_version_info.h"
#if BUILDFLAG(IS_APPLE)
#include "ui/gl/gl_fence_apple.h"
#endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
#define USE_GL_FENCE_ANDROID_NATIVE_FENCE_SYNC
#include "ui/gl/gl_fence_android_native_fence_sync.h"
@ -44,9 +40,6 @@ bool GLFence::IsSupported() {
return g_current_gl_version->is_es3 ||
(display && display->ext->b_EGL_KHR_fence_sync) ||
#if BUILDFLAG(IS_APPLE)
g_current_gl_driver->ext.b_GL_APPLE_fence ||
#endif
g_current_gl_driver->ext.b_GL_NV_fence;
}
@ -70,11 +63,7 @@ std::unique_ptr<GLFence> GLFence::Create() {
// Prefer ARB_sync which supports server-side wait.
fence = std::make_unique<GLFenceARB>();
DCHECK(fence);
#if BUILDFLAG(IS_APPLE)
} else if (g_current_gl_driver->ext.b_GL_APPLE_fence) {
fence = std::make_unique<GLFenceAPPLE>();
DCHECK(fence);
#else // IS_APPLE
#if !BUILDFLAG(IS_APPLE)
} else if (display && display->ext->b_EGL_KHR_fence_sync) {
fence = GLFenceEGL::Create();
DCHECK(fence);

44
ui/gl/gl_fence_apple.cc

@ -1,44 +0,0 @@
// Copyright 2014 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "ui/gl/gl_fence_apple.h"
#include "ui/gl/gl_bindings.h"
namespace gl {
GLFenceAPPLE::GLFenceAPPLE() {
glGenFencesAPPLE(1, &fence_);
glSetFenceAPPLE(fence_);
DCHECK(glIsFenceAPPLE(fence_));
glFlush();
}
bool GLFenceAPPLE::HasCompleted() {
DCHECK(glIsFenceAPPLE(fence_));
return !!glTestFenceAPPLE(fence_);
}
void GLFenceAPPLE::ClientWait() {
DCHECK(glIsFenceAPPLE(fence_));
glFinishFenceAPPLE(fence_);
}
void GLFenceAPPLE::ServerWait() {
DCHECK(glIsFenceAPPLE(fence_));
ClientWait();
}
GLFenceAPPLE::~GLFenceAPPLE() {
if (fence_) {
DCHECK(glIsFenceAPPLE(fence_));
glDeleteFencesAPPLE(1, &fence_);
}
}
void GLFenceAPPLE::Invalidate() {
fence_ = 0;
}
} // namespace gl

35
ui/gl/gl_fence_apple.h

@ -1,35 +0,0 @@
// Copyright 2014 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef UI_GL_GL_FENCE_APPLE_H_
#define UI_GL_GL_FENCE_APPLE_H_
#include "ui/gl/gl_bindings.h"
#include "ui/gl/gl_export.h"
#include "ui/gl/gl_fence.h"
namespace gl {
class GL_EXPORT GLFenceAPPLE : public GLFence {
public:
GLFenceAPPLE();
GLFenceAPPLE(const GLFenceAPPLE&) = delete;
GLFenceAPPLE& operator=(const GLFenceAPPLE&) = delete;
~GLFenceAPPLE() override;
// GLFence implementation:
bool HasCompleted() override;
void ClientWait() override;
void ServerWait() override;
void Invalidate() override;
private:
GLuint fence_ = 0;
};
} // namespace gl
#endif // UI_GL_GL_FENCE_APPLE_H_

13
ui/gl/gl_mock_autogen_gl.h

@ -120,8 +120,6 @@ MOCK_METHOD5(ClearTexImage,
// glClearTexSubImage cannot be mocked because it has 11 args.
MOCK_METHOD3(ClientWaitSync,
GLenum(GLsync sync, GLbitfield flags, GLuint64 timeout));
MOCK_METHOD3(ClientWaitSyncAPPLE,
GLenum(GLsync sync, GLbitfield flags, GLuint64 timeout));
MOCK_METHOD2(ClipControlEXT, void(GLenum origin, GLenum depth));
MOCK_METHOD4(
ColorMask,
@ -268,7 +266,6 @@ MOCK_METHOD6(DebugMessageInsert,
GLsizei length,
const char* buf));
MOCK_METHOD2(DeleteBuffersARB, void(GLsizei n, const GLuint* buffers));
MOCK_METHOD2(DeleteFencesAPPLE, void(GLsizei n, const GLuint* fences));
MOCK_METHOD2(DeleteFencesNV, void(GLsizei n, const GLuint* fences));
MOCK_METHOD2(DeleteFramebuffersEXT,
void(GLsizei n, const GLuint* framebuffers));
@ -283,7 +280,6 @@ MOCK_METHOD2(DeleteSamplers, void(GLsizei n, const GLuint* samplers));
MOCK_METHOD2(DeleteSemaphoresEXT, void(GLsizei n, const GLuint* semaphores));
MOCK_METHOD1(DeleteShader, void(GLuint shader));
MOCK_METHOD1(DeleteSync, void(GLsync sync));
MOCK_METHOD1(DeleteSyncAPPLE, void(GLsync sync));
MOCK_METHOD2(DeleteTextures, void(GLsizei n, const GLuint* textures));
MOCK_METHOD2(DeleteTransformFeedbacks, void(GLsizei n, const GLuint* ids));
MOCK_METHOD2(DeleteVertexArraysOES, void(GLsizei n, const GLuint* arrays));
@ -354,9 +350,7 @@ MOCK_METHOD1(EndQuery, void(GLenum target));
MOCK_METHOD1(EndTilingQCOM, void(GLbitfield preserveMask));
MOCK_METHOD0(EndTransformFeedback, void());
MOCK_METHOD2(FenceSync, GLsync(GLenum condition, GLbitfield flags));
MOCK_METHOD2(FenceSyncAPPLE, GLsync(GLenum condition, GLbitfield flags));
MOCK_METHOD0(Finish, void());
MOCK_METHOD1(FinishFenceAPPLE, void(GLuint fence));
MOCK_METHOD1(FinishFenceNV, void(GLuint fence));
MOCK_METHOD0(Flush, void());
MOCK_METHOD3(FlushMappedBufferRange,
@ -410,7 +404,6 @@ MOCK_METHOD4(
MOCK_METHOD1(FrontFace, void(GLenum mode));
MOCK_METHOD2(GenBuffersARB, void(GLsizei n, GLuint* buffers));
MOCK_METHOD1(GenerateMipmapEXT, void(GLenum target));
MOCK_METHOD2(GenFencesAPPLE, void(GLsizei n, GLuint* fences));
MOCK_METHOD2(GenFencesNV, void(GLsizei n, GLuint* fences));
MOCK_METHOD2(GenFramebuffersEXT, void(GLsizei n, GLuint* framebuffers));
MOCK_METHOD2(GenProgramPipelines, GLuint(GLsizei n, GLuint* pipelines));
@ -934,7 +927,6 @@ MOCK_METHOD1(InvalidateTextureANGLE, void(GLenum target));
MOCK_METHOD1(IsBuffer, GLboolean(GLuint buffer));
MOCK_METHOD1(IsEnabled, GLboolean(GLenum cap));
MOCK_METHOD2(IsEnablediOES, GLboolean(GLenum target, GLuint index));
MOCK_METHOD1(IsFenceAPPLE, GLboolean(GLuint fence));
MOCK_METHOD1(IsFenceNV, GLboolean(GLuint fence));
MOCK_METHOD1(IsFramebufferEXT, GLboolean(GLuint framebuffer));
MOCK_METHOD1(IsProgram, GLboolean(GLuint program));
@ -944,7 +936,6 @@ MOCK_METHOD1(IsRenderbufferEXT, GLboolean(GLuint renderbuffer));
MOCK_METHOD1(IsSampler, GLboolean(GLuint sampler));
MOCK_METHOD1(IsShader, GLboolean(GLuint shader));
MOCK_METHOD1(IsSync, GLboolean(GLsync sync));
MOCK_METHOD1(IsSyncAPPLE, GLboolean(GLsync sync));
MOCK_METHOD1(IsTexture, GLboolean(GLuint texture));
MOCK_METHOD1(IsTransformFeedback, GLboolean(GLuint id));
MOCK_METHOD1(IsVertexArrayOES, GLboolean(GLuint array));
@ -1227,7 +1218,6 @@ MOCK_METHOD4(
SamplerParameterivRobustANGLE,
void(GLuint sampler, GLenum pname, GLsizei bufSize, const GLint* param));
MOCK_METHOD4(Scissor, void(GLint x, GLint y, GLsizei width, GLsizei height));
MOCK_METHOD1(SetFenceAPPLE, void(GLuint fence));
MOCK_METHOD2(SetFenceNV, void(GLuint fence, GLenum condition));
MOCK_METHOD5(ShaderBinary,
void(GLsizei n,
@ -1261,7 +1251,6 @@ MOCK_METHOD2(StencilMaskSeparate, void(GLenum face, GLuint mask));
MOCK_METHOD3(StencilOp, void(GLenum fail, GLenum zfail, GLenum zpass));
MOCK_METHOD4(StencilOpSeparate,
void(GLenum face, GLenum fail, GLenum zfail, GLenum zpass));
MOCK_METHOD1(TestFenceAPPLE, GLboolean(GLuint fence));
MOCK_METHOD1(TestFenceNV, GLboolean(GLuint fence));
MOCK_METHOD3(TexBuffer,
void(GLenum target, GLenum internalformat, GLuint buffer));
@ -1534,7 +1523,5 @@ MOCK_METHOD6(WaitSemaphoreEXT,
const GLuint* textures,
const GLenum* srcLayouts));
MOCK_METHOD3(WaitSync, void(GLsync sync, GLbitfield flags, GLuint64 timeout));
MOCK_METHOD3(WaitSyncAPPLE,
void(GLsync sync, GLbitfield flags, GLuint64 timeout));
MOCK_METHOD3(WindowRectanglesEXT,
void(GLenum mode, GLsizei n, const GLint* box));

12
ui/gl/gl_stub_api.cc

@ -32,10 +32,6 @@ void GLStubApi::glGenBuffersARBFn(GLsizei n, GLuint* buffers) {
void GLStubApi::glGenerateMipmapEXTFn(GLenum target) {}
void GLStubApi::glGenFencesAPPLEFn(GLsizei n, GLuint* fences) {
GenHelper(n, fences);
}
void GLStubApi::glGenFencesNVFn(GLsizei n, GLuint* fences) {
GenHelper(n, fences);
}
@ -268,10 +264,6 @@ GLboolean GLStubApi::glIsEnabledFn(GLenum cap) {
return GL_TRUE;
}
GLboolean GLStubApi::glIsFenceAPPLEFn(GLuint fence) {
return GL_TRUE;
}
GLboolean GLStubApi::glIsFenceNVFn(GLuint fence) {
return GL_TRUE;
}
@ -316,10 +308,6 @@ GLboolean GLStubApi::glIsVertexArrayOESFn(GLuint array) {
return GL_TRUE;
}
GLboolean GLStubApi::glTestFenceAPPLEFn(GLuint fence) {
return GL_TRUE;
}
GLboolean GLStubApi::glTestFenceNVFn(GLuint fence) {
return GL_TRUE;
}

3
ui/gl/gl_stub_api.h

@ -33,7 +33,6 @@ class GL_EXPORT GLStubApi: public GLStubApiBase {
GLsync glFenceSyncFn(GLenum condition, GLbitfield flags) override;
void glGenBuffersARBFn(GLsizei n, GLuint* buffers) override;
void glGenerateMipmapEXTFn(GLenum target) override;
void glGenFencesAPPLEFn(GLsizei n, GLuint* fences) override;
void glGenFencesNVFn(GLsizei n, GLuint* fences) override;
void glGenFramebuffersEXTFn(GLsizei n, GLuint* framebuffers) override;
void glGenQueriesFn(GLsizei n, GLuint* ids) override;
@ -57,7 +56,6 @@ class GL_EXPORT GLStubApi: public GLStubApiBase {
const GLubyte* glGetStringiFn(GLenum name, GLuint index) override;
GLboolean glIsBufferFn(GLuint buffer) override;
GLboolean glIsEnabledFn(GLenum cap) override;
GLboolean glIsFenceAPPLEFn(GLuint fence) override;
GLboolean glIsFenceNVFn(GLuint fence) override;
GLboolean glIsFramebufferEXTFn(GLuint framebuffer) override;
GLboolean glIsProgramFn(GLuint program) override;
@ -69,7 +67,6 @@ class GL_EXPORT GLStubApi: public GLStubApiBase {
GLboolean glIsTextureFn(GLuint texture) override;
GLboolean glIsTransformFeedbackFn(GLuint id) override;
GLboolean glIsVertexArrayOESFn(GLuint array) override;
GLboolean glTestFenceAPPLEFn(GLuint fence) override;
GLboolean glTestFenceNVFn(GLuint fence) override;
GLboolean glUnmapBufferFn(GLenum target) override;

22
ui/gl/gl_stub_autogen_gl.cc

@ -22,12 +22,6 @@ GLenum GLStubApiBase::glClientWaitSyncFn(GLsync sync,
return 0;
}
GLenum GLStubApiBase::glClientWaitSyncAPPLEFn(GLsync sync,
GLbitfield flags,
GLuint64 timeout) {
return 0;
}
GLuint GLStubApiBase::glCreateProgramFn() {
return 0;
}
@ -46,10 +40,6 @@ GLsync GLStubApiBase::glFenceSyncFn(GLenum condition, GLbitfield flags) {
return 0;
}
GLsync GLStubApiBase::glFenceSyncAPPLEFn(GLenum condition, GLbitfield flags) {
return 0;
}
GLuint GLStubApiBase::glGenProgramPipelinesFn(GLsizei n, GLuint* pipelines) {
return 0;
}
@ -126,10 +116,6 @@ GLboolean GLStubApiBase::glIsEnablediOESFn(GLenum target, GLuint index) {
return 0;
}
GLboolean GLStubApiBase::glIsFenceAPPLEFn(GLuint fence) {
return 0;
}
GLboolean GLStubApiBase::glIsFenceNVFn(GLuint fence) {
return 0;
}
@ -166,10 +152,6 @@ GLboolean GLStubApiBase::glIsSyncFn(GLsync sync) {
return 0;
}
GLboolean GLStubApiBase::glIsSyncAPPLEFn(GLsync sync) {
return 0;
}
GLboolean GLStubApiBase::glIsTextureFn(GLuint texture) {
return 0;
}
@ -193,10 +175,6 @@ void* GLStubApiBase::glMapBufferRangeFn(GLenum target,
return 0;
}
GLboolean GLStubApiBase::glTestFenceAPPLEFn(GLuint fence) {
return 0;
}
GLboolean GLStubApiBase::glTestFenceNVFn(GLuint fence) {
return 0;
}

15
ui/gl/gl_stub_autogen_gl.h

@ -140,9 +140,6 @@ void glClearTexSubImageFn(GLuint texture,
GLenum glClientWaitSyncFn(GLsync sync,
GLbitfield flags,
GLuint64 timeout) override;
GLenum glClientWaitSyncAPPLEFn(GLsync sync,
GLbitfield flags,
GLuint64 timeout) override;
void glClipControlEXTFn(GLenum origin, GLenum depth) override {}
void glColorMaskFn(GLboolean red,
GLboolean green,
@ -308,7 +305,6 @@ void glDebugMessageInsertFn(GLenum source,
GLsizei length,
const char* buf) override {}
void glDeleteBuffersARBFn(GLsizei n, const GLuint* buffers) override {}
void glDeleteFencesAPPLEFn(GLsizei n, const GLuint* fences) override {}
void glDeleteFencesNVFn(GLsizei n, const GLuint* fences) override {}
void glDeleteFramebuffersEXTFn(GLsizei n, const GLuint* framebuffers) override {
}
@ -323,7 +319,6 @@ void glDeleteSamplersFn(GLsizei n, const GLuint* samplers) override {}
void glDeleteSemaphoresEXTFn(GLsizei n, const GLuint* semaphores) override {}
void glDeleteShaderFn(GLuint shader) override {}
void glDeleteSyncFn(GLsync sync) override {}
void glDeleteSyncAPPLEFn(GLsync sync) override {}
void glDeleteTexturesFn(GLsizei n, const GLuint* textures) override {}
void glDeleteTransformFeedbacksFn(GLsizei n, const GLuint* ids) override {}
void glDeleteVertexArraysOESFn(GLsizei n, const GLuint* arrays) override {}
@ -395,9 +390,7 @@ void glEndQueryFn(GLenum target) override {}
void glEndTilingQCOMFn(GLbitfield preserveMask) override {}
void glEndTransformFeedbackFn() override {}
GLsync glFenceSyncFn(GLenum condition, GLbitfield flags) override;
GLsync glFenceSyncAPPLEFn(GLenum condition, GLbitfield flags) override;
void glFinishFn() override {}
void glFinishFenceAPPLEFn(GLuint fence) override {}
void glFinishFenceNVFn(GLuint fence) override {}
void glFlushFn() override {}
void glFlushMappedBufferRangeFn(GLenum target,
@ -452,7 +445,6 @@ void glFramebufferTexturePixelLocalStorageANGLEFn(GLint plane,
void glFrontFaceFn(GLenum mode) override {}
void glGenBuffersARBFn(GLsizei n, GLuint* buffers) override {}
void glGenerateMipmapEXTFn(GLenum target) override {}
void glGenFencesAPPLEFn(GLsizei n, GLuint* fences) override {}
void glGenFencesNVFn(GLsizei n, GLuint* fences) override {}
void glGenFramebuffersEXTFn(GLsizei n, GLuint* framebuffers) override {}
GLuint glGenProgramPipelinesFn(GLsizei n, GLuint* pipelines) override;
@ -962,7 +954,6 @@ void glInvalidateTextureANGLEFn(GLenum target) override {}
GLboolean glIsBufferFn(GLuint buffer) override;
GLboolean glIsEnabledFn(GLenum cap) override;
GLboolean glIsEnablediOESFn(GLenum target, GLuint index) override;
GLboolean glIsFenceAPPLEFn(GLuint fence) override;
GLboolean glIsFenceNVFn(GLuint fence) override;
GLboolean glIsFramebufferEXTFn(GLuint framebuffer) override;
GLboolean glIsProgramFn(GLuint program) override;
@ -972,7 +963,6 @@ GLboolean glIsRenderbufferEXTFn(GLuint renderbuffer) override;
GLboolean glIsSamplerFn(GLuint sampler) override;
GLboolean glIsShaderFn(GLuint shader) override;
GLboolean glIsSyncFn(GLsync sync) override;
GLboolean glIsSyncAPPLEFn(GLsync sync) override;
GLboolean glIsTextureFn(GLuint texture) override;
GLboolean glIsTransformFeedbackFn(GLuint id) override;
GLboolean glIsVertexArrayOESFn(GLuint array) override;
@ -1288,7 +1278,6 @@ void glSamplerParameterivRobustANGLEFn(GLuint sampler,
GLsizei bufSize,
const GLint* param) override {}
void glScissorFn(GLint x, GLint y, GLsizei width, GLsizei height) override {}
void glSetFenceAPPLEFn(GLuint fence) override {}
void glSetFenceNVFn(GLuint fence, GLenum condition) override {}
void glShaderBinaryFn(GLsizei n,
const GLuint* shaders,
@ -1322,7 +1311,6 @@ void glStencilOpSeparateFn(GLenum face,
GLenum fail,
GLenum zfail,
GLenum zpass) override {}
GLboolean glTestFenceAPPLEFn(GLuint fence) override;
GLboolean glTestFenceNVFn(GLuint fence) override;
void glTexBufferFn(GLenum target,
GLenum internalformat,
@ -1623,9 +1611,6 @@ void glWaitSemaphoreEXTFn(GLuint semaphore,
const GLuint* textures,
const GLenum* srcLayouts) override {}
void glWaitSyncFn(GLsync sync, GLbitfield flags, GLuint64 timeout) override {}
void glWaitSyncAPPLEFn(GLsync sync,
GLbitfield flags,
GLuint64 timeout) override {}
void glWindowRectanglesEXTFn(GLenum mode,
GLsizei n,
const GLint* box) override {}