From b02fc662fa75f6276b1c259d985ac5af2b92d735 Mon Sep 17 00:00:00 2001 From: Geoff Lang Date: Tue, 21 Aug 2018 09:48:01 -0400 Subject: [PATCH] Lock around all EGL and GL calls with a global mutex. BUG=angleproject:2464 Change-Id: I0231cc84777272f9cf26298c6a137f1ad3fd51d6 Reviewed-on: https://chromium-review.googlesource.com/1183441 Reviewed-by: Geoff Lang Commit-Queue: Geoff Lang --- BUILD.gn | 4 + gni/angle.gni | 1 + scripts/generate_entry_points.py | 1 + scripts/run_code_generation_hashes.json | 2 +- src/libANGLE/features.h | 7 +- src/libGLESv2/entry_points_egl.cpp | 51 +- src/libGLESv2/entry_points_egl_ext.cpp | 33 + .../entry_points_gles_1_0_autogen.cpp | 86 ++ .../entry_points_gles_2_0_autogen.cpp | 142 ++++ .../entry_points_gles_3_0_autogen.cpp | 104 +++ .../entry_points_gles_3_1_autogen.cpp | 68 ++ .../entry_points_gles_ext_autogen.cpp | 796 ++++++++++++++++++ src/libGLESv2/global_state.cpp | 15 + src/libGLESv2/global_state.h | 16 + 14 files changed, 1321 insertions(+), 5 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index d614fc7de55..ca4445b246f 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -76,6 +76,10 @@ config("internal_config") { } else { defines += [ "ANGLE_IS_32_BIT_CPU" ] } + + if (angle_force_thread_safety) { + defines += [ "ANGLE_FORCE_THREAD_SAFETY=1" ] + } } config("extra_warnings") { diff --git a/gni/angle.gni b/gni/angle.gni index 621ce4961a3..c002129fb43 100644 --- a/gni/angle.gni +++ b/gni/angle.gni @@ -64,6 +64,7 @@ declare_args() { angle_enable_null = true angle_enable_essl = true angle_enable_glsl = true + angle_force_thread_safety = false } declare_args() { diff --git a/scripts/generate_entry_points.py b/scripts/generate_entry_points.py index f401beeedc6..b574da27622 100755 --- a/scripts/generate_entry_points.py +++ b/scripts/generate_entry_points.py @@ -181,6 +181,7 @@ template_entry_point_def = """{return_type}GL_APIENTRY {name}{explicit_context_suffix}({explicit_context_param}{explicit_context_comma}{params}) {{ + ANGLE_SCOPED_GLOBAL_LOCK(); {event_comment}EVENT("({format_params})"{comma_if_needed}{pass_params}); Context *context = {context_getter}; diff --git a/scripts/run_code_generation_hashes.json b/scripts/run_code_generation_hashes.json index ffd55d600cd..610e50fc5de 100644 --- a/scripts/run_code_generation_hashes.json +++ b/scripts/run_code_generation_hashes.json @@ -48,7 +48,7 @@ "GL entry point:scripts/entry_point_packed_gl_enums.json": "df2c879ccb62109a31c24d4b1df45354", "GL entry point:scripts/generate_entry_points.py": - "bfe4041311e3ae882ed218e306d7b683", + "5a110a1e99777cf8c904f30e54af15a1", "GL entry point:scripts/gl.xml": "b470cb06b06cbbe7adb2c8129ec85708", "GL format map:src/libANGLE/es3_format_type_combinations.json": diff --git a/src/libANGLE/features.h b/src/libANGLE/features.h index 48a194ff0bc..7da9534b9df 100644 --- a/src/libANGLE/features.h +++ b/src/libANGLE/features.h @@ -62,4 +62,9 @@ #endif // defined(ANGLE_PLATFORM_WINDOWS) #endif // !defined(ANGLE_STD_ASYNC_WORKERS) -#endif // LIBANGLE_FEATURES_H_ +// Force thread safety in all of ANGLE by locking a global mutex in every ANGLE entry point. +#if !defined(ANGLE_FORCE_THREAD_SAFETY) +#define ANGLE_FORCE_THREAD_SAFETY ANGLE_DISABLED +#endif // !defined(ANGLE_FORCE_THREAD_SAFETY) + +#endif // LIBANGLE_FEATURES_H_ diff --git a/src/libGLESv2/entry_points_egl.cpp b/src/libGLESv2/entry_points_egl.cpp index 278fa7ef0a8..330c6ae651c 100644 --- a/src/libGLESv2/entry_points_egl.cpp +++ b/src/libGLESv2/entry_points_egl.cpp @@ -55,6 +55,7 @@ void ClipConfigs(const std::vector &filteredConfigs, // EGL 1.0 EGLint EGLAPIENTRY GetError(void) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Thread *thread = GetCurrentThread(); @@ -65,6 +66,7 @@ EGLint EGLAPIENTRY GetError(void) EGLDisplay EGLAPIENTRY GetDisplay(EGLNativeDisplayType display_id) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLNativeDisplayType display_id = 0x%0.8p)", display_id); return Display::GetDisplayFromNativeDisplay(display_id, AttributeMap()); @@ -72,6 +74,7 @@ EGLDisplay EGLAPIENTRY GetDisplay(EGLNativeDisplayType display_id) EGLBoolean EGLAPIENTRY Initialize(EGLDisplay dpy, EGLint *major, EGLint *minor) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint *major = 0x%0.8p, EGLint *minor = 0x%0.8p)", dpy, major, minor); Thread *thread = GetCurrentThread(); @@ -94,6 +97,7 @@ EGLBoolean EGLAPIENTRY Initialize(EGLDisplay dpy, EGLint *major, EGLint *minor) EGLBoolean EGLAPIENTRY Terminate(EGLDisplay dpy) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p)", dpy); Thread *thread = GetCurrentThread(); @@ -115,6 +119,7 @@ EGLBoolean EGLAPIENTRY Terminate(EGLDisplay dpy) const char *EGLAPIENTRY QueryString(EGLDisplay dpy, EGLint name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint name = %d)", dpy, name); Thread *thread = GetCurrentThread(); @@ -162,6 +167,7 @@ EGLBoolean EGLAPIENTRY GetConfigs(EGLDisplay dpy, EGLint config_size, EGLint *num_config) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLConfig *configs = 0x%0.8p, " "EGLint config_size = %d, EGLint *num_config = 0x%0.8p)", @@ -185,6 +191,7 @@ EGLBoolean EGLAPIENTRY ChooseConfig(EGLDisplay dpy, EGLint config_size, EGLint *num_config) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, const EGLint *attrib_list = 0x%0.8p, " "EGLConfig *configs = 0x%0.8p, EGLint config_size = %d, EGLint *num_config = 0x%0.8p)", @@ -208,6 +215,7 @@ EGLBoolean EGLAPIENTRY GetConfigAttrib(EGLDisplay dpy, EGLint attribute, EGLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLint attribute = %d, EGLint " "*value = 0x%0.8p)", @@ -231,6 +239,7 @@ EGLSurface EGLAPIENTRY CreateWindowSurface(EGLDisplay dpy, EGLNativeWindowType win, const EGLint *attrib_list) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLNativeWindowType win = 0x%0.8p, " "const EGLint *attrib_list = 0x%0.8p)", @@ -257,6 +266,7 @@ EGLSurface EGLAPIENTRY CreatePbufferSurface(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, const EGLint *attrib_list = " "0x%0.8p)", @@ -282,6 +292,7 @@ EGLSurface EGLAPIENTRY CreatePixmapSurface(EGLDisplay dpy, EGLNativePixmapType pixmap, const EGLint *attrib_list) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLNativePixmapType pixmap = " "0x%0.8p, " @@ -303,6 +314,7 @@ EGLSurface EGLAPIENTRY CreatePixmapSurface(EGLDisplay dpy, EGLBoolean EGLAPIENTRY DestroySurface(EGLDisplay dpy, EGLSurface surface) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p)", dpy, surface); Thread *thread = GetCurrentThread(); @@ -324,6 +336,7 @@ EGLBoolean EGLAPIENTRY QuerySurface(EGLDisplay dpy, EGLint attribute, EGLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint attribute = %d, EGLint " "*value = 0x%0.8p)", @@ -347,6 +360,7 @@ EGLContext EGLAPIENTRY CreateContext(EGLDisplay dpy, EGLContext share_context, const EGLint *attrib_list) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLContext share_context = " "0x%0.8p, " @@ -374,6 +388,7 @@ EGLContext EGLAPIENTRY CreateContext(EGLDisplay dpy, EGLBoolean EGLAPIENTRY DestroyContext(EGLDisplay dpy, EGLContext ctx) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLContext ctx = 0x%0.8p)", dpy, ctx); Thread *thread = GetCurrentThread(); @@ -399,6 +414,7 @@ EGLBoolean EGLAPIENTRY DestroyContext(EGLDisplay dpy, EGLContext ctx) EGLBoolean EGLAPIENTRY MakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLSurface draw = 0x%0.8p, EGLSurface read = 0x%0.8p, " "EGLContext ctx = 0x%0.8p)", @@ -440,6 +456,7 @@ EGLBoolean EGLAPIENTRY MakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface r EGLSurface EGLAPIENTRY GetCurrentSurface(EGLint readdraw) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLint readdraw = %d)", readdraw); Thread *thread = GetCurrentThread(); @@ -462,6 +479,7 @@ EGLSurface EGLAPIENTRY GetCurrentSurface(EGLint readdraw) EGLDisplay EGLAPIENTRY GetCurrentDisplay(void) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Thread *thread = GetCurrentThread(); @@ -475,6 +493,7 @@ EGLDisplay EGLAPIENTRY GetCurrentDisplay(void) EGLBoolean EGLAPIENTRY QueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLContext ctx = 0x%0.8p, EGLint attribute = %d, EGLint *value " "= 0x%0.8p)", @@ -495,6 +514,7 @@ EGLBoolean EGLAPIENTRY QueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attri EGLBoolean EGLAPIENTRY WaitGL(void) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Thread *thread = GetCurrentThread(); @@ -514,6 +534,7 @@ EGLBoolean EGLAPIENTRY WaitGL(void) EGLBoolean EGLAPIENTRY WaitNative(EGLint engine) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLint engine = %d)", engine); Thread *thread = GetCurrentThread(); @@ -531,6 +552,7 @@ EGLBoolean EGLAPIENTRY WaitNative(EGLint engine) EGLBoolean EGLAPIENTRY SwapBuffers(EGLDisplay dpy, EGLSurface surface) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p)", dpy, surface); Thread *thread = GetCurrentThread(); @@ -549,6 +571,7 @@ EGLBoolean EGLAPIENTRY SwapBuffers(EGLDisplay dpy, EGLSurface surface) EGLBoolean EGLAPIENTRY CopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLNativePixmapType target = " "0x%0.8p)", @@ -570,12 +593,13 @@ EGLBoolean EGLAPIENTRY CopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNative // EGL 1.1 EGLBoolean EGLAPIENTRY BindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint buffer = %d)", dpy, surface, buffer); Thread *thread = GetCurrentThread(); - Display *display = static_cast(dpy); - Surface *eglSurface = static_cast(surface); + Display *display = static_cast(dpy); + Surface *eglSurface = static_cast(surface); gl::Context *context = thread->getContext(); gl::Texture *textureObject = nullptr; @@ -598,6 +622,7 @@ EGLBoolean EGLAPIENTRY SurfaceAttrib(EGLDisplay dpy, EGLint attribute, EGLint value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint attribute = %d, EGLint " "value = %d)", @@ -618,6 +643,7 @@ EGLBoolean EGLAPIENTRY SurfaceAttrib(EGLDisplay dpy, EGLBoolean EGLAPIENTRY ReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint buffer = %d)", dpy, surface, buffer); Thread *thread = GetCurrentThread(); @@ -643,10 +669,11 @@ EGLBoolean EGLAPIENTRY ReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLin EGLBoolean EGLAPIENTRY SwapInterval(EGLDisplay dpy, EGLint interval) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint interval = %d)", dpy, interval); Thread *thread = GetCurrentThread(); - Display *display = static_cast(dpy); + Display *display = static_cast(dpy); Surface *draw_surface = static_cast(thread->getCurrentDrawSurface()); ANGLE_EGL_TRY_RETURN(thread, ValidateSwapInterval(display, draw_surface), "eglSwapInterval", @@ -665,6 +692,7 @@ EGLBoolean EGLAPIENTRY SwapInterval(EGLDisplay dpy, EGLint interval) // EGL 1.2 EGLBoolean EGLAPIENTRY BindAPI(EGLenum api) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLenum api = 0x%X)", api); Thread *thread = GetCurrentThread(); @@ -679,6 +707,7 @@ EGLBoolean EGLAPIENTRY BindAPI(EGLenum api) EGLenum EGLAPIENTRY QueryAPI(void) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Thread *thread = GetCurrentThread(); @@ -694,6 +723,7 @@ EGLSurface EGLAPIENTRY CreatePbufferFromClientBuffer(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLenum buftype = 0x%X, EGLClientBuffer buffer = 0x%0.8p, " "EGLConfig config = 0x%0.8p, const EGLint *attrib_list = 0x%0.8p)", @@ -721,6 +751,8 @@ EGLSurface EGLAPIENTRY CreatePbufferFromClientBuffer(EGLDisplay dpy, EGLBoolean EGLAPIENTRY ReleaseThread(void) { + // Explicitly no global mutex lock because eglReleaseThread forwards its implementation to + // eglMakeCurrent EVENT("()"); Thread *thread = GetCurrentThread(); @@ -732,6 +764,7 @@ EGLBoolean EGLAPIENTRY ReleaseThread(void) EGLBoolean EGLAPIENTRY WaitClient(void) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Thread *thread = GetCurrentThread(); @@ -751,6 +784,7 @@ EGLBoolean EGLAPIENTRY WaitClient(void) // EGL 1.4 EGLContext EGLAPIENTRY GetCurrentContext(void) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Thread *thread = GetCurrentThread(); @@ -763,6 +797,7 @@ EGLContext EGLAPIENTRY GetCurrentContext(void) // EGL 1.5 EGLSync EGLAPIENTRY CreateSync(EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLenum type = 0x%X, const EGLint* attrib_list = 0x%0.8p)", dpy, type, attrib_list); Thread *thread = GetCurrentThread(); @@ -777,6 +812,7 @@ EGLSync EGLAPIENTRY CreateSync(EGLDisplay dpy, EGLenum type, const EGLAttrib *at EGLBoolean EGLAPIENTRY DestroySync(EGLDisplay dpy, EGLSync sync) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSync sync = 0x%0.8p)", dpy, sync); Thread *thread = GetCurrentThread(); @@ -789,6 +825,7 @@ EGLBoolean EGLAPIENTRY DestroySync(EGLDisplay dpy, EGLSync sync) EGLint EGLAPIENTRY ClientWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLSync sync = 0x%0.8p, EGLint flags = 0x%X, EGLTime timeout = " "%d)", @@ -807,6 +844,7 @@ EGLBoolean EGLAPIENTRY GetSyncAttrib(EGLDisplay dpy, EGLint attribute, EGLAttrib *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLSync sync = 0x%0.8p, EGLint attribute = 0x%X, EGLAttrib " "*value = 0x%0.8p)", @@ -826,6 +864,7 @@ EGLImage EGLAPIENTRY CreateImage(EGLDisplay dpy, EGLClientBuffer buffer, const EGLAttrib *attrib_list) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLContext ctx = 0x%0.8p, EGLenum target = 0x%X, " "EGLClientBuffer buffer = 0x%0.8p, const EGLAttrib *attrib_list = 0x%0.8p)", @@ -841,6 +880,7 @@ EGLImage EGLAPIENTRY CreateImage(EGLDisplay dpy, EGLBoolean EGLAPIENTRY DestroyImage(EGLDisplay dpy, EGLImage image) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLImage image = 0x%0.8p)", dpy, image); Thread *thread = GetCurrentThread(); Display *display = static_cast(dpy); @@ -856,6 +896,7 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplay(EGLenum platform, void *native_display, const EGLAttrib *attrib_list) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLenum platform = %d, void* native_display = 0x%0.8p, const EGLint* attrib_list = " "0x%0.8p)", @@ -888,6 +929,7 @@ EGLSurface EGLAPIENTRY CreatePlatformWindowSurface(EGLDisplay dpy, void *native_window, const EGLAttrib *attrib_list) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, void* native_window = 0x%0.8p, " "const EGLint* attrib_list = 0x%0.8p)", @@ -906,6 +948,7 @@ EGLSurface EGLAPIENTRY CreatePlatformPixmapSurface(EGLDisplay dpy, void *native_pixmap, const EGLAttrib *attrib_list) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, void* native_pixmap = 0x%0.8p, " "const EGLint* attrib_list = 0x%0.8p)", @@ -921,6 +964,7 @@ EGLSurface EGLAPIENTRY CreatePlatformPixmapSurface(EGLDisplay dpy, EGLBoolean EGLAPIENTRY WaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSync sync = 0x%0.8p, EGLint flags = 0x%X)", dpy, sync, flags); Thread *thread = GetCurrentThread(); @@ -934,6 +978,7 @@ EGLBoolean EGLAPIENTRY WaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags) __eglMustCastToProperFunctionPointerType EGLAPIENTRY GetProcAddress(const char *procname) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const char *procname = \"%s\")", procname); Thread *thread = GetCurrentThread(); diff --git a/src/libGLESv2/entry_points_egl_ext.cpp b/src/libGLESv2/entry_points_egl_ext.cpp index 9e309cd18d6..1510aff2bd8 100644 --- a/src/libGLESv2/entry_points_egl_ext.cpp +++ b/src/libGLESv2/entry_points_egl_ext.cpp @@ -28,6 +28,7 @@ EGLBoolean EGLAPIENTRY QuerySurfacePointerANGLE(EGLDisplay dpy, EGLint attribute, void **value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint attribute = %d, void " "**value = 0x%0.8p)", @@ -99,6 +100,7 @@ EGLBoolean EGLAPIENTRY QuerySurfacePointerANGLE(EGLDisplay dpy, EGLBoolean EGLAPIENTRY PostSubBufferNV(EGLDisplay dpy, EGLSurface surface, EGLint x, EGLint y, EGLint width, EGLint height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint x = %d, EGLint y = %d, " "EGLint width = %d, EGLint height = %d)", @@ -161,6 +163,7 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplayEXT(EGLenum platform, void *native_display, const EGLint *attrib_list) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLenum platform = %d, void* native_display = 0x%0.8p, const EGLint* attrib_list = " "0x%0.8p)", @@ -197,6 +200,7 @@ EGLSurface EGLAPIENTRY CreatePlatformWindowSurfaceEXT(EGLDisplay dpy, void *native_window, const EGLint *attrib_list) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, void *native_window = 0x%0.8p, " "const EGLint *attrib_list = 0x%0.8p)", @@ -222,6 +226,7 @@ EGLSurface EGLAPIENTRY CreatePlatformPixmapSurfaceEXT(EGLDisplay dpy, void *native_pixmap, const EGLint *attrib_list) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, void *native_pixmap = 0x%0.8p, " "const EGLint *attrib_list = 0x%0.8p)", @@ -245,6 +250,7 @@ EGLSurface EGLAPIENTRY CreatePlatformPixmapSurfaceEXT(EGLDisplay dpy, // EGL_EXT_device_query EGLBoolean EGLAPIENTRY QueryDeviceAttribEXT(EGLDeviceEXT device, EGLint attribute, EGLAttrib *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDeviceEXT device = 0x%0.8p, EGLint attribute = %d, EGLAttrib *value = 0x%0.8p)", device, attribute, value); Thread *thread = GetCurrentThread(); @@ -302,6 +308,7 @@ EGLBoolean EGLAPIENTRY QueryDeviceAttribEXT(EGLDeviceEXT device, EGLint attribut // EGL_EXT_device_query const char *EGLAPIENTRY QueryDeviceStringEXT(EGLDeviceEXT device, EGLint name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDeviceEXT device = 0x%0.8p, EGLint name = %d)", device, name); Thread *thread = GetCurrentThread(); @@ -333,6 +340,7 @@ const char *EGLAPIENTRY QueryDeviceStringEXT(EGLDeviceEXT device, EGLint name) // EGL_EXT_device_query EGLBoolean EGLAPIENTRY QueryDisplayAttribEXT(EGLDisplay dpy, EGLint attribute, EGLAttrib *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint attribute = %d, EGLAttrib *value = 0x%0.8p)", dpy, attribute, value); Thread *thread = GetCurrentThread(); @@ -376,6 +384,7 @@ ANGLE_EXPORT EGLImageKHR EGLAPIENTRY CreateImageKHR(EGLDisplay dpy, EGLClientBuffer buffer, const EGLint *attrib_list) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLContext ctx = 0x%0.8p, EGLenum target = 0x%X, " "EGLClientBuffer buffer = 0x%0.8p, const EGLAttrib *attrib_list = 0x%0.8p)", @@ -407,6 +416,7 @@ ANGLE_EXPORT EGLImageKHR EGLAPIENTRY CreateImageKHR(EGLDisplay dpy, ANGLE_EXPORT EGLBoolean EGLAPIENTRY DestroyImageKHR(EGLDisplay dpy, EGLImageKHR image) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLImage image = 0x%0.8p)", dpy, image); Thread *thread = GetCurrentThread(); @@ -430,6 +440,7 @@ ANGLE_EXPORT EGLDeviceEXT EGLAPIENTRY CreateDeviceANGLE(EGLint device_type, void *native_device, const EGLAttrib *attrib_list) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLint device_type = %d, void* native_device = 0x%0.8p, const EGLAttrib* attrib_list = " "0x%0.8p)", @@ -458,6 +469,7 @@ ANGLE_EXPORT EGLDeviceEXT EGLAPIENTRY CreateDeviceANGLE(EGLint device_type, ANGLE_EXPORT EGLBoolean EGLAPIENTRY ReleaseDeviceANGLE(EGLDeviceEXT device) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDeviceEXT device = 0x%0.8p)", device); Thread *thread = GetCurrentThread(); @@ -479,6 +491,7 @@ ANGLE_EXPORT EGLBoolean EGLAPIENTRY ReleaseDeviceANGLE(EGLDeviceEXT device) // EGL_KHR_stream EGLStreamKHR EGLAPIENTRY CreateStreamKHR(EGLDisplay dpy, const EGLint *attrib_list) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, const EGLAttrib* attrib_list = 0x%0.8p)", dpy, attrib_list); Thread *thread = GetCurrentThread(); @@ -506,6 +519,7 @@ EGLStreamKHR EGLAPIENTRY CreateStreamKHR(EGLDisplay dpy, const EGLint *attrib_li EGLBoolean EGLAPIENTRY DestroyStreamKHR(EGLDisplay dpy, EGLStreamKHR stream) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR = 0x%0.8p)", dpy, stream); Thread *thread = GetCurrentThread(); @@ -531,6 +545,7 @@ EGLBoolean EGLAPIENTRY StreamAttribKHR(EGLDisplay dpy, EGLenum attribute, EGLint value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, EGLenum attribute = 0x%X, " "EGLint value = 0x%X)", @@ -569,6 +584,7 @@ EGLBoolean EGLAPIENTRY QueryStreamKHR(EGLDisplay dpy, EGLenum attribute, EGLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, EGLenum attribute = 0x%X, " "EGLint value = 0x%0.8p)", @@ -610,6 +626,7 @@ EGLBoolean EGLAPIENTRY QueryStreamu64KHR(EGLDisplay dpy, EGLenum attribute, EGLuint64KHR *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, EGLenum attribute = 0x%X, " "EGLuint64KHR value = 0x%0.8p)", @@ -645,6 +662,7 @@ EGLBoolean EGLAPIENTRY QueryStreamu64KHR(EGLDisplay dpy, EGLBoolean EGLAPIENTRY StreamConsumerGLTextureExternalKHR(EGLDisplay dpy, EGLStreamKHR stream) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR = 0x%0.8p)", dpy, stream); Thread *thread = GetCurrentThread(); @@ -674,6 +692,7 @@ EGLBoolean EGLAPIENTRY StreamConsumerGLTextureExternalKHR(EGLDisplay dpy, EGLStr EGLBoolean EGLAPIENTRY StreamConsumerAcquireKHR(EGLDisplay dpy, EGLStreamKHR stream) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR = 0x%0.8p)", dpy, stream); Thread *thread = GetCurrentThread(); @@ -703,6 +722,7 @@ EGLBoolean EGLAPIENTRY StreamConsumerAcquireKHR(EGLDisplay dpy, EGLStreamKHR str EGLBoolean EGLAPIENTRY StreamConsumerReleaseKHR(EGLDisplay dpy, EGLStreamKHR stream) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR = 0x%0.8p)", dpy, stream); Thread *thread = GetCurrentThread(); @@ -734,6 +754,7 @@ EGLBoolean EGLAPIENTRY StreamConsumerGLTextureExternalAttribsNV(EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, EGLAttrib attrib_list = 0x%0.8p", dpy, stream, attrib_list); @@ -769,6 +790,7 @@ EGLBoolean EGLAPIENTRY CreateStreamProducerD3DTextureANGLE(EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, EGLAttrib attrib_list = 0x%0.8p", dpy, stream, attrib_list); @@ -803,6 +825,7 @@ EGLBoolean EGLAPIENTRY StreamPostD3DTextureANGLE(EGLDisplay dpy, void *texture, const EGLAttrib *attrib_list) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, void* texture = 0x%0.8p, " "EGLAttrib attrib_list = 0x%0.8p", @@ -839,6 +862,7 @@ EGLBoolean EGLAPIENTRY GetSyncValuesCHROMIUM(EGLDisplay dpy, EGLuint64KHR *msc, EGLuint64KHR *sbc) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLuint64KHR* ust = 0x%0.8p, " "EGLuint64KHR* msc = 0x%0.8p, EGLuint64KHR* sbc = 0x%0.8p", @@ -873,6 +897,7 @@ EGLBoolean EGLAPIENTRY SwapBuffersWithDamageKHR(EGLDisplay dpy, EGLint *rects, EGLint n_rects) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint *rects = 0x%0.8p, EGLint " "n_rects = %d)", @@ -906,6 +931,7 @@ EGLBoolean EGLAPIENTRY PresentationTimeANDROID(EGLDisplay dpy, EGLSurface surface, EGLnsecsANDROID time) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLnsecsANDROID time = %d)", dpy, surface, time); Thread *thread = GetCurrentThread(); @@ -925,6 +951,7 @@ EGLBoolean EGLAPIENTRY PresentationTimeANDROID(EGLDisplay dpy, EGLint EGLAPIENTRY ProgramCacheGetAttribANGLE(EGLDisplay dpy, EGLenum attrib) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLenum attrib = 0x%X)", dpy, attrib); Display *display = static_cast(dpy); @@ -944,6 +971,7 @@ void EGLAPIENTRY ProgramCacheQueryANGLE(EGLDisplay dpy, void *binary, EGLint *binarysize) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, EGLint index = %d, void *key = 0x%0.8p, EGLint *keysize = " "0x%0.8p, void *binary = 0x%0.8p, EGLint *size = 0x%0.8p)", @@ -968,6 +996,7 @@ void EGLAPIENTRY ProgramCachePopulateANGLE(EGLDisplay dpy, const void *binary, EGLint binarysize) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8p, void *key = 0x%0.8p, EGLint keysize = %d, void *binary = " "0x%0.8p, EGLint *size = 0x%0.8p)", @@ -988,6 +1017,7 @@ void EGLAPIENTRY ProgramCachePopulateANGLE(EGLDisplay dpy, EGLint EGLAPIENTRY ProgramCacheResizeANGLE(EGLDisplay dpy, EGLint limit, EGLenum mode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint limit = %d, EGLenum mode = 0x%X)", dpy, limit, mode); Display *display = static_cast(dpy); @@ -1002,6 +1032,7 @@ EGLint EGLAPIENTRY ProgramCacheResizeANGLE(EGLDisplay dpy, EGLint limit, EGLenum EGLint EGLAPIENTRY DebugMessageControlKHR(EGLDEBUGPROCKHR callback, const EGLAttrib *attrib_list) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLDEBUGPROCKHR callback = 0x%0.8p, EGLAttrib attrib_list = 0x%0.8p)", callback, attrib_list); @@ -1025,6 +1056,7 @@ EGLint EGLAPIENTRY DebugMessageControlKHR(EGLDEBUGPROCKHR callback, const EGLAtt EGLBoolean EGLAPIENTRY QueryDebugKHR(EGLint attribute, EGLAttrib *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(EGLint attribute = 0x%X, EGLAttrib* value = 0x%0.8p)", attribute, value); Thread *thread = GetCurrentThread(); @@ -1063,6 +1095,7 @@ EGLint EGLAPIENTRY LabelObjectKHR(EGLDisplay dpy, EGLObjectKHR object, EGLLabelKHR label) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(EGLDisplay dpy = 0x%0.8pf, EGLenum objectType = 0x%X, EGLObjectKHR object = 0x%0.8p, " "EGLLabelKHR label = 0x%0.8p)", diff --git a/src/libGLESv2/entry_points_gles_1_0_autogen.cpp b/src/libGLESv2/entry_points_gles_1_0_autogen.cpp index 44a3950d3a2..0cf9d2e0a47 100644 --- a/src/libGLESv2/entry_points_gles_1_0_autogen.cpp +++ b/src/libGLESv2/entry_points_gles_1_0_autogen.cpp @@ -18,6 +18,7 @@ namespace gl { void GL_APIENTRY AlphaFunc(GLenum func, GLfloat ref) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum func = 0x%X, GLfloat ref = %f)", func, ref); Context *context = GetValidGlobalContext(); @@ -35,6 +36,7 @@ void GL_APIENTRY AlphaFunc(GLenum func, GLfloat ref) void GL_APIENTRY AlphaFuncx(GLenum func, GLfixed ref) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum func = 0x%X, GLfixed ref = 0x%X)", func, ref); Context *context = GetValidGlobalContext(); @@ -52,6 +54,7 @@ void GL_APIENTRY AlphaFuncx(GLenum func, GLfixed ref) void GL_APIENTRY ClearColorx(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed red = 0x%X, GLfixed green = 0x%X, GLfixed blue = 0x%X, GLfixed alpha = 0x%X)", red, green, blue, alpha); @@ -69,6 +72,7 @@ void GL_APIENTRY ClearColorx(GLfixed red, GLfixed green, GLfixed blue, GLfixed a void GL_APIENTRY ClearDepthx(GLfixed depth) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed depth = 0x%X)", depth); Context *context = GetValidGlobalContext(); @@ -85,6 +89,7 @@ void GL_APIENTRY ClearDepthx(GLfixed depth) void GL_APIENTRY ClientActiveTexture(GLenum texture) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum texture = 0x%X)", texture); Context *context = GetValidGlobalContext(); @@ -101,6 +106,7 @@ void GL_APIENTRY ClientActiveTexture(GLenum texture) void GL_APIENTRY ClipPlanef(GLenum p, const GLfloat *eqn) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum p = 0x%X, const GLfloat *eqn = 0x%0.8p)", p, eqn); Context *context = GetValidGlobalContext(); @@ -117,6 +123,7 @@ void GL_APIENTRY ClipPlanef(GLenum p, const GLfloat *eqn) void GL_APIENTRY ClipPlanex(GLenum plane, const GLfixed *equation) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum plane = 0x%X, const GLfixed *equation = 0x%0.8p)", plane, equation); Context *context = GetValidGlobalContext(); @@ -133,6 +140,7 @@ void GL_APIENTRY ClipPlanex(GLenum plane, const GLfixed *equation) void GL_APIENTRY Color4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat red = %f, GLfloat green = %f, GLfloat blue = %f, GLfloat alpha = %f)", red, green, blue, alpha); @@ -150,6 +158,7 @@ void GL_APIENTRY Color4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha void GL_APIENTRY Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLubyte red = %d, GLubyte green = %d, GLubyte blue = %d, GLubyte alpha = %d)", red, green, blue, alpha); @@ -167,6 +176,7 @@ void GL_APIENTRY Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alph void GL_APIENTRY Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed red = 0x%X, GLfixed green = 0x%X, GLfixed blue = 0x%X, GLfixed alpha = 0x%X)", red, green, blue, alpha); @@ -184,6 +194,7 @@ void GL_APIENTRY Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha void GL_APIENTRY ColorPointer(GLint size, GLenum type, GLsizei stride, const void *pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%0.8p)", size, type, stride, pointer); @@ -202,6 +213,7 @@ void GL_APIENTRY ColorPointer(GLint size, GLenum type, GLsizei stride, const voi void GL_APIENTRY DepthRangex(GLfixed n, GLfixed f) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed n = 0x%X, GLfixed f = 0x%X)", n, f); Context *context = GetValidGlobalContext(); @@ -218,6 +230,7 @@ void GL_APIENTRY DepthRangex(GLfixed n, GLfixed f) void GL_APIENTRY DisableClientState(GLenum array) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum array = 0x%X)", array); Context *context = GetValidGlobalContext(); @@ -235,6 +248,7 @@ void GL_APIENTRY DisableClientState(GLenum array) void GL_APIENTRY EnableClientState(GLenum array) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum array = 0x%X)", array); Context *context = GetValidGlobalContext(); @@ -252,6 +266,7 @@ void GL_APIENTRY EnableClientState(GLenum array) void GL_APIENTRY Fogf(GLenum pname, GLfloat param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLfloat param = %f)", pname, param); Context *context = GetValidGlobalContext(); @@ -268,6 +283,7 @@ void GL_APIENTRY Fogf(GLenum pname, GLfloat param) void GL_APIENTRY Fogfv(GLenum pname, const GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", pname, params); Context *context = GetValidGlobalContext(); @@ -284,6 +300,7 @@ void GL_APIENTRY Fogfv(GLenum pname, const GLfloat *params) void GL_APIENTRY Fogx(GLenum pname, GLfixed param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLfixed param = 0x%X)", pname, param); Context *context = GetValidGlobalContext(); @@ -300,6 +317,7 @@ void GL_APIENTRY Fogx(GLenum pname, GLfixed param) void GL_APIENTRY Fogxv(GLenum pname, const GLfixed *param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, const GLfixed *param = 0x%0.8p)", pname, param); Context *context = GetValidGlobalContext(); @@ -316,6 +334,7 @@ void GL_APIENTRY Fogxv(GLenum pname, const GLfixed *param) void GL_APIENTRY Frustumf(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLfloat l = %f, GLfloat r = %f, GLfloat b = %f, GLfloat t = %f, GLfloat n = %f, GLfloat " "f = %f)", @@ -335,6 +354,7 @@ void GL_APIENTRY Frustumf(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, void GL_APIENTRY Frustumx(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLfixed l = 0x%X, GLfixed r = 0x%X, GLfixed b = 0x%X, GLfixed t = 0x%X, GLfixed n = " "0x%X, GLfixed f = 0x%X)", @@ -354,6 +374,7 @@ void GL_APIENTRY Frustumx(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, void GL_APIENTRY GetClipPlanef(GLenum plane, GLfloat *equation) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum plane = 0x%X, GLfloat *equation = 0x%0.8p)", plane, equation); Context *context = GetValidGlobalContext(); @@ -370,6 +391,7 @@ void GL_APIENTRY GetClipPlanef(GLenum plane, GLfloat *equation) void GL_APIENTRY GetClipPlanex(GLenum plane, GLfixed *equation) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum plane = 0x%X, GLfixed *equation = 0x%0.8p)", plane, equation); Context *context = GetValidGlobalContext(); @@ -386,6 +408,7 @@ void GL_APIENTRY GetClipPlanex(GLenum plane, GLfixed *equation) void GL_APIENTRY GetFixedv(GLenum pname, GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLfixed *params = 0x%0.8p)", pname, params); Context *context = GetValidGlobalContext(); @@ -402,6 +425,7 @@ void GL_APIENTRY GetFixedv(GLenum pname, GLfixed *params) void GL_APIENTRY GetLightfv(GLenum light, GLenum pname, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", light, pname, params); @@ -420,6 +444,7 @@ void GL_APIENTRY GetLightfv(GLenum light, GLenum pname, GLfloat *params) void GL_APIENTRY GetLightxv(GLenum light, GLenum pname, GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%0.8p)", light, pname, params); @@ -438,6 +463,7 @@ void GL_APIENTRY GetLightxv(GLenum light, GLenum pname, GLfixed *params) void GL_APIENTRY GetMaterialfv(GLenum face, GLenum pname, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", face, pname, params); @@ -456,6 +482,7 @@ void GL_APIENTRY GetMaterialfv(GLenum face, GLenum pname, GLfloat *params) void GL_APIENTRY GetMaterialxv(GLenum face, GLenum pname, GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%0.8p)", face, pname, params); @@ -474,6 +501,7 @@ void GL_APIENTRY GetMaterialxv(GLenum face, GLenum pname, GLfixed *params) void GL_APIENTRY GetPointerv(GLenum pname, void **params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, void **params = 0x%0.8p)", pname, params); Context *context = GetValidGlobalContext(); @@ -490,6 +518,7 @@ void GL_APIENTRY GetPointerv(GLenum pname, void **params) void GL_APIENTRY GetTexEnvfv(GLenum target, GLenum pname, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", target, pname, params); @@ -510,6 +539,7 @@ void GL_APIENTRY GetTexEnvfv(GLenum target, GLenum pname, GLfloat *params) void GL_APIENTRY GetTexEnviv(GLenum target, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname, params); @@ -530,6 +560,7 @@ void GL_APIENTRY GetTexEnviv(GLenum target, GLenum pname, GLint *params) void GL_APIENTRY GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%0.8p)", target, pname, params); @@ -550,6 +581,7 @@ void GL_APIENTRY GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params) void GL_APIENTRY GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%0.8p)", target, pname, params); @@ -569,6 +601,7 @@ void GL_APIENTRY GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params) void GL_APIENTRY LightModelf(GLenum pname, GLfloat param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLfloat param = %f)", pname, param); Context *context = GetValidGlobalContext(); @@ -585,6 +618,7 @@ void GL_APIENTRY LightModelf(GLenum pname, GLfloat param) void GL_APIENTRY LightModelfv(GLenum pname, const GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", pname, params); Context *context = GetValidGlobalContext(); @@ -601,6 +635,7 @@ void GL_APIENTRY LightModelfv(GLenum pname, const GLfloat *params) void GL_APIENTRY LightModelx(GLenum pname, GLfixed param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLfixed param = 0x%X)", pname, param); Context *context = GetValidGlobalContext(); @@ -617,6 +652,7 @@ void GL_APIENTRY LightModelx(GLenum pname, GLfixed param) void GL_APIENTRY LightModelxv(GLenum pname, const GLfixed *param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, const GLfixed *param = 0x%0.8p)", pname, param); Context *context = GetValidGlobalContext(); @@ -633,6 +669,7 @@ void GL_APIENTRY LightModelxv(GLenum pname, const GLfixed *param) void GL_APIENTRY Lightf(GLenum light, GLenum pname, GLfloat param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", light, pname, param); Context *context = GetValidGlobalContext(); @@ -650,6 +687,7 @@ void GL_APIENTRY Lightf(GLenum light, GLenum pname, GLfloat param) void GL_APIENTRY Lightfv(GLenum light, GLenum pname, const GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", light, pname, params); @@ -668,6 +706,7 @@ void GL_APIENTRY Lightfv(GLenum light, GLenum pname, const GLfloat *params) void GL_APIENTRY Lightx(GLenum light, GLenum pname, GLfixed param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", light, pname, param); Context *context = GetValidGlobalContext(); @@ -685,6 +724,7 @@ void GL_APIENTRY Lightx(GLenum light, GLenum pname, GLfixed param) void GL_APIENTRY Lightxv(GLenum light, GLenum pname, const GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%0.8p)", light, pname, params); @@ -703,6 +743,7 @@ void GL_APIENTRY Lightxv(GLenum light, GLenum pname, const GLfixed *params) void GL_APIENTRY LineWidthx(GLfixed width) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed width = 0x%X)", width); Context *context = GetValidGlobalContext(); @@ -719,6 +760,7 @@ void GL_APIENTRY LineWidthx(GLfixed width) void GL_APIENTRY LoadIdentity() { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = GetValidGlobalContext(); @@ -735,6 +777,7 @@ void GL_APIENTRY LoadIdentity() void GL_APIENTRY LoadMatrixf(const GLfloat *m) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const GLfloat *m = 0x%0.8p)", m); Context *context = GetValidGlobalContext(); @@ -751,6 +794,7 @@ void GL_APIENTRY LoadMatrixf(const GLfloat *m) void GL_APIENTRY LoadMatrixx(const GLfixed *m) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const GLfixed *m = 0x%0.8p)", m); Context *context = GetValidGlobalContext(); @@ -767,6 +811,7 @@ void GL_APIENTRY LoadMatrixx(const GLfixed *m) void GL_APIENTRY LogicOp(GLenum opcode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum opcode = 0x%X)", opcode); Context *context = GetValidGlobalContext(); @@ -784,6 +829,7 @@ void GL_APIENTRY LogicOp(GLenum opcode) void GL_APIENTRY Materialf(GLenum face, GLenum pname, GLfloat param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", face, pname, param); Context *context = GetValidGlobalContext(); @@ -801,6 +847,7 @@ void GL_APIENTRY Materialf(GLenum face, GLenum pname, GLfloat param) void GL_APIENTRY Materialfv(GLenum face, GLenum pname, const GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", face, pname, params); @@ -819,6 +866,7 @@ void GL_APIENTRY Materialfv(GLenum face, GLenum pname, const GLfloat *params) void GL_APIENTRY Materialx(GLenum face, GLenum pname, GLfixed param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", face, pname, param); Context *context = GetValidGlobalContext(); @@ -836,6 +884,7 @@ void GL_APIENTRY Materialx(GLenum face, GLenum pname, GLfixed param) void GL_APIENTRY Materialxv(GLenum face, GLenum pname, const GLfixed *param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, const GLfixed *param = 0x%0.8p)", face, pname, param); @@ -854,6 +903,7 @@ void GL_APIENTRY Materialxv(GLenum face, GLenum pname, const GLfixed *param) void GL_APIENTRY MatrixMode(GLenum mode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum mode = 0x%X)", mode); Context *context = GetValidGlobalContext(); @@ -871,6 +921,7 @@ void GL_APIENTRY MatrixMode(GLenum mode) void GL_APIENTRY MultMatrixf(const GLfloat *m) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const GLfloat *m = 0x%0.8p)", m); Context *context = GetValidGlobalContext(); @@ -887,6 +938,7 @@ void GL_APIENTRY MultMatrixf(const GLfloat *m) void GL_APIENTRY MultMatrixx(const GLfixed *m) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const GLfixed *m = 0x%0.8p)", m); Context *context = GetValidGlobalContext(); @@ -903,6 +955,7 @@ void GL_APIENTRY MultMatrixx(const GLfixed *m) void GL_APIENTRY MultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLfloat s = %f, GLfloat t = %f, GLfloat r = %f, GLfloat q = %f)", target, s, t, r, q); @@ -920,6 +973,7 @@ void GL_APIENTRY MultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, void GL_APIENTRY MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum texture = 0x%X, GLfixed s = 0x%X, GLfixed t = 0x%X, GLfixed r = 0x%X, GLfixed q = " "0x%X)", @@ -939,6 +993,7 @@ void GL_APIENTRY MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r void GL_APIENTRY Normal3f(GLfloat nx, GLfloat ny, GLfloat nz) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat nx = %f, GLfloat ny = %f, GLfloat nz = %f)", nx, ny, nz); Context *context = GetValidGlobalContext(); @@ -955,6 +1010,7 @@ void GL_APIENTRY Normal3f(GLfloat nx, GLfloat ny, GLfloat nz) void GL_APIENTRY Normal3x(GLfixed nx, GLfixed ny, GLfixed nz) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed nx = 0x%X, GLfixed ny = 0x%X, GLfixed nz = 0x%X)", nx, ny, nz); Context *context = GetValidGlobalContext(); @@ -971,6 +1027,7 @@ void GL_APIENTRY Normal3x(GLfixed nx, GLfixed ny, GLfixed nz) void GL_APIENTRY NormalPointer(GLenum type, GLsizei stride, const void *pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%0.8p)", type, stride, pointer); @@ -988,6 +1045,7 @@ void GL_APIENTRY NormalPointer(GLenum type, GLsizei stride, const void *pointer) void GL_APIENTRY Orthof(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLfloat l = %f, GLfloat r = %f, GLfloat b = %f, GLfloat t = %f, GLfloat n = %f, GLfloat " "f = %f)", @@ -1007,6 +1065,7 @@ void GL_APIENTRY Orthof(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, G void GL_APIENTRY Orthox(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLfixed l = 0x%X, GLfixed r = 0x%X, GLfixed b = 0x%X, GLfixed t = 0x%X, GLfixed n = " "0x%X, GLfixed f = 0x%X)", @@ -1026,6 +1085,7 @@ void GL_APIENTRY Orthox(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, G void GL_APIENTRY PointParameterf(GLenum pname, GLfloat param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLfloat param = %f)", pname, param); Context *context = GetValidGlobalContext(); @@ -1043,6 +1103,7 @@ void GL_APIENTRY PointParameterf(GLenum pname, GLfloat param) void GL_APIENTRY PointParameterfv(GLenum pname, const GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", pname, params); Context *context = GetValidGlobalContext(); @@ -1060,6 +1121,7 @@ void GL_APIENTRY PointParameterfv(GLenum pname, const GLfloat *params) void GL_APIENTRY PointParameterx(GLenum pname, GLfixed param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLfixed param = 0x%X)", pname, param); Context *context = GetValidGlobalContext(); @@ -1077,6 +1139,7 @@ void GL_APIENTRY PointParameterx(GLenum pname, GLfixed param) void GL_APIENTRY PointParameterxv(GLenum pname, const GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, const GLfixed *params = 0x%0.8p)", pname, params); Context *context = GetValidGlobalContext(); @@ -1094,6 +1157,7 @@ void GL_APIENTRY PointParameterxv(GLenum pname, const GLfixed *params) void GL_APIENTRY PointSize(GLfloat size) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat size = %f)", size); Context *context = GetValidGlobalContext(); @@ -1110,6 +1174,7 @@ void GL_APIENTRY PointSize(GLfloat size) void GL_APIENTRY PointSizex(GLfixed size) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed size = 0x%X)", size); Context *context = GetValidGlobalContext(); @@ -1126,6 +1191,7 @@ void GL_APIENTRY PointSizex(GLfixed size) void GL_APIENTRY PolygonOffsetx(GLfixed factor, GLfixed units) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed factor = 0x%X, GLfixed units = 0x%X)", factor, units); Context *context = GetValidGlobalContext(); @@ -1142,6 +1208,7 @@ void GL_APIENTRY PolygonOffsetx(GLfixed factor, GLfixed units) void GL_APIENTRY PopMatrix() { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = GetValidGlobalContext(); @@ -1158,6 +1225,7 @@ void GL_APIENTRY PopMatrix() void GL_APIENTRY PushMatrix() { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = GetValidGlobalContext(); @@ -1174,6 +1242,7 @@ void GL_APIENTRY PushMatrix() void GL_APIENTRY Rotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat angle = %f, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", angle, x, y, z); Context *context = GetValidGlobalContext(); @@ -1190,6 +1259,7 @@ void GL_APIENTRY Rotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z) void GL_APIENTRY Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed angle = 0x%X, GLfixed x = 0x%X, GLfixed y = 0x%X, GLfixed z = 0x%X)", angle, x, y, z); @@ -1207,6 +1277,7 @@ void GL_APIENTRY Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z) void GL_APIENTRY SampleCoveragex(GLclampx value, GLboolean invert) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLclampx value = 0x%X, GLboolean invert = %u)", value, invert); Context *context = GetValidGlobalContext(); @@ -1223,6 +1294,7 @@ void GL_APIENTRY SampleCoveragex(GLclampx value, GLboolean invert) void GL_APIENTRY Scalef(GLfloat x, GLfloat y, GLfloat z) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", x, y, z); Context *context = GetValidGlobalContext(); @@ -1239,6 +1311,7 @@ void GL_APIENTRY Scalef(GLfloat x, GLfloat y, GLfloat z) void GL_APIENTRY Scalex(GLfixed x, GLfixed y, GLfixed z) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed x = 0x%X, GLfixed y = 0x%X, GLfixed z = 0x%X)", x, y, z); Context *context = GetValidGlobalContext(); @@ -1255,6 +1328,7 @@ void GL_APIENTRY Scalex(GLfixed x, GLfixed y, GLfixed z) void GL_APIENTRY ShadeModel(GLenum mode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum mode = 0x%X)", mode); Context *context = GetValidGlobalContext(); @@ -1272,6 +1346,7 @@ void GL_APIENTRY ShadeModel(GLenum mode) void GL_APIENTRY TexCoordPointer(GLint size, GLenum type, GLsizei stride, const void *pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%0.8p)", size, type, stride, pointer); @@ -1291,6 +1366,7 @@ void GL_APIENTRY TexCoordPointer(GLint size, GLenum type, GLsizei stride, const void GL_APIENTRY TexEnvf(GLenum target, GLenum pname, GLfloat param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", target, pname, param); Context *context = GetValidGlobalContext(); @@ -1309,6 +1385,7 @@ void GL_APIENTRY TexEnvf(GLenum target, GLenum pname, GLfloat param) void GL_APIENTRY TexEnvfv(GLenum target, GLenum pname, const GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", target, pname, params); @@ -1329,6 +1406,7 @@ void GL_APIENTRY TexEnvfv(GLenum target, GLenum pname, const GLfloat *params) void GL_APIENTRY TexEnvi(GLenum target, GLenum pname, GLint param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %d)", target, pname, param); Context *context = GetValidGlobalContext(); @@ -1347,6 +1425,7 @@ void GL_APIENTRY TexEnvi(GLenum target, GLenum pname, GLint param) void GL_APIENTRY TexEnviv(GLenum target, GLenum pname, const GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%0.8p)", target, pname, params); @@ -1367,6 +1446,7 @@ void GL_APIENTRY TexEnviv(GLenum target, GLenum pname, const GLint *params) void GL_APIENTRY TexEnvx(GLenum target, GLenum pname, GLfixed param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", target, pname, param); @@ -1386,6 +1466,7 @@ void GL_APIENTRY TexEnvx(GLenum target, GLenum pname, GLfixed param) void GL_APIENTRY TexEnvxv(GLenum target, GLenum pname, const GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%0.8p)", target, pname, params); @@ -1406,6 +1487,7 @@ void GL_APIENTRY TexEnvxv(GLenum target, GLenum pname, const GLfixed *params) void GL_APIENTRY TexParameterx(GLenum target, GLenum pname, GLfixed param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", target, pname, param); @@ -1424,6 +1506,7 @@ void GL_APIENTRY TexParameterx(GLenum target, GLenum pname, GLfixed param) void GL_APIENTRY TexParameterxv(GLenum target, GLenum pname, const GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%0.8p)", target, pname, params); @@ -1443,6 +1526,7 @@ void GL_APIENTRY TexParameterxv(GLenum target, GLenum pname, const GLfixed *para void GL_APIENTRY Translatef(GLfloat x, GLfloat y, GLfloat z) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", x, y, z); Context *context = GetValidGlobalContext(); @@ -1459,6 +1543,7 @@ void GL_APIENTRY Translatef(GLfloat x, GLfloat y, GLfloat z) void GL_APIENTRY Translatex(GLfixed x, GLfixed y, GLfixed z) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed x = 0x%X, GLfixed y = 0x%X, GLfixed z = 0x%X)", x, y, z); Context *context = GetValidGlobalContext(); @@ -1475,6 +1560,7 @@ void GL_APIENTRY Translatex(GLfixed x, GLfixed y, GLfixed z) void GL_APIENTRY VertexPointer(GLint size, GLenum type, GLsizei stride, const void *pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%0.8p)", size, type, stride, pointer); diff --git a/src/libGLESv2/entry_points_gles_2_0_autogen.cpp b/src/libGLESv2/entry_points_gles_2_0_autogen.cpp index de6e7140053..c2ae51e8dfc 100644 --- a/src/libGLESv2/entry_points_gles_2_0_autogen.cpp +++ b/src/libGLESv2/entry_points_gles_2_0_autogen.cpp @@ -18,6 +18,7 @@ namespace gl { void GL_APIENTRY ActiveTexture(GLenum texture) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum texture = 0x%X)", texture); Context *context = GetValidGlobalContext(); @@ -34,6 +35,7 @@ void GL_APIENTRY ActiveTexture(GLenum texture) void GL_APIENTRY AttachShader(GLuint program, GLuint shader) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLuint shader = %u)", program, shader); Context *context = GetValidGlobalContext(); @@ -50,6 +52,7 @@ void GL_APIENTRY AttachShader(GLuint program, GLuint shader) void GL_APIENTRY BindAttribLocation(GLuint program, GLuint index, const GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLuint index = %u, const GLchar *name = 0x%0.8p)", program, index, name); @@ -67,6 +70,7 @@ void GL_APIENTRY BindAttribLocation(GLuint program, GLuint index, const GLchar * void GL_APIENTRY BindBuffer(GLenum target, GLuint buffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint buffer = %u)", target, buffer); Context *context = GetValidGlobalContext(); @@ -84,6 +88,7 @@ void GL_APIENTRY BindBuffer(GLenum target, GLuint buffer) void GL_APIENTRY BindFramebuffer(GLenum target, GLuint framebuffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint framebuffer = %u)", target, framebuffer); Context *context = GetValidGlobalContext(); @@ -100,6 +105,7 @@ void GL_APIENTRY BindFramebuffer(GLenum target, GLuint framebuffer) void GL_APIENTRY BindRenderbuffer(GLenum target, GLuint renderbuffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint renderbuffer = %u)", target, renderbuffer); Context *context = GetValidGlobalContext(); @@ -116,6 +122,7 @@ void GL_APIENTRY BindRenderbuffer(GLenum target, GLuint renderbuffer) void GL_APIENTRY BindTexture(GLenum target, GLuint texture) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint texture = %u)", target, texture); Context *context = GetValidGlobalContext(); @@ -133,6 +140,7 @@ void GL_APIENTRY BindTexture(GLenum target, GLuint texture) void GL_APIENTRY BlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat red = %f, GLfloat green = %f, GLfloat blue = %f, GLfloat alpha = %f)", red, green, blue, alpha); @@ -150,6 +158,7 @@ void GL_APIENTRY BlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat al void GL_APIENTRY BlendEquation(GLenum mode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum mode = 0x%X)", mode); Context *context = GetValidGlobalContext(); @@ -166,6 +175,7 @@ void GL_APIENTRY BlendEquation(GLenum mode) void GL_APIENTRY BlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum modeRGB = 0x%X, GLenum modeAlpha = 0x%X)", modeRGB, modeAlpha); Context *context = GetValidGlobalContext(); @@ -182,6 +192,7 @@ void GL_APIENTRY BlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha) void GL_APIENTRY BlendFunc(GLenum sfactor, GLenum dfactor) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum sfactor = 0x%X, GLenum dfactor = 0x%X)", sfactor, dfactor); Context *context = GetValidGlobalContext(); @@ -201,6 +212,7 @@ void GL_APIENTRY BlendFuncSeparate(GLenum sfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum sfactorRGB = 0x%X, GLenum dfactorRGB = 0x%X, GLenum sfactorAlpha = 0x%X, GLenum " "dfactorAlpha = 0x%X)", @@ -222,6 +234,7 @@ void GL_APIENTRY BlendFuncSeparate(GLenum sfactorRGB, void GL_APIENTRY BufferData(GLenum target, GLsizeiptr size, const void *data, GLenum usage) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizeiptr size = %d, const void *data = 0x%0.8p, GLenum usage = " "0x%X)", @@ -244,6 +257,7 @@ void GL_APIENTRY BufferData(GLenum target, GLsizeiptr size, const void *data, GL void GL_APIENTRY BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const void *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr size = %d, const void *data = " "0x%0.8p)", @@ -265,6 +279,7 @@ void GL_APIENTRY BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLenum GL_APIENTRY CheckFramebufferStatus(GLenum target) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X)", target); Context *context = GetValidGlobalContext(); @@ -283,6 +298,7 @@ GLenum GL_APIENTRY CheckFramebufferStatus(GLenum target) void GL_APIENTRY Clear(GLbitfield mask) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLbitfield mask = 0x%X)", mask); Context *context = GetValidGlobalContext(); @@ -299,6 +315,7 @@ void GL_APIENTRY Clear(GLbitfield mask) void GL_APIENTRY ClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat red = %f, GLfloat green = %f, GLfloat blue = %f, GLfloat alpha = %f)", red, green, blue, alpha); @@ -316,6 +333,7 @@ void GL_APIENTRY ClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat al void GL_APIENTRY ClearDepthf(GLfloat d) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat d = %f)", d); Context *context = GetValidGlobalContext(); @@ -332,6 +350,7 @@ void GL_APIENTRY ClearDepthf(GLfloat d) void GL_APIENTRY ClearStencil(GLint s) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint s = %d)", s); Context *context = GetValidGlobalContext(); @@ -348,6 +367,7 @@ void GL_APIENTRY ClearStencil(GLint s) void GL_APIENTRY ColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLboolean red = %u, GLboolean green = %u, GLboolean blue = %u, GLboolean alpha = %u)", red, green, blue, alpha); @@ -365,6 +385,7 @@ void GL_APIENTRY ColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboo void GL_APIENTRY CompileShader(GLuint shader) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint shader = %u)", shader); Context *context = GetValidGlobalContext(); @@ -388,6 +409,7 @@ void GL_APIENTRY CompressedTexImage2D(GLenum target, GLsizei imageSize, const void *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = " "%d, GLsizei height = %d, GLint border = %d, GLsizei imageSize = %d, const void *data = " @@ -421,6 +443,7 @@ void GL_APIENTRY CompressedTexSubImage2D(GLenum target, GLsizei imageSize, const void *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLsizei " "width = %d, GLsizei height = %d, GLenum format = 0x%X, GLsizei imageSize = %d, const void " @@ -453,6 +476,7 @@ void GL_APIENTRY CopyTexImage2D(GLenum target, GLsizei height, GLint border) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLint x = %d, " "GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLint border = %d)", @@ -484,6 +508,7 @@ void GL_APIENTRY CopyTexSubImage2D(GLenum target, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint x " "= %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", @@ -507,6 +532,7 @@ void GL_APIENTRY CopyTexSubImage2D(GLenum target, GLuint GL_APIENTRY CreateProgram() { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = GetValidGlobalContext(); @@ -525,6 +551,7 @@ GLuint GL_APIENTRY CreateProgram() GLuint GL_APIENTRY CreateShader(GLenum type) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum type = 0x%X)", type); Context *context = GetValidGlobalContext(); @@ -544,6 +571,7 @@ GLuint GL_APIENTRY CreateShader(GLenum type) void GL_APIENTRY CullFace(GLenum mode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum mode = 0x%X)", mode); Context *context = GetValidGlobalContext(); @@ -561,6 +589,7 @@ void GL_APIENTRY CullFace(GLenum mode) void GL_APIENTRY DeleteBuffers(GLsizei n, const GLuint *buffers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *buffers = 0x%0.8p)", n, buffers); Context *context = GetValidGlobalContext(); @@ -577,6 +606,7 @@ void GL_APIENTRY DeleteBuffers(GLsizei n, const GLuint *buffers) void GL_APIENTRY DeleteFramebuffers(GLsizei n, const GLuint *framebuffers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *framebuffers = 0x%0.8p)", n, framebuffers); Context *context = GetValidGlobalContext(); @@ -593,6 +623,7 @@ void GL_APIENTRY DeleteFramebuffers(GLsizei n, const GLuint *framebuffers) void GL_APIENTRY DeleteProgram(GLuint program) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u)", program); Context *context = GetValidGlobalContext(); @@ -609,6 +640,7 @@ void GL_APIENTRY DeleteProgram(GLuint program) void GL_APIENTRY DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *renderbuffers = 0x%0.8p)", n, renderbuffers); Context *context = GetValidGlobalContext(); @@ -625,6 +657,7 @@ void GL_APIENTRY DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers) void GL_APIENTRY DeleteShader(GLuint shader) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint shader = %u)", shader); Context *context = GetValidGlobalContext(); @@ -641,6 +674,7 @@ void GL_APIENTRY DeleteShader(GLuint shader) void GL_APIENTRY DeleteTextures(GLsizei n, const GLuint *textures) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *textures = 0x%0.8p)", n, textures); Context *context = GetValidGlobalContext(); @@ -657,6 +691,7 @@ void GL_APIENTRY DeleteTextures(GLsizei n, const GLuint *textures) void GL_APIENTRY DepthFunc(GLenum func) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum func = 0x%X)", func); Context *context = GetValidGlobalContext(); @@ -673,6 +708,7 @@ void GL_APIENTRY DepthFunc(GLenum func) void GL_APIENTRY DepthMask(GLboolean flag) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLboolean flag = %u)", flag); Context *context = GetValidGlobalContext(); @@ -689,6 +725,7 @@ void GL_APIENTRY DepthMask(GLboolean flag) void GL_APIENTRY DepthRangef(GLfloat n, GLfloat f) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat n = %f, GLfloat f = %f)", n, f); Context *context = GetValidGlobalContext(); @@ -705,6 +742,7 @@ void GL_APIENTRY DepthRangef(GLfloat n, GLfloat f) void GL_APIENTRY DetachShader(GLuint program, GLuint shader) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLuint shader = %u)", program, shader); Context *context = GetValidGlobalContext(); @@ -721,6 +759,7 @@ void GL_APIENTRY DetachShader(GLuint program, GLuint shader) void GL_APIENTRY Disable(GLenum cap) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum cap = 0x%X)", cap); Context *context = GetValidGlobalContext(); @@ -737,6 +776,7 @@ void GL_APIENTRY Disable(GLenum cap) void GL_APIENTRY DisableVertexAttribArray(GLuint index) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u)", index); Context *context = GetValidGlobalContext(); @@ -753,6 +793,7 @@ void GL_APIENTRY DisableVertexAttribArray(GLuint index) void GL_APIENTRY DrawArrays(GLenum mode, GLint first, GLsizei count) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d)", mode, first, count); Context *context = GetValidGlobalContext(); @@ -770,6 +811,7 @@ void GL_APIENTRY DrawArrays(GLenum mode, GLint first, GLsizei count) void GL_APIENTRY DrawElements(GLenum mode, GLsizei count, GLenum type, const void *indices) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = " "0x%0.8p)", @@ -791,6 +833,7 @@ void GL_APIENTRY DrawElements(GLenum mode, GLsizei count, GLenum type, const voi void GL_APIENTRY Enable(GLenum cap) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum cap = 0x%X)", cap); Context *context = GetValidGlobalContext(); @@ -807,6 +850,7 @@ void GL_APIENTRY Enable(GLenum cap) void GL_APIENTRY EnableVertexAttribArray(GLuint index) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u)", index); Context *context = GetValidGlobalContext(); @@ -823,6 +867,7 @@ void GL_APIENTRY EnableVertexAttribArray(GLuint index) void GL_APIENTRY Finish() { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = GetValidGlobalContext(); @@ -839,6 +884,7 @@ void GL_APIENTRY Finish() void GL_APIENTRY Flush() { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = GetValidGlobalContext(); @@ -858,6 +904,7 @@ void GL_APIENTRY FramebufferRenderbuffer(GLenum target, GLenum renderbuffertarget, GLuint renderbuffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum renderbuffertarget = 0x%X, GLuint " "renderbuffer = %u)", @@ -884,6 +931,7 @@ void GL_APIENTRY FramebufferTexture2D(GLenum target, GLuint texture, GLint level) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, GLuint texture " "= %u, GLint level = %d)", @@ -907,6 +955,7 @@ void GL_APIENTRY FramebufferTexture2D(GLenum target, void GL_APIENTRY FrontFace(GLenum mode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum mode = 0x%X)", mode); Context *context = GetValidGlobalContext(); @@ -923,6 +972,7 @@ void GL_APIENTRY FrontFace(GLenum mode) void GL_APIENTRY GenBuffers(GLsizei n, GLuint *buffers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *buffers = 0x%0.8p)", n, buffers); Context *context = GetValidGlobalContext(); @@ -939,6 +989,7 @@ void GL_APIENTRY GenBuffers(GLsizei n, GLuint *buffers) void GL_APIENTRY GenFramebuffers(GLsizei n, GLuint *framebuffers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *framebuffers = 0x%0.8p)", n, framebuffers); Context *context = GetValidGlobalContext(); @@ -955,6 +1006,7 @@ void GL_APIENTRY GenFramebuffers(GLsizei n, GLuint *framebuffers) void GL_APIENTRY GenRenderbuffers(GLsizei n, GLuint *renderbuffers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *renderbuffers = 0x%0.8p)", n, renderbuffers); Context *context = GetValidGlobalContext(); @@ -971,6 +1023,7 @@ void GL_APIENTRY GenRenderbuffers(GLsizei n, GLuint *renderbuffers) void GL_APIENTRY GenTextures(GLsizei n, GLuint *textures) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *textures = 0x%0.8p)", n, textures); Context *context = GetValidGlobalContext(); @@ -987,6 +1040,7 @@ void GL_APIENTRY GenTextures(GLsizei n, GLuint *textures) void GL_APIENTRY GenerateMipmap(GLenum target) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X)", target); Context *context = GetValidGlobalContext(); @@ -1010,6 +1064,7 @@ void GL_APIENTRY GetActiveAttrib(GLuint program, GLenum *type, GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, " "GLint *size = 0x%0.8p, GLenum *type = 0x%0.8p, GLchar *name = 0x%0.8p)", @@ -1037,6 +1092,7 @@ void GL_APIENTRY GetActiveUniform(GLuint program, GLenum *type, GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, " "GLint *size = 0x%0.8p, GLenum *type = 0x%0.8p, GLchar *name = 0x%0.8p)", @@ -1061,6 +1117,7 @@ void GL_APIENTRY GetAttachedShaders(GLuint program, GLsizei *count, GLuint *shaders) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLsizei maxCount = %d, GLsizei *count = 0x%0.8p, GLuint *shaders = " "0x%0.8p)", @@ -1081,6 +1138,7 @@ void GL_APIENTRY GetAttachedShaders(GLuint program, GLint GL_APIENTRY GetAttribLocation(GLuint program, const GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, const GLchar *name = 0x%0.8p)", program, name); Context *context = GetValidGlobalContext(); @@ -1099,6 +1157,7 @@ GLint GL_APIENTRY GetAttribLocation(GLuint program, const GLchar *name) void GL_APIENTRY GetBooleanv(GLenum pname, GLboolean *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLboolean *data = 0x%0.8p)", pname, data); Context *context = GetValidGlobalContext(); @@ -1115,6 +1174,7 @@ void GL_APIENTRY GetBooleanv(GLenum pname, GLboolean *data) void GL_APIENTRY GetBufferParameteriv(GLenum target, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname, params); @@ -1134,6 +1194,7 @@ void GL_APIENTRY GetBufferParameteriv(GLenum target, GLenum pname, GLint *params GLenum GL_APIENTRY GetError() { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = GetGlobalContext(); @@ -1152,6 +1213,7 @@ GLenum GL_APIENTRY GetError() void GL_APIENTRY GetFloatv(GLenum pname, GLfloat *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLfloat *data = 0x%0.8p)", pname, data); Context *context = GetValidGlobalContext(); @@ -1171,6 +1233,7 @@ void GL_APIENTRY GetFramebufferAttachmentParameteriv(GLenum target, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLint *params = " "0x%0.8p)", @@ -1192,6 +1255,7 @@ void GL_APIENTRY GetFramebufferAttachmentParameteriv(GLenum target, void GL_APIENTRY GetIntegerv(GLenum pname, GLint *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLint *data = 0x%0.8p)", pname, data); Context *context = GetValidGlobalContext(); @@ -1211,6 +1275,7 @@ void GL_APIENTRY GetProgramInfoLog(GLuint program, GLsizei *length, GLchar *infoLog) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *infoLog = " "0x%0.8p)", @@ -1231,6 +1296,7 @@ void GL_APIENTRY GetProgramInfoLog(GLuint program, void GL_APIENTRY GetProgramiv(GLuint program, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", program, pname, params); @@ -1248,6 +1314,7 @@ void GL_APIENTRY GetProgramiv(GLuint program, GLenum pname, GLint *params) void GL_APIENTRY GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname, params); @@ -1266,6 +1333,7 @@ void GL_APIENTRY GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint * void GL_APIENTRY GetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *infoLog = " "0x%0.8p)", @@ -1289,6 +1357,7 @@ void GL_APIENTRY GetShaderPrecisionFormat(GLenum shadertype, GLint *range, GLint *precision) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum shadertype = 0x%X, GLenum precisiontype = 0x%X, GLint *range = 0x%0.8p, GLint " "*precision = 0x%0.8p)", @@ -1310,6 +1379,7 @@ void GL_APIENTRY GetShaderPrecisionFormat(GLenum shadertype, void GL_APIENTRY GetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *source = " "0x%0.8p)", @@ -1330,6 +1400,7 @@ void GL_APIENTRY GetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length void GL_APIENTRY GetShaderiv(GLuint shader, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint shader = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", shader, pname, params); @@ -1347,6 +1418,7 @@ void GL_APIENTRY GetShaderiv(GLuint shader, GLenum pname, GLint *params) const GLubyte *GL_APIENTRY GetString(GLenum name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum name = 0x%X)", name); Context *context = GetValidGlobalContext(); @@ -1365,6 +1437,7 @@ const GLubyte *GL_APIENTRY GetString(GLenum name) void GL_APIENTRY GetTexParameterfv(GLenum target, GLenum pname, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", target, pname, params); @@ -1384,6 +1457,7 @@ void GL_APIENTRY GetTexParameterfv(GLenum target, GLenum pname, GLfloat *params) void GL_APIENTRY GetTexParameteriv(GLenum target, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname, params); @@ -1403,6 +1477,7 @@ void GL_APIENTRY GetTexParameteriv(GLenum target, GLenum pname, GLint *params) GLint GL_APIENTRY GetUniformLocation(GLuint program, const GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, const GLchar *name = 0x%0.8p)", program, name); Context *context = GetValidGlobalContext(); @@ -1421,6 +1496,7 @@ GLint GL_APIENTRY GetUniformLocation(GLuint program, const GLchar *name) void GL_APIENTRY GetUniformfv(GLuint program, GLint location, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, GLfloat *params = 0x%0.8p)", program, location, params); @@ -1438,6 +1514,7 @@ void GL_APIENTRY GetUniformfv(GLuint program, GLint location, GLfloat *params) void GL_APIENTRY GetUniformiv(GLuint program, GLint location, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, GLint *params = 0x%0.8p)", program, location, params); @@ -1455,6 +1532,7 @@ void GL_APIENTRY GetUniformiv(GLuint program, GLint location, GLint *params) void GL_APIENTRY GetVertexAttribPointerv(GLuint index, GLenum pname, void **pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLenum pname = 0x%X, void **pointer = 0x%0.8p)", index, pname, pointer); @@ -1473,6 +1551,7 @@ void GL_APIENTRY GetVertexAttribPointerv(GLuint index, GLenum pname, void **poin void GL_APIENTRY GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", index, pname, params); @@ -1490,6 +1569,7 @@ void GL_APIENTRY GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params) void GL_APIENTRY GetVertexAttribiv(GLuint index, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", index, pname, params); @@ -1507,6 +1587,7 @@ void GL_APIENTRY GetVertexAttribiv(GLuint index, GLenum pname, GLint *params) void GL_APIENTRY Hint(GLenum target, GLenum mode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum mode = 0x%X)", target, mode); Context *context = GetValidGlobalContext(); @@ -1523,6 +1604,7 @@ void GL_APIENTRY Hint(GLenum target, GLenum mode) GLboolean GL_APIENTRY IsBuffer(GLuint buffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint buffer = %u)", buffer); Context *context = GetValidGlobalContext(); @@ -1541,6 +1623,7 @@ GLboolean GL_APIENTRY IsBuffer(GLuint buffer) GLboolean GL_APIENTRY IsEnabled(GLenum cap) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum cap = 0x%X)", cap); Context *context = GetValidGlobalContext(); @@ -1559,6 +1642,7 @@ GLboolean GL_APIENTRY IsEnabled(GLenum cap) GLboolean GL_APIENTRY IsFramebuffer(GLuint framebuffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint framebuffer = %u)", framebuffer); Context *context = GetValidGlobalContext(); @@ -1577,6 +1661,7 @@ GLboolean GL_APIENTRY IsFramebuffer(GLuint framebuffer) GLboolean GL_APIENTRY IsProgram(GLuint program) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u)", program); Context *context = GetValidGlobalContext(); @@ -1595,6 +1680,7 @@ GLboolean GL_APIENTRY IsProgram(GLuint program) GLboolean GL_APIENTRY IsRenderbuffer(GLuint renderbuffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint renderbuffer = %u)", renderbuffer); Context *context = GetValidGlobalContext(); @@ -1613,6 +1699,7 @@ GLboolean GL_APIENTRY IsRenderbuffer(GLuint renderbuffer) GLboolean GL_APIENTRY IsShader(GLuint shader) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint shader = %u)", shader); Context *context = GetValidGlobalContext(); @@ -1631,6 +1718,7 @@ GLboolean GL_APIENTRY IsShader(GLuint shader) GLboolean GL_APIENTRY IsTexture(GLuint texture) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint texture = %u)", texture); Context *context = GetValidGlobalContext(); @@ -1649,6 +1737,7 @@ GLboolean GL_APIENTRY IsTexture(GLuint texture) void GL_APIENTRY LineWidth(GLfloat width) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat width = %f)", width); Context *context = GetValidGlobalContext(); @@ -1665,6 +1754,7 @@ void GL_APIENTRY LineWidth(GLfloat width) void GL_APIENTRY LinkProgram(GLuint program) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u)", program); Context *context = GetValidGlobalContext(); @@ -1681,6 +1771,7 @@ void GL_APIENTRY LinkProgram(GLuint program) void GL_APIENTRY PixelStorei(GLenum pname, GLint param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLint param = %d)", pname, param); Context *context = GetValidGlobalContext(); @@ -1697,6 +1788,7 @@ void GL_APIENTRY PixelStorei(GLenum pname, GLint param) void GL_APIENTRY PolygonOffset(GLfloat factor, GLfloat units) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat factor = %f, GLfloat units = %f)", factor, units); Context *context = GetValidGlobalContext(); @@ -1719,6 +1811,7 @@ void GL_APIENTRY ReadPixels(GLint x, GLenum type, void *pixels) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = " "0x%X, GLenum type = 0x%X, void *pixels = 0x%0.8p)", @@ -1739,6 +1832,7 @@ void GL_APIENTRY ReadPixels(GLint x, void GL_APIENTRY ReleaseShaderCompiler() { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = GetValidGlobalContext(); @@ -1758,6 +1852,7 @@ void GL_APIENTRY RenderbufferStorage(GLenum target, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = " "%d)", @@ -1779,6 +1874,7 @@ void GL_APIENTRY RenderbufferStorage(GLenum target, void GL_APIENTRY SampleCoverage(GLfloat value, GLboolean invert) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat value = %f, GLboolean invert = %u)", value, invert); Context *context = GetValidGlobalContext(); @@ -1795,6 +1891,7 @@ void GL_APIENTRY SampleCoverage(GLfloat value, GLboolean invert) void GL_APIENTRY Scissor(GLint x, GLint y, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", x, y, width, height); @@ -1816,6 +1913,7 @@ void GL_APIENTRY ShaderBinary(GLsizei count, const void *binary, GLsizei length) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLsizei count = %d, const GLuint *shaders = 0x%0.8p, GLenum binaryformat = 0x%X, const " "void *binary = 0x%0.8p, GLsizei length = %d)", @@ -1840,6 +1938,7 @@ void GL_APIENTRY ShaderSource(GLuint shader, const GLchar *const *string, const GLint *length) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint shader = %u, GLsizei count = %d, const GLchar *const*string = 0x%0.8p, const " "GLint *length = 0x%0.8p)", @@ -1860,6 +1959,7 @@ void GL_APIENTRY ShaderSource(GLuint shader, void GL_APIENTRY StencilFunc(GLenum func, GLint ref, GLuint mask) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum func = 0x%X, GLint ref = %d, GLuint mask = %u)", func, ref, mask); Context *context = GetValidGlobalContext(); @@ -1876,6 +1976,7 @@ void GL_APIENTRY StencilFunc(GLenum func, GLint ref, GLuint mask) void GL_APIENTRY StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum face = 0x%X, GLenum func = 0x%X, GLint ref = %d, GLuint mask = %u)", face, func, ref, mask); @@ -1894,6 +1995,7 @@ void GL_APIENTRY StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint void GL_APIENTRY StencilMask(GLuint mask) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint mask = %u)", mask); Context *context = GetValidGlobalContext(); @@ -1910,6 +2012,7 @@ void GL_APIENTRY StencilMask(GLuint mask) void GL_APIENTRY StencilMaskSeparate(GLenum face, GLuint mask) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum face = 0x%X, GLuint mask = %u)", face, mask); Context *context = GetValidGlobalContext(); @@ -1926,6 +2029,7 @@ void GL_APIENTRY StencilMaskSeparate(GLenum face, GLuint mask) void GL_APIENTRY StencilOp(GLenum fail, GLenum zfail, GLenum zpass) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum fail = 0x%X, GLenum zfail = 0x%X, GLenum zpass = 0x%X)", fail, zfail, zpass); Context *context = GetValidGlobalContext(); @@ -1942,6 +2046,7 @@ void GL_APIENTRY StencilOp(GLenum fail, GLenum zfail, GLenum zpass) void GL_APIENTRY StencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum face = 0x%X, GLenum sfail = 0x%X, GLenum dpfail = 0x%X, GLenum dppass = 0x%X)", face, sfail, dpfail, dppass); @@ -1968,6 +2073,7 @@ void GL_APIENTRY TexImage2D(GLenum target, GLenum type, const void *pixels) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, " "GLsizei height = %d, GLint border = %d, GLenum format = 0x%X, GLenum type = 0x%X, const " @@ -1993,6 +2099,7 @@ void GL_APIENTRY TexImage2D(GLenum target, void GL_APIENTRY TexParameterf(GLenum target, GLenum pname, GLfloat param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", target, pname, param); Context *context = GetValidGlobalContext(); @@ -2010,6 +2117,7 @@ void GL_APIENTRY TexParameterf(GLenum target, GLenum pname, GLfloat param) void GL_APIENTRY TexParameterfv(GLenum target, GLenum pname, const GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", target, pname, params); @@ -2029,6 +2137,7 @@ void GL_APIENTRY TexParameterfv(GLenum target, GLenum pname, const GLfloat *para void GL_APIENTRY TexParameteri(GLenum target, GLenum pname, GLint param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %d)", target, pname, param); Context *context = GetValidGlobalContext(); @@ -2046,6 +2155,7 @@ void GL_APIENTRY TexParameteri(GLenum target, GLenum pname, GLint param) void GL_APIENTRY TexParameteriv(GLenum target, GLenum pname, const GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%0.8p)", target, pname, params); @@ -2073,6 +2183,7 @@ void GL_APIENTRY TexSubImage2D(GLenum target, GLenum type, const void *pixels) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLsizei " "width = %d, GLsizei height = %d, GLenum format = 0x%X, GLenum type = 0x%X, const void " @@ -2098,6 +2209,7 @@ void GL_APIENTRY TexSubImage2D(GLenum target, void GL_APIENTRY Uniform1f(GLint location, GLfloat v0) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLfloat v0 = %f)", location, v0); Context *context = GetValidGlobalContext(); @@ -2114,6 +2226,7 @@ void GL_APIENTRY Uniform1f(GLint location, GLfloat v0) void GL_APIENTRY Uniform1fv(GLint location, GLsizei count, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%0.8p)", location, count, value); @@ -2131,6 +2244,7 @@ void GL_APIENTRY Uniform1fv(GLint location, GLsizei count, const GLfloat *value) void GL_APIENTRY Uniform1i(GLint location, GLint v0) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLint v0 = %d)", location, v0); Context *context = GetValidGlobalContext(); @@ -2147,6 +2261,7 @@ void GL_APIENTRY Uniform1i(GLint location, GLint v0) void GL_APIENTRY Uniform1iv(GLint location, GLsizei count, const GLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%0.8p)", location, count, value); @@ -2164,6 +2279,7 @@ void GL_APIENTRY Uniform1iv(GLint location, GLsizei count, const GLint *value) void GL_APIENTRY Uniform2f(GLint location, GLfloat v0, GLfloat v1) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f)", location, v0, v1); Context *context = GetValidGlobalContext(); @@ -2180,6 +2296,7 @@ void GL_APIENTRY Uniform2f(GLint location, GLfloat v0, GLfloat v1) void GL_APIENTRY Uniform2fv(GLint location, GLsizei count, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%0.8p)", location, count, value); @@ -2197,6 +2314,7 @@ void GL_APIENTRY Uniform2fv(GLint location, GLsizei count, const GLfloat *value) void GL_APIENTRY Uniform2i(GLint location, GLint v0, GLint v1) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLint v0 = %d, GLint v1 = %d)", location, v0, v1); Context *context = GetValidGlobalContext(); @@ -2213,6 +2331,7 @@ void GL_APIENTRY Uniform2i(GLint location, GLint v0, GLint v1) void GL_APIENTRY Uniform2iv(GLint location, GLsizei count, const GLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%0.8p)", location, count, value); @@ -2230,6 +2349,7 @@ void GL_APIENTRY Uniform2iv(GLint location, GLsizei count, const GLint *value) void GL_APIENTRY Uniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = %f)", location, v0, v1, v2); @@ -2247,6 +2367,7 @@ void GL_APIENTRY Uniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2) void GL_APIENTRY Uniform3fv(GLint location, GLsizei count, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%0.8p)", location, count, value); @@ -2264,6 +2385,7 @@ void GL_APIENTRY Uniform3fv(GLint location, GLsizei count, const GLfloat *value) void GL_APIENTRY Uniform3i(GLint location, GLint v0, GLint v1, GLint v2) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d)", location, v0, v1, v2); @@ -2281,6 +2403,7 @@ void GL_APIENTRY Uniform3i(GLint location, GLint v0, GLint v1, GLint v2) void GL_APIENTRY Uniform3iv(GLint location, GLsizei count, const GLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%0.8p)", location, count, value); @@ -2298,6 +2421,7 @@ void GL_APIENTRY Uniform3iv(GLint location, GLsizei count, const GLint *value) void GL_APIENTRY Uniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = %f, GLfloat v3 = %f)", location, v0, v1, v2, v3); @@ -2316,6 +2440,7 @@ void GL_APIENTRY Uniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, G void GL_APIENTRY Uniform4fv(GLint location, GLsizei count, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%0.8p)", location, count, value); @@ -2333,6 +2458,7 @@ void GL_APIENTRY Uniform4fv(GLint location, GLsizei count, const GLfloat *value) void GL_APIENTRY Uniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d, GLint v3 = %d)", location, v0, v1, v2, v3); @@ -2350,6 +2476,7 @@ void GL_APIENTRY Uniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v void GL_APIENTRY Uniform4iv(GLint location, GLsizei count, const GLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%0.8p)", location, count, value); @@ -2370,6 +2497,7 @@ void GL_APIENTRY UniformMatrix2fv(GLint location, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "= 0x%0.8p)", @@ -2393,6 +2521,7 @@ void GL_APIENTRY UniformMatrix3fv(GLint location, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "= 0x%0.8p)", @@ -2416,6 +2545,7 @@ void GL_APIENTRY UniformMatrix4fv(GLint location, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "= 0x%0.8p)", @@ -2436,6 +2566,7 @@ void GL_APIENTRY UniformMatrix4fv(GLint location, void GL_APIENTRY UseProgram(GLuint program) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u)", program); Context *context = GetValidGlobalContext(); @@ -2452,6 +2583,7 @@ void GL_APIENTRY UseProgram(GLuint program) void GL_APIENTRY ValidateProgram(GLuint program) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u)", program); Context *context = GetValidGlobalContext(); @@ -2468,6 +2600,7 @@ void GL_APIENTRY ValidateProgram(GLuint program) void GL_APIENTRY VertexAttrib1f(GLuint index, GLfloat x) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLfloat x = %f)", index, x); Context *context = GetValidGlobalContext(); @@ -2484,6 +2617,7 @@ void GL_APIENTRY VertexAttrib1f(GLuint index, GLfloat x) void GL_APIENTRY VertexAttrib1fv(GLuint index, const GLfloat *v) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v); Context *context = GetValidGlobalContext(); @@ -2500,6 +2634,7 @@ void GL_APIENTRY VertexAttrib1fv(GLuint index, const GLfloat *v) void GL_APIENTRY VertexAttrib2f(GLuint index, GLfloat x, GLfloat y) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLfloat x = %f, GLfloat y = %f)", index, x, y); Context *context = GetValidGlobalContext(); @@ -2516,6 +2651,7 @@ void GL_APIENTRY VertexAttrib2f(GLuint index, GLfloat x, GLfloat y) void GL_APIENTRY VertexAttrib2fv(GLuint index, const GLfloat *v) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v); Context *context = GetValidGlobalContext(); @@ -2532,6 +2668,7 @@ void GL_APIENTRY VertexAttrib2fv(GLuint index, const GLfloat *v) void GL_APIENTRY VertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", index, x, y, z); Context *context = GetValidGlobalContext(); @@ -2548,6 +2685,7 @@ void GL_APIENTRY VertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z) void GL_APIENTRY VertexAttrib3fv(GLuint index, const GLfloat *v) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v); Context *context = GetValidGlobalContext(); @@ -2564,6 +2702,7 @@ void GL_APIENTRY VertexAttrib3fv(GLuint index, const GLfloat *v) void GL_APIENTRY VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f, GLfloat w = %f)", index, x, y, z, w); @@ -2581,6 +2720,7 @@ void GL_APIENTRY VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, G void GL_APIENTRY VertexAttrib4fv(GLuint index, const GLfloat *v) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v); Context *context = GetValidGlobalContext(); @@ -2602,6 +2742,7 @@ void GL_APIENTRY VertexAttribPointer(GLuint index, GLsizei stride, const void *pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint index = %u, GLint size = %d, GLenum type = 0x%X, GLboolean normalized = %u, " "GLsizei stride = %d, const void *pointer = 0x%0.8p)", @@ -2623,6 +2764,7 @@ void GL_APIENTRY VertexAttribPointer(GLuint index, void GL_APIENTRY Viewport(GLint x, GLint y, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", x, y, width, height); diff --git a/src/libGLESv2/entry_points_gles_3_0_autogen.cpp b/src/libGLESv2/entry_points_gles_3_0_autogen.cpp index 53cb40e23ad..85f3d074d2a 100644 --- a/src/libGLESv2/entry_points_gles_3_0_autogen.cpp +++ b/src/libGLESv2/entry_points_gles_3_0_autogen.cpp @@ -18,6 +18,7 @@ namespace gl { void GL_APIENTRY BeginQuery(GLenum target, GLuint id) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint id = %u)", target, id); Context *context = GetValidGlobalContext(); @@ -35,6 +36,7 @@ void GL_APIENTRY BeginQuery(GLenum target, GLuint id) void GL_APIENTRY BeginTransformFeedback(GLenum primitiveMode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum primitiveMode = 0x%X)", primitiveMode); Context *context = GetValidGlobalContext(); @@ -53,6 +55,7 @@ void GL_APIENTRY BeginTransformFeedback(GLenum primitiveMode) void GL_APIENTRY BindBufferBase(GLenum target, GLuint index, GLuint buffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint index = %u, GLuint buffer = %u)", target, index, buffer); Context *context = GetValidGlobalContext(); @@ -72,6 +75,7 @@ void GL_APIENTRY BindBufferBase(GLenum target, GLuint index, GLuint buffer) void GL_APIENTRY BindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLuint index = %u, GLuint buffer = %u, GLintptr offset = %d, " "GLsizeiptr size = %d)", @@ -94,6 +98,7 @@ BindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLs void GL_APIENTRY BindSampler(GLuint unit, GLuint sampler) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint unit = %u, GLuint sampler = %u)", unit, sampler); Context *context = GetValidGlobalContext(); @@ -110,6 +115,7 @@ void GL_APIENTRY BindSampler(GLuint unit, GLuint sampler) void GL_APIENTRY BindTransformFeedback(GLenum target, GLuint id) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint id = %u)", target, id); Context *context = GetValidGlobalContext(); @@ -126,6 +132,7 @@ void GL_APIENTRY BindTransformFeedback(GLenum target, GLuint id) void GL_APIENTRY BindVertexArray(GLuint array) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint array = %u)", array); Context *context = GetValidGlobalContext(); @@ -151,6 +158,7 @@ void GL_APIENTRY BlitFramebuffer(GLint srcX0, GLbitfield mask, GLenum filter) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint srcX0 = %d, GLint srcY0 = %d, GLint srcX1 = %d, GLint srcY1 = %d, GLint dstX0 = " "%d, GLint dstY0 = %d, GLint dstX1 = %d, GLint dstY1 = %d, GLbitfield mask = 0x%X, GLenum " @@ -175,6 +183,7 @@ void GL_APIENTRY BlitFramebuffer(GLint srcX0, void GL_APIENTRY ClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, GLfloat depth = %f, GLint stencil = %d)", buffer, drawbuffer, depth, stencil); @@ -193,6 +202,7 @@ void GL_APIENTRY ClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, G void GL_APIENTRY ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLfloat *value = 0x%0.8p)", buffer, drawbuffer, value); @@ -210,6 +220,7 @@ void GL_APIENTRY ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *v void GL_APIENTRY ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLint *value = 0x%0.8p)", buffer, drawbuffer, value); @@ -227,6 +238,7 @@ void GL_APIENTRY ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *val void GL_APIENTRY ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLuint *value = 0x%0.8p)", buffer, drawbuffer, value); @@ -244,6 +256,7 @@ void GL_APIENTRY ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *v GLenum GL_APIENTRY ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsync sync = 0x%0.8p, GLbitfield flags = 0x%X, GLuint64 timeout = %llu)", sync, flags, timeout); @@ -271,6 +284,7 @@ void GL_APIENTRY CompressedTexImage3D(GLenum target, GLsizei imageSize, const void *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = " "%d, GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLsizei imageSize = %d, " @@ -306,6 +320,7 @@ void GL_APIENTRY CompressedTexSubImage3D(GLenum target, GLsizei imageSize, const void *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint " "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format " @@ -336,6 +351,7 @@ void GL_APIENTRY CopyBufferSubData(GLenum readTarget, GLintptr writeOffset, GLsizeiptr size) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum readTarget = 0x%X, GLenum writeTarget = 0x%X, GLintptr readOffset = %d, GLintptr " "writeOffset = %d, GLsizeiptr size = %d)", @@ -369,6 +385,7 @@ void GL_APIENTRY CopyTexSubImage3D(GLenum target, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint " "zoffset = %d, GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", @@ -393,6 +410,7 @@ void GL_APIENTRY CopyTexSubImage3D(GLenum target, void GL_APIENTRY DeleteQueries(GLsizei n, const GLuint *ids) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *ids = 0x%0.8p)", n, ids); Context *context = GetValidGlobalContext(); @@ -409,6 +427,7 @@ void GL_APIENTRY DeleteQueries(GLsizei n, const GLuint *ids) void GL_APIENTRY DeleteSamplers(GLsizei count, const GLuint *samplers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei count = %d, const GLuint *samplers = 0x%0.8p)", count, samplers); Context *context = GetValidGlobalContext(); @@ -425,6 +444,7 @@ void GL_APIENTRY DeleteSamplers(GLsizei count, const GLuint *samplers) void GL_APIENTRY DeleteSync(GLsync sync) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsync sync = 0x%0.8p)", sync); Context *context = GetValidGlobalContext(); @@ -441,6 +461,7 @@ void GL_APIENTRY DeleteSync(GLsync sync) void GL_APIENTRY DeleteTransformFeedbacks(GLsizei n, const GLuint *ids) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *ids = 0x%0.8p)", n, ids); Context *context = GetValidGlobalContext(); @@ -457,6 +478,7 @@ void GL_APIENTRY DeleteTransformFeedbacks(GLsizei n, const GLuint *ids) void GL_APIENTRY DeleteVertexArrays(GLsizei n, const GLuint *arrays) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *arrays = 0x%0.8p)", n, arrays); Context *context = GetValidGlobalContext(); @@ -473,6 +495,7 @@ void GL_APIENTRY DeleteVertexArrays(GLsizei n, const GLuint *arrays) void GL_APIENTRY DrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d, GLsizei instancecount = %d)", mode, first, count, instancecount); @@ -493,6 +516,7 @@ void GL_APIENTRY DrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GL void GL_APIENTRY DrawBuffers(GLsizei n, const GLenum *bufs) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLenum *bufs = 0x%0.8p)", n, bufs); Context *context = GetValidGlobalContext(); @@ -513,6 +537,7 @@ void GL_APIENTRY DrawElementsInstanced(GLenum mode, const void *indices, GLsizei instancecount) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = " "0x%0.8p, GLsizei instancecount = %d)", @@ -540,6 +565,7 @@ void GL_APIENTRY DrawRangeElements(GLenum mode, GLenum type, const void *indices) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum mode = 0x%X, GLuint start = %u, GLuint end = %u, GLsizei count = %d, GLenum type " "= 0x%X, const void *indices = 0x%0.8p)", @@ -562,6 +588,7 @@ void GL_APIENTRY DrawRangeElements(GLenum mode, void GL_APIENTRY EndQuery(GLenum target) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X)", target); Context *context = GetValidGlobalContext(); @@ -579,6 +606,7 @@ void GL_APIENTRY EndQuery(GLenum target) void GL_APIENTRY EndTransformFeedback() { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = GetValidGlobalContext(); @@ -595,6 +623,7 @@ void GL_APIENTRY EndTransformFeedback() GLsync GL_APIENTRY FenceSync(GLenum condition, GLbitfield flags) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum condition = 0x%X, GLbitfield flags = 0x%X)", condition, flags); Context *context = GetValidGlobalContext(); @@ -613,6 +642,7 @@ GLsync GL_APIENTRY FenceSync(GLenum condition, GLbitfield flags) void GL_APIENTRY FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr length = %d)", target, offset, length); @@ -633,6 +663,7 @@ void GL_APIENTRY FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeip void GL_APIENTRY FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %u, GLint level = %d, " "GLint layer = %d)", @@ -654,6 +685,7 @@ FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint void GL_APIENTRY GenQueries(GLsizei n, GLuint *ids) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *ids = 0x%0.8p)", n, ids); Context *context = GetValidGlobalContext(); @@ -670,6 +702,7 @@ void GL_APIENTRY GenQueries(GLsizei n, GLuint *ids) void GL_APIENTRY GenSamplers(GLsizei count, GLuint *samplers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei count = %d, GLuint *samplers = 0x%0.8p)", count, samplers); Context *context = GetValidGlobalContext(); @@ -686,6 +719,7 @@ void GL_APIENTRY GenSamplers(GLsizei count, GLuint *samplers) void GL_APIENTRY GenTransformFeedbacks(GLsizei n, GLuint *ids) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *ids = 0x%0.8p)", n, ids); Context *context = GetValidGlobalContext(); @@ -702,6 +736,7 @@ void GL_APIENTRY GenTransformFeedbacks(GLsizei n, GLuint *ids) void GL_APIENTRY GenVertexArrays(GLsizei n, GLuint *arrays) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *arrays = 0x%0.8p)", n, arrays); Context *context = GetValidGlobalContext(); @@ -722,6 +757,7 @@ void GL_APIENTRY GetActiveUniformBlockName(GLuint program, GLsizei *length, GLchar *uniformBlockName) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLuint uniformBlockIndex = %u, GLsizei bufSize = %d, GLsizei " "*length = 0x%0.8p, GLchar *uniformBlockName = 0x%0.8p)", @@ -748,6 +784,7 @@ void GL_APIENTRY GetActiveUniformBlockiv(GLuint program, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLuint uniformBlockIndex = %u, GLenum pname = 0x%X, GLint *params = " "0x%0.8p)", @@ -773,6 +810,7 @@ void GL_APIENTRY GetActiveUniformsiv(GLuint program, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLsizei uniformCount = %d, const GLuint *uniformIndices = 0x%0.8p, " "GLenum pname = 0x%X, GLint *params = 0x%0.8p)", @@ -794,6 +832,7 @@ void GL_APIENTRY GetActiveUniformsiv(GLuint program, void GL_APIENTRY GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint64 *params = 0x%0.8p)", target, pname, params); @@ -813,6 +852,7 @@ void GL_APIENTRY GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *pa void GL_APIENTRY GetBufferPointerv(GLenum target, GLenum pname, void **params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, void **params = 0x%0.8p)", target, pname, params); @@ -832,6 +872,7 @@ void GL_APIENTRY GetBufferPointerv(GLenum target, GLenum pname, void **params) GLint GL_APIENTRY GetFragDataLocation(GLuint program, const GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, const GLchar *name = 0x%0.8p)", program, name); Context *context = GetValidGlobalContext(); @@ -850,6 +891,7 @@ GLint GL_APIENTRY GetFragDataLocation(GLuint program, const GLchar *name) void GL_APIENTRY GetInteger64i_v(GLenum target, GLuint index, GLint64 *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint index = %u, GLint64 *data = 0x%0.8p)", target, index, data); @@ -867,6 +909,7 @@ void GL_APIENTRY GetInteger64i_v(GLenum target, GLuint index, GLint64 *data) void GL_APIENTRY GetInteger64v(GLenum pname, GLint64 *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLint64 *data = 0x%0.8p)", pname, data); Context *context = GetValidGlobalContext(); @@ -883,6 +926,7 @@ void GL_APIENTRY GetInteger64v(GLenum pname, GLint64 *data) void GL_APIENTRY GetIntegeri_v(GLenum target, GLuint index, GLint *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint index = %u, GLint *data = 0x%0.8p)", target, index, data); Context *context = GetValidGlobalContext(); @@ -903,6 +947,7 @@ void GL_APIENTRY GetInternalformativ(GLenum target, GLsizei bufSize, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLenum pname = 0x%X, GLsizei bufSize " "= %d, GLint *params = 0x%0.8p)", @@ -928,6 +973,7 @@ void GL_APIENTRY GetProgramBinary(GLuint program, GLenum *binaryFormat, void *binary) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLenum " "*binaryFormat = 0x%0.8p, void *binary = 0x%0.8p)", @@ -949,6 +995,7 @@ void GL_APIENTRY GetProgramBinary(GLuint program, void GL_APIENTRY GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLuint *params = 0x%0.8p)", id, pname, params); Context *context = GetValidGlobalContext(); @@ -965,6 +1012,7 @@ void GL_APIENTRY GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params) void GL_APIENTRY GetQueryiv(GLenum target, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname, params); @@ -983,6 +1031,7 @@ void GL_APIENTRY GetQueryiv(GLenum target, GLenum pname, GLint *params) void GL_APIENTRY GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", sampler, pname, params); @@ -1001,6 +1050,7 @@ void GL_APIENTRY GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *pa void GL_APIENTRY GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", sampler, pname, params); @@ -1019,6 +1069,7 @@ void GL_APIENTRY GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *para const GLubyte *GL_APIENTRY GetStringi(GLenum name, GLuint index) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum name = 0x%X, GLuint index = %u)", name, index); Context *context = GetValidGlobalContext(); @@ -1038,6 +1089,7 @@ const GLubyte *GL_APIENTRY GetStringi(GLenum name, GLuint index) void GL_APIENTRY GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLsync sync = 0x%0.8p, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei *length = " "0x%0.8p, GLint *values = 0x%0.8p)", @@ -1064,6 +1116,7 @@ void GL_APIENTRY GetTransformFeedbackVarying(GLuint program, GLenum *type, GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, " "GLsizei *size = 0x%0.8p, GLenum *type = 0x%0.8p, GLchar *name = 0x%0.8p)", @@ -1086,6 +1139,7 @@ void GL_APIENTRY GetTransformFeedbackVarying(GLuint program, GLuint GL_APIENTRY GetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, const GLchar *uniformBlockName = 0x%0.8p)", program, uniformBlockName); @@ -1109,6 +1163,7 @@ void GL_APIENTRY GetUniformIndices(GLuint program, const GLchar *const *uniformNames, GLuint *uniformIndices) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLsizei uniformCount = %d, const GLchar *const*uniformNames = " "0x%0.8p, GLuint *uniformIndices = 0x%0.8p)", @@ -1130,6 +1185,7 @@ void GL_APIENTRY GetUniformIndices(GLuint program, void GL_APIENTRY GetUniformuiv(GLuint program, GLint location, GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, GLuint *params = 0x%0.8p)", program, location, params); @@ -1147,6 +1203,7 @@ void GL_APIENTRY GetUniformuiv(GLuint program, GLint location, GLuint *params) void GL_APIENTRY GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", index, pname, params); @@ -1164,6 +1221,7 @@ void GL_APIENTRY GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params) void GL_APIENTRY GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLuint *params = 0x%0.8p)", index, pname, params); @@ -1183,6 +1241,7 @@ void GL_APIENTRY InvalidateFramebuffer(GLenum target, GLsizei numAttachments, const GLenum *attachments) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = 0x%0.8p)", target, numAttachments, attachments); @@ -1209,6 +1268,7 @@ void GL_APIENTRY InvalidateSubFramebuffer(GLenum target, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = 0x%0.8p, " "GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", @@ -1232,6 +1292,7 @@ void GL_APIENTRY InvalidateSubFramebuffer(GLenum target, GLboolean GL_APIENTRY IsQuery(GLuint id) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint id = %u)", id); Context *context = GetValidGlobalContext(); @@ -1250,6 +1311,7 @@ GLboolean GL_APIENTRY IsQuery(GLuint id) GLboolean GL_APIENTRY IsSampler(GLuint sampler) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint sampler = %u)", sampler); Context *context = GetValidGlobalContext(); @@ -1268,6 +1330,7 @@ GLboolean GL_APIENTRY IsSampler(GLuint sampler) GLboolean GL_APIENTRY IsSync(GLsync sync) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsync sync = 0x%0.8p)", sync); Context *context = GetValidGlobalContext(); @@ -1286,6 +1349,7 @@ GLboolean GL_APIENTRY IsSync(GLsync sync) GLboolean GL_APIENTRY IsTransformFeedback(GLuint id) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint id = %u)", id); Context *context = GetValidGlobalContext(); @@ -1304,6 +1368,7 @@ GLboolean GL_APIENTRY IsTransformFeedback(GLuint id) GLboolean GL_APIENTRY IsVertexArray(GLuint array) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint array = %u)", array); Context *context = GetValidGlobalContext(); @@ -1325,6 +1390,7 @@ void *GL_APIENTRY MapBufferRange(GLenum target, GLsizeiptr length, GLbitfield access) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr length = %d, GLbitfield access = " "0x%X)", @@ -1348,6 +1414,7 @@ void *GL_APIENTRY MapBufferRange(GLenum target, void GL_APIENTRY PauseTransformFeedback() { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = GetValidGlobalContext(); @@ -1367,6 +1434,7 @@ void GL_APIENTRY ProgramBinary(GLuint program, const void *binary, GLsizei length) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLenum binaryFormat = 0x%X, const void *binary = 0x%0.8p, GLsizei " "length = %d)", @@ -1387,6 +1455,7 @@ void GL_APIENTRY ProgramBinary(GLuint program, void GL_APIENTRY ProgramParameteri(GLuint program, GLenum pname, GLint value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLenum pname = 0x%X, GLint value = %d)", program, pname, value); Context *context = GetValidGlobalContext(); @@ -1403,6 +1472,7 @@ void GL_APIENTRY ProgramParameteri(GLuint program, GLenum pname, GLint value) void GL_APIENTRY ReadBuffer(GLenum src) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum src = 0x%X)", src); Context *context = GetValidGlobalContext(); @@ -1423,6 +1493,7 @@ void GL_APIENTRY RenderbufferStorageMultisample(GLenum target, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width " "= %d, GLsizei height = %d)", @@ -1445,6 +1516,7 @@ void GL_APIENTRY RenderbufferStorageMultisample(GLenum target, void GL_APIENTRY ResumeTransformFeedback() { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = GetValidGlobalContext(); @@ -1461,6 +1533,7 @@ void GL_APIENTRY ResumeTransformFeedback() void GL_APIENTRY SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLfloat param = %f)", sampler, pname, param); Context *context = GetValidGlobalContext(); @@ -1477,6 +1550,7 @@ void GL_APIENTRY SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param) void GL_APIENTRY SamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLfloat *param = 0x%0.8p)", sampler, pname, param); @@ -1494,6 +1568,7 @@ void GL_APIENTRY SamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat void GL_APIENTRY SamplerParameteri(GLuint sampler, GLenum pname, GLint param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLint param = %d)", sampler, pname, param); Context *context = GetValidGlobalContext(); @@ -1510,6 +1585,7 @@ void GL_APIENTRY SamplerParameteri(GLuint sampler, GLenum pname, GLint param) void GL_APIENTRY SamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLint *param = 0x%0.8p)", sampler, pname, param); @@ -1536,6 +1612,7 @@ void GL_APIENTRY TexImage3D(GLenum target, GLenum type, const void *pixels) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, " "GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLenum format = 0x%X, GLenum " @@ -1562,6 +1639,7 @@ void GL_APIENTRY TexImage3D(GLenum target, void GL_APIENTRY TexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = " "%d, GLsizei height = %d)", @@ -1589,6 +1667,7 @@ void GL_APIENTRY TexStorage3D(GLenum target, GLsizei height, GLsizei depth) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = " "%d, GLsizei height = %d, GLsizei depth = %d)", @@ -1621,6 +1700,7 @@ void GL_APIENTRY TexSubImage3D(GLenum target, GLenum type, const void *pixels) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint " "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format " @@ -1650,6 +1730,7 @@ void GL_APIENTRY TransformFeedbackVaryings(GLuint program, const GLchar *const *varyings, GLenum bufferMode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLsizei count = %d, const GLchar *const*varyings = 0x%0.8p, GLenum " "bufferMode = 0x%X)", @@ -1671,6 +1752,7 @@ void GL_APIENTRY TransformFeedbackVaryings(GLuint program, void GL_APIENTRY Uniform1ui(GLint location, GLuint v0) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLuint v0 = %u)", location, v0); Context *context = GetValidGlobalContext(); @@ -1687,6 +1769,7 @@ void GL_APIENTRY Uniform1ui(GLint location, GLuint v0) void GL_APIENTRY Uniform1uiv(GLint location, GLsizei count, const GLuint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%0.8p)", location, count, value); @@ -1704,6 +1787,7 @@ void GL_APIENTRY Uniform1uiv(GLint location, GLsizei count, const GLuint *value) void GL_APIENTRY Uniform2ui(GLint location, GLuint v0, GLuint v1) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u)", location, v0, v1); Context *context = GetValidGlobalContext(); @@ -1720,6 +1804,7 @@ void GL_APIENTRY Uniform2ui(GLint location, GLuint v0, GLuint v1) void GL_APIENTRY Uniform2uiv(GLint location, GLsizei count, const GLuint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%0.8p)", location, count, value); @@ -1737,6 +1822,7 @@ void GL_APIENTRY Uniform2uiv(GLint location, GLsizei count, const GLuint *value) void GL_APIENTRY Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = %u)", location, v0, v1, v2); @@ -1754,6 +1840,7 @@ void GL_APIENTRY Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2) void GL_APIENTRY Uniform3uiv(GLint location, GLsizei count, const GLuint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%0.8p)", location, count, value); @@ -1771,6 +1858,7 @@ void GL_APIENTRY Uniform3uiv(GLint location, GLsizei count, const GLuint *value) void GL_APIENTRY Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = %u, GLuint v3 = %u)", location, v0, v1, v2, v3); @@ -1788,6 +1876,7 @@ void GL_APIENTRY Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLu void GL_APIENTRY Uniform4uiv(GLint location, GLsizei count, const GLuint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%0.8p)", location, count, value); @@ -1807,6 +1896,7 @@ void GL_APIENTRY UniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLuint uniformBlockIndex = %u, GLuint uniformBlockBinding = %u)", program, uniformBlockIndex, uniformBlockBinding); @@ -1829,6 +1919,7 @@ void GL_APIENTRY UniformMatrix2x3fv(GLint location, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "= 0x%0.8p)", @@ -1852,6 +1943,7 @@ void GL_APIENTRY UniformMatrix2x4fv(GLint location, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "= 0x%0.8p)", @@ -1875,6 +1967,7 @@ void GL_APIENTRY UniformMatrix3x2fv(GLint location, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "= 0x%0.8p)", @@ -1898,6 +1991,7 @@ void GL_APIENTRY UniformMatrix3x4fv(GLint location, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "= 0x%0.8p)", @@ -1921,6 +2015,7 @@ void GL_APIENTRY UniformMatrix4x2fv(GLint location, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "= 0x%0.8p)", @@ -1944,6 +2039,7 @@ void GL_APIENTRY UniformMatrix4x3fv(GLint location, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "= 0x%0.8p)", @@ -1964,6 +2060,7 @@ void GL_APIENTRY UniformMatrix4x3fv(GLint location, GLboolean GL_APIENTRY UnmapBuffer(GLenum target) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X)", target); Context *context = GetValidGlobalContext(); @@ -1983,6 +2080,7 @@ GLboolean GL_APIENTRY UnmapBuffer(GLenum target) void GL_APIENTRY VertexAttribDivisor(GLuint index, GLuint divisor) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLuint divisor = %u)", index, divisor); Context *context = GetValidGlobalContext(); @@ -1999,6 +2097,7 @@ void GL_APIENTRY VertexAttribDivisor(GLuint index, GLuint divisor) void GL_APIENTRY VertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLint x = %d, GLint y = %d, GLint z = %d, GLint w = %d)", index, x, y, z, w); @@ -2016,6 +2115,7 @@ void GL_APIENTRY VertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint void GL_APIENTRY VertexAttribI4iv(GLuint index, const GLint *v) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, const GLint *v = 0x%0.8p)", index, v); Context *context = GetValidGlobalContext(); @@ -2032,6 +2132,7 @@ void GL_APIENTRY VertexAttribI4iv(GLuint index, const GLint *v) void GL_APIENTRY VertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLuint x = %u, GLuint y = %u, GLuint z = %u, GLuint w = %u)", index, x, y, z, w); @@ -2049,6 +2150,7 @@ void GL_APIENTRY VertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GL void GL_APIENTRY VertexAttribI4uiv(GLuint index, const GLuint *v) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, const GLuint *v = 0x%0.8p)", index, v); Context *context = GetValidGlobalContext(); @@ -2066,6 +2168,7 @@ void GL_APIENTRY VertexAttribI4uiv(GLuint index, const GLuint *v) void GL_APIENTRY VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint index = %u, GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void " "*pointer = 0x%0.8p)", @@ -2086,6 +2189,7 @@ VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, cons void GL_APIENTRY WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsync sync = 0x%0.8p, GLbitfield flags = 0x%X, GLuint64 timeout = %llu)", sync, flags, timeout); diff --git a/src/libGLESv2/entry_points_gles_3_1_autogen.cpp b/src/libGLESv2/entry_points_gles_3_1_autogen.cpp index 18f6c42eb8e..2865231bc29 100644 --- a/src/libGLESv2/entry_points_gles_3_1_autogen.cpp +++ b/src/libGLESv2/entry_points_gles_3_1_autogen.cpp @@ -18,6 +18,7 @@ namespace gl { void GL_APIENTRY ActiveShaderProgram(GLuint pipeline, GLuint program) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint pipeline = %u, GLuint program = %u)", pipeline, program); Context *context = GetValidGlobalContext(); @@ -40,6 +41,7 @@ void GL_APIENTRY BindImageTexture(GLuint unit, GLenum access, GLenum format) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint unit = %u, GLuint texture = %u, GLint level = %d, GLboolean layered = %u, GLint " "layer = %d, GLenum access = 0x%X, GLenum format = 0x%X)", @@ -61,6 +63,7 @@ void GL_APIENTRY BindImageTexture(GLuint unit, void GL_APIENTRY BindProgramPipeline(GLuint pipeline) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint pipeline = %u)", pipeline); Context *context = GetValidGlobalContext(); @@ -80,6 +83,7 @@ void GL_APIENTRY BindVertexBuffer(GLuint bindingindex, GLintptr offset, GLsizei stride) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint bindingindex = %u, GLuint buffer = %u, GLintptr offset = %d, GLsizei stride = %d)", bindingindex, buffer, offset, stride); @@ -99,6 +103,7 @@ void GL_APIENTRY BindVertexBuffer(GLuint bindingindex, GLuint GL_APIENTRY CreateShaderProgramv(GLenum type, GLsizei count, const GLchar *const *strings) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum type = 0x%X, GLsizei count = %d, const GLchar *const*strings = 0x%0.8p)", type, count, strings); @@ -120,6 +125,7 @@ GLuint GL_APIENTRY CreateShaderProgramv(GLenum type, GLsizei count, const GLchar void GL_APIENTRY DeleteProgramPipelines(GLsizei n, const GLuint *pipelines) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *pipelines = 0x%0.8p)", n, pipelines); Context *context = GetValidGlobalContext(); @@ -136,6 +142,7 @@ void GL_APIENTRY DeleteProgramPipelines(GLsizei n, const GLuint *pipelines) void GL_APIENTRY DispatchCompute(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint num_groups_x = %u, GLuint num_groups_y = %u, GLuint num_groups_z = %u)", num_groups_x, num_groups_y, num_groups_z); @@ -155,6 +162,7 @@ void GL_APIENTRY DispatchCompute(GLuint num_groups_x, GLuint num_groups_y, GLuin void GL_APIENTRY DispatchComputeIndirect(GLintptr indirect) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLintptr indirect = %d)", indirect); Context *context = GetValidGlobalContext(); @@ -171,6 +179,7 @@ void GL_APIENTRY DispatchComputeIndirect(GLintptr indirect) void GL_APIENTRY DrawArraysIndirect(GLenum mode, const void *indirect) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum mode = 0x%X, const void *indirect = 0x%0.8p)", mode, indirect); Context *context = GetValidGlobalContext(); @@ -188,6 +197,7 @@ void GL_APIENTRY DrawArraysIndirect(GLenum mode, const void *indirect) void GL_APIENTRY DrawElementsIndirect(GLenum mode, GLenum type, const void *indirect) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum mode = 0x%X, GLenum type = 0x%X, const void *indirect = 0x%0.8p)", mode, type, indirect); @@ -207,6 +217,7 @@ void GL_APIENTRY DrawElementsIndirect(GLenum mode, GLenum type, const void *indi void GL_APIENTRY FramebufferParameteri(GLenum target, GLenum pname, GLint param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %d)", target, pname, param); Context *context = GetValidGlobalContext(); @@ -224,6 +235,7 @@ void GL_APIENTRY FramebufferParameteri(GLenum target, GLenum pname, GLint param) void GL_APIENTRY GenProgramPipelines(GLsizei n, GLuint *pipelines) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *pipelines = 0x%0.8p)", n, pipelines); Context *context = GetValidGlobalContext(); @@ -240,6 +252,7 @@ void GL_APIENTRY GenProgramPipelines(GLsizei n, GLuint *pipelines) void GL_APIENTRY GetBooleani_v(GLenum target, GLuint index, GLboolean *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint index = %u, GLboolean *data = 0x%0.8p)", target, index, data); @@ -257,6 +270,7 @@ void GL_APIENTRY GetBooleani_v(GLenum target, GLuint index, GLboolean *data) void GL_APIENTRY GetFramebufferParameteriv(GLenum target, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname, params); @@ -275,6 +289,7 @@ void GL_APIENTRY GetFramebufferParameteriv(GLenum target, GLenum pname, GLint *p void GL_APIENTRY GetMultisamplefv(GLenum pname, GLuint index, GLfloat *val) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLuint index = %u, GLfloat *val = 0x%0.8p)", pname, index, val); Context *context = GetValidGlobalContext(); @@ -294,6 +309,7 @@ void GL_APIENTRY GetProgramInterfaceiv(GLuint program, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLenum programInterface = 0x%X, GLenum pname = 0x%X, GLint *params " "= 0x%0.8p)", @@ -318,6 +334,7 @@ void GL_APIENTRY GetProgramPipelineInfoLog(GLuint pipeline, GLsizei *length, GLchar *infoLog) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint pipeline = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *infoLog = " "0x%0.8p)", @@ -339,6 +356,7 @@ void GL_APIENTRY GetProgramPipelineInfoLog(GLuint pipeline, void GL_APIENTRY GetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint pipeline = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", pipeline, pname, params); @@ -359,6 +377,7 @@ GLuint GL_APIENTRY GetProgramResourceIndex(GLuint program, GLenum programInterface, const GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%0.8p)", program, programInterface, name); @@ -381,6 +400,7 @@ GLint GL_APIENTRY GetProgramResourceLocation(GLuint program, GLenum programInterface, const GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%0.8p)", program, programInterface, name); @@ -407,6 +427,7 @@ void GL_APIENTRY GetProgramResourceName(GLuint program, GLsizei *length, GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLenum programInterface = 0x%X, GLuint index = %u, GLsizei bufSize " "= %d, GLsizei *length = 0x%0.8p, GLchar *name = 0x%0.8p)", @@ -437,6 +458,7 @@ void GL_APIENTRY GetProgramResourceiv(GLuint program, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLenum programInterface = 0x%X, GLuint index = %u, GLsizei " "propCount = %d, const GLenum *props = 0x%0.8p, GLsizei bufSize = %d, GLsizei *length = " @@ -461,6 +483,7 @@ void GL_APIENTRY GetProgramResourceiv(GLuint program, void GL_APIENTRY GetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", target, level, pname, params); @@ -482,6 +505,7 @@ void GL_APIENTRY GetTexLevelParameterfv(GLenum target, GLint level, GLenum pname void GL_APIENTRY GetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, level, pname, params); @@ -502,6 +526,7 @@ void GL_APIENTRY GetTexLevelParameteriv(GLenum target, GLint level, GLenum pname GLboolean GL_APIENTRY IsProgramPipeline(GLuint pipeline) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint pipeline = %u)", pipeline); Context *context = GetValidGlobalContext(); @@ -520,6 +545,7 @@ GLboolean GL_APIENTRY IsProgramPipeline(GLuint pipeline) void GL_APIENTRY MemoryBarrier(GLbitfield barriers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLbitfield barriers = 0x%X)", barriers); Context *context = GetValidGlobalContext(); @@ -536,6 +562,7 @@ void GL_APIENTRY MemoryBarrier(GLbitfield barriers) void GL_APIENTRY MemoryBarrierByRegion(GLbitfield barriers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLbitfield barriers = 0x%X)", barriers); Context *context = GetValidGlobalContext(); @@ -552,6 +579,7 @@ void GL_APIENTRY MemoryBarrierByRegion(GLbitfield barriers) void GL_APIENTRY ProgramUniform1f(GLuint program, GLint location, GLfloat v0) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, GLfloat v0 = %f)", program, location, v0); Context *context = GetValidGlobalContext(); @@ -571,6 +599,7 @@ void GL_APIENTRY ProgramUniform1fv(GLuint program, GLsizei count, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = " "0x%0.8p)", @@ -591,6 +620,7 @@ void GL_APIENTRY ProgramUniform1fv(GLuint program, void GL_APIENTRY ProgramUniform1i(GLuint program, GLint location, GLint v0) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, GLint v0 = %d)", program, location, v0); Context *context = GetValidGlobalContext(); @@ -610,6 +640,7 @@ void GL_APIENTRY ProgramUniform1iv(GLuint program, GLsizei count, const GLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = " "0x%0.8p)", @@ -630,6 +661,7 @@ void GL_APIENTRY ProgramUniform1iv(GLuint program, void GL_APIENTRY ProgramUniform1ui(GLuint program, GLint location, GLuint v0) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, GLuint v0 = %u)", program, location, v0); Context *context = GetValidGlobalContext(); @@ -649,6 +681,7 @@ void GL_APIENTRY ProgramUniform1uiv(GLuint program, GLsizei count, const GLuint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = " "0x%0.8p)", @@ -669,6 +702,7 @@ void GL_APIENTRY ProgramUniform1uiv(GLuint program, void GL_APIENTRY ProgramUniform2f(GLuint program, GLint location, GLfloat v0, GLfloat v1) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f)", program, location, v0, v1); @@ -690,6 +724,7 @@ void GL_APIENTRY ProgramUniform2fv(GLuint program, GLsizei count, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = " "0x%0.8p)", @@ -710,6 +745,7 @@ void GL_APIENTRY ProgramUniform2fv(GLuint program, void GL_APIENTRY ProgramUniform2i(GLuint program, GLint location, GLint v0, GLint v1) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, GLint v0 = %d, GLint v1 = %d)", program, location, v0, v1); @@ -731,6 +767,7 @@ void GL_APIENTRY ProgramUniform2iv(GLuint program, GLsizei count, const GLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = " "0x%0.8p)", @@ -751,6 +788,7 @@ void GL_APIENTRY ProgramUniform2iv(GLuint program, void GL_APIENTRY ProgramUniform2ui(GLuint program, GLint location, GLuint v0, GLuint v1) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, GLuint v0 = %u, GLuint v1 = %u)", program, location, v0, v1); @@ -772,6 +810,7 @@ void GL_APIENTRY ProgramUniform2uiv(GLuint program, GLsizei count, const GLuint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = " "0x%0.8p)", @@ -793,6 +832,7 @@ void GL_APIENTRY ProgramUniform2uiv(GLuint program, void GL_APIENTRY ProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = " "%f)", @@ -816,6 +856,7 @@ void GL_APIENTRY ProgramUniform3fv(GLuint program, GLsizei count, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = " "0x%0.8p)", @@ -836,6 +877,7 @@ void GL_APIENTRY ProgramUniform3fv(GLuint program, void GL_APIENTRY ProgramUniform3i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d)", program, location, v0, v1, v2); @@ -857,6 +899,7 @@ void GL_APIENTRY ProgramUniform3iv(GLuint program, GLsizei count, const GLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = " "0x%0.8p)", @@ -877,6 +920,7 @@ void GL_APIENTRY ProgramUniform3iv(GLuint program, void GL_APIENTRY ProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = " "%u)", @@ -900,6 +944,7 @@ void GL_APIENTRY ProgramUniform3uiv(GLuint program, GLsizei count, const GLuint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = " "0x%0.8p)", @@ -921,6 +966,7 @@ void GL_APIENTRY ProgramUniform3uiv(GLuint program, void GL_APIENTRY ProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = " "%f, GLfloat v3 = %f)", @@ -944,6 +990,7 @@ void GL_APIENTRY ProgramUniform4fv(GLuint program, GLsizei count, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = " "0x%0.8p)", @@ -965,6 +1012,7 @@ void GL_APIENTRY ProgramUniform4fv(GLuint program, void GL_APIENTRY ProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d, " "GLint v3 = %d)", @@ -988,6 +1036,7 @@ void GL_APIENTRY ProgramUniform4iv(GLuint program, GLsizei count, const GLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = " "0x%0.8p)", @@ -1009,6 +1058,7 @@ void GL_APIENTRY ProgramUniform4iv(GLuint program, void GL_APIENTRY ProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = " "%u, GLuint v3 = %u)", @@ -1032,6 +1082,7 @@ void GL_APIENTRY ProgramUniform4uiv(GLuint program, GLsizei count, const GLuint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = " "0x%0.8p)", @@ -1056,6 +1107,7 @@ void GL_APIENTRY ProgramUniformMatrix2fv(GLuint program, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "const GLfloat *value = 0x%0.8p)", @@ -1081,6 +1133,7 @@ void GL_APIENTRY ProgramUniformMatrix2x3fv(GLuint program, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "const GLfloat *value = 0x%0.8p)", @@ -1106,6 +1159,7 @@ void GL_APIENTRY ProgramUniformMatrix2x4fv(GLuint program, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "const GLfloat *value = 0x%0.8p)", @@ -1131,6 +1185,7 @@ void GL_APIENTRY ProgramUniformMatrix3fv(GLuint program, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "const GLfloat *value = 0x%0.8p)", @@ -1156,6 +1211,7 @@ void GL_APIENTRY ProgramUniformMatrix3x2fv(GLuint program, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "const GLfloat *value = 0x%0.8p)", @@ -1181,6 +1237,7 @@ void GL_APIENTRY ProgramUniformMatrix3x4fv(GLuint program, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "const GLfloat *value = 0x%0.8p)", @@ -1206,6 +1263,7 @@ void GL_APIENTRY ProgramUniformMatrix4fv(GLuint program, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "const GLfloat *value = 0x%0.8p)", @@ -1231,6 +1289,7 @@ void GL_APIENTRY ProgramUniformMatrix4x2fv(GLuint program, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "const GLfloat *value = 0x%0.8p)", @@ -1256,6 +1315,7 @@ void GL_APIENTRY ProgramUniformMatrix4x3fv(GLuint program, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "const GLfloat *value = 0x%0.8p)", @@ -1277,6 +1337,7 @@ void GL_APIENTRY ProgramUniformMatrix4x3fv(GLuint program, void GL_APIENTRY SampleMaski(GLuint maskNumber, GLbitfield mask) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint maskNumber = %u, GLbitfield mask = 0x%X)", maskNumber, mask); Context *context = GetValidGlobalContext(); @@ -1298,6 +1359,7 @@ void GL_APIENTRY TexStorage2DMultisample(GLenum target, GLsizei height, GLboolean fixedsamplelocations) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width " "= %d, GLsizei height = %d, GLboolean fixedsamplelocations = %u)", @@ -1322,6 +1384,7 @@ void GL_APIENTRY TexStorage2DMultisample(GLenum target, void GL_APIENTRY UseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint pipeline = %u, GLbitfield stages = 0x%X, GLuint program = %u)", pipeline, stages, program); @@ -1340,6 +1403,7 @@ void GL_APIENTRY UseProgramStages(GLuint pipeline, GLbitfield stages, GLuint pro void GL_APIENTRY ValidateProgramPipeline(GLuint pipeline) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint pipeline = %u)", pipeline); Context *context = GetValidGlobalContext(); @@ -1356,6 +1420,7 @@ void GL_APIENTRY ValidateProgramPipeline(GLuint pipeline) void GL_APIENTRY VertexAttribBinding(GLuint attribindex, GLuint bindingindex) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint attribindex = %u, GLuint bindingindex = %u)", attribindex, bindingindex); Context *context = GetValidGlobalContext(); @@ -1377,6 +1442,7 @@ void GL_APIENTRY VertexAttribFormat(GLuint attribindex, GLboolean normalized, GLuint relativeoffset) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint attribindex = %u, GLint size = %d, GLenum type = 0x%X, GLboolean normalized = %u, " "GLuint relativeoffset = %u)", @@ -1402,6 +1468,7 @@ void GL_APIENTRY VertexAttribIFormat(GLuint attribindex, GLenum type, GLuint relativeoffset) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint attribindex = %u, GLint size = %d, GLenum type = 0x%X, GLuint relativeoffset = " "%u)", @@ -1423,6 +1490,7 @@ void GL_APIENTRY VertexAttribIFormat(GLuint attribindex, void GL_APIENTRY VertexBindingDivisor(GLuint bindingindex, GLuint divisor) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint bindingindex = %u, GLuint divisor = %u)", bindingindex, divisor); Context *context = GetValidGlobalContext(); diff --git a/src/libGLESv2/entry_points_gles_ext_autogen.cpp b/src/libGLESv2/entry_points_gles_ext_autogen.cpp index 8b655f660ba..5e5a6150302 100644 --- a/src/libGLESv2/entry_points_gles_ext_autogen.cpp +++ b/src/libGLESv2/entry_points_gles_ext_autogen.cpp @@ -34,6 +34,7 @@ void GL_APIENTRY BlitFramebufferANGLE(GLint srcX0, GLbitfield mask, GLenum filter) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint srcX0 = %d, GLint srcY0 = %d, GLint srcX1 = %d, GLint srcY1 = %d, GLint dstX0 = " "%d, GLint dstY0 = %d, GLint dstX1 = %d, GLint dstY1 = %d, GLbitfield mask = 0x%X, GLenum " @@ -63,6 +64,7 @@ void GL_APIENTRY RenderbufferStorageMultisampleANGLE(GLenum target, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width " "= %d, GLsizei height = %d)", @@ -89,6 +91,7 @@ void GL_APIENTRY DrawArraysInstancedANGLE(GLenum mode, GLsizei count, GLsizei primcount) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d, GLsizei primcount = %d)", mode, first, count, primcount); @@ -113,6 +116,7 @@ void GL_APIENTRY DrawElementsInstancedANGLE(GLenum mode, const void *indices, GLsizei primcount) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = " "0x%0.8p, GLsizei primcount = %d)", @@ -135,6 +139,7 @@ void GL_APIENTRY DrawElementsInstancedANGLE(GLenum mode, void GL_APIENTRY VertexAttribDivisorANGLE(GLuint index, GLuint divisor) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLuint divisor = %u)", index, divisor); Context *context = GetValidGlobalContext(); @@ -157,6 +162,7 @@ void GL_APIENTRY FramebufferTextureMultiviewLayeredANGLE(GLenum target, GLint baseViewIndex, GLsizei numViews) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %u, GLint level = %d, " "GLint baseViewIndex = %d, GLsizei numViews = %d)", @@ -185,6 +191,7 @@ void GL_APIENTRY FramebufferTextureMultiviewSideBySideANGLE(GLenum target, GLsizei numViews, const GLint *viewportOffsets) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %u, GLint level = %d, " "GLsizei numViews = %d, const GLint * viewportOffsets = 0x%0.8p)", @@ -209,6 +216,7 @@ void GL_APIENTRY FramebufferTextureMultiviewSideBySideANGLE(GLenum target, // GL_ANGLE_request_extension void GL_APIENTRY RequestExtensionANGLE(const GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const GLchar * name = 0x%0.8p)", name); Context *context = GetValidGlobalContext(); @@ -229,6 +237,7 @@ void GL_APIENTRY GetBooleanvRobustANGLE(GLenum pname, GLsizei *length, GLboolean *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, GLboolean * " "params = 0x%0.8p)", @@ -253,6 +262,7 @@ void GL_APIENTRY GetBufferParameterivRobustANGLE(GLenum target, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -278,6 +288,7 @@ void GL_APIENTRY GetFloatvRobustANGLE(GLenum pname, GLsizei *length, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, GLfloat * params " "= 0x%0.8p)", @@ -303,6 +314,7 @@ void GL_APIENTRY GetFramebufferAttachmentParameterivRobustANGLE(GLenum target, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = " "%d, GLsizei * length = 0x%0.8p, GLint * params = 0x%0.8p)", @@ -326,6 +338,7 @@ void GL_APIENTRY GetFramebufferAttachmentParameterivRobustANGLE(GLenum target, void GL_APIENTRY GetIntegervRobustANGLE(GLenum pname, GLsizei bufSize, GLsizei *length, GLint *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, GLint * data = " "0x%0.8p)", @@ -350,6 +363,7 @@ void GL_APIENTRY GetProgramivRobustANGLE(GLuint program, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -375,6 +389,7 @@ void GL_APIENTRY GetRenderbufferParameterivRobustANGLE(GLenum target, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -397,6 +412,7 @@ void GL_APIENTRY GetRenderbufferParameterivRobustANGLE(GLenum target, void GL_APIENTRY GetShaderivRobustANGLE(GLuint shader, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint shader = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -422,6 +438,7 @@ void GL_APIENTRY GetTexParameterfvRobustANGLE(GLenum target, GLsizei *length, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLfloat * params = 0x%0.8p)", @@ -448,6 +465,7 @@ void GL_APIENTRY GetTexParameterivRobustANGLE(GLenum target, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -474,6 +492,7 @@ void GL_APIENTRY GetUniformfvRobustANGLE(GLuint program, GLsizei *length, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLfloat * params = 0x%0.8p)", @@ -499,6 +518,7 @@ void GL_APIENTRY GetUniformivRobustANGLE(GLuint program, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -524,6 +544,7 @@ void GL_APIENTRY GetVertexAttribfvRobustANGLE(GLuint index, GLsizei *length, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLfloat * params = 0x%0.8p)", @@ -549,6 +570,7 @@ void GL_APIENTRY GetVertexAttribivRobustANGLE(GLuint index, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -574,6 +596,7 @@ void GL_APIENTRY GetVertexAttribPointervRobustANGLE(GLuint index, GLsizei *length, void **pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, void ** pointer = 0x%0.8p)", @@ -605,6 +628,7 @@ void GL_APIENTRY ReadPixelsRobustANGLE(GLint x, GLsizei *rows, void *pixels) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = " "0x%X, GLenum type = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, GLsizei * " @@ -638,6 +662,7 @@ void GL_APIENTRY TexImage2DRobustANGLE(GLenum target, GLsizei bufSize, const void *pixels) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, " "GLsizei height = %d, GLint border = %d, GLenum format = 0x%X, GLenum type = 0x%X, GLsizei " @@ -667,6 +692,7 @@ void GL_APIENTRY TexParameterfvRobustANGLE(GLenum target, GLsizei bufSize, const GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLfloat * params " "= 0x%0.8p)", @@ -692,6 +718,7 @@ void GL_APIENTRY TexParameterivRobustANGLE(GLenum target, GLsizei bufSize, const GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLint * params = " "0x%0.8p)", @@ -723,6 +750,7 @@ void GL_APIENTRY TexSubImage2DRobustANGLE(GLenum target, GLsizei bufSize, const void *pixels) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLsizei " "width = %d, GLsizei height = %d, GLenum format = 0x%X, GLenum type = 0x%X, GLsizei " @@ -758,6 +786,7 @@ void GL_APIENTRY TexImage3DRobustANGLE(GLenum target, GLsizei bufSize, const void *pixels) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, " "GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLenum format = 0x%X, GLenum " @@ -795,6 +824,7 @@ void GL_APIENTRY TexSubImage3DRobustANGLE(GLenum target, GLsizei bufSize, const void *pixels) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint " "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format " @@ -831,6 +861,7 @@ void GL_APIENTRY CompressedTexImage2DRobustANGLE(GLenum target, GLsizei dataSize, const GLvoid *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = " "%d, GLsizei height = %d, GLint border = %d, GLsizei imageSize = %d, GLsizei dataSize = " @@ -865,6 +896,7 @@ void GL_APIENTRY CompressedTexSubImage2DRobustANGLE(GLenum target, GLsizei dataSize, const GLvoid *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLsizei xoffset = %d, GLsizei yoffset = %d, " "GLsizei width = %d, GLsizei height = %d, GLenum format = 0x%X, GLsizei imageSize = %d, " @@ -900,6 +932,7 @@ void GL_APIENTRY CompressedTexImage3DRobustANGLE(GLenum target, GLsizei dataSize, const GLvoid *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = " "%d, GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLsizei imageSize = %d, " @@ -937,6 +970,7 @@ void GL_APIENTRY CompressedTexSubImage3DRobustANGLE(GLenum target, GLsizei dataSize, const GLvoid *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint " "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format " @@ -967,6 +1001,7 @@ void GL_APIENTRY CompressedTexSubImage3DRobustANGLE(GLenum target, void GL_APIENTRY GetQueryivRobustANGLE(GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -993,6 +1028,7 @@ void GL_APIENTRY GetQueryObjectuivRobustANGLE(GLuint id, GLsizei *length, GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint id = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, " "GLuint * params = 0x%0.8p)", @@ -1018,6 +1054,7 @@ void GL_APIENTRY GetBufferPointervRobustANGLE(GLenum target, GLsizei *length, void **params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, void ** params = 0x%0.8p)", @@ -1041,6 +1078,7 @@ void GL_APIENTRY GetBufferPointervRobustANGLE(GLenum target, void GL_APIENTRY GetIntegeri_vRobustANGLE(GLenum target, GLuint index, GLsizei bufSize, GLsizei *length, GLint *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLuint index = %u, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * data = 0x%0.8p)", @@ -1067,6 +1105,7 @@ void GL_APIENTRY GetInternalformativRobustANGLE(GLenum target, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLenum pname = 0x%X, GLsizei bufSize " "= %d, GLsizei * length = 0x%0.8p, GLint * params = 0x%0.8p)", @@ -1094,6 +1133,7 @@ void GL_APIENTRY GetVertexAttribIivRobustANGLE(GLuint index, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -1119,6 +1159,7 @@ void GL_APIENTRY GetVertexAttribIuivRobustANGLE(GLuint index, GLsizei *length, GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLuint * params = 0x%0.8p)", @@ -1144,6 +1185,7 @@ void GL_APIENTRY GetUniformuivRobustANGLE(GLuint program, GLsizei *length, GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLuint * params = 0x%0.8p)", @@ -1170,6 +1212,7 @@ void GL_APIENTRY GetActiveUniformBlockivRobustANGLE(GLuint program, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLuint uniformBlockIndex = %u, GLenum pname = 0x%X, GLsizei bufSize " "= %d, GLsizei * length = 0x%0.8p, GLint * params = 0x%0.8p)", @@ -1196,6 +1239,7 @@ void GL_APIENTRY GetInteger64vRobustANGLE(GLenum pname, GLsizei *length, GLint64 *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, GLint64 * data = " "0x%0.8p)", @@ -1220,6 +1264,7 @@ void GL_APIENTRY GetInteger64i_vRobustANGLE(GLenum target, GLsizei *length, GLint64 *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLuint index = %u, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint64 * data = 0x%0.8p)", @@ -1245,6 +1290,7 @@ void GL_APIENTRY GetBufferParameteri64vRobustANGLE(GLenum target, GLsizei *length, GLint64 *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint64 * params = 0x%0.8p)", @@ -1270,6 +1316,7 @@ void GL_APIENTRY SamplerParameterivRobustANGLE(GLuint sampler, GLsizei bufSize, const GLint *param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sampler = %u, GLuint pname = %u, GLsizei bufSize = %d, const GLint * param = " "0x%0.8p)", @@ -1294,6 +1341,7 @@ void GL_APIENTRY SamplerParameterfvRobustANGLE(GLuint sampler, GLsizei bufSize, const GLfloat *param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLfloat * param = " "0x%0.8p)", @@ -1319,6 +1367,7 @@ void GL_APIENTRY GetSamplerParameterivRobustANGLE(GLuint sampler, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -1344,6 +1393,7 @@ void GL_APIENTRY GetSamplerParameterfvRobustANGLE(GLuint sampler, GLsizei *length, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLfloat * params = 0x%0.8p)", @@ -1369,6 +1419,7 @@ void GL_APIENTRY GetFramebufferParameterivRobustANGLE(GLuint sampler, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -1395,6 +1446,7 @@ void GL_APIENTRY GetProgramInterfaceivRobustANGLE(GLuint program, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLenum programInterface = 0x%X, GLenum pname = 0x%X, GLsizei " "bufSize = %d, GLsizei * length = 0x%0.8p, GLint * params = 0x%0.8p)", @@ -1422,6 +1474,7 @@ void GL_APIENTRY GetBooleani_vRobustANGLE(GLenum target, GLsizei *length, GLboolean *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLuint index = %u, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLboolean * data = 0x%0.8p)", @@ -1447,6 +1500,7 @@ void GL_APIENTRY GetMultisamplefvRobustANGLE(GLenum pname, GLsizei *length, GLfloat *val) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum pname = 0x%X, GLuint index = %u, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLfloat * val = 0x%0.8p)", @@ -1473,6 +1527,7 @@ void GL_APIENTRY GetTexLevelParameterivRobustANGLE(GLenum target, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLsizei bufSize = %d, " "GLsizei * length = 0x%0.8p, GLint * params = 0x%0.8p)", @@ -1502,6 +1557,7 @@ void GL_APIENTRY GetTexLevelParameterfvRobustANGLE(GLenum target, GLsizei *length, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLsizei bufSize = %d, " "GLsizei * length = 0x%0.8p, GLfloat * params = 0x%0.8p)", @@ -1529,6 +1585,7 @@ void GL_APIENTRY GetPointervRobustANGLERobustANGLE(GLenum pname, GLsizei *length, void **params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, void ** params = " "0x%0.8p)", @@ -1560,6 +1617,7 @@ void GL_APIENTRY ReadnPixelsRobustANGLE(GLint x, GLsizei *rows, void *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = " "0x%X, GLenum type = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, GLsizei * " @@ -1588,6 +1646,7 @@ void GL_APIENTRY GetnUniformfvRobustANGLE(GLuint program, GLsizei *length, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLfloat * params = 0x%0.8p)", @@ -1613,6 +1672,7 @@ void GL_APIENTRY GetnUniformivRobustANGLE(GLuint program, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -1638,6 +1698,7 @@ void GL_APIENTRY GetnUniformuivRobustANGLE(GLuint program, GLsizei *length, GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLuint * params = 0x%0.8p)", @@ -1662,6 +1723,7 @@ void GL_APIENTRY TexParameterIivRobustANGLE(GLenum target, GLsizei bufSize, const GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLint * params = " "0x%0.8p)", @@ -1687,6 +1749,7 @@ void GL_APIENTRY TexParameterIuivRobustANGLE(GLenum target, GLsizei bufSize, const GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLuint * params = " "0x%0.8p)", @@ -1713,6 +1776,7 @@ void GL_APIENTRY GetTexParameterIivRobustANGLE(GLenum target, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -1739,6 +1803,7 @@ void GL_APIENTRY GetTexParameterIuivRobustANGLE(GLenum target, GLsizei *length, GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLuint * params = 0x%0.8p)", @@ -1764,6 +1829,7 @@ void GL_APIENTRY SamplerParameterIivRobustANGLE(GLuint sampler, GLsizei bufSize, const GLint *param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLint * param = " "0x%0.8p)", @@ -1788,6 +1854,7 @@ void GL_APIENTRY SamplerParameterIuivRobustANGLE(GLuint sampler, GLsizei bufSize, const GLuint *param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLuint * param = " "0x%0.8p)", @@ -1813,6 +1880,7 @@ void GL_APIENTRY GetSamplerParameterIivRobustANGLE(GLuint sampler, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -1838,6 +1906,7 @@ void GL_APIENTRY GetSamplerParameterIuivRobustANGLE(GLuint sampler, GLsizei *length, GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLuint * params = 0x%0.8p)", @@ -1863,6 +1932,7 @@ void GL_APIENTRY GetQueryObjectivRobustANGLE(GLuint id, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint id = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, " "GLint * params = 0x%0.8p)", @@ -1888,6 +1958,7 @@ void GL_APIENTRY GetQueryObjecti64vRobustANGLE(GLuint id, GLsizei *length, GLint64 *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint id = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, " "GLint64 * params = 0x%0.8p)", @@ -1913,6 +1984,7 @@ void GL_APIENTRY GetQueryObjectui64vRobustANGLE(GLuint id, GLsizei *length, GLuint64 *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint id = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, " "GLuint64 * params = 0x%0.8p)", @@ -1938,6 +2010,7 @@ void GL_APIENTRY GetTranslatedShaderSourceANGLE(GLuint shader, GLsizei *length, GLchar *source) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint shader = %u, GLsizei bufsize = %d, GLsizei *length = 0x%0.8p, GLchar *source = " "0x%0.8p)", @@ -1960,6 +2033,7 @@ void GL_APIENTRY GetTranslatedShaderSourceANGLE(GLuint shader, // GL_CHROMIUM_bind_uniform_location void GL_APIENTRY BindUniformLocationCHROMIUM(GLuint program, GLint location, const GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, const GLchar* name = 0x%0.8p)", program, location, name); @@ -1979,6 +2053,7 @@ void GL_APIENTRY BindUniformLocationCHROMIUM(GLuint program, GLint location, con // GL_CHROMIUM_copy_compressed_texture void GL_APIENTRY CompressedCopyTextureCHROMIUM(GLuint sourceId, GLuint destId) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint sourceId = %u, GLuint destId = %u)", sourceId, destId); Context *context = GetValidGlobalContext(); @@ -2006,6 +2081,7 @@ void GL_APIENTRY CopyTextureCHROMIUM(GLuint sourceId, GLboolean unpackPremultiplyAlpha, GLboolean unpackUnmultiplyAlpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sourceId = %u, GLint sourceLevel = %d, GLenum destTarget = 0x%X, GLuint destId = " "%u, GLint destLevel = %d, GLint internalFormat = %d, GLenum destType = 0x%X, GLboolean " @@ -2049,6 +2125,7 @@ void GL_APIENTRY CopySubTextureCHROMIUM(GLuint sourceId, GLboolean unpackPremultiplyAlpha, GLboolean unpackUnmultiplyAlpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sourceId = %u, GLint sourceLevel = %d, GLenum destTarget = 0x%X, GLuint destId = " "%u, GLint destLevel = %d, GLint xoffset = %d, GLint yoffset = %d, GLint x = %d, GLint y = " @@ -2081,6 +2158,7 @@ void GL_APIENTRY CopySubTextureCHROMIUM(GLuint sourceId, // GL_CHROMIUM_framebuffer_mixed_samples void GL_APIENTRY CoverageModulationCHROMIUM(GLenum components) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum components = 0x%X)", components); Context *context = GetValidGlobalContext(); @@ -2097,6 +2175,7 @@ void GL_APIENTRY CoverageModulationCHROMIUM(GLenum components) void GL_APIENTRY MatrixLoadfCHROMIUM(GLenum matrixMode, const GLfloat *matrix) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum matrixMode = 0x%X, const GLfloat * matrix = 0x%0.8p)", matrixMode, matrix); Context *context = GetValidGlobalContext(); @@ -2113,6 +2192,7 @@ void GL_APIENTRY MatrixLoadfCHROMIUM(GLenum matrixMode, const GLfloat *matrix) void GL_APIENTRY MatrixLoadIdentityCHROMIUM(GLenum matrixMode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum matrixMode = 0x%X)", matrixMode); Context *context = GetValidGlobalContext(); @@ -2130,6 +2210,7 @@ void GL_APIENTRY MatrixLoadIdentityCHROMIUM(GLenum matrixMode) // GL_CHROMIUM_path_rendering GLuint GL_APIENTRY GenPathsCHROMIUM(GLsizei range) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei range = %d)", range); Context *context = GetValidGlobalContext(); @@ -2148,6 +2229,7 @@ GLuint GL_APIENTRY GenPathsCHROMIUM(GLsizei range) void GL_APIENTRY DeletePathsCHROMIUM(GLuint first, GLsizei range) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint first = %u, GLsizei range = %d)", first, range); Context *context = GetValidGlobalContext(); @@ -2164,6 +2246,7 @@ void GL_APIENTRY DeletePathsCHROMIUM(GLuint first, GLsizei range) GLboolean GL_APIENTRY IsPathCHROMIUM(GLuint path) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u)", path); Context *context = GetValidGlobalContext(); @@ -2187,6 +2270,7 @@ void GL_APIENTRY PathCommandsCHROMIUM(GLuint path, GLenum coordType, const void *coords) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint path = %u, GLsizei numCommands = %d, const GLubyte * commands = 0x%0.8p, GLsizei " "numCoords = %d, GLenum coordType = 0x%X, const void* coords = 0x%0.8p)", @@ -2209,6 +2293,7 @@ void GL_APIENTRY PathCommandsCHROMIUM(GLuint path, void GL_APIENTRY PathParameterfCHROMIUM(GLuint path, GLenum pname, GLfloat value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u, GLenum pname = 0x%X, GLfloat value = %f)", path, pname, value); Context *context = GetValidGlobalContext(); @@ -2226,6 +2311,7 @@ void GL_APIENTRY PathParameterfCHROMIUM(GLuint path, GLenum pname, GLfloat value void GL_APIENTRY PathParameteriCHROMIUM(GLuint path, GLenum pname, GLint value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u, GLenum pname = 0x%X, GLint value = %d)", path, pname, value); Context *context = GetValidGlobalContext(); @@ -2243,6 +2329,7 @@ void GL_APIENTRY PathParameteriCHROMIUM(GLuint path, GLenum pname, GLint value) void GL_APIENTRY GetPathParameterfvCHROMIUM(GLuint path, GLenum pname, GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u, GLenum pname = 0x%X, GLfloat * value = 0x%0.8p)", path, pname, value); Context *context = GetValidGlobalContext(); @@ -2260,6 +2347,7 @@ void GL_APIENTRY GetPathParameterfvCHROMIUM(GLuint path, GLenum pname, GLfloat * void GL_APIENTRY GetPathParameterivCHROMIUM(GLuint path, GLenum pname, GLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u, GLenum pname = 0x%X, GLint * value = 0x%0.8p)", path, pname, value); Context *context = GetValidGlobalContext(); @@ -2277,6 +2365,7 @@ void GL_APIENTRY GetPathParameterivCHROMIUM(GLuint path, GLenum pname, GLint *va void GL_APIENTRY PathStencilFuncCHROMIUM(GLenum func, GLint ref, GLuint mask) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum func = 0x%X, GLint ref = %d, GLuint mask = %u)", func, ref, mask); Context *context = GetValidGlobalContext(); @@ -2293,6 +2382,7 @@ void GL_APIENTRY PathStencilFuncCHROMIUM(GLenum func, GLint ref, GLuint mask) void GL_APIENTRY StencilFillPathCHROMIUM(GLuint path, GLenum fillMode, GLuint mask) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u, GLenum fillMode = 0x%X, GLuint mask = %u)", path, fillMode, mask); Context *context = GetValidGlobalContext(); @@ -2310,6 +2400,7 @@ void GL_APIENTRY StencilFillPathCHROMIUM(GLuint path, GLenum fillMode, GLuint ma void GL_APIENTRY StencilStrokePathCHROMIUM(GLuint path, GLint reference, GLuint mask) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u, GLint reference = %d, GLuint mask = %u)", path, reference, mask); Context *context = GetValidGlobalContext(); @@ -2327,6 +2418,7 @@ void GL_APIENTRY StencilStrokePathCHROMIUM(GLuint path, GLint reference, GLuint void GL_APIENTRY CoverFillPathCHROMIUM(GLuint path, GLenum coverMode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u, GLenum coverMode = 0x%X)", path, coverMode); Context *context = GetValidGlobalContext(); @@ -2343,6 +2435,7 @@ void GL_APIENTRY CoverFillPathCHROMIUM(GLuint path, GLenum coverMode) void GL_APIENTRY CoverStrokePathCHROMIUM(GLuint path, GLenum coverMode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u, GLenum coverMode = 0x%X)", path, coverMode); Context *context = GetValidGlobalContext(); @@ -2362,6 +2455,7 @@ void GL_APIENTRY StencilThenCoverFillPathCHROMIUM(GLuint path, GLuint mask, GLenum coverMode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u, GLenum fillMode = 0x%X, GLuint mask = %u, GLenum coverMode = 0x%X)", path, fillMode, mask, coverMode); @@ -2384,6 +2478,7 @@ void GL_APIENTRY StencilThenCoverStrokePathCHROMIUM(GLuint path, GLuint mask, GLenum coverMode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u, GLint reference = %d, GLuint mask = %u, GLenum coverMode = 0x%X)", path, reference, mask, coverMode); @@ -2409,6 +2504,7 @@ void GL_APIENTRY CoverFillPathInstancedCHROMIUM(GLsizei numPath, GLenum transformType, const GLfloat *transformValues) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLsizei numPath = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%0.8p, GLuint " "pathBase = %u, GLenum coverMode = 0x%X, GLenum transformType = 0x%X, const GLfloat * " @@ -2439,6 +2535,7 @@ void GL_APIENTRY CoverStrokePathInstancedCHROMIUM(GLsizei numPath, GLenum transformType, const GLfloat *transformValues) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLsizei numPath = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%0.8p, GLuint " "pathBase = %u, GLenum coverMode = 0x%X, GLenum transformType = 0x%X, const GLfloat * " @@ -2470,6 +2567,7 @@ void GL_APIENTRY StencilStrokePathInstancedCHROMIUM(GLsizei numPath, GLenum transformType, const GLfloat *transformValues) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLsizei numPath = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%0.8p, GLuint " "pathBase = %u, GLint reference = %d, GLuint mask = %u, GLenum transformType = 0x%X, const " @@ -2502,6 +2600,7 @@ void GL_APIENTRY StencilFillPathInstancedCHROMIUM(GLsizei numPaths, GLenum transformType, const GLfloat *transformValues) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLsizei numPaths = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%0.8p, GLuint " "pathBase = %u, GLenum fillMode = 0x%X, GLuint mask = %u, GLenum transformType = 0x%X, " @@ -2535,6 +2634,7 @@ void GL_APIENTRY StencilThenCoverFillPathInstancedCHROMIUM(GLsizei numPaths, GLenum transformType, const GLfloat *transformValues) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLsizei numPaths = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%0.8p, GLuint " "pathBase = %u, GLenum fillMode = 0x%X, GLuint mask = %u, GLenum coverMode = 0x%X, GLenum " @@ -2571,6 +2671,7 @@ void GL_APIENTRY StencilThenCoverStrokePathInstancedCHROMIUM(GLsizei numPaths, GLenum transformType, const GLfloat *transformValues) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLsizei numPaths = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%0.8p, GLuint " "pathBase = %u, GLint reference = %d, GLuint mask = %u, GLenum coverMode = 0x%X, GLenum " @@ -2601,6 +2702,7 @@ void GL_APIENTRY BindFragmentInputLocationCHROMIUM(GLuint programs, GLint location, const GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint programs = %u, GLint location = %d, const GLchar * name = 0x%0.8p)", programs, location, name); @@ -2624,6 +2726,7 @@ void GL_APIENTRY ProgramPathFragmentInputGenCHROMIUM(GLuint program, GLint components, const GLfloat *coeffs) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLenum genMode = 0x%X, GLint components = %d, " "const GLfloat * coeffs = 0x%0.8p)", @@ -2647,6 +2750,7 @@ void GL_APIENTRY ProgramPathFragmentInputGenCHROMIUM(GLuint program, // GL_EXT_debug_marker void GL_APIENTRY InsertEventMarkerEXT(GLsizei length, const GLchar *marker) { + ANGLE_SCOPED_GLOBAL_LOCK(); // Don't run an EVENT() macro on the EXT_debug_marker entry points. // It can interfere with the debug events being set by the caller. // EVENT("(GLsizei length = %d, const GLchar *marker = 0x%0.8p)", length, marker); @@ -2665,6 +2769,7 @@ void GL_APIENTRY InsertEventMarkerEXT(GLsizei length, const GLchar *marker) void GL_APIENTRY PopGroupMarkerEXT() { + ANGLE_SCOPED_GLOBAL_LOCK(); // Don't run an EVENT() macro on the EXT_debug_marker entry points. // It can interfere with the debug events being set by the caller. // EVENT("()"); @@ -2683,6 +2788,7 @@ void GL_APIENTRY PopGroupMarkerEXT() void GL_APIENTRY PushGroupMarkerEXT(GLsizei length, const GLchar *marker) { + ANGLE_SCOPED_GLOBAL_LOCK(); // Don't run an EVENT() macro on the EXT_debug_marker entry points. // It can interfere with the debug events being set by the caller. // EVENT("(GLsizei length = %d, const GLchar *marker = 0x%0.8p)", length, marker); @@ -2704,6 +2810,7 @@ void GL_APIENTRY DiscardFramebufferEXT(GLenum target, GLsizei numAttachments, const GLenum *attachments) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = 0x%0.8p)", target, numAttachments, attachments); @@ -2725,6 +2832,7 @@ void GL_APIENTRY DiscardFramebufferEXT(GLenum target, // GL_EXT_disjoint_timer_query void GL_APIENTRY BeginQueryEXT(GLenum target, GLuint id) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint id = %u)", target, id); Context *context = GetValidGlobalContext(); @@ -2742,6 +2850,7 @@ void GL_APIENTRY BeginQueryEXT(GLenum target, GLuint id) void GL_APIENTRY DeleteQueriesEXT(GLsizei n, const GLuint *ids) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *ids = 0x%0.8p)", n, ids); Context *context = GetValidGlobalContext(); @@ -2758,6 +2867,7 @@ void GL_APIENTRY DeleteQueriesEXT(GLsizei n, const GLuint *ids) void GL_APIENTRY EndQueryEXT(GLenum target) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X)", target); Context *context = GetValidGlobalContext(); @@ -2775,6 +2885,7 @@ void GL_APIENTRY EndQueryEXT(GLenum target) void GL_APIENTRY GenQueriesEXT(GLsizei n, GLuint *ids) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *ids = 0x%0.8p)", n, ids); Context *context = GetValidGlobalContext(); @@ -2791,6 +2902,7 @@ void GL_APIENTRY GenQueriesEXT(GLsizei n, GLuint *ids) void GL_APIENTRY GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64 *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLint64 *params = 0x%0.8p)", id, pname, params); Context *context = GetValidGlobalContext(); @@ -2807,6 +2919,7 @@ void GL_APIENTRY GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64 *params) void GL_APIENTRY GetQueryObjectivEXT(GLuint id, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", id, pname, params); Context *context = GetValidGlobalContext(); @@ -2823,6 +2936,7 @@ void GL_APIENTRY GetQueryObjectivEXT(GLuint id, GLenum pname, GLint *params) void GL_APIENTRY GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64 *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLuint64 *params = 0x%0.8p)", id, pname, params); Context *context = GetValidGlobalContext(); @@ -2839,6 +2953,7 @@ void GL_APIENTRY GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64 *param void GL_APIENTRY GetQueryObjectuivEXT(GLuint id, GLenum pname, GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLuint *params = 0x%0.8p)", id, pname, params); Context *context = GetValidGlobalContext(); @@ -2855,6 +2970,7 @@ void GL_APIENTRY GetQueryObjectuivEXT(GLuint id, GLenum pname, GLuint *params) void GL_APIENTRY GetQueryivEXT(GLenum target, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname, params); @@ -2874,6 +2990,7 @@ void GL_APIENTRY GetQueryivEXT(GLenum target, GLenum pname, GLint *params) GLboolean GL_APIENTRY IsQueryEXT(GLuint id) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint id = %u)", id); Context *context = GetValidGlobalContext(); @@ -2892,6 +3009,7 @@ GLboolean GL_APIENTRY IsQueryEXT(GLuint id) void GL_APIENTRY QueryCounterEXT(GLuint id, GLenum target) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint id = %u, GLenum target = 0x%X)", id, target); Context *context = GetValidGlobalContext(); @@ -2910,6 +3028,7 @@ void GL_APIENTRY QueryCounterEXT(GLuint id, GLenum target) // GL_EXT_draw_buffers void GL_APIENTRY DrawBuffersEXT(GLsizei n, const GLenum *bufs) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLenum *bufs = 0x%0.8p)", n, bufs); Context *context = GetValidGlobalContext(); @@ -2930,6 +3049,7 @@ void GL_APIENTRY FramebufferTextureEXT(GLenum target, GLuint texture, GLint level) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %u, GLint level = %d)", target, attachment, texture, level); @@ -2950,6 +3070,7 @@ void GL_APIENTRY FramebufferTextureEXT(GLenum target, // GL_EXT_map_buffer_range void GL_APIENTRY FlushMappedBufferRangeEXT(GLenum target, GLintptr offset, GLsizeiptr length) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr length = %d)", target, offset, length); @@ -2972,6 +3093,7 @@ void *GL_APIENTRY MapBufferRangeEXT(GLenum target, GLsizeiptr length, GLbitfield access) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr length = %d, GLbitfield access = " "0x%X)", @@ -3011,6 +3133,7 @@ void *GL_APIENTRY MapBufferRangeEXT(GLenum target, // GL_EXT_robustness GLenum GL_APIENTRY GetGraphicsResetStatusEXT() { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = GetValidGlobalContext(); @@ -3029,6 +3152,7 @@ GLenum GL_APIENTRY GetGraphicsResetStatusEXT() void GL_APIENTRY GetnUniformfvEXT(GLuint program, GLint location, GLsizei bufSize, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLfloat *params = " "0x%0.8p)", @@ -3049,6 +3173,7 @@ void GL_APIENTRY GetnUniformfvEXT(GLuint program, GLint location, GLsizei bufSiz void GL_APIENTRY GetnUniformivEXT(GLuint program, GLint location, GLsizei bufSize, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLint *params = 0x%0.8p)", program, location, bufSize, params); @@ -3075,6 +3200,7 @@ void GL_APIENTRY ReadnPixelsEXT(GLint x, GLsizei bufSize, void *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = " "0x%X, GLenum type = 0x%X, GLsizei bufSize = %d, void *data = 0x%0.8p)", @@ -3100,6 +3226,7 @@ void GL_APIENTRY TexStorage1DEXT(GLenum target, GLenum internalformat, GLsizei width) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = " "%d)", @@ -3121,6 +3248,7 @@ void GL_APIENTRY TexStorage1DEXT(GLenum target, void GL_APIENTRY TexStorage2DEXT(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = " "%d, GLsizei height = %d)", @@ -3148,6 +3276,7 @@ void GL_APIENTRY TexStorage3DEXT(GLenum target, GLsizei height, GLsizei depth) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = " "%d, GLsizei height = %d, GLsizei depth = %d)", @@ -3172,6 +3301,7 @@ void GL_APIENTRY TexStorage3DEXT(GLenum target, // GL_KHR_debug void GL_APIENTRY DebugMessageCallbackKHR(GLDEBUGPROCKHR callback, const void *userParam) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLDEBUGPROCKHR callback = 0x%0.8p, const void *userParam = 0x%0.8p)", callback, userParam); @@ -3195,6 +3325,7 @@ void GL_APIENTRY DebugMessageControlKHR(GLenum source, const GLuint *ids, GLboolean enabled) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum source = 0x%X, GLenum type = 0x%X, GLenum severity = 0x%X, GLsizei count = %d, " "const GLuint *ids = 0x%0.8p, GLboolean enabled = %u)", @@ -3221,6 +3352,7 @@ void GL_APIENTRY DebugMessageInsertKHR(GLenum source, GLsizei length, const GLchar *buf) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum source = 0x%X, GLenum type = 0x%X, GLuint id = %u, GLenum severity = 0x%X, " "GLsizei length = %d, const GLchar *buf = 0x%0.8p)", @@ -3249,6 +3381,7 @@ GLuint GL_APIENTRY GetDebugMessageLogKHR(GLuint count, GLsizei *lengths, GLchar *messageLog) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint count = %u, GLsizei bufSize = %d, GLenum *sources = 0x%0.8p, GLenum *types = " "0x%0.8p, GLuint *ids = 0x%0.8p, GLenum *severities = 0x%0.8p, GLsizei *lengths = 0x%0.8p, " @@ -3276,6 +3409,7 @@ GLuint GL_APIENTRY GetDebugMessageLogKHR(GLuint count, void GL_APIENTRY GetObjectLabelKHR(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum identifier = 0x%X, GLuint name = %u, GLsizei bufSize = %d, GLsizei *length = " "0x%0.8p, GLchar *label = 0x%0.8p)", @@ -3300,6 +3434,7 @@ void GL_APIENTRY GetObjectPtrLabelKHR(const void *ptr, GLsizei *length, GLchar *label) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(const void *ptr = 0x%0.8p, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar " "*label = 0x%0.8p)", @@ -3320,6 +3455,7 @@ void GL_APIENTRY GetObjectPtrLabelKHR(const void *ptr, void GL_APIENTRY GetPointervKHR(GLenum pname, void **params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, void **params = 0x%0.8p)", pname, params); Context *context = GetValidGlobalContext(); @@ -3336,6 +3472,7 @@ void GL_APIENTRY GetPointervKHR(GLenum pname, void **params) void GL_APIENTRY ObjectLabelKHR(GLenum identifier, GLuint name, GLsizei length, const GLchar *label) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum identifier = 0x%X, GLuint name = %u, GLsizei length = %d, const GLchar *label = " "0x%0.8p)", @@ -3356,6 +3493,7 @@ void GL_APIENTRY ObjectLabelKHR(GLenum identifier, GLuint name, GLsizei length, void GL_APIENTRY ObjectPtrLabelKHR(const void *ptr, GLsizei length, const GLchar *label) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const void *ptr = 0x%0.8p, GLsizei length = %d, const GLchar *label = 0x%0.8p)", ptr, length, label); @@ -3373,6 +3511,7 @@ void GL_APIENTRY ObjectPtrLabelKHR(const void *ptr, GLsizei length, const GLchar void GL_APIENTRY PopDebugGroupKHR() { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = GetValidGlobalContext(); @@ -3389,6 +3528,7 @@ void GL_APIENTRY PopDebugGroupKHR() void GL_APIENTRY PushDebugGroupKHR(GLenum source, GLuint id, GLsizei length, const GLchar *message) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum source = 0x%X, GLuint id = %u, GLsizei length = %d, const GLchar *message = " "0x%0.8p)", @@ -3410,6 +3550,7 @@ void GL_APIENTRY PushDebugGroupKHR(GLenum source, GLuint id, GLsizei length, con // GL_KHR_parallel_shader_compile void GL_APIENTRY MaxShaderCompilerThreadsKHR(GLuint count) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint count = %u)", count); Context *context = GetValidGlobalContext(); @@ -3427,6 +3568,7 @@ void GL_APIENTRY MaxShaderCompilerThreadsKHR(GLuint count) // GL_NV_fence void GL_APIENTRY DeleteFencesNV(GLsizei n, const GLuint *fences) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *fences = 0x%0.8p)", n, fences); Context *context = GetValidGlobalContext(); @@ -3443,6 +3585,7 @@ void GL_APIENTRY DeleteFencesNV(GLsizei n, const GLuint *fences) void GL_APIENTRY FinishFenceNV(GLuint fence) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint fence = %u)", fence); Context *context = GetValidGlobalContext(); @@ -3459,6 +3602,7 @@ void GL_APIENTRY FinishFenceNV(GLuint fence) void GL_APIENTRY GenFencesNV(GLsizei n, GLuint *fences) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *fences = 0x%0.8p)", n, fences); Context *context = GetValidGlobalContext(); @@ -3475,6 +3619,7 @@ void GL_APIENTRY GenFencesNV(GLsizei n, GLuint *fences) void GL_APIENTRY GetFenceivNV(GLuint fence, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint fence = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", fence, pname, params); @@ -3492,6 +3637,7 @@ void GL_APIENTRY GetFenceivNV(GLuint fence, GLenum pname, GLint *params) GLboolean GL_APIENTRY IsFenceNV(GLuint fence) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint fence = %u)", fence); Context *context = GetValidGlobalContext(); @@ -3510,6 +3656,7 @@ GLboolean GL_APIENTRY IsFenceNV(GLuint fence) void GL_APIENTRY SetFenceNV(GLuint fence, GLenum condition) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint fence = %u, GLenum condition = 0x%X)", fence, condition); Context *context = GetValidGlobalContext(); @@ -3526,6 +3673,7 @@ void GL_APIENTRY SetFenceNV(GLuint fence, GLenum condition) GLboolean GL_APIENTRY TestFenceNV(GLuint fence) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint fence = %u)", fence); Context *context = GetValidGlobalContext(); @@ -3545,6 +3693,7 @@ GLboolean GL_APIENTRY TestFenceNV(GLuint fence) // GL_OES_EGL_image void GL_APIENTRY EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLeglImageOES image = 0x%0.8p)", target, image); Context *context = GetValidGlobalContext(); @@ -3562,6 +3711,7 @@ void GL_APIENTRY EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageO void GL_APIENTRY EGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLeglImageOES image = 0x%0.8p)", target, image); Context *context = GetValidGlobalContext(); @@ -3581,6 +3731,7 @@ void GL_APIENTRY EGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image) // GL_OES_draw_texture void GL_APIENTRY DrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLfloat x = %f, GLfloat y = %f, GLfloat z = %f, GLfloat width = %f, GLfloat height = %f)", x, y, z, width, height); @@ -3599,6 +3750,7 @@ void GL_APIENTRY DrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLf void GL_APIENTRY DrawTexfvOES(const GLfloat *coords) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const GLfloat *coords = 0x%0.8p)", coords); Context *context = GetValidGlobalContext(); @@ -3615,6 +3767,7 @@ void GL_APIENTRY DrawTexfvOES(const GLfloat *coords) void GL_APIENTRY DrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint x = %d, GLint y = %d, GLint z = %d, GLint width = %d, GLint height = %d)", x, y, z, width, height); @@ -3632,6 +3785,7 @@ void GL_APIENTRY DrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint heigh void GL_APIENTRY DrawTexivOES(const GLint *coords) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const GLint *coords = 0x%0.8p)", coords); Context *context = GetValidGlobalContext(); @@ -3648,6 +3802,7 @@ void GL_APIENTRY DrawTexivOES(const GLint *coords) void GL_APIENTRY DrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLshort x = %d, GLshort y = %d, GLshort z = %d, GLshort width = %d, GLshort height = %d)", x, y, z, width, height); @@ -3666,6 +3821,7 @@ void GL_APIENTRY DrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, GLs void GL_APIENTRY DrawTexsvOES(const GLshort *coords) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const GLshort *coords = 0x%0.8p)", coords); Context *context = GetValidGlobalContext(); @@ -3682,6 +3838,7 @@ void GL_APIENTRY DrawTexsvOES(const GLshort *coords) void GL_APIENTRY DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLfixed x = 0x%X, GLfixed y = 0x%X, GLfixed z = 0x%X, GLfixed width = 0x%X, GLfixed " "height = 0x%X)", @@ -3701,6 +3858,7 @@ void GL_APIENTRY DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLf void GL_APIENTRY DrawTexxvOES(const GLfixed *coords) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const GLfixed *coords = 0x%0.8p)", coords); Context *context = GetValidGlobalContext(); @@ -3718,6 +3876,7 @@ void GL_APIENTRY DrawTexxvOES(const GLfixed *coords) // GL_OES_framebuffer_object void GL_APIENTRY BindFramebufferOES(GLenum target, GLuint framebuffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint framebuffer = %u)", target, framebuffer); Context *context = GetValidGlobalContext(); @@ -3734,6 +3893,7 @@ void GL_APIENTRY BindFramebufferOES(GLenum target, GLuint framebuffer) void GL_APIENTRY BindRenderbufferOES(GLenum target, GLuint renderbuffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint renderbuffer = %u)", target, renderbuffer); Context *context = GetValidGlobalContext(); @@ -3750,6 +3910,7 @@ void GL_APIENTRY BindRenderbufferOES(GLenum target, GLuint renderbuffer) GLenum GL_APIENTRY CheckFramebufferStatusOES(GLenum target) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X)", target); Context *context = GetValidGlobalContext(); @@ -3768,6 +3929,7 @@ GLenum GL_APIENTRY CheckFramebufferStatusOES(GLenum target) void GL_APIENTRY DeleteFramebuffersOES(GLsizei n, const GLuint *framebuffers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *framebuffers = 0x%0.8p)", n, framebuffers); Context *context = GetValidGlobalContext(); @@ -3784,6 +3946,7 @@ void GL_APIENTRY DeleteFramebuffersOES(GLsizei n, const GLuint *framebuffers) void GL_APIENTRY DeleteRenderbuffersOES(GLsizei n, const GLuint *renderbuffers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *renderbuffers = 0x%0.8p)", n, renderbuffers); Context *context = GetValidGlobalContext(); @@ -3803,6 +3966,7 @@ void GL_APIENTRY FramebufferRenderbufferOES(GLenum target, GLenum renderbuffertarget, GLuint renderbuffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum renderbuffertarget = 0x%X, GLuint " "renderbuffer = %u)", @@ -3829,6 +3993,7 @@ void GL_APIENTRY FramebufferTexture2DOES(GLenum target, GLuint texture, GLint level) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, GLuint texture " "= %u, GLint level = %d)", @@ -3852,6 +4017,7 @@ void GL_APIENTRY FramebufferTexture2DOES(GLenum target, void GL_APIENTRY GenFramebuffersOES(GLsizei n, GLuint *framebuffers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *framebuffers = 0x%0.8p)", n, framebuffers); Context *context = GetValidGlobalContext(); @@ -3868,6 +4034,7 @@ void GL_APIENTRY GenFramebuffersOES(GLsizei n, GLuint *framebuffers) void GL_APIENTRY GenRenderbuffersOES(GLsizei n, GLuint *renderbuffers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *renderbuffers = 0x%0.8p)", n, renderbuffers); Context *context = GetValidGlobalContext(); @@ -3884,6 +4051,7 @@ void GL_APIENTRY GenRenderbuffersOES(GLsizei n, GLuint *renderbuffers) void GL_APIENTRY GenerateMipmapOES(GLenum target) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X)", target); Context *context = GetValidGlobalContext(); @@ -3904,6 +4072,7 @@ void GL_APIENTRY GetFramebufferAttachmentParameterivOES(GLenum target, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLint *params = " "0x%0.8p)", @@ -3925,6 +4094,7 @@ void GL_APIENTRY GetFramebufferAttachmentParameterivOES(GLenum target, void GL_APIENTRY GetRenderbufferParameterivOES(GLenum target, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname, params); @@ -3943,6 +4113,7 @@ void GL_APIENTRY GetRenderbufferParameterivOES(GLenum target, GLenum pname, GLin GLboolean GL_APIENTRY IsFramebufferOES(GLuint framebuffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint framebuffer = %u)", framebuffer); Context *context = GetValidGlobalContext(); @@ -3961,6 +4132,7 @@ GLboolean GL_APIENTRY IsFramebufferOES(GLuint framebuffer) GLboolean GL_APIENTRY IsRenderbufferOES(GLuint renderbuffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint renderbuffer = %u)", renderbuffer); Context *context = GetValidGlobalContext(); @@ -3982,6 +4154,7 @@ void GL_APIENTRY RenderbufferStorageOES(GLenum target, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = " "%d)", @@ -4008,6 +4181,7 @@ void GL_APIENTRY GetProgramBinaryOES(GLuint program, GLenum *binaryFormat, void *binary) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLenum " "*binaryFormat = 0x%0.8p, void *binary = 0x%0.8p)", @@ -4032,6 +4206,7 @@ void GL_APIENTRY ProgramBinaryOES(GLuint program, const void *binary, GLint length) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLenum binaryFormat = 0x%X, const void *binary = 0x%0.8p, GLint " "length = %d)", @@ -4053,6 +4228,7 @@ void GL_APIENTRY ProgramBinaryOES(GLuint program, // GL_OES_mapbuffer void GL_APIENTRY GetBufferPointervOES(GLenum target, GLenum pname, void **params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, void **params = 0x%0.8p)", target, pname, params); @@ -4072,6 +4248,7 @@ void GL_APIENTRY GetBufferPointervOES(GLenum target, GLenum pname, void **params void *GL_APIENTRY MapBufferOES(GLenum target, GLenum access) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum access = 0x%X)", target, access); Context *context = GetValidGlobalContext(); @@ -4091,6 +4268,7 @@ void *GL_APIENTRY MapBufferOES(GLenum target, GLenum access) GLboolean GL_APIENTRY UnmapBufferOES(GLenum target) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X)", target); Context *context = GetValidGlobalContext(); @@ -4111,6 +4289,7 @@ GLboolean GL_APIENTRY UnmapBufferOES(GLenum target) // GL_OES_matrix_palette void GL_APIENTRY CurrentPaletteMatrixOES(GLuint matrixpaletteindex) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint matrixpaletteindex = %u)", matrixpaletteindex); Context *context = GetValidGlobalContext(); @@ -4128,6 +4307,7 @@ void GL_APIENTRY CurrentPaletteMatrixOES(GLuint matrixpaletteindex) void GL_APIENTRY LoadPaletteFromModelViewMatrixOES() { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = GetValidGlobalContext(); @@ -4144,6 +4324,7 @@ void GL_APIENTRY LoadPaletteFromModelViewMatrixOES() void GL_APIENTRY MatrixIndexPointerOES(GLint size, GLenum type, GLsizei stride, const void *pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%0.8p)", size, type, stride, pointer); @@ -4163,6 +4344,7 @@ void GL_APIENTRY MatrixIndexPointerOES(GLint size, GLenum type, GLsizei stride, void GL_APIENTRY WeightPointerOES(GLint size, GLenum type, GLsizei stride, const void *pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%0.8p)", size, type, stride, pointer); @@ -4183,6 +4365,7 @@ void GL_APIENTRY WeightPointerOES(GLint size, GLenum type, GLsizei stride, const // GL_OES_point_size_array void GL_APIENTRY PointSizePointerOES(GLenum type, GLsizei stride, const void *pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%0.8p)", type, stride, pointer); @@ -4202,6 +4385,7 @@ void GL_APIENTRY PointSizePointerOES(GLenum type, GLsizei stride, const void *po // GL_OES_query_matrix GLbitfield GL_APIENTRY QueryMatrixxOES(GLfixed *mantissa, GLint *exponent) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed *mantissa = 0x%0.8p, GLint *exponent = 0x%0.8p)", mantissa, exponent); Context *context = GetValidGlobalContext(); @@ -4221,6 +4405,7 @@ GLbitfield GL_APIENTRY QueryMatrixxOES(GLfixed *mantissa, GLint *exponent) // GL_OES_texture_cube_map void GL_APIENTRY GetTexGenfvOES(GLenum coord, GLenum pname, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", coord, pname, params); @@ -4238,6 +4423,7 @@ void GL_APIENTRY GetTexGenfvOES(GLenum coord, GLenum pname, GLfloat *params) void GL_APIENTRY GetTexGenivOES(GLenum coord, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", coord, pname, params); @@ -4255,6 +4441,7 @@ void GL_APIENTRY GetTexGenivOES(GLenum coord, GLenum pname, GLint *params) void GL_APIENTRY GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%0.8p)", coord, pname, params); @@ -4272,6 +4459,7 @@ void GL_APIENTRY GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params) void GL_APIENTRY TexGenfOES(GLenum coord, GLenum pname, GLfloat param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", coord, pname, param); Context *context = GetValidGlobalContext(); @@ -4288,6 +4476,7 @@ void GL_APIENTRY TexGenfOES(GLenum coord, GLenum pname, GLfloat param) void GL_APIENTRY TexGenfvOES(GLenum coord, GLenum pname, const GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", coord, pname, params); @@ -4305,6 +4494,7 @@ void GL_APIENTRY TexGenfvOES(GLenum coord, GLenum pname, const GLfloat *params) void GL_APIENTRY TexGeniOES(GLenum coord, GLenum pname, GLint param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLint param = %d)", coord, pname, param); Context *context = GetValidGlobalContext(); @@ -4321,6 +4511,7 @@ void GL_APIENTRY TexGeniOES(GLenum coord, GLenum pname, GLint param) void GL_APIENTRY TexGenivOES(GLenum coord, GLenum pname, const GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%0.8p)", coord, pname, params); @@ -4338,6 +4529,7 @@ void GL_APIENTRY TexGenivOES(GLenum coord, GLenum pname, const GLint *params) void GL_APIENTRY TexGenxOES(GLenum coord, GLenum pname, GLfixed param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", coord, pname, param); Context *context = GetValidGlobalContext(); @@ -4354,6 +4546,7 @@ void GL_APIENTRY TexGenxOES(GLenum coord, GLenum pname, GLfixed param) void GL_APIENTRY TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%0.8p)", coord, pname, params); @@ -4378,6 +4571,7 @@ void GL_APIENTRY TexStorage3DMultisampleOES(GLenum target, GLsizei depth, GLboolean fixedsamplelocations) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width " "= %d, GLsizei height = %d, GLsizei depth = %d, GLboolean fixedsamplelocations = %u)", @@ -4403,6 +4597,7 @@ void GL_APIENTRY TexStorage3DMultisampleOES(GLenum target, // GL_OES_vertex_array_object void GL_APIENTRY BindVertexArrayOES(GLuint array) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint array = %u)", array); Context *context = GetValidGlobalContext(); @@ -4419,6 +4614,7 @@ void GL_APIENTRY BindVertexArrayOES(GLuint array) void GL_APIENTRY DeleteVertexArraysOES(GLsizei n, const GLuint *arrays) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *arrays = 0x%0.8p)", n, arrays); Context *context = GetValidGlobalContext(); @@ -4435,6 +4631,7 @@ void GL_APIENTRY DeleteVertexArraysOES(GLsizei n, const GLuint *arrays) void GL_APIENTRY GenVertexArraysOES(GLsizei n, GLuint *arrays) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *arrays = 0x%0.8p)", n, arrays); Context *context = GetValidGlobalContext(); @@ -4451,6 +4648,7 @@ void GL_APIENTRY GenVertexArraysOES(GLsizei n, GLuint *arrays) GLboolean GL_APIENTRY IsVertexArrayOES(GLuint array) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint array = %u)", array); Context *context = GetValidGlobalContext(); @@ -4470,6 +4668,7 @@ GLboolean GL_APIENTRY IsVertexArrayOES(GLuint array) // EGL_ANGLE_explicit_context void GL_APIENTRY ActiveShaderProgramContextANGLE(GLeglContext ctx, GLuint pipeline, GLuint program) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint pipeline = %u, GLuint program = %u)", pipeline, program); Context *context = static_cast(ctx); @@ -4487,6 +4686,7 @@ void GL_APIENTRY ActiveShaderProgramContextANGLE(GLeglContext ctx, GLuint pipeli void GL_APIENTRY ActiveTextureContextANGLE(GLeglContext ctx, GLenum texture) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum texture = 0x%X)", texture); Context *context = static_cast(ctx); @@ -4504,6 +4704,7 @@ void GL_APIENTRY ActiveTextureContextANGLE(GLeglContext ctx, GLenum texture) void GL_APIENTRY AlphaFuncContextANGLE(GLeglContext ctx, GLenum func, GLfloat ref) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum func = 0x%X, GLfloat ref = %f)", func, ref); Context *context = static_cast(ctx); @@ -4522,6 +4723,7 @@ void GL_APIENTRY AlphaFuncContextANGLE(GLeglContext ctx, GLenum func, GLfloat re void GL_APIENTRY AlphaFuncxContextANGLE(GLeglContext ctx, GLenum func, GLfixed ref) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum func = 0x%X, GLfixed ref = 0x%X)", func, ref); Context *context = static_cast(ctx); @@ -4540,6 +4742,7 @@ void GL_APIENTRY AlphaFuncxContextANGLE(GLeglContext ctx, GLenum func, GLfixed r void GL_APIENTRY AttachShaderContextANGLE(GLeglContext ctx, GLuint program, GLuint shader) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLuint shader = %u)", program, shader); Context *context = static_cast(ctx); @@ -4557,6 +4760,7 @@ void GL_APIENTRY AttachShaderContextANGLE(GLeglContext ctx, GLuint program, GLui void GL_APIENTRY BeginQueryContextANGLE(GLeglContext ctx, GLenum target, GLuint id) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint id = %u)", target, id); Context *context = static_cast(ctx); @@ -4575,6 +4779,7 @@ void GL_APIENTRY BeginQueryContextANGLE(GLeglContext ctx, GLenum target, GLuint void GL_APIENTRY BeginQueryEXTContextANGLE(GLeglContext ctx, GLenum target, GLuint id) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint id = %u)", target, id); Context *context = static_cast(ctx); @@ -4593,6 +4798,7 @@ void GL_APIENTRY BeginQueryEXTContextANGLE(GLeglContext ctx, GLenum target, GLui void GL_APIENTRY BeginTransformFeedbackContextANGLE(GLeglContext ctx, GLenum primitiveMode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum primitiveMode = 0x%X)", primitiveMode); Context *context = static_cast(ctx); @@ -4615,6 +4821,7 @@ void GL_APIENTRY BindAttribLocationContextANGLE(GLeglContext ctx, GLuint index, const GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLuint index = %u, const GLchar *name = 0x%0.8p)", program, index, name); @@ -4633,6 +4840,7 @@ void GL_APIENTRY BindAttribLocationContextANGLE(GLeglContext ctx, void GL_APIENTRY BindBufferContextANGLE(GLeglContext ctx, GLenum target, GLuint buffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint buffer = %u)", target, buffer); Context *context = static_cast(ctx); @@ -4654,6 +4862,7 @@ void GL_APIENTRY BindBufferBaseContextANGLE(GLeglContext ctx, GLuint index, GLuint buffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint index = %u, GLuint buffer = %u)", target, index, buffer); Context *context = static_cast(ctx); @@ -4678,6 +4887,7 @@ void GL_APIENTRY BindBufferRangeContextANGLE(GLeglContext ctx, GLintptr offset, GLsizeiptr size) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLuint index = %u, GLuint buffer = %u, GLintptr offset = %d, " "GLsizeiptr size = %d)", @@ -4701,6 +4911,7 @@ void GL_APIENTRY BindBufferRangeContextANGLE(GLeglContext ctx, void GL_APIENTRY BindFramebufferContextANGLE(GLeglContext ctx, GLenum target, GLuint framebuffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint framebuffer = %u)", target, framebuffer); Context *context = static_cast(ctx); @@ -4718,6 +4929,7 @@ void GL_APIENTRY BindFramebufferContextANGLE(GLeglContext ctx, GLenum target, GL void GL_APIENTRY BindFramebufferOESContextANGLE(GLeglContext ctx, GLenum target, GLuint framebuffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint framebuffer = %u)", target, framebuffer); Context *context = static_cast(ctx); @@ -4742,6 +4954,7 @@ void GL_APIENTRY BindImageTextureContextANGLE(GLeglContext ctx, GLenum access, GLenum format) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint unit = %u, GLuint texture = %u, GLint level = %d, GLboolean layered = %u, GLint " "layer = %d, GLenum access = 0x%X, GLenum format = 0x%X)", @@ -4764,6 +4977,7 @@ void GL_APIENTRY BindImageTextureContextANGLE(GLeglContext ctx, void GL_APIENTRY BindProgramPipelineContextANGLE(GLeglContext ctx, GLuint pipeline) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint pipeline = %u)", pipeline); Context *context = static_cast(ctx); @@ -4781,6 +4995,7 @@ void GL_APIENTRY BindProgramPipelineContextANGLE(GLeglContext ctx, GLuint pipeli void GL_APIENTRY BindRenderbufferContextANGLE(GLeglContext ctx, GLenum target, GLuint renderbuffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint renderbuffer = %u)", target, renderbuffer); Context *context = static_cast(ctx); @@ -4800,6 +5015,7 @@ void GL_APIENTRY BindRenderbufferOESContextANGLE(GLeglContext ctx, GLenum target, GLuint renderbuffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint renderbuffer = %u)", target, renderbuffer); Context *context = static_cast(ctx); @@ -4817,6 +5033,7 @@ void GL_APIENTRY BindRenderbufferOESContextANGLE(GLeglContext ctx, void GL_APIENTRY BindSamplerContextANGLE(GLeglContext ctx, GLuint unit, GLuint sampler) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint unit = %u, GLuint sampler = %u)", unit, sampler); Context *context = static_cast(ctx); @@ -4834,6 +5051,7 @@ void GL_APIENTRY BindSamplerContextANGLE(GLeglContext ctx, GLuint unit, GLuint s void GL_APIENTRY BindTextureContextANGLE(GLeglContext ctx, GLenum target, GLuint texture) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint texture = %u)", target, texture); Context *context = static_cast(ctx); @@ -4852,6 +5070,7 @@ void GL_APIENTRY BindTextureContextANGLE(GLeglContext ctx, GLenum target, GLuint void GL_APIENTRY BindTransformFeedbackContextANGLE(GLeglContext ctx, GLenum target, GLuint id) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint id = %u)", target, id); Context *context = static_cast(ctx); @@ -4869,6 +5088,7 @@ void GL_APIENTRY BindTransformFeedbackContextANGLE(GLeglContext ctx, GLenum targ void GL_APIENTRY BindVertexArrayContextANGLE(GLeglContext ctx, GLuint array) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint array = %u)", array); Context *context = static_cast(ctx); @@ -4886,6 +5106,7 @@ void GL_APIENTRY BindVertexArrayContextANGLE(GLeglContext ctx, GLuint array) void GL_APIENTRY BindVertexArrayOESContextANGLE(GLeglContext ctx, GLuint array) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint array = %u)", array); Context *context = static_cast(ctx); @@ -4907,6 +5128,7 @@ void GL_APIENTRY BindVertexBufferContextANGLE(GLeglContext ctx, GLintptr offset, GLsizei stride) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint bindingindex = %u, GLuint buffer = %u, GLintptr offset = %d, GLsizei stride = %d)", bindingindex, buffer, offset, stride); @@ -4928,6 +5150,7 @@ void GL_APIENTRY BindVertexBufferContextANGLE(GLeglContext ctx, void GL_APIENTRY BlendColorContextANGLE(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat red = %f, GLfloat green = %f, GLfloat blue = %f, GLfloat alpha = %f)", red, green, blue, alpha); @@ -4946,6 +5169,7 @@ BlendColorContextANGLE(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blu void GL_APIENTRY BlendEquationContextANGLE(GLeglContext ctx, GLenum mode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum mode = 0x%X)", mode); Context *context = static_cast(ctx); @@ -4965,6 +5189,7 @@ void GL_APIENTRY BlendEquationSeparateContextANGLE(GLeglContext ctx, GLenum modeRGB, GLenum modeAlpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum modeRGB = 0x%X, GLenum modeAlpha = 0x%X)", modeRGB, modeAlpha); Context *context = static_cast(ctx); @@ -4982,6 +5207,7 @@ void GL_APIENTRY BlendEquationSeparateContextANGLE(GLeglContext ctx, void GL_APIENTRY BlendFuncContextANGLE(GLeglContext ctx, GLenum sfactor, GLenum dfactor) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum sfactor = 0x%X, GLenum dfactor = 0x%X)", sfactor, dfactor); Context *context = static_cast(ctx); @@ -5003,6 +5229,7 @@ void GL_APIENTRY BlendFuncSeparateContextANGLE(GLeglContext ctx, GLenum sfactorAlpha, GLenum dfactorAlpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum sfactorRGB = 0x%X, GLenum dfactorRGB = 0x%X, GLenum sfactorAlpha = 0x%X, GLenum " "dfactorAlpha = 0x%X)", @@ -5035,6 +5262,7 @@ void GL_APIENTRY BlitFramebufferContextANGLE(GLeglContext ctx, GLbitfield mask, GLenum filter) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint srcX0 = %d, GLint srcY0 = %d, GLint srcX1 = %d, GLint srcY1 = %d, GLint dstX0 = " "%d, GLint dstY0 = %d, GLint dstX1 = %d, GLint dstY1 = %d, GLbitfield mask = 0x%X, GLenum " @@ -5070,6 +5298,7 @@ void GL_APIENTRY BlitFramebufferANGLEContextANGLE(GLeglContext ctx, GLbitfield mask, GLenum filter) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint srcX0 = %d, GLint srcY0 = %d, GLint srcX1 = %d, GLint srcY1 = %d, GLint dstX0 = " "%d, GLint dstY0 = %d, GLint dstX1 = %d, GLint dstY1 = %d, GLbitfield mask = 0x%X, GLenum " @@ -5099,6 +5328,7 @@ void GL_APIENTRY BufferDataContextANGLE(GLeglContext ctx, const void *data, GLenum usage) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizeiptr size = %d, const void *data = 0x%0.8p, GLenum usage = " "0x%X)", @@ -5126,6 +5356,7 @@ void GL_APIENTRY BufferSubDataContextANGLE(GLeglContext ctx, GLsizeiptr size, const void *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr size = %d, const void *data = " "0x%0.8p)", @@ -5148,6 +5379,7 @@ void GL_APIENTRY BufferSubDataContextANGLE(GLeglContext ctx, GLenum GL_APIENTRY CheckFramebufferStatusContextANGLE(GLeglContext ctx, GLenum target) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X)", target); Context *context = static_cast(ctx); @@ -5167,6 +5399,7 @@ GLenum GL_APIENTRY CheckFramebufferStatusContextANGLE(GLeglContext ctx, GLenum t GLenum GL_APIENTRY CheckFramebufferStatusOESContextANGLE(GLeglContext ctx, GLenum target) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X)", target); Context *context = static_cast(ctx); @@ -5186,6 +5419,7 @@ GLenum GL_APIENTRY CheckFramebufferStatusOESContextANGLE(GLeglContext ctx, GLenu void GL_APIENTRY ClearContextANGLE(GLeglContext ctx, GLbitfield mask) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLbitfield mask = 0x%X)", mask); Context *context = static_cast(ctx); @@ -5207,6 +5441,7 @@ void GL_APIENTRY ClearBufferfiContextANGLE(GLeglContext ctx, GLfloat depth, GLint stencil) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, GLfloat depth = %f, GLint stencil = %d)", buffer, drawbuffer, depth, stencil); @@ -5229,6 +5464,7 @@ void GL_APIENTRY ClearBufferfvContextANGLE(GLeglContext ctx, GLint drawbuffer, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLfloat *value = 0x%0.8p)", buffer, drawbuffer, value); @@ -5250,6 +5486,7 @@ void GL_APIENTRY ClearBufferivContextANGLE(GLeglContext ctx, GLint drawbuffer, const GLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLint *value = 0x%0.8p)", buffer, drawbuffer, value); @@ -5271,6 +5508,7 @@ void GL_APIENTRY ClearBufferuivContextANGLE(GLeglContext ctx, GLint drawbuffer, const GLuint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLuint *value = 0x%0.8p)", buffer, drawbuffer, value); @@ -5290,6 +5528,7 @@ void GL_APIENTRY ClearBufferuivContextANGLE(GLeglContext ctx, void GL_APIENTRY ClearColorContextANGLE(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat red = %f, GLfloat green = %f, GLfloat blue = %f, GLfloat alpha = %f)", red, green, blue, alpha); @@ -5309,6 +5548,7 @@ ClearColorContextANGLE(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blu void GL_APIENTRY ClearColorxContextANGLE(GLeglContext ctx, GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed red = 0x%X, GLfixed green = 0x%X, GLfixed blue = 0x%X, GLfixed alpha = 0x%X)", red, green, blue, alpha); @@ -5327,6 +5567,7 @@ ClearColorxContextANGLE(GLeglContext ctx, GLfixed red, GLfixed green, GLfixed bl void GL_APIENTRY ClearDepthfContextANGLE(GLeglContext ctx, GLfloat d) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat d = %f)", d); Context *context = static_cast(ctx); @@ -5344,6 +5585,7 @@ void GL_APIENTRY ClearDepthfContextANGLE(GLeglContext ctx, GLfloat d) void GL_APIENTRY ClearDepthxContextANGLE(GLeglContext ctx, GLfixed depth) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed depth = 0x%X)", depth); Context *context = static_cast(ctx); @@ -5361,6 +5603,7 @@ void GL_APIENTRY ClearDepthxContextANGLE(GLeglContext ctx, GLfixed depth) void GL_APIENTRY ClearStencilContextANGLE(GLeglContext ctx, GLint s) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint s = %d)", s); Context *context = static_cast(ctx); @@ -5378,6 +5621,7 @@ void GL_APIENTRY ClearStencilContextANGLE(GLeglContext ctx, GLint s) void GL_APIENTRY ClientActiveTextureContextANGLE(GLeglContext ctx, GLenum texture) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum texture = 0x%X)", texture); Context *context = static_cast(ctx); @@ -5398,6 +5642,7 @@ GLenum GL_APIENTRY ClientWaitSyncContextANGLE(GLeglContext ctx, GLbitfield flags, GLuint64 timeout) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsync sync = 0x%0.8p, GLbitfield flags = 0x%X, GLuint64 timeout = %llu)", sync, flags, timeout); @@ -5418,6 +5663,7 @@ GLenum GL_APIENTRY ClientWaitSyncContextANGLE(GLeglContext ctx, void GL_APIENTRY ClipPlanefContextANGLE(GLeglContext ctx, GLenum p, const GLfloat *eqn) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum p = 0x%X, const GLfloat *eqn = 0x%0.8p)", p, eqn); Context *context = static_cast(ctx); @@ -5435,6 +5681,7 @@ void GL_APIENTRY ClipPlanefContextANGLE(GLeglContext ctx, GLenum p, const GLfloa void GL_APIENTRY ClipPlanexContextANGLE(GLeglContext ctx, GLenum plane, const GLfixed *equation) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum plane = 0x%X, const GLfixed *equation = 0x%0.8p)", plane, equation); Context *context = static_cast(ctx); @@ -5453,6 +5700,7 @@ void GL_APIENTRY ClipPlanexContextANGLE(GLeglContext ctx, GLenum plane, const GL void GL_APIENTRY Color4fContextANGLE(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat red = %f, GLfloat green = %f, GLfloat blue = %f, GLfloat alpha = %f)", red, green, blue, alpha); @@ -5472,6 +5720,7 @@ Color4fContextANGLE(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blue, void GL_APIENTRY Color4ubContextANGLE(GLeglContext ctx, GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLubyte red = %d, GLubyte green = %d, GLubyte blue = %d, GLubyte alpha = %d)", red, green, blue, alpha); @@ -5491,6 +5740,7 @@ Color4ubContextANGLE(GLeglContext ctx, GLubyte red, GLubyte green, GLubyte blue, void GL_APIENTRY Color4xContextANGLE(GLeglContext ctx, GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed red = 0x%X, GLfixed green = 0x%X, GLfixed blue = 0x%X, GLfixed alpha = 0x%X)", red, green, blue, alpha); @@ -5513,6 +5763,7 @@ void GL_APIENTRY ColorMaskContextANGLE(GLeglContext ctx, GLboolean blue, GLboolean alpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLboolean red = %u, GLboolean green = %u, GLboolean blue = %u, GLboolean alpha = %u)", red, green, blue, alpha); @@ -5535,6 +5786,7 @@ void GL_APIENTRY ColorPointerContextANGLE(GLeglContext ctx, GLsizei stride, const void *pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%0.8p)", size, type, stride, pointer); @@ -5554,6 +5806,7 @@ void GL_APIENTRY ColorPointerContextANGLE(GLeglContext ctx, void GL_APIENTRY CompileShaderContextANGLE(GLeglContext ctx, GLuint shader) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint shader = %u)", shader); Context *context = static_cast(ctx); @@ -5579,6 +5832,7 @@ void GL_APIENTRY CompressedTexImage2DContextANGLE(GLeglContext ctx, GLsizei imageSize, const void *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = " "%d, GLsizei height = %d, GLint border = %d, GLsizei imageSize = %d, const void *data = " @@ -5614,6 +5868,7 @@ void GL_APIENTRY CompressedTexImage3DContextANGLE(GLeglContext ctx, GLsizei imageSize, const void *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = " "%d, GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLsizei imageSize = %d, " @@ -5649,6 +5904,7 @@ void GL_APIENTRY CompressedTexSubImage2DContextANGLE(GLeglContext ctx, GLsizei imageSize, const void *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLsizei " "width = %d, GLsizei height = %d, GLenum format = 0x%X, GLsizei imageSize = %d, const void " @@ -5686,6 +5942,7 @@ void GL_APIENTRY CompressedTexSubImage3DContextANGLE(GLeglContext ctx, GLsizei imageSize, const void *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint " "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format " @@ -5718,6 +5975,7 @@ void GL_APIENTRY CopyBufferSubDataContextANGLE(GLeglContext ctx, GLintptr writeOffset, GLsizeiptr size) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum readTarget = 0x%X, GLenum writeTarget = 0x%X, GLintptr readOffset = %d, GLintptr " "writeOffset = %d, GLsizeiptr size = %d)", @@ -5752,6 +6010,7 @@ void GL_APIENTRY CopyTexImage2DContextANGLE(GLeglContext ctx, GLsizei height, GLint border) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLint x = %d, " "GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLint border = %d)", @@ -5785,6 +6044,7 @@ void GL_APIENTRY CopyTexSubImage2DContextANGLE(GLeglContext ctx, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint x " "= %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", @@ -5818,6 +6078,7 @@ void GL_APIENTRY CopyTexSubImage3DContextANGLE(GLeglContext ctx, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint " "zoffset = %d, GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", @@ -5843,6 +6104,7 @@ void GL_APIENTRY CopyTexSubImage3DContextANGLE(GLeglContext ctx, GLuint GL_APIENTRY CreateProgramContextANGLE(GLeglContext ctx) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = static_cast(ctx); @@ -5862,6 +6124,7 @@ GLuint GL_APIENTRY CreateProgramContextANGLE(GLeglContext ctx) GLuint GL_APIENTRY CreateShaderContextANGLE(GLeglContext ctx, GLenum type) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum type = 0x%X)", type); Context *context = static_cast(ctx); @@ -5885,6 +6148,7 @@ GLuint GL_APIENTRY CreateShaderProgramvContextANGLE(GLeglContext ctx, GLsizei count, const GLchar *const *strings) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum type = 0x%X, GLsizei count = %d, const GLchar *const*strings = 0x%0.8p)", type, count, strings); @@ -5907,6 +6171,7 @@ GLuint GL_APIENTRY CreateShaderProgramvContextANGLE(GLeglContext ctx, void GL_APIENTRY CullFaceContextANGLE(GLeglContext ctx, GLenum mode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum mode = 0x%X)", mode); Context *context = static_cast(ctx); @@ -5925,6 +6190,7 @@ void GL_APIENTRY CullFaceContextANGLE(GLeglContext ctx, GLenum mode) void GL_APIENTRY CurrentPaletteMatrixOESContextANGLE(GLeglContext ctx, GLuint matrixpaletteindex) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint matrixpaletteindex = %u)", matrixpaletteindex); Context *context = static_cast(ctx); @@ -5945,6 +6211,7 @@ void GL_APIENTRY DebugMessageCallbackKHRContextANGLE(GLeglContext ctx, GLDEBUGPROCKHR callback, const void *userParam) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLDEBUGPROCKHR callback = 0x%0.8p, const void *userParam = 0x%0.8p)", callback, userParam); @@ -5970,6 +6237,7 @@ void GL_APIENTRY DebugMessageControlKHRContextANGLE(GLeglContext ctx, const GLuint *ids, GLboolean enabled) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum source = 0x%X, GLenum type = 0x%X, GLenum severity = 0x%X, GLsizei count = %d, " "const GLuint *ids = 0x%0.8p, GLboolean enabled = %u)", @@ -5998,6 +6266,7 @@ void GL_APIENTRY DebugMessageInsertKHRContextANGLE(GLeglContext ctx, GLsizei length, const GLchar *buf) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum source = 0x%X, GLenum type = 0x%X, GLuint id = %u, GLenum severity = 0x%X, " "GLsizei length = %d, const GLchar *buf = 0x%0.8p)", @@ -6020,6 +6289,7 @@ void GL_APIENTRY DebugMessageInsertKHRContextANGLE(GLeglContext ctx, void GL_APIENTRY DeleteBuffersContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *buffers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *buffers = 0x%0.8p)", n, buffers); Context *context = static_cast(ctx); @@ -6037,6 +6307,7 @@ void GL_APIENTRY DeleteBuffersContextANGLE(GLeglContext ctx, GLsizei n, const GL void GL_APIENTRY DeleteFencesNVContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *fences) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *fences = 0x%0.8p)", n, fences); Context *context = static_cast(ctx); @@ -6056,6 +6327,7 @@ void GL_APIENTRY DeleteFramebuffersContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *framebuffers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *framebuffers = 0x%0.8p)", n, framebuffers); Context *context = static_cast(ctx); @@ -6075,6 +6347,7 @@ void GL_APIENTRY DeleteFramebuffersOESContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *framebuffers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *framebuffers = 0x%0.8p)", n, framebuffers); Context *context = static_cast(ctx); @@ -6092,6 +6365,7 @@ void GL_APIENTRY DeleteFramebuffersOESContextANGLE(GLeglContext ctx, void GL_APIENTRY DeleteProgramContextANGLE(GLeglContext ctx, GLuint program) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u)", program); Context *context = static_cast(ctx); @@ -6111,6 +6385,7 @@ void GL_APIENTRY DeleteProgramPipelinesContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *pipelines) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *pipelines = 0x%0.8p)", n, pipelines); Context *context = static_cast(ctx); @@ -6128,6 +6403,7 @@ void GL_APIENTRY DeleteProgramPipelinesContextANGLE(GLeglContext ctx, void GL_APIENTRY DeleteQueriesContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *ids) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *ids = 0x%0.8p)", n, ids); Context *context = static_cast(ctx); @@ -6145,6 +6421,7 @@ void GL_APIENTRY DeleteQueriesContextANGLE(GLeglContext ctx, GLsizei n, const GL void GL_APIENTRY DeleteQueriesEXTContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *ids) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *ids = 0x%0.8p)", n, ids); Context *context = static_cast(ctx); @@ -6164,6 +6441,7 @@ void GL_APIENTRY DeleteRenderbuffersContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *renderbuffers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *renderbuffers = 0x%0.8p)", n, renderbuffers); Context *context = static_cast(ctx); @@ -6183,6 +6461,7 @@ void GL_APIENTRY DeleteRenderbuffersOESContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *renderbuffers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *renderbuffers = 0x%0.8p)", n, renderbuffers); Context *context = static_cast(ctx); @@ -6200,6 +6479,7 @@ void GL_APIENTRY DeleteRenderbuffersOESContextANGLE(GLeglContext ctx, void GL_APIENTRY DeleteSamplersContextANGLE(GLeglContext ctx, GLsizei count, const GLuint *samplers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei count = %d, const GLuint *samplers = 0x%0.8p)", count, samplers); Context *context = static_cast(ctx); @@ -6217,6 +6497,7 @@ void GL_APIENTRY DeleteSamplersContextANGLE(GLeglContext ctx, GLsizei count, con void GL_APIENTRY DeleteShaderContextANGLE(GLeglContext ctx, GLuint shader) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint shader = %u)", shader); Context *context = static_cast(ctx); @@ -6234,6 +6515,7 @@ void GL_APIENTRY DeleteShaderContextANGLE(GLeglContext ctx, GLuint shader) void GL_APIENTRY DeleteSyncContextANGLE(GLeglContext ctx, GLsync sync) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsync sync = 0x%0.8p)", sync); Context *context = static_cast(ctx); @@ -6251,6 +6533,7 @@ void GL_APIENTRY DeleteSyncContextANGLE(GLeglContext ctx, GLsync sync) void GL_APIENTRY DeleteTexturesContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *textures) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *textures = 0x%0.8p)", n, textures); Context *context = static_cast(ctx); @@ -6270,6 +6553,7 @@ void GL_APIENTRY DeleteTransformFeedbacksContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *ids) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *ids = 0x%0.8p)", n, ids); Context *context = static_cast(ctx); @@ -6287,6 +6571,7 @@ void GL_APIENTRY DeleteTransformFeedbacksContextANGLE(GLeglContext ctx, void GL_APIENTRY DeleteVertexArraysContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *arrays) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *arrays = 0x%0.8p)", n, arrays); Context *context = static_cast(ctx); @@ -6306,6 +6591,7 @@ void GL_APIENTRY DeleteVertexArraysOESContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *arrays) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLuint *arrays = 0x%0.8p)", n, arrays); Context *context = static_cast(ctx); @@ -6323,6 +6609,7 @@ void GL_APIENTRY DeleteVertexArraysOESContextANGLE(GLeglContext ctx, void GL_APIENTRY DepthFuncContextANGLE(GLeglContext ctx, GLenum func) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum func = 0x%X)", func); Context *context = static_cast(ctx); @@ -6340,6 +6627,7 @@ void GL_APIENTRY DepthFuncContextANGLE(GLeglContext ctx, GLenum func) void GL_APIENTRY DepthMaskContextANGLE(GLeglContext ctx, GLboolean flag) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLboolean flag = %u)", flag); Context *context = static_cast(ctx); @@ -6357,6 +6645,7 @@ void GL_APIENTRY DepthMaskContextANGLE(GLeglContext ctx, GLboolean flag) void GL_APIENTRY DepthRangefContextANGLE(GLeglContext ctx, GLfloat n, GLfloat f) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat n = %f, GLfloat f = %f)", n, f); Context *context = static_cast(ctx); @@ -6374,6 +6663,7 @@ void GL_APIENTRY DepthRangefContextANGLE(GLeglContext ctx, GLfloat n, GLfloat f) void GL_APIENTRY DepthRangexContextANGLE(GLeglContext ctx, GLfixed n, GLfixed f) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed n = 0x%X, GLfixed f = 0x%X)", n, f); Context *context = static_cast(ctx); @@ -6391,6 +6681,7 @@ void GL_APIENTRY DepthRangexContextANGLE(GLeglContext ctx, GLfixed n, GLfixed f) void GL_APIENTRY DetachShaderContextANGLE(GLeglContext ctx, GLuint program, GLuint shader) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLuint shader = %u)", program, shader); Context *context = static_cast(ctx); @@ -6408,6 +6699,7 @@ void GL_APIENTRY DetachShaderContextANGLE(GLeglContext ctx, GLuint program, GLui void GL_APIENTRY DisableContextANGLE(GLeglContext ctx, GLenum cap) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum cap = 0x%X)", cap); Context *context = static_cast(ctx); @@ -6425,6 +6717,7 @@ void GL_APIENTRY DisableContextANGLE(GLeglContext ctx, GLenum cap) void GL_APIENTRY DisableClientStateContextANGLE(GLeglContext ctx, GLenum array) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum array = 0x%X)", array); Context *context = static_cast(ctx); @@ -6443,6 +6736,7 @@ void GL_APIENTRY DisableClientStateContextANGLE(GLeglContext ctx, GLenum array) void GL_APIENTRY DisableVertexAttribArrayContextANGLE(GLeglContext ctx, GLuint index) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u)", index); Context *context = static_cast(ctx); @@ -6463,6 +6757,7 @@ void GL_APIENTRY DiscardFramebufferEXTContextANGLE(GLeglContext ctx, GLsizei numAttachments, const GLenum *attachments) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = 0x%0.8p)", target, numAttachments, attachments); @@ -6487,6 +6782,7 @@ void GL_APIENTRY DispatchComputeContextANGLE(GLeglContext ctx, GLuint num_groups_y, GLuint num_groups_z) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint num_groups_x = %u, GLuint num_groups_y = %u, GLuint num_groups_z = %u)", num_groups_x, num_groups_y, num_groups_z); @@ -6507,6 +6803,7 @@ void GL_APIENTRY DispatchComputeContextANGLE(GLeglContext ctx, void GL_APIENTRY DispatchComputeIndirectContextANGLE(GLeglContext ctx, GLintptr indirect) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLintptr indirect = %d)", indirect); Context *context = static_cast(ctx); @@ -6524,6 +6821,7 @@ void GL_APIENTRY DispatchComputeIndirectContextANGLE(GLeglContext ctx, GLintptr void GL_APIENTRY DrawArraysContextANGLE(GLeglContext ctx, GLenum mode, GLint first, GLsizei count) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d)", mode, first, count); Context *context = static_cast(ctx); @@ -6542,6 +6840,7 @@ void GL_APIENTRY DrawArraysContextANGLE(GLeglContext ctx, GLenum mode, GLint fir void GL_APIENTRY DrawArraysIndirectContextANGLE(GLeglContext ctx, GLenum mode, const void *indirect) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum mode = 0x%X, const void *indirect = 0x%0.8p)", mode, indirect); Context *context = static_cast(ctx); @@ -6564,6 +6863,7 @@ void GL_APIENTRY DrawArraysInstancedContextANGLE(GLeglContext ctx, GLsizei count, GLsizei instancecount) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d, GLsizei instancecount = %d)", mode, first, count, instancecount); @@ -6589,6 +6889,7 @@ void GL_APIENTRY DrawArraysInstancedANGLEContextANGLE(GLeglContext ctx, GLsizei count, GLsizei primcount) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d, GLsizei primcount = %d)", mode, first, count, primcount); @@ -6610,6 +6911,7 @@ void GL_APIENTRY DrawArraysInstancedANGLEContextANGLE(GLeglContext ctx, void GL_APIENTRY DrawBuffersContextANGLE(GLeglContext ctx, GLsizei n, const GLenum *bufs) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLenum *bufs = 0x%0.8p)", n, bufs); Context *context = static_cast(ctx); @@ -6627,6 +6929,7 @@ void GL_APIENTRY DrawBuffersContextANGLE(GLeglContext ctx, GLsizei n, const GLen void GL_APIENTRY DrawBuffersEXTContextANGLE(GLeglContext ctx, GLsizei n, const GLenum *bufs) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, const GLenum *bufs = 0x%0.8p)", n, bufs); Context *context = static_cast(ctx); @@ -6648,6 +6951,7 @@ void GL_APIENTRY DrawElementsContextANGLE(GLeglContext ctx, GLenum type, const void *indices) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = " "0x%0.8p)", @@ -6673,6 +6977,7 @@ void GL_APIENTRY DrawElementsIndirectContextANGLE(GLeglContext ctx, GLenum type, const void *indirect) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum mode = 0x%X, GLenum type = 0x%X, const void *indirect = 0x%0.8p)", mode, type, indirect); @@ -6698,6 +7003,7 @@ void GL_APIENTRY DrawElementsInstancedContextANGLE(GLeglContext ctx, const void *indices, GLsizei instancecount) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = " "0x%0.8p, GLsizei instancecount = %d)", @@ -6726,6 +7032,7 @@ void GL_APIENTRY DrawElementsInstancedANGLEContextANGLE(GLeglContext ctx, const void *indices, GLsizei primcount) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = " "0x%0.8p, GLsizei primcount = %d)", @@ -6755,6 +7062,7 @@ void GL_APIENTRY DrawRangeElementsContextANGLE(GLeglContext ctx, GLenum type, const void *indices) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum mode = 0x%X, GLuint start = %u, GLuint end = %u, GLsizei count = %d, GLenum type " "= 0x%X, const void *indices = 0x%0.8p)", @@ -6783,6 +7091,7 @@ void GL_APIENTRY DrawTexfOESContextANGLE(GLeglContext ctx, GLfloat width, GLfloat height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLfloat x = %f, GLfloat y = %f, GLfloat z = %f, GLfloat width = %f, GLfloat height = %f)", x, y, z, width, height); @@ -6802,6 +7111,7 @@ void GL_APIENTRY DrawTexfOESContextANGLE(GLeglContext ctx, void GL_APIENTRY DrawTexfvOESContextANGLE(GLeglContext ctx, const GLfloat *coords) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const GLfloat *coords = 0x%0.8p)", coords); Context *context = static_cast(ctx); @@ -6820,6 +7130,7 @@ void GL_APIENTRY DrawTexfvOESContextANGLE(GLeglContext ctx, const GLfloat *coord void GL_APIENTRY DrawTexiOESContextANGLE(GLeglContext ctx, GLint x, GLint y, GLint z, GLint width, GLint height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint x = %d, GLint y = %d, GLint z = %d, GLint width = %d, GLint height = %d)", x, y, z, width, height); @@ -6838,6 +7149,7 @@ DrawTexiOESContextANGLE(GLeglContext ctx, GLint x, GLint y, GLint z, GLint width void GL_APIENTRY DrawTexivOESContextANGLE(GLeglContext ctx, const GLint *coords) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const GLint *coords = 0x%0.8p)", coords); Context *context = static_cast(ctx); @@ -6860,6 +7172,7 @@ void GL_APIENTRY DrawTexsOESContextANGLE(GLeglContext ctx, GLshort width, GLshort height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLshort x = %d, GLshort y = %d, GLshort z = %d, GLshort width = %d, GLshort height = %d)", x, y, z, width, height); @@ -6879,6 +7192,7 @@ void GL_APIENTRY DrawTexsOESContextANGLE(GLeglContext ctx, void GL_APIENTRY DrawTexsvOESContextANGLE(GLeglContext ctx, const GLshort *coords) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const GLshort *coords = 0x%0.8p)", coords); Context *context = static_cast(ctx); @@ -6901,6 +7215,7 @@ void GL_APIENTRY DrawTexxOESContextANGLE(GLeglContext ctx, GLfixed width, GLfixed height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLfixed x = 0x%X, GLfixed y = 0x%X, GLfixed z = 0x%X, GLfixed width = 0x%X, GLfixed " "height = 0x%X)", @@ -6921,6 +7236,7 @@ void GL_APIENTRY DrawTexxOESContextANGLE(GLeglContext ctx, void GL_APIENTRY DrawTexxvOESContextANGLE(GLeglContext ctx, const GLfixed *coords) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const GLfixed *coords = 0x%0.8p)", coords); Context *context = static_cast(ctx); @@ -6940,6 +7256,7 @@ void GL_APIENTRY EGLImageTargetRenderbufferStorageOESContextANGLE(GLeglContext c GLenum target, GLeglImageOES image) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLeglImageOES image = 0x%0.8p)", target, image); Context *context = static_cast(ctx); @@ -6960,6 +7277,7 @@ void GL_APIENTRY EGLImageTargetTexture2DOESContextANGLE(GLeglContext ctx, GLenum target, GLeglImageOES image) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLeglImageOES image = 0x%0.8p)", target, image); Context *context = static_cast(ctx); @@ -6979,6 +7297,7 @@ void GL_APIENTRY EGLImageTargetTexture2DOESContextANGLE(GLeglContext ctx, void GL_APIENTRY EnableContextANGLE(GLeglContext ctx, GLenum cap) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum cap = 0x%X)", cap); Context *context = static_cast(ctx); @@ -6996,6 +7315,7 @@ void GL_APIENTRY EnableContextANGLE(GLeglContext ctx, GLenum cap) void GL_APIENTRY EnableClientStateContextANGLE(GLeglContext ctx, GLenum array) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum array = 0x%X)", array); Context *context = static_cast(ctx); @@ -7014,6 +7334,7 @@ void GL_APIENTRY EnableClientStateContextANGLE(GLeglContext ctx, GLenum array) void GL_APIENTRY EnableVertexAttribArrayContextANGLE(GLeglContext ctx, GLuint index) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u)", index); Context *context = static_cast(ctx); @@ -7031,6 +7352,7 @@ void GL_APIENTRY EnableVertexAttribArrayContextANGLE(GLeglContext ctx, GLuint in void GL_APIENTRY EndQueryContextANGLE(GLeglContext ctx, GLenum target) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X)", target); Context *context = static_cast(ctx); @@ -7049,6 +7371,7 @@ void GL_APIENTRY EndQueryContextANGLE(GLeglContext ctx, GLenum target) void GL_APIENTRY EndQueryEXTContextANGLE(GLeglContext ctx, GLenum target) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X)", target); Context *context = static_cast(ctx); @@ -7067,6 +7390,7 @@ void GL_APIENTRY EndQueryEXTContextANGLE(GLeglContext ctx, GLenum target) void GL_APIENTRY EndTransformFeedbackContextANGLE(GLeglContext ctx) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = static_cast(ctx); @@ -7084,6 +7408,7 @@ void GL_APIENTRY EndTransformFeedbackContextANGLE(GLeglContext ctx) GLsync GL_APIENTRY FenceSyncContextANGLE(GLeglContext ctx, GLenum condition, GLbitfield flags) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum condition = 0x%X, GLbitfield flags = 0x%X)", condition, flags); Context *context = static_cast(ctx); @@ -7103,6 +7428,7 @@ GLsync GL_APIENTRY FenceSyncContextANGLE(GLeglContext ctx, GLenum condition, GLb void GL_APIENTRY FinishContextANGLE(GLeglContext ctx) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = static_cast(ctx); @@ -7120,6 +7446,7 @@ void GL_APIENTRY FinishContextANGLE(GLeglContext ctx) void GL_APIENTRY FinishFenceNVContextANGLE(GLeglContext ctx, GLuint fence) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint fence = %u)", fence); Context *context = static_cast(ctx); @@ -7137,6 +7464,7 @@ void GL_APIENTRY FinishFenceNVContextANGLE(GLeglContext ctx, GLuint fence) void GL_APIENTRY FlushContextANGLE(GLeglContext ctx) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = static_cast(ctx); @@ -7157,6 +7485,7 @@ void GL_APIENTRY FlushMappedBufferRangeContextANGLE(GLeglContext ctx, GLintptr offset, GLsizeiptr length) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr length = %d)", target, offset, length); @@ -7180,6 +7509,7 @@ void GL_APIENTRY FlushMappedBufferRangeEXTContextANGLE(GLeglContext ctx, GLintptr offset, GLsizeiptr length) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr length = %d)", target, offset, length); @@ -7200,6 +7530,7 @@ void GL_APIENTRY FlushMappedBufferRangeEXTContextANGLE(GLeglContext ctx, void GL_APIENTRY FogfContextANGLE(GLeglContext ctx, GLenum pname, GLfloat param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLfloat param = %f)", pname, param); Context *context = static_cast(ctx); @@ -7217,6 +7548,7 @@ void GL_APIENTRY FogfContextANGLE(GLeglContext ctx, GLenum pname, GLfloat param) void GL_APIENTRY FogfvContextANGLE(GLeglContext ctx, GLenum pname, const GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", pname, params); Context *context = static_cast(ctx); @@ -7234,6 +7566,7 @@ void GL_APIENTRY FogfvContextANGLE(GLeglContext ctx, GLenum pname, const GLfloat void GL_APIENTRY FogxContextANGLE(GLeglContext ctx, GLenum pname, GLfixed param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLfixed param = 0x%X)", pname, param); Context *context = static_cast(ctx); @@ -7251,6 +7584,7 @@ void GL_APIENTRY FogxContextANGLE(GLeglContext ctx, GLenum pname, GLfixed param) void GL_APIENTRY FogxvContextANGLE(GLeglContext ctx, GLenum pname, const GLfixed *param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, const GLfixed *param = 0x%0.8p)", pname, param); Context *context = static_cast(ctx); @@ -7271,6 +7605,7 @@ void GL_APIENTRY FramebufferParameteriContextANGLE(GLeglContext ctx, GLenum pname, GLint param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %d)", target, pname, param); Context *context = static_cast(ctx); @@ -7293,6 +7628,7 @@ void GL_APIENTRY FramebufferRenderbufferContextANGLE(GLeglContext ctx, GLenum renderbuffertarget, GLuint renderbuffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum renderbuffertarget = 0x%X, GLuint " "renderbuffer = %u)", @@ -7320,6 +7656,7 @@ void GL_APIENTRY FramebufferRenderbufferOESContextANGLE(GLeglContext ctx, GLenum renderbuffertarget, GLuint renderbuffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum renderbuffertarget = 0x%X, GLuint " "renderbuffer = %u)", @@ -7348,6 +7685,7 @@ void GL_APIENTRY FramebufferTexture2DContextANGLE(GLeglContext ctx, GLuint texture, GLint level) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, GLuint texture " "= %u, GLint level = %d)", @@ -7377,6 +7715,7 @@ void GL_APIENTRY FramebufferTexture2DOESContextANGLE(GLeglContext ctx, GLuint texture, GLint level) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, GLuint texture " "= %u, GLint level = %d)", @@ -7405,6 +7744,7 @@ void GL_APIENTRY FramebufferTextureEXTContextANGLE(GLeglContext ctx, GLuint texture, GLint level) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %u, GLint level = %d)", target, attachment, texture, level); @@ -7430,6 +7770,7 @@ void GL_APIENTRY FramebufferTextureLayerContextANGLE(GLeglContext ctx, GLint level, GLint layer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %u, GLint level = %d, " "GLint layer = %d)", @@ -7452,6 +7793,7 @@ void GL_APIENTRY FramebufferTextureLayerContextANGLE(GLeglContext ctx, void GL_APIENTRY FrontFaceContextANGLE(GLeglContext ctx, GLenum mode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum mode = 0x%X)", mode); Context *context = static_cast(ctx); @@ -7475,6 +7817,7 @@ void GL_APIENTRY FrustumfContextANGLE(GLeglContext ctx, GLfloat n, GLfloat f) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLfloat l = %f, GLfloat r = %f, GLfloat b = %f, GLfloat t = %f, GLfloat n = %f, GLfloat " "f = %f)", @@ -7501,6 +7844,7 @@ void GL_APIENTRY FrustumxContextANGLE(GLeglContext ctx, GLfixed n, GLfixed f) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLfixed l = 0x%X, GLfixed r = 0x%X, GLfixed b = 0x%X, GLfixed t = 0x%X, GLfixed n = " "0x%X, GLfixed f = 0x%X)", @@ -7521,6 +7865,7 @@ void GL_APIENTRY FrustumxContextANGLE(GLeglContext ctx, void GL_APIENTRY GenBuffersContextANGLE(GLeglContext ctx, GLsizei n, GLuint *buffers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *buffers = 0x%0.8p)", n, buffers); Context *context = static_cast(ctx); @@ -7538,6 +7883,7 @@ void GL_APIENTRY GenBuffersContextANGLE(GLeglContext ctx, GLsizei n, GLuint *buf void GL_APIENTRY GenFencesNVContextANGLE(GLeglContext ctx, GLsizei n, GLuint *fences) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *fences = 0x%0.8p)", n, fences); Context *context = static_cast(ctx); @@ -7555,6 +7901,7 @@ void GL_APIENTRY GenFencesNVContextANGLE(GLeglContext ctx, GLsizei n, GLuint *fe void GL_APIENTRY GenFramebuffersContextANGLE(GLeglContext ctx, GLsizei n, GLuint *framebuffers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *framebuffers = 0x%0.8p)", n, framebuffers); Context *context = static_cast(ctx); @@ -7572,6 +7919,7 @@ void GL_APIENTRY GenFramebuffersContextANGLE(GLeglContext ctx, GLsizei n, GLuint void GL_APIENTRY GenFramebuffersOESContextANGLE(GLeglContext ctx, GLsizei n, GLuint *framebuffers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *framebuffers = 0x%0.8p)", n, framebuffers); Context *context = static_cast(ctx); @@ -7589,6 +7937,7 @@ void GL_APIENTRY GenFramebuffersOESContextANGLE(GLeglContext ctx, GLsizei n, GLu void GL_APIENTRY GenProgramPipelinesContextANGLE(GLeglContext ctx, GLsizei n, GLuint *pipelines) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *pipelines = 0x%0.8p)", n, pipelines); Context *context = static_cast(ctx); @@ -7606,6 +7955,7 @@ void GL_APIENTRY GenProgramPipelinesContextANGLE(GLeglContext ctx, GLsizei n, GL void GL_APIENTRY GenQueriesContextANGLE(GLeglContext ctx, GLsizei n, GLuint *ids) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *ids = 0x%0.8p)", n, ids); Context *context = static_cast(ctx); @@ -7623,6 +7973,7 @@ void GL_APIENTRY GenQueriesContextANGLE(GLeglContext ctx, GLsizei n, GLuint *ids void GL_APIENTRY GenQueriesEXTContextANGLE(GLeglContext ctx, GLsizei n, GLuint *ids) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *ids = 0x%0.8p)", n, ids); Context *context = static_cast(ctx); @@ -7640,6 +7991,7 @@ void GL_APIENTRY GenQueriesEXTContextANGLE(GLeglContext ctx, GLsizei n, GLuint * void GL_APIENTRY GenRenderbuffersContextANGLE(GLeglContext ctx, GLsizei n, GLuint *renderbuffers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *renderbuffers = 0x%0.8p)", n, renderbuffers); Context *context = static_cast(ctx); @@ -7657,6 +8009,7 @@ void GL_APIENTRY GenRenderbuffersContextANGLE(GLeglContext ctx, GLsizei n, GLuin void GL_APIENTRY GenRenderbuffersOESContextANGLE(GLeglContext ctx, GLsizei n, GLuint *renderbuffers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *renderbuffers = 0x%0.8p)", n, renderbuffers); Context *context = static_cast(ctx); @@ -7674,6 +8027,7 @@ void GL_APIENTRY GenRenderbuffersOESContextANGLE(GLeglContext ctx, GLsizei n, GL void GL_APIENTRY GenSamplersContextANGLE(GLeglContext ctx, GLsizei count, GLuint *samplers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei count = %d, GLuint *samplers = 0x%0.8p)", count, samplers); Context *context = static_cast(ctx); @@ -7691,6 +8045,7 @@ void GL_APIENTRY GenSamplersContextANGLE(GLeglContext ctx, GLsizei count, GLuint void GL_APIENTRY GenTexturesContextANGLE(GLeglContext ctx, GLsizei n, GLuint *textures) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *textures = 0x%0.8p)", n, textures); Context *context = static_cast(ctx); @@ -7708,6 +8063,7 @@ void GL_APIENTRY GenTexturesContextANGLE(GLeglContext ctx, GLsizei n, GLuint *te void GL_APIENTRY GenTransformFeedbacksContextANGLE(GLeglContext ctx, GLsizei n, GLuint *ids) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *ids = 0x%0.8p)", n, ids); Context *context = static_cast(ctx); @@ -7725,6 +8081,7 @@ void GL_APIENTRY GenTransformFeedbacksContextANGLE(GLeglContext ctx, GLsizei n, void GL_APIENTRY GenVertexArraysContextANGLE(GLeglContext ctx, GLsizei n, GLuint *arrays) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *arrays = 0x%0.8p)", n, arrays); Context *context = static_cast(ctx); @@ -7742,6 +8099,7 @@ void GL_APIENTRY GenVertexArraysContextANGLE(GLeglContext ctx, GLsizei n, GLuint void GL_APIENTRY GenVertexArraysOESContextANGLE(GLeglContext ctx, GLsizei n, GLuint *arrays) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei n = %d, GLuint *arrays = 0x%0.8p)", n, arrays); Context *context = static_cast(ctx); @@ -7759,6 +8117,7 @@ void GL_APIENTRY GenVertexArraysOESContextANGLE(GLeglContext ctx, GLsizei n, GLu void GL_APIENTRY GenerateMipmapContextANGLE(GLeglContext ctx, GLenum target) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X)", target); Context *context = static_cast(ctx); @@ -7777,6 +8136,7 @@ void GL_APIENTRY GenerateMipmapContextANGLE(GLeglContext ctx, GLenum target) void GL_APIENTRY GenerateMipmapOESContextANGLE(GLeglContext ctx, GLenum target) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X)", target); Context *context = static_cast(ctx); @@ -7802,6 +8162,7 @@ void GL_APIENTRY GetActiveAttribContextANGLE(GLeglContext ctx, GLenum *type, GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, " "GLint *size = 0x%0.8p, GLenum *type = 0x%0.8p, GLchar *name = 0x%0.8p)", @@ -7831,6 +8192,7 @@ void GL_APIENTRY GetActiveUniformContextANGLE(GLeglContext ctx, GLenum *type, GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, " "GLint *size = 0x%0.8p, GLenum *type = 0x%0.8p, GLchar *name = 0x%0.8p)", @@ -7858,6 +8220,7 @@ void GL_APIENTRY GetActiveUniformBlockNameContextANGLE(GLeglContext ctx, GLsizei *length, GLchar *uniformBlockName) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLuint uniformBlockIndex = %u, GLsizei bufSize = %d, GLsizei " "*length = 0x%0.8p, GLchar *uniformBlockName = 0x%0.8p)", @@ -7886,6 +8249,7 @@ void GL_APIENTRY GetActiveUniformBlockivContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLuint uniformBlockIndex = %u, GLenum pname = 0x%X, GLint *params = " "0x%0.8p)", @@ -7913,6 +8277,7 @@ void GL_APIENTRY GetActiveUniformsivContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLsizei uniformCount = %d, const GLuint *uniformIndices = 0x%0.8p, " "GLenum pname = 0x%X, GLint *params = 0x%0.8p)", @@ -7939,6 +8304,7 @@ void GL_APIENTRY GetAttachedShadersContextANGLE(GLeglContext ctx, GLsizei *count, GLuint *shaders) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLsizei maxCount = %d, GLsizei *count = 0x%0.8p, GLuint *shaders = " "0x%0.8p)", @@ -7962,6 +8328,7 @@ GLint GL_APIENTRY GetAttribLocationContextANGLE(GLeglContext ctx, GLuint program, const GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, const GLchar *name = 0x%0.8p)", program, name); Context *context = static_cast(ctx); @@ -7984,6 +8351,7 @@ void GL_APIENTRY GetBooleani_vContextANGLE(GLeglContext ctx, GLuint index, GLboolean *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint index = %u, GLboolean *data = 0x%0.8p)", target, index, data); @@ -8002,6 +8370,7 @@ void GL_APIENTRY GetBooleani_vContextANGLE(GLeglContext ctx, void GL_APIENTRY GetBooleanvContextANGLE(GLeglContext ctx, GLenum pname, GLboolean *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLboolean *data = 0x%0.8p)", pname, data); Context *context = static_cast(ctx); @@ -8022,6 +8391,7 @@ void GL_APIENTRY GetBufferParameteri64vContextANGLE(GLeglContext ctx, GLenum pname, GLint64 *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint64 *params = 0x%0.8p)", target, pname, params); @@ -8045,6 +8415,7 @@ void GL_APIENTRY GetBufferParameterivContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname, params); @@ -8068,6 +8439,7 @@ void GL_APIENTRY GetBufferPointervContextANGLE(GLeglContext ctx, GLenum pname, void **params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, void **params = 0x%0.8p)", target, pname, params); @@ -8091,6 +8463,7 @@ void GL_APIENTRY GetBufferPointervOESContextANGLE(GLeglContext ctx, GLenum pname, void **params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, void **params = 0x%0.8p)", target, pname, params); @@ -8111,6 +8484,7 @@ void GL_APIENTRY GetBufferPointervOESContextANGLE(GLeglContext ctx, void GL_APIENTRY GetClipPlanefContextANGLE(GLeglContext ctx, GLenum plane, GLfloat *equation) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum plane = 0x%X, GLfloat *equation = 0x%0.8p)", plane, equation); Context *context = static_cast(ctx); @@ -8128,6 +8502,7 @@ void GL_APIENTRY GetClipPlanefContextANGLE(GLeglContext ctx, GLenum plane, GLflo void GL_APIENTRY GetClipPlanexContextANGLE(GLeglContext ctx, GLenum plane, GLfixed *equation) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum plane = 0x%X, GLfixed *equation = 0x%0.8p)", plane, equation); Context *context = static_cast(ctx); @@ -8153,6 +8528,7 @@ GLuint GL_APIENTRY GetDebugMessageLogKHRContextANGLE(GLeglContext ctx, GLsizei *lengths, GLchar *messageLog) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint count = %u, GLsizei bufSize = %d, GLenum *sources = 0x%0.8p, GLenum *types = " "0x%0.8p, GLuint *ids = 0x%0.8p, GLenum *severities = 0x%0.8p, GLsizei *lengths = 0x%0.8p, " @@ -8180,6 +8556,7 @@ GLuint GL_APIENTRY GetDebugMessageLogKHRContextANGLE(GLeglContext ctx, GLenum GL_APIENTRY GetErrorContextANGLE(GLeglContext ctx) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = GetGlobalContext(); @@ -8202,6 +8579,7 @@ void GL_APIENTRY GetFenceivNVContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint fence = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", fence, pname, params); @@ -8220,6 +8598,7 @@ void GL_APIENTRY GetFenceivNVContextANGLE(GLeglContext ctx, void GL_APIENTRY GetFixedvContextANGLE(GLeglContext ctx, GLenum pname, GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLfixed *params = 0x%0.8p)", pname, params); Context *context = static_cast(ctx); @@ -8237,6 +8616,7 @@ void GL_APIENTRY GetFixedvContextANGLE(GLeglContext ctx, GLenum pname, GLfixed * void GL_APIENTRY GetFloatvContextANGLE(GLeglContext ctx, GLenum pname, GLfloat *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLfloat *data = 0x%0.8p)", pname, data); Context *context = static_cast(ctx); @@ -8256,6 +8636,7 @@ GLint GL_APIENTRY GetFragDataLocationContextANGLE(GLeglContext ctx, GLuint program, const GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, const GLchar *name = 0x%0.8p)", program, name); Context *context = static_cast(ctx); @@ -8279,6 +8660,7 @@ void GL_APIENTRY GetFramebufferAttachmentParameterivContextANGLE(GLeglContext ct GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLint *params = " "0x%0.8p)", @@ -8305,6 +8687,7 @@ void GL_APIENTRY GetFramebufferAttachmentParameterivOESContextANGLE(GLeglContext GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLint *params = " "0x%0.8p)", @@ -8330,6 +8713,7 @@ void GL_APIENTRY GetFramebufferParameterivContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname, params); @@ -8349,6 +8733,7 @@ void GL_APIENTRY GetFramebufferParameterivContextANGLE(GLeglContext ctx, GLenum GL_APIENTRY GetGraphicsResetStatusEXTContextANGLE(GLeglContext ctx) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = static_cast(ctx); @@ -8371,6 +8756,7 @@ void GL_APIENTRY GetInteger64i_vContextANGLE(GLeglContext ctx, GLuint index, GLint64 *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint index = %u, GLint64 *data = 0x%0.8p)", target, index, data); @@ -8389,6 +8775,7 @@ void GL_APIENTRY GetInteger64i_vContextANGLE(GLeglContext ctx, void GL_APIENTRY GetInteger64vContextANGLE(GLeglContext ctx, GLenum pname, GLint64 *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLint64 *data = 0x%0.8p)", pname, data); Context *context = static_cast(ctx); @@ -8409,6 +8796,7 @@ void GL_APIENTRY GetIntegeri_vContextANGLE(GLeglContext ctx, GLuint index, GLint *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLuint index = %u, GLint *data = 0x%0.8p)", target, index, data); Context *context = static_cast(ctx); @@ -8426,6 +8814,7 @@ void GL_APIENTRY GetIntegeri_vContextANGLE(GLeglContext ctx, void GL_APIENTRY GetIntegervContextANGLE(GLeglContext ctx, GLenum pname, GLint *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLint *data = 0x%0.8p)", pname, data); Context *context = static_cast(ctx); @@ -8448,6 +8837,7 @@ void GL_APIENTRY GetInternalformativContextANGLE(GLeglContext ctx, GLsizei bufSize, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLenum pname = 0x%X, GLsizei bufSize " "= %d, GLint *params = 0x%0.8p)", @@ -8473,6 +8863,7 @@ void GL_APIENTRY GetLightfvContextANGLE(GLeglContext ctx, GLenum pname, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", light, pname, params); @@ -8495,6 +8886,7 @@ void GL_APIENTRY GetLightxvContextANGLE(GLeglContext ctx, GLenum pname, GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%0.8p)", light, pname, params); @@ -8517,6 +8909,7 @@ void GL_APIENTRY GetMaterialfvContextANGLE(GLeglContext ctx, GLenum pname, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", face, pname, params); @@ -8539,6 +8932,7 @@ void GL_APIENTRY GetMaterialxvContextANGLE(GLeglContext ctx, GLenum pname, GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%0.8p)", face, pname, params); @@ -8561,6 +8955,7 @@ void GL_APIENTRY GetMultisamplefvContextANGLE(GLeglContext ctx, GLuint index, GLfloat *val) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLuint index = %u, GLfloat *val = 0x%0.8p)", pname, index, val); Context *context = static_cast(ctx); @@ -8583,6 +8978,7 @@ void GL_APIENTRY GetObjectLabelKHRContextANGLE(GLeglContext ctx, GLsizei *length, GLchar *label) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum identifier = 0x%X, GLuint name = %u, GLsizei bufSize = %d, GLsizei *length = " "0x%0.8p, GLchar *label = 0x%0.8p)", @@ -8609,6 +9005,7 @@ void GL_APIENTRY GetObjectPtrLabelKHRContextANGLE(GLeglContext ctx, GLsizei *length, GLchar *label) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(const void *ptr = 0x%0.8p, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar " "*label = 0x%0.8p)", @@ -8630,6 +9027,7 @@ void GL_APIENTRY GetObjectPtrLabelKHRContextANGLE(GLeglContext ctx, void GL_APIENTRY GetPointervContextANGLE(GLeglContext ctx, GLenum pname, void **params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, void **params = 0x%0.8p)", pname, params); Context *context = static_cast(ctx); @@ -8647,6 +9045,7 @@ void GL_APIENTRY GetPointervContextANGLE(GLeglContext ctx, GLenum pname, void ** void GL_APIENTRY GetPointervKHRContextANGLE(GLeglContext ctx, GLenum pname, void **params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, void **params = 0x%0.8p)", pname, params); Context *context = static_cast(ctx); @@ -8669,6 +9068,7 @@ void GL_APIENTRY GetProgramBinaryContextANGLE(GLeglContext ctx, GLenum *binaryFormat, void *binary) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLenum " "*binaryFormat = 0x%0.8p, void *binary = 0x%0.8p)", @@ -8696,6 +9096,7 @@ void GL_APIENTRY GetProgramBinaryOESContextANGLE(GLeglContext ctx, GLenum *binaryFormat, void *binary) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLenum " "*binaryFormat = 0x%0.8p, void *binary = 0x%0.8p)", @@ -8722,6 +9123,7 @@ void GL_APIENTRY GetProgramInfoLogContextANGLE(GLeglContext ctx, GLsizei *length, GLchar *infoLog) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *infoLog = " "0x%0.8p)", @@ -8747,6 +9149,7 @@ void GL_APIENTRY GetProgramInterfaceivContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLenum programInterface = 0x%X, GLenum pname = 0x%X, GLint *params " "= 0x%0.8p)", @@ -8773,6 +9176,7 @@ void GL_APIENTRY GetProgramPipelineInfoLogContextANGLE(GLeglContext ctx, GLsizei *length, GLchar *infoLog) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint pipeline = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *infoLog = " "0x%0.8p)", @@ -8798,6 +9202,7 @@ void GL_APIENTRY GetProgramPipelineivContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint pipeline = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", pipeline, pname, params); @@ -8820,6 +9225,7 @@ GLuint GL_APIENTRY GetProgramResourceIndexContextANGLE(GLeglContext ctx, GLenum programInterface, const GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%0.8p)", program, programInterface, name); @@ -8844,6 +9250,7 @@ GLint GL_APIENTRY GetProgramResourceLocationContextANGLE(GLeglContext ctx, GLenum programInterface, const GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%0.8p)", program, programInterface, name); @@ -8872,6 +9279,7 @@ void GL_APIENTRY GetProgramResourceNameContextANGLE(GLeglContext ctx, GLsizei *length, GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLenum programInterface = 0x%X, GLuint index = %u, GLsizei bufSize " "= %d, GLsizei *length = 0x%0.8p, GLchar *name = 0x%0.8p)", @@ -8904,6 +9312,7 @@ void GL_APIENTRY GetProgramResourceivContextANGLE(GLeglContext ctx, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLenum programInterface = 0x%X, GLuint index = %u, GLsizei " "propCount = %d, const GLenum *props = 0x%0.8p, GLsizei bufSize = %d, GLsizei *length = " @@ -8932,6 +9341,7 @@ void GL_APIENTRY GetProgramivContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", program, pname, params); @@ -8953,6 +9363,7 @@ void GL_APIENTRY GetQueryObjecti64vEXTContextANGLE(GLeglContext ctx, GLenum pname, GLint64 *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLint64 *params = 0x%0.8p)", id, pname, params); Context *context = static_cast(ctx); @@ -8973,6 +9384,7 @@ void GL_APIENTRY GetQueryObjectivEXTContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", id, pname, params); Context *context = static_cast(ctx); @@ -8993,6 +9405,7 @@ void GL_APIENTRY GetQueryObjectui64vEXTContextANGLE(GLeglContext ctx, GLenum pname, GLuint64 *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLuint64 *params = 0x%0.8p)", id, pname, params); Context *context = static_cast(ctx); @@ -9013,6 +9426,7 @@ void GL_APIENTRY GetQueryObjectuivContextANGLE(GLeglContext ctx, GLenum pname, GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLuint *params = 0x%0.8p)", id, pname, params); Context *context = static_cast(ctx); @@ -9033,6 +9447,7 @@ void GL_APIENTRY GetQueryObjectuivEXTContextANGLE(GLeglContext ctx, GLenum pname, GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLuint *params = 0x%0.8p)", id, pname, params); Context *context = static_cast(ctx); @@ -9053,6 +9468,7 @@ void GL_APIENTRY GetQueryivContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname, params); @@ -9075,6 +9491,7 @@ void GL_APIENTRY GetQueryivEXTContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname, params); @@ -9098,6 +9515,7 @@ void GL_APIENTRY GetRenderbufferParameterivContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname, params); @@ -9120,6 +9538,7 @@ void GL_APIENTRY GetRenderbufferParameterivOESContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname, params); @@ -9142,6 +9561,7 @@ void GL_APIENTRY GetSamplerParameterfvContextANGLE(GLeglContext ctx, GLenum pname, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", sampler, pname, params); @@ -9164,6 +9584,7 @@ void GL_APIENTRY GetSamplerParameterivContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", sampler, pname, params); @@ -9187,6 +9608,7 @@ void GL_APIENTRY GetShaderInfoLogContextANGLE(GLeglContext ctx, GLsizei *length, GLchar *infoLog) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *infoLog = " "0x%0.8p)", @@ -9212,6 +9634,7 @@ void GL_APIENTRY GetShaderPrecisionFormatContextANGLE(GLeglContext ctx, GLint *range, GLint *precision) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum shadertype = 0x%X, GLenum precisiontype = 0x%X, GLint *range = 0x%0.8p, GLint " "*precision = 0x%0.8p)", @@ -9238,6 +9661,7 @@ void GL_APIENTRY GetShaderSourceContextANGLE(GLeglContext ctx, GLsizei *length, GLchar *source) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *source = " "0x%0.8p)", @@ -9262,6 +9686,7 @@ void GL_APIENTRY GetShaderivContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint shader = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", shader, pname, params); @@ -9280,6 +9705,7 @@ void GL_APIENTRY GetShaderivContextANGLE(GLeglContext ctx, const GLubyte *GL_APIENTRY GetStringContextANGLE(GLeglContext ctx, GLenum name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum name = 0x%X)", name); Context *context = static_cast(ctx); @@ -9299,6 +9725,7 @@ const GLubyte *GL_APIENTRY GetStringContextANGLE(GLeglContext ctx, GLenum name) const GLubyte *GL_APIENTRY GetStringiContextANGLE(GLeglContext ctx, GLenum name, GLuint index) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum name = 0x%X, GLuint index = %u)", name, index); Context *context = static_cast(ctx); @@ -9323,6 +9750,7 @@ void GL_APIENTRY GetSyncivContextANGLE(GLeglContext ctx, GLsizei *length, GLint *values) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLsync sync = 0x%0.8p, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei *length = " "0x%0.8p, GLint *values = 0x%0.8p)", @@ -9347,6 +9775,7 @@ void GL_APIENTRY GetTexEnvfvContextANGLE(GLeglContext ctx, GLenum pname, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", target, pname, params); @@ -9371,6 +9800,7 @@ void GL_APIENTRY GetTexEnvivContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname, params); @@ -9395,6 +9825,7 @@ void GL_APIENTRY GetTexEnvxvContextANGLE(GLeglContext ctx, GLenum pname, GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%0.8p)", target, pname, params); @@ -9419,6 +9850,7 @@ void GL_APIENTRY GetTexGenfvOESContextANGLE(GLeglContext ctx, GLenum pname, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", coord, pname, params); @@ -9440,6 +9872,7 @@ void GL_APIENTRY GetTexGenivOESContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", coord, pname, params); @@ -9461,6 +9894,7 @@ void GL_APIENTRY GetTexGenxvOESContextANGLE(GLeglContext ctx, GLenum pname, GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%0.8p)", coord, pname, params); @@ -9483,6 +9917,7 @@ void GL_APIENTRY GetTexLevelParameterfvContextANGLE(GLeglContext ctx, GLenum pname, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", target, level, pname, params); @@ -9509,6 +9944,7 @@ void GL_APIENTRY GetTexLevelParameterivContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, level, pname, params); @@ -9533,6 +9969,7 @@ void GL_APIENTRY GetTexParameterfvContextANGLE(GLeglContext ctx, GLenum pname, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", target, pname, params); @@ -9556,6 +9993,7 @@ void GL_APIENTRY GetTexParameterivContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname, params); @@ -9579,6 +10017,7 @@ void GL_APIENTRY GetTexParameterxvContextANGLE(GLeglContext ctx, GLenum pname, GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%0.8p)", target, pname, params); @@ -9606,6 +10045,7 @@ void GL_APIENTRY GetTransformFeedbackVaryingContextANGLE(GLeglContext ctx, GLenum *type, GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, " "GLsizei *size = 0x%0.8p, GLenum *type = 0x%0.8p, GLchar *name = 0x%0.8p)", @@ -9633,6 +10073,7 @@ void GL_APIENTRY GetTranslatedShaderSourceANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLchar *source) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint shader = %u, GLsizei bufsize = %d, GLsizei *length = 0x%0.8p, GLchar *source = " "0x%0.8p)", @@ -9657,6 +10098,7 @@ GLuint GL_APIENTRY GetUniformBlockIndexContextANGLE(GLeglContext ctx, GLuint program, const GLchar *uniformBlockName) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, const GLchar *uniformBlockName = 0x%0.8p)", program, uniformBlockName); @@ -9682,6 +10124,7 @@ void GL_APIENTRY GetUniformIndicesContextANGLE(GLeglContext ctx, const GLchar *const *uniformNames, GLuint *uniformIndices) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLsizei uniformCount = %d, const GLchar *const*uniformNames = " "0x%0.8p, GLuint *uniformIndices = 0x%0.8p)", @@ -9706,6 +10149,7 @@ GLint GL_APIENTRY GetUniformLocationContextANGLE(GLeglContext ctx, GLuint program, const GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, const GLchar *name = 0x%0.8p)", program, name); Context *context = static_cast(ctx); @@ -9728,6 +10172,7 @@ void GL_APIENTRY GetUniformfvContextANGLE(GLeglContext ctx, GLint location, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, GLfloat *params = 0x%0.8p)", program, location, params); @@ -9749,6 +10194,7 @@ void GL_APIENTRY GetUniformivContextANGLE(GLeglContext ctx, GLint location, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, GLint *params = 0x%0.8p)", program, location, params); @@ -9770,6 +10216,7 @@ void GL_APIENTRY GetUniformuivContextANGLE(GLeglContext ctx, GLint location, GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, GLuint *params = 0x%0.8p)", program, location, params); @@ -9791,6 +10238,7 @@ void GL_APIENTRY GetVertexAttribIivContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", index, pname, params); @@ -9812,6 +10260,7 @@ void GL_APIENTRY GetVertexAttribIuivContextANGLE(GLeglContext ctx, GLenum pname, GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLuint *params = 0x%0.8p)", index, pname, params); @@ -9833,6 +10282,7 @@ void GL_APIENTRY GetVertexAttribPointervContextANGLE(GLeglContext ctx, GLenum pname, void **pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLenum pname = 0x%X, void **pointer = 0x%0.8p)", index, pname, pointer); @@ -9855,6 +10305,7 @@ void GL_APIENTRY GetVertexAttribfvContextANGLE(GLeglContext ctx, GLenum pname, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", index, pname, params); @@ -9876,6 +10327,7 @@ void GL_APIENTRY GetVertexAttribivContextANGLE(GLeglContext ctx, GLenum pname, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", index, pname, params); @@ -9898,6 +10350,7 @@ void GL_APIENTRY GetnUniformfvEXTContextANGLE(GLeglContext ctx, GLsizei bufSize, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLfloat *params = " "0x%0.8p)", @@ -9923,6 +10376,7 @@ void GL_APIENTRY GetnUniformivEXTContextANGLE(GLeglContext ctx, GLsizei bufSize, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLint *params = 0x%0.8p)", program, location, bufSize, params); @@ -9943,6 +10397,7 @@ void GL_APIENTRY GetnUniformivEXTContextANGLE(GLeglContext ctx, void GL_APIENTRY HintContextANGLE(GLeglContext ctx, GLenum target, GLenum mode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum mode = 0x%X)", target, mode); Context *context = static_cast(ctx); @@ -9962,6 +10417,7 @@ void GL_APIENTRY InsertEventMarkerEXTContextANGLE(GLeglContext ctx, GLsizei length, const GLchar *marker) { + ANGLE_SCOPED_GLOBAL_LOCK(); // Don't run an EVENT() macro on the EXT_debug_marker entry points. // It can interfere with the debug events being set by the caller. // EVENT("(GLsizei length = %d, const GLchar *marker = 0x%0.8p)", length, marker); @@ -9984,6 +10440,7 @@ void GL_APIENTRY InvalidateFramebufferContextANGLE(GLeglContext ctx, GLsizei numAttachments, const GLenum *attachments) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = 0x%0.8p)", target, numAttachments, attachments); @@ -10012,6 +10469,7 @@ void GL_APIENTRY InvalidateSubFramebufferContextANGLE(GLeglContext ctx, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = 0x%0.8p, " "GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", @@ -10036,6 +10494,7 @@ void GL_APIENTRY InvalidateSubFramebufferContextANGLE(GLeglContext ctx, GLboolean GL_APIENTRY IsBufferContextANGLE(GLeglContext ctx, GLuint buffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint buffer = %u)", buffer); Context *context = static_cast(ctx); @@ -10055,6 +10514,7 @@ GLboolean GL_APIENTRY IsBufferContextANGLE(GLeglContext ctx, GLuint buffer) GLboolean GL_APIENTRY IsEnabledContextANGLE(GLeglContext ctx, GLenum cap) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum cap = 0x%X)", cap); Context *context = static_cast(ctx); @@ -10074,6 +10534,7 @@ GLboolean GL_APIENTRY IsEnabledContextANGLE(GLeglContext ctx, GLenum cap) GLboolean GL_APIENTRY IsFenceNVContextANGLE(GLeglContext ctx, GLuint fence) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint fence = %u)", fence); Context *context = static_cast(ctx); @@ -10093,6 +10554,7 @@ GLboolean GL_APIENTRY IsFenceNVContextANGLE(GLeglContext ctx, GLuint fence) GLboolean GL_APIENTRY IsFramebufferContextANGLE(GLeglContext ctx, GLuint framebuffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint framebuffer = %u)", framebuffer); Context *context = static_cast(ctx); @@ -10112,6 +10574,7 @@ GLboolean GL_APIENTRY IsFramebufferContextANGLE(GLeglContext ctx, GLuint framebu GLboolean GL_APIENTRY IsFramebufferOESContextANGLE(GLeglContext ctx, GLuint framebuffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint framebuffer = %u)", framebuffer); Context *context = static_cast(ctx); @@ -10131,6 +10594,7 @@ GLboolean GL_APIENTRY IsFramebufferOESContextANGLE(GLeglContext ctx, GLuint fram GLboolean GL_APIENTRY IsProgramContextANGLE(GLeglContext ctx, GLuint program) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u)", program); Context *context = static_cast(ctx); @@ -10150,6 +10614,7 @@ GLboolean GL_APIENTRY IsProgramContextANGLE(GLeglContext ctx, GLuint program) GLboolean GL_APIENTRY IsProgramPipelineContextANGLE(GLeglContext ctx, GLuint pipeline) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint pipeline = %u)", pipeline); Context *context = static_cast(ctx); @@ -10169,6 +10634,7 @@ GLboolean GL_APIENTRY IsProgramPipelineContextANGLE(GLeglContext ctx, GLuint pip GLboolean GL_APIENTRY IsQueryContextANGLE(GLeglContext ctx, GLuint id) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint id = %u)", id); Context *context = static_cast(ctx); @@ -10188,6 +10654,7 @@ GLboolean GL_APIENTRY IsQueryContextANGLE(GLeglContext ctx, GLuint id) GLboolean GL_APIENTRY IsQueryEXTContextANGLE(GLeglContext ctx, GLuint id) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint id = %u)", id); Context *context = static_cast(ctx); @@ -10207,6 +10674,7 @@ GLboolean GL_APIENTRY IsQueryEXTContextANGLE(GLeglContext ctx, GLuint id) GLboolean GL_APIENTRY IsRenderbufferContextANGLE(GLeglContext ctx, GLuint renderbuffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint renderbuffer = %u)", renderbuffer); Context *context = static_cast(ctx); @@ -10226,6 +10694,7 @@ GLboolean GL_APIENTRY IsRenderbufferContextANGLE(GLeglContext ctx, GLuint render GLboolean GL_APIENTRY IsRenderbufferOESContextANGLE(GLeglContext ctx, GLuint renderbuffer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint renderbuffer = %u)", renderbuffer); Context *context = static_cast(ctx); @@ -10245,6 +10714,7 @@ GLboolean GL_APIENTRY IsRenderbufferOESContextANGLE(GLeglContext ctx, GLuint ren GLboolean GL_APIENTRY IsSamplerContextANGLE(GLeglContext ctx, GLuint sampler) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint sampler = %u)", sampler); Context *context = static_cast(ctx); @@ -10264,6 +10734,7 @@ GLboolean GL_APIENTRY IsSamplerContextANGLE(GLeglContext ctx, GLuint sampler) GLboolean GL_APIENTRY IsShaderContextANGLE(GLeglContext ctx, GLuint shader) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint shader = %u)", shader); Context *context = static_cast(ctx); @@ -10283,6 +10754,7 @@ GLboolean GL_APIENTRY IsShaderContextANGLE(GLeglContext ctx, GLuint shader) GLboolean GL_APIENTRY IsSyncContextANGLE(GLeglContext ctx, GLsync sync) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsync sync = 0x%0.8p)", sync); Context *context = static_cast(ctx); @@ -10302,6 +10774,7 @@ GLboolean GL_APIENTRY IsSyncContextANGLE(GLeglContext ctx, GLsync sync) GLboolean GL_APIENTRY IsTextureContextANGLE(GLeglContext ctx, GLuint texture) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint texture = %u)", texture); Context *context = static_cast(ctx); @@ -10321,6 +10794,7 @@ GLboolean GL_APIENTRY IsTextureContextANGLE(GLeglContext ctx, GLuint texture) GLboolean GL_APIENTRY IsTransformFeedbackContextANGLE(GLeglContext ctx, GLuint id) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint id = %u)", id); Context *context = static_cast(ctx); @@ -10340,6 +10814,7 @@ GLboolean GL_APIENTRY IsTransformFeedbackContextANGLE(GLeglContext ctx, GLuint i GLboolean GL_APIENTRY IsVertexArrayContextANGLE(GLeglContext ctx, GLuint array) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint array = %u)", array); Context *context = static_cast(ctx); @@ -10359,6 +10834,7 @@ GLboolean GL_APIENTRY IsVertexArrayContextANGLE(GLeglContext ctx, GLuint array) GLboolean GL_APIENTRY IsVertexArrayOESContextANGLE(GLeglContext ctx, GLuint array) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint array = %u)", array); Context *context = static_cast(ctx); @@ -10378,6 +10854,7 @@ GLboolean GL_APIENTRY IsVertexArrayOESContextANGLE(GLeglContext ctx, GLuint arra void GL_APIENTRY LightModelfContextANGLE(GLeglContext ctx, GLenum pname, GLfloat param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLfloat param = %f)", pname, param); Context *context = static_cast(ctx); @@ -10395,6 +10872,7 @@ void GL_APIENTRY LightModelfContextANGLE(GLeglContext ctx, GLenum pname, GLfloat void GL_APIENTRY LightModelfvContextANGLE(GLeglContext ctx, GLenum pname, const GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", pname, params); Context *context = static_cast(ctx); @@ -10412,6 +10890,7 @@ void GL_APIENTRY LightModelfvContextANGLE(GLeglContext ctx, GLenum pname, const void GL_APIENTRY LightModelxContextANGLE(GLeglContext ctx, GLenum pname, GLfixed param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLfixed param = 0x%X)", pname, param); Context *context = static_cast(ctx); @@ -10429,6 +10908,7 @@ void GL_APIENTRY LightModelxContextANGLE(GLeglContext ctx, GLenum pname, GLfixed void GL_APIENTRY LightModelxvContextANGLE(GLeglContext ctx, GLenum pname, const GLfixed *param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, const GLfixed *param = 0x%0.8p)", pname, param); Context *context = static_cast(ctx); @@ -10446,6 +10926,7 @@ void GL_APIENTRY LightModelxvContextANGLE(GLeglContext ctx, GLenum pname, const void GL_APIENTRY LightfContextANGLE(GLeglContext ctx, GLenum light, GLenum pname, GLfloat param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", light, pname, param); Context *context = static_cast(ctx); @@ -10467,6 +10948,7 @@ void GL_APIENTRY LightfvContextANGLE(GLeglContext ctx, GLenum pname, const GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", light, pname, params); @@ -10486,6 +10968,7 @@ void GL_APIENTRY LightfvContextANGLE(GLeglContext ctx, void GL_APIENTRY LightxContextANGLE(GLeglContext ctx, GLenum light, GLenum pname, GLfixed param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", light, pname, param); Context *context = static_cast(ctx); @@ -10507,6 +10990,7 @@ void GL_APIENTRY LightxvContextANGLE(GLeglContext ctx, GLenum pname, const GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%0.8p)", light, pname, params); @@ -10526,6 +11010,7 @@ void GL_APIENTRY LightxvContextANGLE(GLeglContext ctx, void GL_APIENTRY LineWidthContextANGLE(GLeglContext ctx, GLfloat width) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat width = %f)", width); Context *context = static_cast(ctx); @@ -10543,6 +11028,7 @@ void GL_APIENTRY LineWidthContextANGLE(GLeglContext ctx, GLfloat width) void GL_APIENTRY LineWidthxContextANGLE(GLeglContext ctx, GLfixed width) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed width = 0x%X)", width); Context *context = static_cast(ctx); @@ -10560,6 +11046,7 @@ void GL_APIENTRY LineWidthxContextANGLE(GLeglContext ctx, GLfixed width) void GL_APIENTRY LinkProgramContextANGLE(GLeglContext ctx, GLuint program) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u)", program); Context *context = static_cast(ctx); @@ -10577,6 +11064,7 @@ void GL_APIENTRY LinkProgramContextANGLE(GLeglContext ctx, GLuint program) void GL_APIENTRY LoadIdentityContextANGLE(GLeglContext ctx) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = static_cast(ctx); @@ -10594,6 +11082,7 @@ void GL_APIENTRY LoadIdentityContextANGLE(GLeglContext ctx) void GL_APIENTRY LoadMatrixfContextANGLE(GLeglContext ctx, const GLfloat *m) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const GLfloat *m = 0x%0.8p)", m); Context *context = static_cast(ctx); @@ -10611,6 +11100,7 @@ void GL_APIENTRY LoadMatrixfContextANGLE(GLeglContext ctx, const GLfloat *m) void GL_APIENTRY LoadMatrixxContextANGLE(GLeglContext ctx, const GLfixed *m) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const GLfixed *m = 0x%0.8p)", m); Context *context = static_cast(ctx); @@ -10628,6 +11118,7 @@ void GL_APIENTRY LoadMatrixxContextANGLE(GLeglContext ctx, const GLfixed *m) void GL_APIENTRY LoadPaletteFromModelViewMatrixOESContextANGLE(GLeglContext ctx) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = static_cast(ctx); @@ -10645,6 +11136,7 @@ void GL_APIENTRY LoadPaletteFromModelViewMatrixOESContextANGLE(GLeglContext ctx) void GL_APIENTRY LogicOpContextANGLE(GLeglContext ctx, GLenum opcode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum opcode = 0x%X)", opcode); Context *context = static_cast(ctx); @@ -10663,6 +11155,7 @@ void GL_APIENTRY LogicOpContextANGLE(GLeglContext ctx, GLenum opcode) void *GL_APIENTRY MapBufferOESContextANGLE(GLeglContext ctx, GLenum target, GLenum access) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum access = 0x%X)", target, access); Context *context = static_cast(ctx); @@ -10687,6 +11180,7 @@ void *GL_APIENTRY MapBufferRangeContextANGLE(GLeglContext ctx, GLsizeiptr length, GLbitfield access) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr length = %d, GLbitfield access = " "0x%X)", @@ -10715,6 +11209,7 @@ void *GL_APIENTRY MapBufferRangeEXTContextANGLE(GLeglContext ctx, GLsizeiptr length, GLbitfield access) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr length = %d, GLbitfield access = " "0x%X)", @@ -10739,6 +11234,7 @@ void *GL_APIENTRY MapBufferRangeEXTContextANGLE(GLeglContext ctx, void GL_APIENTRY MaterialfContextANGLE(GLeglContext ctx, GLenum face, GLenum pname, GLfloat param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", face, pname, param); Context *context = static_cast(ctx); @@ -10760,6 +11256,7 @@ void GL_APIENTRY MaterialfvContextANGLE(GLeglContext ctx, GLenum pname, const GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", face, pname, params); @@ -10779,6 +11276,7 @@ void GL_APIENTRY MaterialfvContextANGLE(GLeglContext ctx, void GL_APIENTRY MaterialxContextANGLE(GLeglContext ctx, GLenum face, GLenum pname, GLfixed param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", face, pname, param); Context *context = static_cast(ctx); @@ -10800,6 +11298,7 @@ void GL_APIENTRY MaterialxvContextANGLE(GLeglContext ctx, GLenum pname, const GLfixed *param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, const GLfixed *param = 0x%0.8p)", face, pname, param); @@ -10823,6 +11322,7 @@ void GL_APIENTRY MatrixIndexPointerOESContextANGLE(GLeglContext ctx, GLsizei stride, const void *pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%0.8p)", size, type, stride, pointer); @@ -10843,6 +11343,7 @@ void GL_APIENTRY MatrixIndexPointerOESContextANGLE(GLeglContext ctx, void GL_APIENTRY MatrixModeContextANGLE(GLeglContext ctx, GLenum mode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum mode = 0x%X)", mode); Context *context = static_cast(ctx); @@ -10861,6 +11362,7 @@ void GL_APIENTRY MatrixModeContextANGLE(GLeglContext ctx, GLenum mode) void GL_APIENTRY MaxShaderCompilerThreadsKHRContextANGLE(GLeglContext ctx, GLuint count) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint count = %u)", count); Context *context = static_cast(ctx); @@ -10878,6 +11380,7 @@ void GL_APIENTRY MaxShaderCompilerThreadsKHRContextANGLE(GLeglContext ctx, GLuin void GL_APIENTRY MemoryBarrierContextANGLE(GLeglContext ctx, GLbitfield barriers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLbitfield barriers = 0x%X)", barriers); Context *context = static_cast(ctx); @@ -10895,6 +11398,7 @@ void GL_APIENTRY MemoryBarrierContextANGLE(GLeglContext ctx, GLbitfield barriers void GL_APIENTRY MemoryBarrierByRegionContextANGLE(GLeglContext ctx, GLbitfield barriers) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLbitfield barriers = 0x%X)", barriers); Context *context = static_cast(ctx); @@ -10912,6 +11416,7 @@ void GL_APIENTRY MemoryBarrierByRegionContextANGLE(GLeglContext ctx, GLbitfield void GL_APIENTRY MultMatrixfContextANGLE(GLeglContext ctx, const GLfloat *m) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const GLfloat *m = 0x%0.8p)", m); Context *context = static_cast(ctx); @@ -10929,6 +11434,7 @@ void GL_APIENTRY MultMatrixfContextANGLE(GLeglContext ctx, const GLfloat *m) void GL_APIENTRY MultMatrixxContextANGLE(GLeglContext ctx, const GLfixed *m) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const GLfixed *m = 0x%0.8p)", m); Context *context = static_cast(ctx); @@ -10951,6 +11457,7 @@ void GL_APIENTRY MultiTexCoord4fContextANGLE(GLeglContext ctx, GLfloat r, GLfloat q) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLfloat s = %f, GLfloat t = %f, GLfloat r = %f, GLfloat q = %f)", target, s, t, r, q); @@ -10974,6 +11481,7 @@ void GL_APIENTRY MultiTexCoord4xContextANGLE(GLeglContext ctx, GLfixed r, GLfixed q) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum texture = 0x%X, GLfixed s = 0x%X, GLfixed t = 0x%X, GLfixed r = 0x%X, GLfixed q = " "0x%X)", @@ -10994,6 +11502,7 @@ void GL_APIENTRY MultiTexCoord4xContextANGLE(GLeglContext ctx, void GL_APIENTRY Normal3fContextANGLE(GLeglContext ctx, GLfloat nx, GLfloat ny, GLfloat nz) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat nx = %f, GLfloat ny = %f, GLfloat nz = %f)", nx, ny, nz); Context *context = static_cast(ctx); @@ -11011,6 +11520,7 @@ void GL_APIENTRY Normal3fContextANGLE(GLeglContext ctx, GLfloat nx, GLfloat ny, void GL_APIENTRY Normal3xContextANGLE(GLeglContext ctx, GLfixed nx, GLfixed ny, GLfixed nz) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed nx = 0x%X, GLfixed ny = 0x%X, GLfixed nz = 0x%X)", nx, ny, nz); Context *context = static_cast(ctx); @@ -11031,6 +11541,7 @@ void GL_APIENTRY NormalPointerContextANGLE(GLeglContext ctx, GLsizei stride, const void *pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%0.8p)", type, stride, pointer); @@ -11053,6 +11564,7 @@ void GL_APIENTRY ObjectLabelKHRContextANGLE(GLeglContext ctx, GLsizei length, const GLchar *label) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum identifier = 0x%X, GLuint name = %u, GLsizei length = %d, const GLchar *label = " "0x%0.8p)", @@ -11077,6 +11589,7 @@ void GL_APIENTRY ObjectPtrLabelKHRContextANGLE(GLeglContext ctx, GLsizei length, const GLchar *label) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const void *ptr = 0x%0.8p, GLsizei length = %d, const GLchar *label = 0x%0.8p)", ptr, length, label); @@ -11101,6 +11614,7 @@ void GL_APIENTRY OrthofContextANGLE(GLeglContext ctx, GLfloat n, GLfloat f) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLfloat l = %f, GLfloat r = %f, GLfloat b = %f, GLfloat t = %f, GLfloat n = %f, GLfloat " "f = %f)", @@ -11127,6 +11641,7 @@ void GL_APIENTRY OrthoxContextANGLE(GLeglContext ctx, GLfixed n, GLfixed f) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLfixed l = 0x%X, GLfixed r = 0x%X, GLfixed b = 0x%X, GLfixed t = 0x%X, GLfixed n = " "0x%X, GLfixed f = 0x%X)", @@ -11147,6 +11662,7 @@ void GL_APIENTRY OrthoxContextANGLE(GLeglContext ctx, void GL_APIENTRY PauseTransformFeedbackContextANGLE(GLeglContext ctx) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = static_cast(ctx); @@ -11164,6 +11680,7 @@ void GL_APIENTRY PauseTransformFeedbackContextANGLE(GLeglContext ctx) void GL_APIENTRY PixelStoreiContextANGLE(GLeglContext ctx, GLenum pname, GLint param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLint param = %d)", pname, param); Context *context = static_cast(ctx); @@ -11181,6 +11698,7 @@ void GL_APIENTRY PixelStoreiContextANGLE(GLeglContext ctx, GLenum pname, GLint p void GL_APIENTRY PointParameterfContextANGLE(GLeglContext ctx, GLenum pname, GLfloat param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLfloat param = %f)", pname, param); Context *context = static_cast(ctx); @@ -11199,6 +11717,7 @@ void GL_APIENTRY PointParameterfContextANGLE(GLeglContext ctx, GLenum pname, GLf void GL_APIENTRY PointParameterfvContextANGLE(GLeglContext ctx, GLenum pname, const GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", pname, params); Context *context = static_cast(ctx); @@ -11217,6 +11736,7 @@ void GL_APIENTRY PointParameterfvContextANGLE(GLeglContext ctx, GLenum pname, co void GL_APIENTRY PointParameterxContextANGLE(GLeglContext ctx, GLenum pname, GLfixed param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, GLfixed param = 0x%X)", pname, param); Context *context = static_cast(ctx); @@ -11235,6 +11755,7 @@ void GL_APIENTRY PointParameterxContextANGLE(GLeglContext ctx, GLenum pname, GLf void GL_APIENTRY PointParameterxvContextANGLE(GLeglContext ctx, GLenum pname, const GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum pname = 0x%X, const GLfixed *params = 0x%0.8p)", pname, params); Context *context = static_cast(ctx); @@ -11253,6 +11774,7 @@ void GL_APIENTRY PointParameterxvContextANGLE(GLeglContext ctx, GLenum pname, co void GL_APIENTRY PointSizeContextANGLE(GLeglContext ctx, GLfloat size) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat size = %f)", size); Context *context = static_cast(ctx); @@ -11273,6 +11795,7 @@ void GL_APIENTRY PointSizePointerOESContextANGLE(GLeglContext ctx, GLsizei stride, const void *pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%0.8p)", type, stride, pointer); @@ -11292,6 +11815,7 @@ void GL_APIENTRY PointSizePointerOESContextANGLE(GLeglContext ctx, void GL_APIENTRY PointSizexContextANGLE(GLeglContext ctx, GLfixed size) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed size = 0x%X)", size); Context *context = static_cast(ctx); @@ -11309,6 +11833,7 @@ void GL_APIENTRY PointSizexContextANGLE(GLeglContext ctx, GLfixed size) void GL_APIENTRY PolygonOffsetContextANGLE(GLeglContext ctx, GLfloat factor, GLfloat units) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat factor = %f, GLfloat units = %f)", factor, units); Context *context = static_cast(ctx); @@ -11326,6 +11851,7 @@ void GL_APIENTRY PolygonOffsetContextANGLE(GLeglContext ctx, GLfloat factor, GLf void GL_APIENTRY PolygonOffsetxContextANGLE(GLeglContext ctx, GLfixed factor, GLfixed units) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed factor = 0x%X, GLfixed units = 0x%X)", factor, units); Context *context = static_cast(ctx); @@ -11343,6 +11869,7 @@ void GL_APIENTRY PolygonOffsetxContextANGLE(GLeglContext ctx, GLfixed factor, GL void GL_APIENTRY PopDebugGroupKHRContextANGLE(GLeglContext ctx) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = static_cast(ctx); @@ -11360,6 +11887,7 @@ void GL_APIENTRY PopDebugGroupKHRContextANGLE(GLeglContext ctx) void GL_APIENTRY PopGroupMarkerEXTContextANGLE(GLeglContext ctx) { + ANGLE_SCOPED_GLOBAL_LOCK(); // Don't run an EVENT() macro on the EXT_debug_marker entry points. // It can interfere with the debug events being set by the caller. // EVENT("()"); @@ -11379,6 +11907,7 @@ void GL_APIENTRY PopGroupMarkerEXTContextANGLE(GLeglContext ctx) void GL_APIENTRY PopMatrixContextANGLE(GLeglContext ctx) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = static_cast(ctx); @@ -11400,6 +11929,7 @@ void GL_APIENTRY ProgramBinaryContextANGLE(GLeglContext ctx, const void *binary, GLsizei length) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLenum binaryFormat = 0x%X, const void *binary = 0x%0.8p, GLsizei " "length = %d)", @@ -11425,6 +11955,7 @@ void GL_APIENTRY ProgramBinaryOESContextANGLE(GLeglContext ctx, const void *binary, GLint length) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLenum binaryFormat = 0x%X, const void *binary = 0x%0.8p, GLint " "length = %d)", @@ -11449,6 +11980,7 @@ void GL_APIENTRY ProgramParameteriContextANGLE(GLeglContext ctx, GLenum pname, GLint value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLenum pname = 0x%X, GLint value = %d)", program, pname, value); Context *context = static_cast(ctx); @@ -11469,6 +12001,7 @@ void GL_APIENTRY ProgramUniform1fContextANGLE(GLeglContext ctx, GLint location, GLfloat v0) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, GLfloat v0 = %f)", program, location, v0); Context *context = static_cast(ctx); @@ -11490,6 +12023,7 @@ void GL_APIENTRY ProgramUniform1fvContextANGLE(GLeglContext ctx, GLsizei count, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = " "0x%0.8p)", @@ -11514,6 +12048,7 @@ void GL_APIENTRY ProgramUniform1iContextANGLE(GLeglContext ctx, GLint location, GLint v0) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, GLint v0 = %d)", program, location, v0); Context *context = static_cast(ctx); @@ -11535,6 +12070,7 @@ void GL_APIENTRY ProgramUniform1ivContextANGLE(GLeglContext ctx, GLsizei count, const GLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = " "0x%0.8p)", @@ -11559,6 +12095,7 @@ void GL_APIENTRY ProgramUniform1uiContextANGLE(GLeglContext ctx, GLint location, GLuint v0) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, GLuint v0 = %u)", program, location, v0); Context *context = static_cast(ctx); @@ -11580,6 +12117,7 @@ void GL_APIENTRY ProgramUniform1uivContextANGLE(GLeglContext ctx, GLsizei count, const GLuint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = " "0x%0.8p)", @@ -11605,6 +12143,7 @@ void GL_APIENTRY ProgramUniform2fContextANGLE(GLeglContext ctx, GLfloat v0, GLfloat v1) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f)", program, location, v0, v1); @@ -11628,6 +12167,7 @@ void GL_APIENTRY ProgramUniform2fvContextANGLE(GLeglContext ctx, GLsizei count, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = " "0x%0.8p)", @@ -11650,6 +12190,7 @@ void GL_APIENTRY ProgramUniform2fvContextANGLE(GLeglContext ctx, void GL_APIENTRY ProgramUniform2iContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLint v0, GLint v1) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, GLint v0 = %d, GLint v1 = %d)", program, location, v0, v1); @@ -11673,6 +12214,7 @@ void GL_APIENTRY ProgramUniform2ivContextANGLE(GLeglContext ctx, GLsizei count, const GLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = " "0x%0.8p)", @@ -11698,6 +12240,7 @@ void GL_APIENTRY ProgramUniform2uiContextANGLE(GLeglContext ctx, GLuint v0, GLuint v1) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, GLuint v0 = %u, GLuint v1 = %u)", program, location, v0, v1); @@ -11721,6 +12264,7 @@ void GL_APIENTRY ProgramUniform2uivContextANGLE(GLeglContext ctx, GLsizei count, const GLuint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = " "0x%0.8p)", @@ -11747,6 +12291,7 @@ void GL_APIENTRY ProgramUniform3fContextANGLE(GLeglContext ctx, GLfloat v1, GLfloat v2) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = " "%f)", @@ -11772,6 +12317,7 @@ void GL_APIENTRY ProgramUniform3fvContextANGLE(GLeglContext ctx, GLsizei count, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = " "0x%0.8p)", @@ -11798,6 +12344,7 @@ void GL_APIENTRY ProgramUniform3iContextANGLE(GLeglContext ctx, GLint v1, GLint v2) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d)", program, location, v0, v1, v2); @@ -11821,6 +12368,7 @@ void GL_APIENTRY ProgramUniform3ivContextANGLE(GLeglContext ctx, GLsizei count, const GLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = " "0x%0.8p)", @@ -11847,6 +12395,7 @@ void GL_APIENTRY ProgramUniform3uiContextANGLE(GLeglContext ctx, GLuint v1, GLuint v2) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = " "%u)", @@ -11872,6 +12421,7 @@ void GL_APIENTRY ProgramUniform3uivContextANGLE(GLeglContext ctx, GLsizei count, const GLuint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = " "0x%0.8p)", @@ -11899,6 +12449,7 @@ void GL_APIENTRY ProgramUniform4fContextANGLE(GLeglContext ctx, GLfloat v2, GLfloat v3) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = " "%f, GLfloat v3 = %f)", @@ -11924,6 +12475,7 @@ void GL_APIENTRY ProgramUniform4fvContextANGLE(GLeglContext ctx, GLsizei count, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = " "0x%0.8p)", @@ -11951,6 +12503,7 @@ void GL_APIENTRY ProgramUniform4iContextANGLE(GLeglContext ctx, GLint v2, GLint v3) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d, " "GLint v3 = %d)", @@ -11976,6 +12529,7 @@ void GL_APIENTRY ProgramUniform4ivContextANGLE(GLeglContext ctx, GLsizei count, const GLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = " "0x%0.8p)", @@ -12003,6 +12557,7 @@ void GL_APIENTRY ProgramUniform4uiContextANGLE(GLeglContext ctx, GLuint v2, GLuint v3) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = " "%u, GLuint v3 = %u)", @@ -12028,6 +12583,7 @@ void GL_APIENTRY ProgramUniform4uivContextANGLE(GLeglContext ctx, GLsizei count, const GLuint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = " "0x%0.8p)", @@ -12054,6 +12610,7 @@ void GL_APIENTRY ProgramUniformMatrix2fvContextANGLE(GLeglContext ctx, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "const GLfloat *value = 0x%0.8p)", @@ -12081,6 +12638,7 @@ void GL_APIENTRY ProgramUniformMatrix2x3fvContextANGLE(GLeglContext ctx, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "const GLfloat *value = 0x%0.8p)", @@ -12108,6 +12666,7 @@ void GL_APIENTRY ProgramUniformMatrix2x4fvContextANGLE(GLeglContext ctx, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "const GLfloat *value = 0x%0.8p)", @@ -12135,6 +12694,7 @@ void GL_APIENTRY ProgramUniformMatrix3fvContextANGLE(GLeglContext ctx, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "const GLfloat *value = 0x%0.8p)", @@ -12162,6 +12722,7 @@ void GL_APIENTRY ProgramUniformMatrix3x2fvContextANGLE(GLeglContext ctx, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "const GLfloat *value = 0x%0.8p)", @@ -12189,6 +12750,7 @@ void GL_APIENTRY ProgramUniformMatrix3x4fvContextANGLE(GLeglContext ctx, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "const GLfloat *value = 0x%0.8p)", @@ -12216,6 +12778,7 @@ void GL_APIENTRY ProgramUniformMatrix4fvContextANGLE(GLeglContext ctx, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "const GLfloat *value = 0x%0.8p)", @@ -12243,6 +12806,7 @@ void GL_APIENTRY ProgramUniformMatrix4x2fvContextANGLE(GLeglContext ctx, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "const GLfloat *value = 0x%0.8p)", @@ -12270,6 +12834,7 @@ void GL_APIENTRY ProgramUniformMatrix4x3fvContextANGLE(GLeglContext ctx, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "const GLfloat *value = 0x%0.8p)", @@ -12296,6 +12861,7 @@ void GL_APIENTRY PushDebugGroupKHRContextANGLE(GLeglContext ctx, GLsizei length, const GLchar *message) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum source = 0x%X, GLuint id = %u, GLsizei length = %d, const GLchar *message = " "0x%0.8p)", @@ -12319,6 +12885,7 @@ void GL_APIENTRY PushGroupMarkerEXTContextANGLE(GLeglContext ctx, GLsizei length, const GLchar *marker) { + ANGLE_SCOPED_GLOBAL_LOCK(); // Don't run an EVENT() macro on the EXT_debug_marker entry points. // It can interfere with the debug events being set by the caller. // EVENT("(GLsizei length = %d, const GLchar *marker = 0x%0.8p)", length, marker); @@ -12338,6 +12905,7 @@ void GL_APIENTRY PushGroupMarkerEXTContextANGLE(GLeglContext ctx, void GL_APIENTRY PushMatrixContextANGLE(GLeglContext ctx) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = static_cast(ctx); @@ -12355,6 +12923,7 @@ void GL_APIENTRY PushMatrixContextANGLE(GLeglContext ctx) void GL_APIENTRY QueryCounterEXTContextANGLE(GLeglContext ctx, GLuint id, GLenum target) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint id = %u, GLenum target = 0x%X)", id, target); Context *context = static_cast(ctx); @@ -12375,6 +12944,7 @@ GLbitfield GL_APIENTRY QueryMatrixxOESContextANGLE(GLeglContext ctx, GLfixed *mantissa, GLint *exponent) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed *mantissa = 0x%0.8p, GLint *exponent = 0x%0.8p)", mantissa, exponent); Context *context = static_cast(ctx); @@ -12394,6 +12964,7 @@ GLbitfield GL_APIENTRY QueryMatrixxOESContextANGLE(GLeglContext ctx, void GL_APIENTRY ReadBufferContextANGLE(GLeglContext ctx, GLenum src) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum src = 0x%X)", src); Context *context = static_cast(ctx); @@ -12418,6 +12989,7 @@ void GL_APIENTRY ReadPixelsContextANGLE(GLeglContext ctx, GLenum type, void *pixels) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = " "0x%X, GLenum type = 0x%X, void *pixels = 0x%0.8p)", @@ -12447,6 +13019,7 @@ void GL_APIENTRY ReadnPixelsEXTContextANGLE(GLeglContext ctx, GLsizei bufSize, void *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = " "0x%X, GLenum type = 0x%X, GLsizei bufSize = %d, void *data = 0x%0.8p)", @@ -12469,6 +13042,7 @@ void GL_APIENTRY ReadnPixelsEXTContextANGLE(GLeglContext ctx, void GL_APIENTRY ReleaseShaderCompilerContextANGLE(GLeglContext ctx) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = static_cast(ctx); @@ -12490,6 +13064,7 @@ void GL_APIENTRY RenderbufferStorageContextANGLE(GLeglContext ctx, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = " "%d)", @@ -12517,6 +13092,7 @@ void GL_APIENTRY RenderbufferStorageMultisampleContextANGLE(GLeglContext ctx, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width " "= %d, GLsizei height = %d)", @@ -12545,6 +13121,7 @@ void GL_APIENTRY RenderbufferStorageMultisampleANGLEContextANGLE(GLeglContext ct GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width " "= %d, GLsizei height = %d)", @@ -12572,6 +13149,7 @@ void GL_APIENTRY RenderbufferStorageOESContextANGLE(GLeglContext ctx, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = " "%d)", @@ -12594,6 +13172,7 @@ void GL_APIENTRY RenderbufferStorageOESContextANGLE(GLeglContext ctx, void GL_APIENTRY ResumeTransformFeedbackContextANGLE(GLeglContext ctx) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("()"); Context *context = static_cast(ctx); @@ -12612,6 +13191,7 @@ void GL_APIENTRY ResumeTransformFeedbackContextANGLE(GLeglContext ctx) void GL_APIENTRY RotatefContextANGLE(GLeglContext ctx, GLfloat angle, GLfloat x, GLfloat y, GLfloat z) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat angle = %f, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", angle, x, y, z); Context *context = static_cast(ctx); @@ -12630,6 +13210,7 @@ RotatefContextANGLE(GLeglContext ctx, GLfloat angle, GLfloat x, GLfloat y, GLflo void GL_APIENTRY RotatexContextANGLE(GLeglContext ctx, GLfixed angle, GLfixed x, GLfixed y, GLfixed z) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed angle = 0x%X, GLfixed x = 0x%X, GLfixed y = 0x%X, GLfixed z = 0x%X)", angle, x, y, z); @@ -12648,6 +13229,7 @@ RotatexContextANGLE(GLeglContext ctx, GLfixed angle, GLfixed x, GLfixed y, GLfix void GL_APIENTRY SampleCoverageContextANGLE(GLeglContext ctx, GLfloat value, GLboolean invert) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat value = %f, GLboolean invert = %u)", value, invert); Context *context = static_cast(ctx); @@ -12665,6 +13247,7 @@ void GL_APIENTRY SampleCoverageContextANGLE(GLeglContext ctx, GLfloat value, GLb void GL_APIENTRY SampleCoveragexContextANGLE(GLeglContext ctx, GLclampx value, GLboolean invert) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLclampx value = 0x%X, GLboolean invert = %u)", value, invert); Context *context = static_cast(ctx); @@ -12682,6 +13265,7 @@ void GL_APIENTRY SampleCoveragexContextANGLE(GLeglContext ctx, GLclampx value, G void GL_APIENTRY SampleMaskiContextANGLE(GLeglContext ctx, GLuint maskNumber, GLbitfield mask) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint maskNumber = %u, GLbitfield mask = 0x%X)", maskNumber, mask); Context *context = static_cast(ctx); @@ -12702,6 +13286,7 @@ void GL_APIENTRY SamplerParameterfContextANGLE(GLeglContext ctx, GLenum pname, GLfloat param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLfloat param = %f)", sampler, pname, param); Context *context = static_cast(ctx); @@ -12722,6 +13307,7 @@ void GL_APIENTRY SamplerParameterfvContextANGLE(GLeglContext ctx, GLenum pname, const GLfloat *param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLfloat *param = 0x%0.8p)", sampler, pname, param); @@ -12743,6 +13329,7 @@ void GL_APIENTRY SamplerParameteriContextANGLE(GLeglContext ctx, GLenum pname, GLint param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLint param = %d)", sampler, pname, param); Context *context = static_cast(ctx); @@ -12763,6 +13350,7 @@ void GL_APIENTRY SamplerParameterivContextANGLE(GLeglContext ctx, GLenum pname, const GLint *param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLint *param = 0x%0.8p)", sampler, pname, param); @@ -12781,6 +13369,7 @@ void GL_APIENTRY SamplerParameterivContextANGLE(GLeglContext ctx, void GL_APIENTRY ScalefContextANGLE(GLeglContext ctx, GLfloat x, GLfloat y, GLfloat z) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", x, y, z); Context *context = static_cast(ctx); @@ -12798,6 +13387,7 @@ void GL_APIENTRY ScalefContextANGLE(GLeglContext ctx, GLfloat x, GLfloat y, GLfl void GL_APIENTRY ScalexContextANGLE(GLeglContext ctx, GLfixed x, GLfixed y, GLfixed z) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed x = 0x%X, GLfixed y = 0x%X, GLfixed z = 0x%X)", x, y, z); Context *context = static_cast(ctx); @@ -12816,6 +13406,7 @@ void GL_APIENTRY ScalexContextANGLE(GLeglContext ctx, GLfixed x, GLfixed y, GLfi void GL_APIENTRY ScissorContextANGLE(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", x, y, width, height); @@ -12834,6 +13425,7 @@ ScissorContextANGLE(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei h void GL_APIENTRY SetFenceNVContextANGLE(GLeglContext ctx, GLuint fence, GLenum condition) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint fence = %u, GLenum condition = 0x%X)", fence, condition); Context *context = static_cast(ctx); @@ -12851,6 +13443,7 @@ void GL_APIENTRY SetFenceNVContextANGLE(GLeglContext ctx, GLuint fence, GLenum c void GL_APIENTRY ShadeModelContextANGLE(GLeglContext ctx, GLenum mode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum mode = 0x%X)", mode); Context *context = static_cast(ctx); @@ -12874,6 +13467,7 @@ void GL_APIENTRY ShaderBinaryContextANGLE(GLeglContext ctx, const void *binary, GLsizei length) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLsizei count = %d, const GLuint *shaders = 0x%0.8p, GLenum binaryformat = 0x%X, const " "void *binary = 0x%0.8p, GLsizei length = %d)", @@ -12900,6 +13494,7 @@ void GL_APIENTRY ShaderSourceContextANGLE(GLeglContext ctx, const GLchar *const *string, const GLint *length) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint shader = %u, GLsizei count = %d, const GLchar *const*string = 0x%0.8p, const " "GLint *length = 0x%0.8p)", @@ -12921,6 +13516,7 @@ void GL_APIENTRY ShaderSourceContextANGLE(GLeglContext ctx, void GL_APIENTRY StencilFuncContextANGLE(GLeglContext ctx, GLenum func, GLint ref, GLuint mask) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum func = 0x%X, GLint ref = %d, GLuint mask = %u)", func, ref, mask); Context *context = static_cast(ctx); @@ -12939,6 +13535,7 @@ void GL_APIENTRY StencilFuncContextANGLE(GLeglContext ctx, GLenum func, GLint re void GL_APIENTRY StencilFuncSeparateContextANGLE(GLeglContext ctx, GLenum face, GLenum func, GLint ref, GLuint mask) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum face = 0x%X, GLenum func = 0x%X, GLint ref = %d, GLuint mask = %u)", face, func, ref, mask); @@ -12958,6 +13555,7 @@ StencilFuncSeparateContextANGLE(GLeglContext ctx, GLenum face, GLenum func, GLin void GL_APIENTRY StencilMaskContextANGLE(GLeglContext ctx, GLuint mask) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint mask = %u)", mask); Context *context = static_cast(ctx); @@ -12975,6 +13573,7 @@ void GL_APIENTRY StencilMaskContextANGLE(GLeglContext ctx, GLuint mask) void GL_APIENTRY StencilMaskSeparateContextANGLE(GLeglContext ctx, GLenum face, GLuint mask) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum face = 0x%X, GLuint mask = %u)", face, mask); Context *context = static_cast(ctx); @@ -12992,6 +13591,7 @@ void GL_APIENTRY StencilMaskSeparateContextANGLE(GLeglContext ctx, GLenum face, void GL_APIENTRY StencilOpContextANGLE(GLeglContext ctx, GLenum fail, GLenum zfail, GLenum zpass) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum fail = 0x%X, GLenum zfail = 0x%X, GLenum zpass = 0x%X)", fail, zfail, zpass); Context *context = static_cast(ctx); @@ -13013,6 +13613,7 @@ void GL_APIENTRY StencilOpSeparateContextANGLE(GLeglContext ctx, GLenum dpfail, GLenum dppass) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum face = 0x%X, GLenum sfail = 0x%X, GLenum dpfail = 0x%X, GLenum dppass = 0x%X)", face, sfail, dpfail, dppass); @@ -13032,6 +13633,7 @@ void GL_APIENTRY StencilOpSeparateContextANGLE(GLeglContext ctx, GLboolean GL_APIENTRY TestFenceNVContextANGLE(GLeglContext ctx, GLuint fence) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint fence = %u)", fence); Context *context = static_cast(ctx); @@ -13055,6 +13657,7 @@ void GL_APIENTRY TexCoordPointerContextANGLE(GLeglContext ctx, GLsizei stride, const void *pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%0.8p)", size, type, stride, pointer); @@ -13075,6 +13678,7 @@ void GL_APIENTRY TexCoordPointerContextANGLE(GLeglContext ctx, void GL_APIENTRY TexEnvfContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLfloat param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", target, pname, param); Context *context = static_cast(ctx); @@ -13097,6 +13701,7 @@ void GL_APIENTRY TexEnvfvContextANGLE(GLeglContext ctx, GLenum pname, const GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", target, pname, params); @@ -13118,6 +13723,7 @@ void GL_APIENTRY TexEnvfvContextANGLE(GLeglContext ctx, void GL_APIENTRY TexEnviContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLint param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %d)", target, pname, param); Context *context = static_cast(ctx); @@ -13140,6 +13746,7 @@ void GL_APIENTRY TexEnvivContextANGLE(GLeglContext ctx, GLenum pname, const GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%0.8p)", target, pname, params); @@ -13161,6 +13768,7 @@ void GL_APIENTRY TexEnvivContextANGLE(GLeglContext ctx, void GL_APIENTRY TexEnvxContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLfixed param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", target, pname, param); @@ -13184,6 +13792,7 @@ void GL_APIENTRY TexEnvxvContextANGLE(GLeglContext ctx, GLenum pname, const GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%0.8p)", target, pname, params); @@ -13205,6 +13814,7 @@ void GL_APIENTRY TexEnvxvContextANGLE(GLeglContext ctx, void GL_APIENTRY TexGenfOESContextANGLE(GLeglContext ctx, GLenum coord, GLenum pname, GLfloat param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", coord, pname, param); Context *context = static_cast(ctx); @@ -13225,6 +13835,7 @@ void GL_APIENTRY TexGenfvOESContextANGLE(GLeglContext ctx, GLenum pname, const GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", coord, pname, params); @@ -13243,6 +13854,7 @@ void GL_APIENTRY TexGenfvOESContextANGLE(GLeglContext ctx, void GL_APIENTRY TexGeniOESContextANGLE(GLeglContext ctx, GLenum coord, GLenum pname, GLint param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLint param = %d)", coord, pname, param); Context *context = static_cast(ctx); @@ -13263,6 +13875,7 @@ void GL_APIENTRY TexGenivOESContextANGLE(GLeglContext ctx, GLenum pname, const GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%0.8p)", coord, pname, params); @@ -13281,6 +13894,7 @@ void GL_APIENTRY TexGenivOESContextANGLE(GLeglContext ctx, void GL_APIENTRY TexGenxOESContextANGLE(GLeglContext ctx, GLenum coord, GLenum pname, GLfixed param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", coord, pname, param); Context *context = static_cast(ctx); @@ -13301,6 +13915,7 @@ void GL_APIENTRY TexGenxvOESContextANGLE(GLeglContext ctx, GLenum pname, const GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%0.8p)", coord, pname, params); @@ -13328,6 +13943,7 @@ void GL_APIENTRY TexImage2DContextANGLE(GLeglContext ctx, GLenum type, const void *pixels) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, " "GLsizei height = %d, GLint border = %d, GLenum format = 0x%X, GLenum type = 0x%X, const " @@ -13364,6 +13980,7 @@ void GL_APIENTRY TexImage3DContextANGLE(GLeglContext ctx, GLenum type, const void *pixels) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, " "GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLenum format = 0x%X, GLenum " @@ -13393,6 +14010,7 @@ void GL_APIENTRY TexParameterfContextANGLE(GLeglContext ctx, GLenum pname, GLfloat param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", target, pname, param); Context *context = static_cast(ctx); @@ -13414,6 +14032,7 @@ void GL_APIENTRY TexParameterfvContextANGLE(GLeglContext ctx, GLenum pname, const GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", target, pname, params); @@ -13437,6 +14056,7 @@ void GL_APIENTRY TexParameteriContextANGLE(GLeglContext ctx, GLenum pname, GLint param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %d)", target, pname, param); Context *context = static_cast(ctx); @@ -13458,6 +14078,7 @@ void GL_APIENTRY TexParameterivContextANGLE(GLeglContext ctx, GLenum pname, const GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%0.8p)", target, pname, params); @@ -13481,6 +14102,7 @@ void GL_APIENTRY TexParameterxContextANGLE(GLeglContext ctx, GLenum pname, GLfixed param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", target, pname, param); @@ -13503,6 +14125,7 @@ void GL_APIENTRY TexParameterxvContextANGLE(GLeglContext ctx, GLenum pname, const GLfixed *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%0.8p)", target, pname, params); @@ -13527,6 +14150,7 @@ void GL_APIENTRY TexStorage1DEXTContextANGLE(GLeglContext ctx, GLenum internalformat, GLsizei width) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = " "%d)", @@ -13553,6 +14177,7 @@ void GL_APIENTRY TexStorage2DContextANGLE(GLeglContext ctx, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = " "%d, GLsizei height = %d)", @@ -13581,6 +14206,7 @@ void GL_APIENTRY TexStorage2DEXTContextANGLE(GLeglContext ctx, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = " "%d, GLsizei height = %d)", @@ -13610,6 +14236,7 @@ void GL_APIENTRY TexStorage2DMultisampleContextANGLE(GLeglContext ctx, GLsizei height, GLboolean fixedsamplelocations) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width " "= %d, GLsizei height = %d, GLboolean fixedsamplelocations = %u)", @@ -13641,6 +14268,7 @@ void GL_APIENTRY TexStorage3DContextANGLE(GLeglContext ctx, GLsizei height, GLsizei depth) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = " "%d, GLsizei height = %d, GLsizei depth = %d)", @@ -13670,6 +14298,7 @@ void GL_APIENTRY TexStorage3DEXTContextANGLE(GLeglContext ctx, GLsizei height, GLsizei depth) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = " "%d, GLsizei height = %d, GLsizei depth = %d)", @@ -13701,6 +14330,7 @@ void GL_APIENTRY TexStorage3DMultisampleOESContextANGLE(GLeglContext ctx, GLsizei depth, GLboolean fixedsamplelocations) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width " "= %d, GLsizei height = %d, GLsizei depth = %d, GLboolean fixedsamplelocations = %u)", @@ -13735,6 +14365,7 @@ void GL_APIENTRY TexSubImage2DContextANGLE(GLeglContext ctx, GLenum type, const void *pixels) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLsizei " "width = %d, GLsizei height = %d, GLenum format = 0x%X, GLenum type = 0x%X, const void " @@ -13772,6 +14403,7 @@ void GL_APIENTRY TexSubImage3DContextANGLE(GLeglContext ctx, GLenum type, const void *pixels) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint " "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format " @@ -13803,6 +14435,7 @@ void GL_APIENTRY TransformFeedbackVaryingsContextANGLE(GLeglContext ctx, const GLchar *const *varyings, GLenum bufferMode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLsizei count = %d, const GLchar *const*varyings = 0x%0.8p, GLenum " "bufferMode = 0x%X)", @@ -13825,6 +14458,7 @@ void GL_APIENTRY TransformFeedbackVaryingsContextANGLE(GLeglContext ctx, void GL_APIENTRY TranslatefContextANGLE(GLeglContext ctx, GLfloat x, GLfloat y, GLfloat z) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", x, y, z); Context *context = static_cast(ctx); @@ -13842,6 +14476,7 @@ void GL_APIENTRY TranslatefContextANGLE(GLeglContext ctx, GLfloat x, GLfloat y, void GL_APIENTRY TranslatexContextANGLE(GLeglContext ctx, GLfixed x, GLfixed y, GLfixed z) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLfixed x = 0x%X, GLfixed y = 0x%X, GLfixed z = 0x%X)", x, y, z); Context *context = static_cast(ctx); @@ -13859,6 +14494,7 @@ void GL_APIENTRY TranslatexContextANGLE(GLeglContext ctx, GLfixed x, GLfixed y, void GL_APIENTRY Uniform1fContextANGLE(GLeglContext ctx, GLint location, GLfloat v0) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLfloat v0 = %f)", location, v0); Context *context = static_cast(ctx); @@ -13879,6 +14515,7 @@ void GL_APIENTRY Uniform1fvContextANGLE(GLeglContext ctx, GLsizei count, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%0.8p)", location, count, value); @@ -13897,6 +14534,7 @@ void GL_APIENTRY Uniform1fvContextANGLE(GLeglContext ctx, void GL_APIENTRY Uniform1iContextANGLE(GLeglContext ctx, GLint location, GLint v0) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLint v0 = %d)", location, v0); Context *context = static_cast(ctx); @@ -13917,6 +14555,7 @@ void GL_APIENTRY Uniform1ivContextANGLE(GLeglContext ctx, GLsizei count, const GLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%0.8p)", location, count, value); @@ -13935,6 +14574,7 @@ void GL_APIENTRY Uniform1ivContextANGLE(GLeglContext ctx, void GL_APIENTRY Uniform1uiContextANGLE(GLeglContext ctx, GLint location, GLuint v0) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLuint v0 = %u)", location, v0); Context *context = static_cast(ctx); @@ -13955,6 +14595,7 @@ void GL_APIENTRY Uniform1uivContextANGLE(GLeglContext ctx, GLsizei count, const GLuint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%0.8p)", location, count, value); @@ -13973,6 +14614,7 @@ void GL_APIENTRY Uniform1uivContextANGLE(GLeglContext ctx, void GL_APIENTRY Uniform2fContextANGLE(GLeglContext ctx, GLint location, GLfloat v0, GLfloat v1) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f)", location, v0, v1); Context *context = static_cast(ctx); @@ -13993,6 +14635,7 @@ void GL_APIENTRY Uniform2fvContextANGLE(GLeglContext ctx, GLsizei count, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%0.8p)", location, count, value); @@ -14011,6 +14654,7 @@ void GL_APIENTRY Uniform2fvContextANGLE(GLeglContext ctx, void GL_APIENTRY Uniform2iContextANGLE(GLeglContext ctx, GLint location, GLint v0, GLint v1) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLint v0 = %d, GLint v1 = %d)", location, v0, v1); Context *context = static_cast(ctx); @@ -14031,6 +14675,7 @@ void GL_APIENTRY Uniform2ivContextANGLE(GLeglContext ctx, GLsizei count, const GLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%0.8p)", location, count, value); @@ -14049,6 +14694,7 @@ void GL_APIENTRY Uniform2ivContextANGLE(GLeglContext ctx, void GL_APIENTRY Uniform2uiContextANGLE(GLeglContext ctx, GLint location, GLuint v0, GLuint v1) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u)", location, v0, v1); Context *context = static_cast(ctx); @@ -14069,6 +14715,7 @@ void GL_APIENTRY Uniform2uivContextANGLE(GLeglContext ctx, GLsizei count, const GLuint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%0.8p)", location, count, value); @@ -14088,6 +14735,7 @@ void GL_APIENTRY Uniform2uivContextANGLE(GLeglContext ctx, void GL_APIENTRY Uniform3fContextANGLE(GLeglContext ctx, GLint location, GLfloat v0, GLfloat v1, GLfloat v2) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = %f)", location, v0, v1, v2); @@ -14109,6 +14757,7 @@ void GL_APIENTRY Uniform3fvContextANGLE(GLeglContext ctx, GLsizei count, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%0.8p)", location, count, value); @@ -14128,6 +14777,7 @@ void GL_APIENTRY Uniform3fvContextANGLE(GLeglContext ctx, void GL_APIENTRY Uniform3iContextANGLE(GLeglContext ctx, GLint location, GLint v0, GLint v1, GLint v2) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d)", location, v0, v1, v2); @@ -14149,6 +14799,7 @@ void GL_APIENTRY Uniform3ivContextANGLE(GLeglContext ctx, GLsizei count, const GLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%0.8p)", location, count, value); @@ -14168,6 +14819,7 @@ void GL_APIENTRY Uniform3ivContextANGLE(GLeglContext ctx, void GL_APIENTRY Uniform3uiContextANGLE(GLeglContext ctx, GLint location, GLuint v0, GLuint v1, GLuint v2) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = %u)", location, v0, v1, v2); @@ -14189,6 +14841,7 @@ void GL_APIENTRY Uniform3uivContextANGLE(GLeglContext ctx, GLsizei count, const GLuint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%0.8p)", location, count, value); @@ -14212,6 +14865,7 @@ void GL_APIENTRY Uniform4fContextANGLE(GLeglContext ctx, GLfloat v2, GLfloat v3) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = %f, GLfloat v3 = %f)", location, v0, v1, v2, v3); @@ -14234,6 +14888,7 @@ void GL_APIENTRY Uniform4fvContextANGLE(GLeglContext ctx, GLsizei count, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%0.8p)", location, count, value); @@ -14253,6 +14908,7 @@ void GL_APIENTRY Uniform4fvContextANGLE(GLeglContext ctx, void GL_APIENTRY Uniform4iContextANGLE(GLeglContext ctx, GLint location, GLint v0, GLint v1, GLint v2, GLint v3) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d, GLint v3 = %d)", location, v0, v1, v2, v3); @@ -14274,6 +14930,7 @@ void GL_APIENTRY Uniform4ivContextANGLE(GLeglContext ctx, GLsizei count, const GLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%0.8p)", location, count, value); @@ -14293,6 +14950,7 @@ void GL_APIENTRY Uniform4ivContextANGLE(GLeglContext ctx, void GL_APIENTRY Uniform4uiContextANGLE(GLeglContext ctx, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = %u, GLuint v3 = %u)", location, v0, v1, v2, v3); @@ -14314,6 +14972,7 @@ void GL_APIENTRY Uniform4uivContextANGLE(GLeglContext ctx, GLsizei count, const GLuint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%0.8p)", location, count, value); @@ -14335,6 +14994,7 @@ void GL_APIENTRY UniformBlockBindingContextANGLE(GLeglContext ctx, GLuint uniformBlockIndex, GLuint uniformBlockBinding) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLuint uniformBlockIndex = %u, GLuint uniformBlockBinding = %u)", program, uniformBlockIndex, uniformBlockBinding); @@ -14359,6 +15019,7 @@ void GL_APIENTRY UniformMatrix2fvContextANGLE(GLeglContext ctx, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "= 0x%0.8p)", @@ -14384,6 +15045,7 @@ void GL_APIENTRY UniformMatrix2x3fvContextANGLE(GLeglContext ctx, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "= 0x%0.8p)", @@ -14409,6 +15071,7 @@ void GL_APIENTRY UniformMatrix2x4fvContextANGLE(GLeglContext ctx, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "= 0x%0.8p)", @@ -14434,6 +15097,7 @@ void GL_APIENTRY UniformMatrix3fvContextANGLE(GLeglContext ctx, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "= 0x%0.8p)", @@ -14459,6 +15123,7 @@ void GL_APIENTRY UniformMatrix3x2fvContextANGLE(GLeglContext ctx, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "= 0x%0.8p)", @@ -14484,6 +15149,7 @@ void GL_APIENTRY UniformMatrix3x4fvContextANGLE(GLeglContext ctx, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "= 0x%0.8p)", @@ -14509,6 +15175,7 @@ void GL_APIENTRY UniformMatrix4fvContextANGLE(GLeglContext ctx, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "= 0x%0.8p)", @@ -14534,6 +15201,7 @@ void GL_APIENTRY UniformMatrix4x2fvContextANGLE(GLeglContext ctx, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "= 0x%0.8p)", @@ -14559,6 +15227,7 @@ void GL_APIENTRY UniformMatrix4x3fvContextANGLE(GLeglContext ctx, GLboolean transpose, const GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "= 0x%0.8p)", @@ -14580,6 +15249,7 @@ void GL_APIENTRY UniformMatrix4x3fvContextANGLE(GLeglContext ctx, GLboolean GL_APIENTRY UnmapBufferContextANGLE(GLeglContext ctx, GLenum target) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X)", target); Context *context = static_cast(ctx); @@ -14600,6 +15270,7 @@ GLboolean GL_APIENTRY UnmapBufferContextANGLE(GLeglContext ctx, GLenum target) GLboolean GL_APIENTRY UnmapBufferOESContextANGLE(GLeglContext ctx, GLenum target) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum target = 0x%X)", target); Context *context = static_cast(ctx); @@ -14620,6 +15291,7 @@ GLboolean GL_APIENTRY UnmapBufferOESContextANGLE(GLeglContext ctx, GLenum target void GL_APIENTRY UseProgramContextANGLE(GLeglContext ctx, GLuint program) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u)", program); Context *context = static_cast(ctx); @@ -14640,6 +15312,7 @@ void GL_APIENTRY UseProgramStagesContextANGLE(GLeglContext ctx, GLbitfield stages, GLuint program) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint pipeline = %u, GLbitfield stages = 0x%X, GLuint program = %u)", pipeline, stages, program); @@ -14659,6 +15332,7 @@ void GL_APIENTRY UseProgramStagesContextANGLE(GLeglContext ctx, void GL_APIENTRY ValidateProgramContextANGLE(GLeglContext ctx, GLuint program) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u)", program); Context *context = static_cast(ctx); @@ -14676,6 +15350,7 @@ void GL_APIENTRY ValidateProgramContextANGLE(GLeglContext ctx, GLuint program) void GL_APIENTRY ValidateProgramPipelineContextANGLE(GLeglContext ctx, GLuint pipeline) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint pipeline = %u)", pipeline); Context *context = static_cast(ctx); @@ -14693,6 +15368,7 @@ void GL_APIENTRY ValidateProgramPipelineContextANGLE(GLeglContext ctx, GLuint pi void GL_APIENTRY VertexAttrib1fContextANGLE(GLeglContext ctx, GLuint index, GLfloat x) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLfloat x = %f)", index, x); Context *context = static_cast(ctx); @@ -14710,6 +15386,7 @@ void GL_APIENTRY VertexAttrib1fContextANGLE(GLeglContext ctx, GLuint index, GLfl void GL_APIENTRY VertexAttrib1fvContextANGLE(GLeglContext ctx, GLuint index, const GLfloat *v) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v); Context *context = static_cast(ctx); @@ -14727,6 +15404,7 @@ void GL_APIENTRY VertexAttrib1fvContextANGLE(GLeglContext ctx, GLuint index, con void GL_APIENTRY VertexAttrib2fContextANGLE(GLeglContext ctx, GLuint index, GLfloat x, GLfloat y) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLfloat x = %f, GLfloat y = %f)", index, x, y); Context *context = static_cast(ctx); @@ -14744,6 +15422,7 @@ void GL_APIENTRY VertexAttrib2fContextANGLE(GLeglContext ctx, GLuint index, GLfl void GL_APIENTRY VertexAttrib2fvContextANGLE(GLeglContext ctx, GLuint index, const GLfloat *v) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v); Context *context = static_cast(ctx); @@ -14762,6 +15441,7 @@ void GL_APIENTRY VertexAttrib2fvContextANGLE(GLeglContext ctx, GLuint index, con void GL_APIENTRY VertexAttrib3fContextANGLE(GLeglContext ctx, GLuint index, GLfloat x, GLfloat y, GLfloat z) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", index, x, y, z); Context *context = static_cast(ctx); @@ -14779,6 +15459,7 @@ VertexAttrib3fContextANGLE(GLeglContext ctx, GLuint index, GLfloat x, GLfloat y, void GL_APIENTRY VertexAttrib3fvContextANGLE(GLeglContext ctx, GLuint index, const GLfloat *v) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v); Context *context = static_cast(ctx); @@ -14801,6 +15482,7 @@ void GL_APIENTRY VertexAttrib4fContextANGLE(GLeglContext ctx, GLfloat z, GLfloat w) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f, GLfloat w = %f)", index, x, y, z, w); @@ -14819,6 +15501,7 @@ void GL_APIENTRY VertexAttrib4fContextANGLE(GLeglContext ctx, void GL_APIENTRY VertexAttrib4fvContextANGLE(GLeglContext ctx, GLuint index, const GLfloat *v) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v); Context *context = static_cast(ctx); @@ -14838,6 +15521,7 @@ void GL_APIENTRY VertexAttribBindingContextANGLE(GLeglContext ctx, GLuint attribindex, GLuint bindingindex) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint attribindex = %u, GLuint bindingindex = %u)", attribindex, bindingindex); Context *context = static_cast(ctx); @@ -14856,6 +15540,7 @@ void GL_APIENTRY VertexAttribBindingContextANGLE(GLeglContext ctx, void GL_APIENTRY VertexAttribDivisorContextANGLE(GLeglContext ctx, GLuint index, GLuint divisor) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLuint divisor = %u)", index, divisor); Context *context = static_cast(ctx); @@ -14875,6 +15560,7 @@ void GL_APIENTRY VertexAttribDivisorANGLEContextANGLE(GLeglContext ctx, GLuint index, GLuint divisor) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLuint divisor = %u)", index, divisor); Context *context = static_cast(ctx); @@ -14897,6 +15583,7 @@ void GL_APIENTRY VertexAttribFormatContextANGLE(GLeglContext ctx, GLboolean normalized, GLuint relativeoffset) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint attribindex = %u, GLint size = %d, GLenum type = 0x%X, GLboolean normalized = %u, " "GLuint relativeoffset = %u)", @@ -14921,6 +15608,7 @@ void GL_APIENTRY VertexAttribFormatContextANGLE(GLeglContext ctx, void GL_APIENTRY VertexAttribI4iContextANGLE(GLeglContext ctx, GLuint index, GLint x, GLint y, GLint z, GLint w) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLint x = %d, GLint y = %d, GLint z = %d, GLint w = %d)", index, x, y, z, w); @@ -14939,6 +15627,7 @@ VertexAttribI4iContextANGLE(GLeglContext ctx, GLuint index, GLint x, GLint y, GL void GL_APIENTRY VertexAttribI4ivContextANGLE(GLeglContext ctx, GLuint index, const GLint *v) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, const GLint *v = 0x%0.8p)", index, v); Context *context = static_cast(ctx); @@ -14957,6 +15646,7 @@ void GL_APIENTRY VertexAttribI4ivContextANGLE(GLeglContext ctx, GLuint index, co void GL_APIENTRY VertexAttribI4uiContextANGLE(GLeglContext ctx, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, GLuint x = %u, GLuint y = %u, GLuint z = %u, GLuint w = %u)", index, x, y, z, w); @@ -14975,6 +15665,7 @@ VertexAttribI4uiContextANGLE(GLeglContext ctx, GLuint index, GLuint x, GLuint y, void GL_APIENTRY VertexAttribI4uivContextANGLE(GLeglContext ctx, GLuint index, const GLuint *v) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint index = %u, const GLuint *v = 0x%0.8p)", index, v); Context *context = static_cast(ctx); @@ -14996,6 +15687,7 @@ void GL_APIENTRY VertexAttribIFormatContextANGLE(GLeglContext ctx, GLenum type, GLuint relativeoffset) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint attribindex = %u, GLint size = %d, GLenum type = 0x%X, GLuint relativeoffset = " "%u)", @@ -15023,6 +15715,7 @@ void GL_APIENTRY VertexAttribIPointerContextANGLE(GLeglContext ctx, GLsizei stride, const void *pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint index = %u, GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void " "*pointer = 0x%0.8p)", @@ -15050,6 +15743,7 @@ void GL_APIENTRY VertexAttribPointerContextANGLE(GLeglContext ctx, GLsizei stride, const void *pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint index = %u, GLint size = %d, GLenum type = 0x%X, GLboolean normalized = %u, " "GLsizei stride = %d, const void *pointer = 0x%0.8p)", @@ -15074,6 +15768,7 @@ void GL_APIENTRY VertexBindingDivisorContextANGLE(GLeglContext ctx, GLuint bindingindex, GLuint divisor) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint bindingindex = %u, GLuint divisor = %u)", bindingindex, divisor); Context *context = static_cast(ctx); @@ -15096,6 +15791,7 @@ void GL_APIENTRY VertexPointerContextANGLE(GLeglContext ctx, GLsizei stride, const void *pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%0.8p)", size, type, stride, pointer); @@ -15117,6 +15813,7 @@ void GL_APIENTRY VertexPointerContextANGLE(GLeglContext ctx, void GL_APIENTRY ViewportContextANGLE(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei height) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", x, y, width, height); @@ -15138,6 +15835,7 @@ void GL_APIENTRY WaitSyncContextANGLE(GLeglContext ctx, GLbitfield flags, GLuint64 timeout) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsync sync = 0x%0.8p, GLbitfield flags = 0x%X, GLuint64 timeout = %llu)", sync, flags, timeout); @@ -15160,6 +15858,7 @@ void GL_APIENTRY WeightPointerOESContextANGLE(GLeglContext ctx, GLsizei stride, const void *pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%0.8p)", size, type, stride, pointer); @@ -15183,6 +15882,7 @@ void GL_APIENTRY BindUniformLocationCHROMIUMContextANGLE(GLeglContext ctx, GLint location, const GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint program = %u, GLint location = %d, const GLchar* name = 0x%0.8p)", program, location, name); @@ -15202,6 +15902,7 @@ void GL_APIENTRY BindUniformLocationCHROMIUMContextANGLE(GLeglContext ctx, void GL_APIENTRY CoverageModulationCHROMIUMContextANGLE(GLeglContext ctx, GLenum components) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum components = 0x%X)", components); Context *context = static_cast(ctx); @@ -15221,6 +15922,7 @@ void GL_APIENTRY MatrixLoadfCHROMIUMContextANGLE(GLeglContext ctx, GLenum matrixMode, const GLfloat *matrix) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum matrixMode = 0x%X, const GLfloat * matrix = 0x%0.8p)", matrixMode, matrix); Context *context = static_cast(ctx); @@ -15238,6 +15940,7 @@ void GL_APIENTRY MatrixLoadfCHROMIUMContextANGLE(GLeglContext ctx, void GL_APIENTRY MatrixLoadIdentityCHROMIUMContextANGLE(GLeglContext ctx, GLenum matrixMode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum matrixMode = 0x%X)", matrixMode); Context *context = static_cast(ctx); @@ -15255,6 +15958,7 @@ void GL_APIENTRY MatrixLoadIdentityCHROMIUMContextANGLE(GLeglContext ctx, GLenum GLuint GL_APIENTRY GenPathsCHROMIUMContextANGLE(GLeglContext ctx, GLsizei range) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLsizei range = %d)", range); Context *context = static_cast(ctx); @@ -15274,6 +15978,7 @@ GLuint GL_APIENTRY GenPathsCHROMIUMContextANGLE(GLeglContext ctx, GLsizei range) void GL_APIENTRY DeletePathsCHROMIUMContextANGLE(GLeglContext ctx, GLuint first, GLsizei range) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint first = %u, GLsizei range = %d)", first, range); Context *context = static_cast(ctx); @@ -15291,6 +15996,7 @@ void GL_APIENTRY DeletePathsCHROMIUMContextANGLE(GLeglContext ctx, GLuint first, GLboolean GL_APIENTRY IsPathCHROMIUMContextANGLE(GLeglContext ctx, GLuint path) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u)", path); Context *context = static_cast(ctx); @@ -15316,6 +16022,7 @@ void GL_APIENTRY PathCommandsCHROMIUMContextANGLE(GLeglContext ctx, GLenum coordType, const void *coords) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint path = %u, GLsizei numCommands = %d, const GLubyte * commands = 0x%0.8p, GLsizei " "numCoords = %d, GLenum coordType = 0x%X, const void* coords = 0x%0.8p)", @@ -15342,6 +16049,7 @@ void GL_APIENTRY PathParameterfCHROMIUMContextANGLE(GLeglContext ctx, GLenum pname, GLfloat value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u, GLenum pname = 0x%X, GLfloat value = %f)", path, pname, value); Context *context = static_cast(ctx); @@ -15363,6 +16071,7 @@ void GL_APIENTRY PathParameteriCHROMIUMContextANGLE(GLeglContext ctx, GLenum pname, GLint value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u, GLenum pname = 0x%X, GLint value = %d)", path, pname, value); Context *context = static_cast(ctx); @@ -15384,6 +16093,7 @@ void GL_APIENTRY GetPathParameterfvCHROMIUMContextANGLE(GLeglContext ctx, GLenum pname, GLfloat *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u, GLenum pname = 0x%X, GLfloat * value = 0x%0.8p)", path, pname, value); Context *context = static_cast(ctx); @@ -15405,6 +16115,7 @@ void GL_APIENTRY GetPathParameterivCHROMIUMContextANGLE(GLeglContext ctx, GLenum pname, GLint *value) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u, GLenum pname = 0x%X, GLint * value = 0x%0.8p)", path, pname, value); Context *context = static_cast(ctx); @@ -15426,6 +16137,7 @@ void GL_APIENTRY PathStencilFuncCHROMIUMContextANGLE(GLeglContext ctx, GLint ref, GLuint mask) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLenum func = 0x%X, GLint ref = %d, GLuint mask = %u)", func, ref, mask); Context *context = static_cast(ctx); @@ -15446,6 +16158,7 @@ void GL_APIENTRY StencilFillPathCHROMIUMContextANGLE(GLeglContext ctx, GLenum fillMode, GLuint mask) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u, GLenum fillMode = 0x%X, GLuint mask = %u)", path, fillMode, mask); Context *context = static_cast(ctx); @@ -15467,6 +16180,7 @@ void GL_APIENTRY StencilStrokePathCHROMIUMContextANGLE(GLeglContext ctx, GLint reference, GLuint mask) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u, GLint reference = %d, GLuint mask = %u)", path, reference, mask); Context *context = static_cast(ctx); @@ -15485,6 +16199,7 @@ void GL_APIENTRY StencilStrokePathCHROMIUMContextANGLE(GLeglContext ctx, void GL_APIENTRY CoverFillPathCHROMIUMContextANGLE(GLeglContext ctx, GLuint path, GLenum coverMode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u, GLenum coverMode = 0x%X)", path, coverMode); Context *context = static_cast(ctx); @@ -15504,6 +16219,7 @@ void GL_APIENTRY CoverStrokePathCHROMIUMContextANGLE(GLeglContext ctx, GLuint path, GLenum coverMode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u, GLenum coverMode = 0x%X)", path, coverMode); Context *context = static_cast(ctx); @@ -15525,6 +16241,7 @@ void GL_APIENTRY StencilThenCoverFillPathCHROMIUMContextANGLE(GLeglContext ctx, GLuint mask, GLenum coverMode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u, GLenum fillMode = 0x%X, GLuint mask = %u, GLenum coverMode = 0x%X)", path, fillMode, mask, coverMode); @@ -15549,6 +16266,7 @@ void GL_APIENTRY StencilThenCoverStrokePathCHROMIUMContextANGLE(GLeglContext ctx GLuint mask, GLenum coverMode) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint path = %u, GLint reference = %d, GLuint mask = %u, GLenum coverMode = 0x%X)", path, reference, mask, coverMode); @@ -15576,6 +16294,7 @@ void GL_APIENTRY CoverFillPathInstancedCHROMIUMContextANGLE(GLeglContext ctx, GLenum transformType, const GLfloat *transformValues) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLsizei numPath = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%0.8p, GLuint " "pathBase = %u, GLenum coverMode = 0x%X, GLenum transformType = 0x%X, const GLfloat * " @@ -15608,6 +16327,7 @@ void GL_APIENTRY CoverStrokePathInstancedCHROMIUMContextANGLE(GLeglContext ctx, GLenum transformType, const GLfloat *transformValues) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLsizei numPath = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%0.8p, GLuint " "pathBase = %u, GLenum coverMode = 0x%X, GLenum transformType = 0x%X, const GLfloat * " @@ -15641,6 +16361,7 @@ void GL_APIENTRY StencilStrokePathInstancedCHROMIUMContextANGLE(GLeglContext ctx GLenum transformType, const GLfloat *transformValues) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLsizei numPath = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%0.8p, GLuint " "pathBase = %u, GLint reference = %d, GLuint mask = %u, GLenum transformType = 0x%X, const " @@ -15675,6 +16396,7 @@ void GL_APIENTRY StencilFillPathInstancedCHROMIUMContextANGLE(GLeglContext ctx, GLenum transformType, const GLfloat *transformValues) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLsizei numPaths = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%0.8p, GLuint " "pathBase = %u, GLenum fillMode = 0x%X, GLuint mask = %u, GLenum transformType = 0x%X, " @@ -15711,6 +16433,7 @@ StencilThenCoverFillPathInstancedCHROMIUMContextANGLE(GLeglContext ctx, GLenum transformType, const GLfloat *transformValues) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLsizei numPaths = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%0.8p, GLuint " "pathBase = %u, GLenum fillMode = 0x%X, GLuint mask = %u, GLenum coverMode = 0x%X, GLenum " @@ -15750,6 +16473,7 @@ StencilThenCoverStrokePathInstancedCHROMIUMContextANGLE(GLeglContext ctx, GLenum transformType, const GLfloat *transformValues) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLsizei numPaths = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%0.8p, GLuint " "pathBase = %u, GLint reference = %d, GLuint mask = %u, GLenum coverMode = 0x%X, GLenum " @@ -15782,6 +16506,7 @@ void GL_APIENTRY BindFragmentInputLocationCHROMIUMContextANGLE(GLeglContext ctx, GLint location, const GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint programs = %u, GLint location = %d, const GLchar * name = 0x%0.8p)", programs, location, name); @@ -15807,6 +16532,7 @@ void GL_APIENTRY ProgramPathFragmentInputGenCHROMIUMContextANGLE(GLeglContext ct GLint components, const GLfloat *coeffs) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLenum genMode = 0x%X, GLint components = %d, " "const GLfloat * coeffs = 0x%0.8p)", @@ -15840,6 +16566,7 @@ void GL_APIENTRY CopyTextureCHROMIUMContextANGLE(GLeglContext ctx, GLboolean unpackPremultiplyAlpha, GLboolean unpackUnmultiplyAlpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sourceId = %u, GLint sourceLevel = %d, GLenum destTarget = 0x%X, GLuint destId = " "%u, GLint destLevel = %d, GLint internalFormat = %d, GLenum destType = 0x%X, GLboolean " @@ -15885,6 +16612,7 @@ void GL_APIENTRY CopySubTextureCHROMIUMContextANGLE(GLeglContext ctx, GLboolean unpackPremultiplyAlpha, GLboolean unpackUnmultiplyAlpha) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sourceId = %u, GLint sourceLevel = %d, GLenum destTarget = 0x%X, GLuint destId = " "%u, GLint destLevel = %d, GLint xoffset = %d, GLint yoffset = %d, GLint x = %d, GLint y = " @@ -15919,6 +16647,7 @@ void GL_APIENTRY CompressedCopyTextureCHROMIUMContextANGLE(GLeglContext ctx, GLuint sourceId, GLuint destId) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(GLuint sourceId = %u, GLuint destId = %u)", sourceId, destId); Context *context = static_cast(ctx); @@ -15937,6 +16666,7 @@ void GL_APIENTRY CompressedCopyTextureCHROMIUMContextANGLE(GLeglContext ctx, void GL_APIENTRY RequestExtensionANGLEContextANGLE(GLeglContext ctx, const GLchar *name) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT("(const GLchar * name = 0x%0.8p)", name); Context *context = static_cast(ctx); @@ -15958,6 +16688,7 @@ void GL_APIENTRY GetBooleanvRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLboolean *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, GLboolean * " "params = 0x%0.8p)", @@ -15984,6 +16715,7 @@ void GL_APIENTRY GetBufferParameterivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -16011,6 +16743,7 @@ void GL_APIENTRY GetFloatvRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, GLfloat * params " "= 0x%0.8p)", @@ -16038,6 +16771,7 @@ void GL_APIENTRY GetFramebufferAttachmentParameterivRobustANGLEContextANGLE(GLeg GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = " "%d, GLsizei * length = 0x%0.8p, GLint * params = 0x%0.8p)", @@ -16066,6 +16800,7 @@ void GL_APIENTRY GetIntegervRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, GLint * data = " "0x%0.8p)", @@ -16092,6 +16827,7 @@ void GL_APIENTRY GetProgramivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -16119,6 +16855,7 @@ void GL_APIENTRY GetRenderbufferParameterivRobustANGLEContextANGLE(GLeglContext GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -16146,6 +16883,7 @@ void GL_APIENTRY GetShaderivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint shader = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -16173,6 +16911,7 @@ void GL_APIENTRY GetTexParameterfvRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLfloat * params = 0x%0.8p)", @@ -16201,6 +16940,7 @@ void GL_APIENTRY GetTexParameterivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -16229,6 +16969,7 @@ void GL_APIENTRY GetUniformfvRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLfloat * params = 0x%0.8p)", @@ -16256,6 +16997,7 @@ void GL_APIENTRY GetUniformivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -16283,6 +17025,7 @@ void GL_APIENTRY GetVertexAttribfvRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLfloat * params = 0x%0.8p)", @@ -16310,6 +17053,7 @@ void GL_APIENTRY GetVertexAttribivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -16337,6 +17081,7 @@ void GL_APIENTRY GetVertexAttribPointervRobustANGLEContextANGLE(GLeglContext ctx GLsizei *length, void **pointer) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, void ** pointer = 0x%0.8p)", @@ -16370,6 +17115,7 @@ void GL_APIENTRY ReadPixelsRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *rows, void *pixels) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = " "0x%X, GLenum type = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, GLsizei * " @@ -16405,6 +17151,7 @@ void GL_APIENTRY TexImage2DRobustANGLEContextANGLE(GLeglContext ctx, GLsizei bufSize, const void *pixels) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, " "GLsizei height = %d, GLint border = %d, GLenum format = 0x%X, GLenum type = 0x%X, GLsizei " @@ -16436,6 +17183,7 @@ void GL_APIENTRY TexParameterfvRobustANGLEContextANGLE(GLeglContext ctx, GLsizei bufSize, const GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLfloat * params " "= 0x%0.8p)", @@ -16463,6 +17211,7 @@ void GL_APIENTRY TexParameterivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei bufSize, const GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLint * params = " "0x%0.8p)", @@ -16496,6 +17245,7 @@ void GL_APIENTRY TexSubImage2DRobustANGLEContextANGLE(GLeglContext ctx, GLsizei bufSize, const void *pixels) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLsizei " "width = %d, GLsizei height = %d, GLenum format = 0x%X, GLenum type = 0x%X, GLsizei " @@ -16533,6 +17283,7 @@ void GL_APIENTRY TexImage3DRobustANGLEContextANGLE(GLeglContext ctx, GLsizei bufSize, const void *pixels) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, " "GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLenum format = 0x%X, GLenum " @@ -16572,6 +17323,7 @@ void GL_APIENTRY TexSubImage3DRobustANGLEContextANGLE(GLeglContext ctx, GLsizei bufSize, const void *pixels) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint " "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format " @@ -16610,6 +17362,7 @@ void GL_APIENTRY CompressedTexImage2DRobustANGLEContextANGLE(GLeglContext ctx, GLsizei dataSize, const GLvoid *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = " "%d, GLsizei height = %d, GLint border = %d, GLsizei imageSize = %d, GLsizei dataSize = " @@ -16646,6 +17399,7 @@ void GL_APIENTRY CompressedTexSubImage2DRobustANGLEContextANGLE(GLeglContext ctx GLsizei dataSize, const GLvoid *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLsizei xoffset = %d, GLsizei yoffset = %d, " "GLsizei width = %d, GLsizei height = %d, GLenum format = 0x%X, GLsizei imageSize = %d, " @@ -16683,6 +17437,7 @@ void GL_APIENTRY CompressedTexImage3DRobustANGLEContextANGLE(GLeglContext ctx, GLsizei dataSize, const GLvoid *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = " "%d, GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLsizei imageSize = %d, " @@ -16722,6 +17477,7 @@ void GL_APIENTRY CompressedTexSubImage3DRobustANGLEContextANGLE(GLeglContext ctx GLsizei dataSize, const GLvoid *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint " "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format " @@ -16757,6 +17513,7 @@ void GL_APIENTRY GetQueryivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -16785,6 +17542,7 @@ void GL_APIENTRY GetQueryObjectuivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint id = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, " "GLuint * params = 0x%0.8p)", @@ -16812,6 +17570,7 @@ void GL_APIENTRY GetBufferPointervRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, void **params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, void ** params = 0x%0.8p)", @@ -16840,6 +17599,7 @@ void GL_APIENTRY GetIntegeri_vRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLuint index = %u, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * data = 0x%0.8p)", @@ -16868,6 +17628,7 @@ void GL_APIENTRY GetInternalformativRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLenum pname = 0x%X, GLsizei bufSize " "= %d, GLsizei * length = 0x%0.8p, GLint * params = 0x%0.8p)", @@ -16897,6 +17658,7 @@ void GL_APIENTRY GetVertexAttribIivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -16924,6 +17686,7 @@ void GL_APIENTRY GetVertexAttribIuivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLuint * params = 0x%0.8p)", @@ -16951,6 +17714,7 @@ void GL_APIENTRY GetUniformuivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLuint * params = 0x%0.8p)", @@ -16979,6 +17743,7 @@ void GL_APIENTRY GetActiveUniformBlockivRobustANGLEContextANGLE(GLeglContext ctx GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLuint uniformBlockIndex = %u, GLenum pname = 0x%X, GLsizei bufSize " "= %d, GLsizei * length = 0x%0.8p, GLint * params = 0x%0.8p)", @@ -17007,6 +17772,7 @@ void GL_APIENTRY GetInteger64vRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint64 *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, GLint64 * data = " "0x%0.8p)", @@ -17033,6 +17799,7 @@ void GL_APIENTRY GetInteger64i_vRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint64 *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLuint index = %u, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint64 * data = 0x%0.8p)", @@ -17060,6 +17827,7 @@ void GL_APIENTRY GetBufferParameteri64vRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint64 *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint64 * params = 0x%0.8p)", @@ -17087,6 +17855,7 @@ void GL_APIENTRY SamplerParameterivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei bufSize, const GLint *param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sampler = %u, GLuint pname = %u, GLsizei bufSize = %d, const GLint * param = " "0x%0.8p)", @@ -17113,6 +17882,7 @@ void GL_APIENTRY SamplerParameterfvRobustANGLEContextANGLE(GLeglContext ctx, GLsizei bufSize, const GLfloat *param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLfloat * param = " "0x%0.8p)", @@ -17140,6 +17910,7 @@ void GL_APIENTRY GetSamplerParameterivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -17167,6 +17938,7 @@ void GL_APIENTRY GetSamplerParameterfvRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLfloat * params = 0x%0.8p)", @@ -17194,6 +17966,7 @@ void GL_APIENTRY GetFramebufferParameterivRobustANGLEContextANGLE(GLeglContext c GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -17222,6 +17995,7 @@ void GL_APIENTRY GetProgramInterfaceivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLenum programInterface = 0x%X, GLenum pname = 0x%X, GLsizei " "bufSize = %d, GLsizei * length = 0x%0.8p, GLint * params = 0x%0.8p)", @@ -17251,6 +18025,7 @@ void GL_APIENTRY GetBooleani_vRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLboolean *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLuint index = %u, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLboolean * data = 0x%0.8p)", @@ -17278,6 +18053,7 @@ void GL_APIENTRY GetMultisamplefvRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLfloat *val) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum pname = 0x%X, GLuint index = %u, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLfloat * val = 0x%0.8p)", @@ -17306,6 +18082,7 @@ void GL_APIENTRY GetTexLevelParameterivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLsizei bufSize = %d, " "GLsizei * length = 0x%0.8p, GLint * params = 0x%0.8p)", @@ -17337,6 +18114,7 @@ void GL_APIENTRY GetTexLevelParameterfvRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLsizei bufSize = %d, " "GLsizei * length = 0x%0.8p, GLfloat * params = 0x%0.8p)", @@ -17366,6 +18144,7 @@ void GL_APIENTRY GetPointervRobustANGLERobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, void **params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, void ** params = " "0x%0.8p)", @@ -17399,6 +18178,7 @@ void GL_APIENTRY ReadnPixelsRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *rows, void *data) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = " "0x%X, GLenum type = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, GLsizei * " @@ -17429,6 +18209,7 @@ void GL_APIENTRY GetnUniformfvRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLfloat *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLfloat * params = 0x%0.8p)", @@ -17456,6 +18237,7 @@ void GL_APIENTRY GetnUniformivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -17483,6 +18265,7 @@ void GL_APIENTRY GetnUniformuivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLuint * params = 0x%0.8p)", @@ -17509,6 +18292,7 @@ void GL_APIENTRY TexParameterIivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei bufSize, const GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLint * params = " "0x%0.8p)", @@ -17536,6 +18320,7 @@ void GL_APIENTRY TexParameterIuivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei bufSize, const GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLuint * params = " "0x%0.8p)", @@ -17564,6 +18349,7 @@ void GL_APIENTRY GetTexParameterIivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -17592,6 +18378,7 @@ void GL_APIENTRY GetTexParameterIuivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLuint * params = 0x%0.8p)", @@ -17619,6 +18406,7 @@ void GL_APIENTRY SamplerParameterIivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei bufSize, const GLint *param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLint * param = " "0x%0.8p)", @@ -17645,6 +18433,7 @@ void GL_APIENTRY SamplerParameterIuivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei bufSize, const GLuint *param) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLuint * param = " "0x%0.8p)", @@ -17672,6 +18461,7 @@ void GL_APIENTRY GetSamplerParameterIivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLint * params = 0x%0.8p)", @@ -17699,6 +18489,7 @@ void GL_APIENTRY GetSamplerParameterIuivRobustANGLEContextANGLE(GLeglContext ctx GLsizei *length, GLuint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = " "0x%0.8p, GLuint * params = 0x%0.8p)", @@ -17726,6 +18517,7 @@ void GL_APIENTRY GetQueryObjectivRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint id = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, " "GLint * params = 0x%0.8p)", @@ -17753,6 +18545,7 @@ void GL_APIENTRY GetQueryObjecti64vRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLint64 *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint id = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, " "GLint64 * params = 0x%0.8p)", @@ -17780,6 +18573,7 @@ void GL_APIENTRY GetQueryObjectui64vRobustANGLEContextANGLE(GLeglContext ctx, GLsizei *length, GLuint64 *params) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLuint id = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%0.8p, " "GLuint64 * params = 0x%0.8p)", @@ -17808,6 +18602,7 @@ void GL_APIENTRY FramebufferTextureMultiviewLayeredANGLEContextANGLE(GLeglContex GLint baseViewIndex, GLsizei numViews) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %u, GLint level = %d, " "GLint baseViewIndex = %d, GLsizei numViews = %d)", @@ -17839,6 +18634,7 @@ FramebufferTextureMultiviewSideBySideANGLEContextANGLE(GLeglContext ctx, GLsizei numViews, const GLint *viewportOffsets) { + ANGLE_SCOPED_GLOBAL_LOCK(); EVENT( "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %u, GLint level = %d, " "GLsizei numViews = %d, const GLint * viewportOffsets = 0x%0.8p)", diff --git a/src/libGLESv2/global_state.cpp b/src/libGLESv2/global_state.cpp index 181a0292a69..ba08b6712f6 100644 --- a/src/libGLESv2/global_state.cpp +++ b/src/libGLESv2/global_state.cpp @@ -93,6 +93,21 @@ Debug *GetDebug() } // namespace egl +#if ANGLE_FORCE_THREAD_SAFETY == ANGLE_ENABLED +namespace angle +{ +namespace +{ +std::mutex g_Mutex; +} // anonymous namespace + +std::mutex &GetGlobalMutex() +{ + return g_Mutex; +} +} // namespace angle +#endif + #ifdef ANGLE_PLATFORM_WINDOWS namespace egl { diff --git a/src/libGLESv2/global_state.h b/src/libGLESv2/global_state.h index d7dcf56e79f..83e4697eeb2 100644 --- a/src/libGLESv2/global_state.h +++ b/src/libGLESv2/global_state.h @@ -9,6 +9,10 @@ #ifndef LIBGLESV2_GLOBALSTATE_H_ #define LIBGLESV2_GLOBALSTATE_H_ +#include "libANGLE/features.h" + +#include + namespace gl { class Context; @@ -28,4 +32,16 @@ Debug *GetDebug(); } // namespace egl +#if ANGLE_FORCE_THREAD_SAFETY == ANGLE_ENABLED +namespace angle +{ +std::mutex &GetGlobalMutex(); +} // namespace angle + +#define ANGLE_SCOPED_GLOBAL_LOCK() \ + std::lock_guard globalMutexLock(angle::GetGlobalMutex()) +#else +#define ANGLE_SCOPED_GLOBAL_LOCK() +#endif + #endif // LIBGLESV2_GLOBALSTATE_H_