Skip to content

A
angle
Commit 067687f4 by Geoff Lang Committed by Commit Bot
Options

Removal global locks from GL entry points. Always lock in EGL.

The ANGLE Vulkan backend is now thread safe for non-share group contexts. This means that a global GL lock only adds overhead for most use cases. Remove the angle_force_thread_safety gn argument. BUG=angleproject:2464 Change-Id: Ic6ba89e18b46e5dd72aa83d0f409097441fcca3a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1635749 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarTobin Ehlis <tobine@google.com>
parent 9d275db4
Showing with 45 additions and 445 deletions
BUILD.gn
...@@ -92,10 +92,6 @@ config("internal_config") { ...@@ -92,10 +92,6 @@ config("internal_config") {
defines += [ "ANGLE_IS_32_BIT_CPU" ] defines += [ "ANGLE_IS_32_BIT_CPU" ]
} }
if (angle_force_thread_safety) {
defines += [ "ANGLE_FORCE_THREAD_SAFETY=1" ]
}
if (angle_enable_vulkan) { if (angle_enable_vulkan) {
if (angle_enable_vulkan_gpu_trace_events) { if (angle_enable_vulkan_gpu_trace_events) {
defines += [ "ANGLE_ENABLE_VULKAN_GPU_TRACE_EVENTS=1" ] defines += [ "ANGLE_ENABLE_VULKAN_GPU_TRACE_EVENTS=1" ]
......
gni/angle.gni
...@@ -63,7 +63,6 @@ declare_args() { ...@@ -63,7 +63,6 @@ declare_args() {
angle_enable_null = true angle_enable_null = true
angle_enable_essl = true angle_enable_essl = true
angle_enable_glsl = true angle_enable_glsl = true
angle_force_thread_safety = false
} }
declare_args() { declare_args() {
......
scripts/generate_entry_points.py
...@@ -116,7 +116,6 @@ template_entry_point_decl = """ANGLE_EXPORT {return_type}GL_APIENTRY {name}{expl ...@@ -116,7 +116,6 @@ template_entry_point_decl = """ANGLE_EXPORT {return_type}GL_APIENTRY {name}{expl
template_entry_point_def = """{return_type}GL_APIENTRY {name}{explicit_context_suffix}({explicit_context_param}{explicit_context_comma}{params}) 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}); {event_comment}EVENT("({format_params})"{comma_if_needed}{pass_params});
Context *context = {context_getter}; Context *context = {context_getter};
......
scripts/run_code_generation_hashes.json
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
"GL/EGL entry points:scripts/entry_point_packed_gl_enums.json": "GL/EGL entry points:scripts/entry_point_packed_gl_enums.json":
"45513f3dd0e9cf5a93de3172b92636f4", "45513f3dd0e9cf5a93de3172b92636f4",
"GL/EGL entry points:scripts/generate_entry_points.py": "GL/EGL entry points:scripts/generate_entry_points.py":
"df89665814d74ffd16c70f017f0ef4d7", "1e493331ee0ab7d5e210a125cb248f0b",
"GL/EGL entry points:scripts/gl.xml": "GL/EGL entry points:scripts/gl.xml":
"b470cb06b06cbbe7adb2c8129ec85708", "b470cb06b06cbbe7adb2c8129ec85708",
"GL/EGL entry points:scripts/gl_angle_ext.xml": "GL/EGL entry points:scripts/gl_angle_ext.xml":
...@@ -124,23 +124,23 @@ ...@@ -124,23 +124,23 @@
"GL/EGL entry points:src/libGLESv2/entry_points_enum_autogen.h": "GL/EGL entry points:src/libGLESv2/entry_points_enum_autogen.h":
"8d4af523c6da76ff7c47302c8dc5b30d", "8d4af523c6da76ff7c47302c8dc5b30d",
"GL/EGL entry points:src/libGLESv2/entry_points_gles_1_0_autogen.cpp": "GL/EGL entry points:src/libGLESv2/entry_points_gles_1_0_autogen.cpp":
"196771da8ad7a5beded1dc878410ac11", "153739031e8ae415fe42ecc9c132ffb2",
"GL/EGL entry points:src/libGLESv2/entry_points_gles_1_0_autogen.h": "GL/EGL entry points:src/libGLESv2/entry_points_gles_1_0_autogen.h":
"77fa8d307ebf839838f8812786cddc1a", "77fa8d307ebf839838f8812786cddc1a",
"GL/EGL entry points:src/libGLESv2/entry_points_gles_2_0_autogen.cpp": "GL/EGL entry points:src/libGLESv2/entry_points_gles_2_0_autogen.cpp":
"4f86bb77e2f29c6c1994448ab55d772f", "835cbe8088a7670776a82ee4099fdc54",
"GL/EGL entry points:src/libGLESv2/entry_points_gles_2_0_autogen.h": "GL/EGL entry points:src/libGLESv2/entry_points_gles_2_0_autogen.h":
"3bbaf1cf42fba5d675e5b54cd1d14df7", "3bbaf1cf42fba5d675e5b54cd1d14df7",
"GL/EGL entry points:src/libGLESv2/entry_points_gles_3_0_autogen.cpp": "GL/EGL entry points:src/libGLESv2/entry_points_gles_3_0_autogen.cpp":
"94cf20c29469d508af7f5e0a791ccd6a", "f460f746355e979a10529124efa43c4c",
"GL/EGL entry points:src/libGLESv2/entry_points_gles_3_0_autogen.h": "GL/EGL entry points:src/libGLESv2/entry_points_gles_3_0_autogen.h":
"395f6978219abd5182bbe80cc367e40c", "395f6978219abd5182bbe80cc367e40c",
"GL/EGL entry points:src/libGLESv2/entry_points_gles_3_1_autogen.cpp": "GL/EGL entry points:src/libGLESv2/entry_points_gles_3_1_autogen.cpp":
"72188430258b99258cef9048f0f4b4ee", "f4cc6820dc6c734cfd4b919d61ed4322",
"GL/EGL entry points:src/libGLESv2/entry_points_gles_3_1_autogen.h": "GL/EGL entry points:src/libGLESv2/entry_points_gles_3_1_autogen.h":
"043d09a964c740067bf4279e0b544aed", "043d09a964c740067bf4279e0b544aed",
"GL/EGL entry points:src/libGLESv2/entry_points_gles_ext_autogen.cpp": "GL/EGL entry points:src/libGLESv2/entry_points_gles_ext_autogen.cpp":
"b07363bbb245fb1b229e5391280c9f43", "b56592ebcd1bed250682e9a9230543ea",
"GL/EGL entry points:src/libGLESv2/entry_points_gles_ext_autogen.h": "GL/EGL entry points:src/libGLESv2/entry_points_gles_ext_autogen.h":
"ad2d05812814ba9016080ba56e6c4218", "ad2d05812814ba9016080ba56e6c4218",
"GL/EGL entry points:src/libGLESv2/libGLESv2_autogen.cpp": "GL/EGL entry points:src/libGLESv2/libGLESv2_autogen.cpp":
......
src/libANGLE/features.h
...@@ -57,9 +57,4 @@ ...@@ -57,9 +57,4 @@
# define ANGLE_STD_ASYNC_WORKERS ANGLE_ENABLED # define ANGLE_STD_ASYNC_WORKERS ANGLE_ENABLED
#endif // !defined(ANGLE_STD_ASYNC_WORKERS) #endif // !defined(ANGLE_STD_ASYNC_WORKERS)
// 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_ #endif // LIBANGLE_FEATURES_H_
src/libGLESv2/entry_points_gles_1_0_autogen.cpp
...@@ -20,7 +20,6 @@ namespace gl ...@@ -20,7 +20,6 @@ namespace gl
{ {
void GL_APIENTRY AlphaFunc(GLenum func, GLfloat ref) void GL_APIENTRY AlphaFunc(GLenum func, GLfloat ref)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum func = 0x%X, GLfloat ref = %f)", func, ref); EVENT("(GLenum func = 0x%X, GLfloat ref = %f)", func, ref);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -36,7 +35,6 @@ void GL_APIENTRY AlphaFunc(GLenum func, GLfloat ref) ...@@ -36,7 +35,6 @@ void GL_APIENTRY AlphaFunc(GLenum func, GLfloat ref)
void GL_APIENTRY AlphaFuncx(GLenum func, GLfixed ref) void GL_APIENTRY AlphaFuncx(GLenum func, GLfixed ref)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum func = 0x%X, GLfixed ref = 0x%X)", func, ref); EVENT("(GLenum func = 0x%X, GLfixed ref = 0x%X)", func, ref);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -52,7 +50,6 @@ void GL_APIENTRY AlphaFuncx(GLenum func, GLfixed ref) ...@@ -52,7 +50,6 @@ void GL_APIENTRY AlphaFuncx(GLenum func, GLfixed ref)
void GL_APIENTRY ClearColorx(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha) 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)", EVENT("(GLfixed red = 0x%X, GLfixed green = 0x%X, GLfixed blue = 0x%X, GLfixed alpha = 0x%X)",
red, green, blue, alpha); red, green, blue, alpha);
...@@ -68,7 +65,6 @@ void GL_APIENTRY ClearColorx(GLfixed red, GLfixed green, GLfixed blue, GLfixed a ...@@ -68,7 +65,6 @@ void GL_APIENTRY ClearColorx(GLfixed red, GLfixed green, GLfixed blue, GLfixed a
void GL_APIENTRY ClearDepthx(GLfixed depth) void GL_APIENTRY ClearDepthx(GLfixed depth)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLfixed depth = 0x%X)", depth); EVENT("(GLfixed depth = 0x%X)", depth);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -83,7 +79,6 @@ void GL_APIENTRY ClearDepthx(GLfixed depth) ...@@ -83,7 +79,6 @@ void GL_APIENTRY ClearDepthx(GLfixed depth)
void GL_APIENTRY ClientActiveTexture(GLenum texture) void GL_APIENTRY ClientActiveTexture(GLenum texture)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum texture = 0x%X)", texture); EVENT("(GLenum texture = 0x%X)", texture);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -98,7 +93,6 @@ void GL_APIENTRY ClientActiveTexture(GLenum texture) ...@@ -98,7 +93,6 @@ void GL_APIENTRY ClientActiveTexture(GLenum texture)
void GL_APIENTRY ClipPlanef(GLenum p, const GLfloat *eqn) void GL_APIENTRY ClipPlanef(GLenum p, const GLfloat *eqn)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum p = 0x%X, const GLfloat *eqn = 0x%016" PRIxPTR ")", p, (uintptr_t)eqn); EVENT("(GLenum p = 0x%X, const GLfloat *eqn = 0x%016" PRIxPTR ")", p, (uintptr_t)eqn);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -113,7 +107,6 @@ void GL_APIENTRY ClipPlanef(GLenum p, const GLfloat *eqn) ...@@ -113,7 +107,6 @@ void GL_APIENTRY ClipPlanef(GLenum p, const GLfloat *eqn)
void GL_APIENTRY ClipPlanex(GLenum plane, const GLfixed *equation) void GL_APIENTRY ClipPlanex(GLenum plane, const GLfixed *equation)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum plane = 0x%X, const GLfixed *equation = 0x%016" PRIxPTR ")", plane, EVENT("(GLenum plane = 0x%X, const GLfixed *equation = 0x%016" PRIxPTR ")", plane,
(uintptr_t)equation); (uintptr_t)equation);
...@@ -129,7 +122,6 @@ void GL_APIENTRY ClipPlanex(GLenum plane, const GLfixed *equation) ...@@ -129,7 +122,6 @@ void GL_APIENTRY ClipPlanex(GLenum plane, const GLfixed *equation)
void GL_APIENTRY Color4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) 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, EVENT("(GLfloat red = %f, GLfloat green = %f, GLfloat blue = %f, GLfloat alpha = %f)", red,
green, blue, alpha); green, blue, alpha);
...@@ -145,7 +137,6 @@ void GL_APIENTRY Color4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha ...@@ -145,7 +137,6 @@ void GL_APIENTRY Color4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha
void GL_APIENTRY Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte 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, EVENT("(GLubyte red = %d, GLubyte green = %d, GLubyte blue = %d, GLubyte alpha = %d)", red,
green, blue, alpha); green, blue, alpha);
...@@ -161,7 +152,6 @@ void GL_APIENTRY Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alph ...@@ -161,7 +152,6 @@ void GL_APIENTRY Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alph
void GL_APIENTRY Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha) 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)", EVENT("(GLfixed red = 0x%X, GLfixed green = 0x%X, GLfixed blue = 0x%X, GLfixed alpha = 0x%X)",
red, green, blue, alpha); red, green, blue, alpha);
...@@ -177,7 +167,6 @@ void GL_APIENTRY Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha ...@@ -177,7 +167,6 @@ 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) void GL_APIENTRY ColorPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = " "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -197,7 +186,6 @@ void GL_APIENTRY ColorPointer(GLint size, GLenum type, GLsizei stride, const voi ...@@ -197,7 +186,6 @@ void GL_APIENTRY ColorPointer(GLint size, GLenum type, GLsizei stride, const voi
void GL_APIENTRY DepthRangex(GLfixed n, GLfixed f) void GL_APIENTRY DepthRangex(GLfixed n, GLfixed f)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLfixed n = 0x%X, GLfixed f = 0x%X)", n, f); EVENT("(GLfixed n = 0x%X, GLfixed f = 0x%X)", n, f);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -212,7 +200,6 @@ void GL_APIENTRY DepthRangex(GLfixed n, GLfixed f) ...@@ -212,7 +200,6 @@ void GL_APIENTRY DepthRangex(GLfixed n, GLfixed f)
void GL_APIENTRY DisableClientState(GLenum array) void GL_APIENTRY DisableClientState(GLenum array)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum array = 0x%X)", array); EVENT("(GLenum array = 0x%X)", array);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -228,7 +215,6 @@ void GL_APIENTRY DisableClientState(GLenum array) ...@@ -228,7 +215,6 @@ void GL_APIENTRY DisableClientState(GLenum array)
void GL_APIENTRY EnableClientState(GLenum array) void GL_APIENTRY EnableClientState(GLenum array)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum array = 0x%X)", array); EVENT("(GLenum array = 0x%X)", array);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -244,7 +230,6 @@ void GL_APIENTRY EnableClientState(GLenum array) ...@@ -244,7 +230,6 @@ void GL_APIENTRY EnableClientState(GLenum array)
void GL_APIENTRY Fogf(GLenum pname, GLfloat param) void GL_APIENTRY Fogf(GLenum pname, GLfloat param)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLfloat param = %f)", pname, param); EVENT("(GLenum pname = 0x%X, GLfloat param = %f)", pname, param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -259,7 +244,6 @@ void GL_APIENTRY Fogf(GLenum pname, GLfloat param) ...@@ -259,7 +244,6 @@ void GL_APIENTRY Fogf(GLenum pname, GLfloat param)
void GL_APIENTRY Fogfv(GLenum pname, const GLfloat *params) void GL_APIENTRY Fogfv(GLenum pname, const GLfloat *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")", pname, EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")", pname,
(uintptr_t)params); (uintptr_t)params);
...@@ -275,7 +259,6 @@ void GL_APIENTRY Fogfv(GLenum pname, const GLfloat *params) ...@@ -275,7 +259,6 @@ void GL_APIENTRY Fogfv(GLenum pname, const GLfloat *params)
void GL_APIENTRY Fogx(GLenum pname, GLfixed param) void GL_APIENTRY Fogx(GLenum pname, GLfixed param)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLfixed param = 0x%X)", pname, param); EVENT("(GLenum pname = 0x%X, GLfixed param = 0x%X)", pname, param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -290,7 +273,6 @@ void GL_APIENTRY Fogx(GLenum pname, GLfixed param) ...@@ -290,7 +273,6 @@ void GL_APIENTRY Fogx(GLenum pname, GLfixed param)
void GL_APIENTRY Fogxv(GLenum pname, const GLfixed *param) void GL_APIENTRY Fogxv(GLenum pname, const GLfixed *param)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, const GLfixed *param = 0x%016" PRIxPTR ")", pname, EVENT("(GLenum pname = 0x%X, const GLfixed *param = 0x%016" PRIxPTR ")", pname,
(uintptr_t)param); (uintptr_t)param);
...@@ -306,7 +288,6 @@ void GL_APIENTRY Fogxv(GLenum pname, const GLfixed *param) ...@@ -306,7 +288,6 @@ 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) void GL_APIENTRY Frustumf(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLfloat l = %f, GLfloat r = %f, GLfloat b = %f, GLfloat t = %f, GLfloat n = %f, GLfloat " "(GLfloat l = %f, GLfloat r = %f, GLfloat b = %f, GLfloat t = %f, GLfloat n = %f, GLfloat "
"f = %f)", "f = %f)",
...@@ -324,7 +305,6 @@ void GL_APIENTRY Frustumf(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, ...@@ -324,7 +305,6 @@ 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) void GL_APIENTRY Frustumx(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLfixed l = 0x%X, GLfixed r = 0x%X, GLfixed b = 0x%X, GLfixed t = 0x%X, GLfixed n = " "(GLfixed l = 0x%X, GLfixed r = 0x%X, GLfixed b = 0x%X, GLfixed t = 0x%X, GLfixed n = "
"0x%X, GLfixed f = 0x%X)", "0x%X, GLfixed f = 0x%X)",
...@@ -342,7 +322,6 @@ void GL_APIENTRY Frustumx(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, ...@@ -342,7 +322,6 @@ void GL_APIENTRY Frustumx(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n,
void GL_APIENTRY GetClipPlanef(GLenum plane, GLfloat *equation) void GL_APIENTRY GetClipPlanef(GLenum plane, GLfloat *equation)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum plane = 0x%X, GLfloat *equation = 0x%016" PRIxPTR ")", plane, EVENT("(GLenum plane = 0x%X, GLfloat *equation = 0x%016" PRIxPTR ")", plane,
(uintptr_t)equation); (uintptr_t)equation);
...@@ -358,7 +337,6 @@ void GL_APIENTRY GetClipPlanef(GLenum plane, GLfloat *equation) ...@@ -358,7 +337,6 @@ void GL_APIENTRY GetClipPlanef(GLenum plane, GLfloat *equation)
void GL_APIENTRY GetClipPlanex(GLenum plane, GLfixed *equation) void GL_APIENTRY GetClipPlanex(GLenum plane, GLfixed *equation)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum plane = 0x%X, GLfixed *equation = 0x%016" PRIxPTR ")", plane, EVENT("(GLenum plane = 0x%X, GLfixed *equation = 0x%016" PRIxPTR ")", plane,
(uintptr_t)equation); (uintptr_t)equation);
...@@ -374,7 +352,6 @@ void GL_APIENTRY GetClipPlanex(GLenum plane, GLfixed *equation) ...@@ -374,7 +352,6 @@ void GL_APIENTRY GetClipPlanex(GLenum plane, GLfixed *equation)
void GL_APIENTRY GetFixedv(GLenum pname, GLfixed *params) void GL_APIENTRY GetFixedv(GLenum pname, GLfixed *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")", pname, (uintptr_t)params); EVENT("(GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")", pname, (uintptr_t)params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -389,7 +366,6 @@ void GL_APIENTRY GetFixedv(GLenum pname, GLfixed *params) ...@@ -389,7 +366,6 @@ void GL_APIENTRY GetFixedv(GLenum pname, GLfixed *params)
void GL_APIENTRY GetLightfv(GLenum light, GLenum pname, GLfloat *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%016" PRIxPTR ")", light, EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")", light,
pname, (uintptr_t)params); pname, (uintptr_t)params);
...@@ -406,7 +382,6 @@ void GL_APIENTRY GetLightfv(GLenum light, GLenum pname, GLfloat *params) ...@@ -406,7 +382,6 @@ void GL_APIENTRY GetLightfv(GLenum light, GLenum pname, GLfloat *params)
void GL_APIENTRY GetLightxv(GLenum light, GLenum pname, GLfixed *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%016" PRIxPTR ")", light, EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")", light,
pname, (uintptr_t)params); pname, (uintptr_t)params);
...@@ -423,7 +398,6 @@ void GL_APIENTRY GetLightxv(GLenum light, GLenum pname, GLfixed *params) ...@@ -423,7 +398,6 @@ void GL_APIENTRY GetLightxv(GLenum light, GLenum pname, GLfixed *params)
void GL_APIENTRY GetMaterialfv(GLenum face, GLenum pname, GLfloat *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%016" PRIxPTR ")", face, EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")", face,
pname, (uintptr_t)params); pname, (uintptr_t)params);
...@@ -440,7 +414,6 @@ void GL_APIENTRY GetMaterialfv(GLenum face, GLenum pname, GLfloat *params) ...@@ -440,7 +414,6 @@ void GL_APIENTRY GetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
void GL_APIENTRY GetMaterialxv(GLenum face, GLenum pname, GLfixed *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%016" PRIxPTR ")", face, EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")", face,
pname, (uintptr_t)params); pname, (uintptr_t)params);
...@@ -457,7 +430,6 @@ void GL_APIENTRY GetMaterialxv(GLenum face, GLenum pname, GLfixed *params) ...@@ -457,7 +430,6 @@ void GL_APIENTRY GetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
void GL_APIENTRY GetPointerv(GLenum pname, void **params) void GL_APIENTRY GetPointerv(GLenum pname, void **params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, void **params = 0x%016" PRIxPTR ")", pname, (uintptr_t)params); EVENT("(GLenum pname = 0x%X, void **params = 0x%016" PRIxPTR ")", pname, (uintptr_t)params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -472,7 +444,6 @@ void GL_APIENTRY GetPointerv(GLenum pname, void **params) ...@@ -472,7 +444,6 @@ void GL_APIENTRY GetPointerv(GLenum pname, void **params)
void GL_APIENTRY GetTexEnvfv(GLenum target, GLenum pname, GLfloat *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%016" PRIxPTR ")", EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params); target, pname, (uintptr_t)params);
...@@ -491,7 +462,6 @@ void GL_APIENTRY GetTexEnvfv(GLenum target, GLenum pname, GLfloat *params) ...@@ -491,7 +462,6 @@ void GL_APIENTRY GetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
void GL_APIENTRY GetTexEnviv(GLenum target, GLenum pname, GLint *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%016" PRIxPTR ")", target, EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
pname, (uintptr_t)params); pname, (uintptr_t)params);
...@@ -510,7 +480,6 @@ void GL_APIENTRY GetTexEnviv(GLenum target, GLenum pname, GLint *params) ...@@ -510,7 +480,6 @@ void GL_APIENTRY GetTexEnviv(GLenum target, GLenum pname, GLint *params)
void GL_APIENTRY GetTexEnvxv(GLenum target, GLenum pname, GLfixed *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%016" PRIxPTR ")", EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params); target, pname, (uintptr_t)params);
...@@ -529,7 +498,6 @@ void GL_APIENTRY GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params) ...@@ -529,7 +498,6 @@ void GL_APIENTRY GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params)
void GL_APIENTRY GetTexParameterxv(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%016" PRIxPTR ")", EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params); target, pname, (uintptr_t)params);
...@@ -547,7 +515,6 @@ void GL_APIENTRY GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params) ...@@ -547,7 +515,6 @@ void GL_APIENTRY GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)
void GL_APIENTRY LightModelf(GLenum pname, GLfloat param) void GL_APIENTRY LightModelf(GLenum pname, GLfloat param)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLfloat param = %f)", pname, param); EVENT("(GLenum pname = 0x%X, GLfloat param = %f)", pname, param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -562,7 +529,6 @@ void GL_APIENTRY LightModelf(GLenum pname, GLfloat param) ...@@ -562,7 +529,6 @@ void GL_APIENTRY LightModelf(GLenum pname, GLfloat param)
void GL_APIENTRY LightModelfv(GLenum pname, const GLfloat *params) void GL_APIENTRY LightModelfv(GLenum pname, const GLfloat *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")", pname, EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")", pname,
(uintptr_t)params); (uintptr_t)params);
...@@ -578,7 +544,6 @@ void GL_APIENTRY LightModelfv(GLenum pname, const GLfloat *params) ...@@ -578,7 +544,6 @@ void GL_APIENTRY LightModelfv(GLenum pname, const GLfloat *params)
void GL_APIENTRY LightModelx(GLenum pname, GLfixed param) void GL_APIENTRY LightModelx(GLenum pname, GLfixed param)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLfixed param = 0x%X)", pname, param); EVENT("(GLenum pname = 0x%X, GLfixed param = 0x%X)", pname, param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -593,7 +558,6 @@ void GL_APIENTRY LightModelx(GLenum pname, GLfixed param) ...@@ -593,7 +558,6 @@ void GL_APIENTRY LightModelx(GLenum pname, GLfixed param)
void GL_APIENTRY LightModelxv(GLenum pname, const GLfixed *param) void GL_APIENTRY LightModelxv(GLenum pname, const GLfixed *param)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, const GLfixed *param = 0x%016" PRIxPTR ")", pname, EVENT("(GLenum pname = 0x%X, const GLfixed *param = 0x%016" PRIxPTR ")", pname,
(uintptr_t)param); (uintptr_t)param);
...@@ -609,7 +573,6 @@ void GL_APIENTRY LightModelxv(GLenum pname, const GLfixed *param) ...@@ -609,7 +573,6 @@ void GL_APIENTRY LightModelxv(GLenum pname, const GLfixed *param)
void GL_APIENTRY Lightf(GLenum light, GLenum pname, GLfloat 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); EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", light, pname, param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -625,7 +588,6 @@ void GL_APIENTRY Lightf(GLenum light, GLenum pname, GLfloat param) ...@@ -625,7 +588,6 @@ void GL_APIENTRY Lightf(GLenum light, GLenum pname, GLfloat param)
void GL_APIENTRY Lightfv(GLenum light, GLenum pname, const GLfloat *params) 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%016" PRIxPTR ")", EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")",
light, pname, (uintptr_t)params); light, pname, (uintptr_t)params);
...@@ -642,7 +604,6 @@ void GL_APIENTRY Lightfv(GLenum light, GLenum pname, const GLfloat *params) ...@@ -642,7 +604,6 @@ void GL_APIENTRY Lightfv(GLenum light, GLenum pname, const GLfloat *params)
void GL_APIENTRY Lightx(GLenum light, GLenum pname, GLfixed param) 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); EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", light, pname, param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -658,7 +619,6 @@ void GL_APIENTRY Lightx(GLenum light, GLenum pname, GLfixed param) ...@@ -658,7 +619,6 @@ void GL_APIENTRY Lightx(GLenum light, GLenum pname, GLfixed param)
void GL_APIENTRY Lightxv(GLenum light, GLenum pname, const GLfixed *params) 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%016" PRIxPTR ")", EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%016" PRIxPTR ")",
light, pname, (uintptr_t)params); light, pname, (uintptr_t)params);
...@@ -675,7 +635,6 @@ void GL_APIENTRY Lightxv(GLenum light, GLenum pname, const GLfixed *params) ...@@ -675,7 +635,6 @@ void GL_APIENTRY Lightxv(GLenum light, GLenum pname, const GLfixed *params)
void GL_APIENTRY LineWidthx(GLfixed width) void GL_APIENTRY LineWidthx(GLfixed width)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLfixed width = 0x%X)", width); EVENT("(GLfixed width = 0x%X)", width);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -690,7 +649,6 @@ void GL_APIENTRY LineWidthx(GLfixed width) ...@@ -690,7 +649,6 @@ void GL_APIENTRY LineWidthx(GLfixed width)
void GL_APIENTRY LoadIdentity() void GL_APIENTRY LoadIdentity()
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("()"); EVENT("()");
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -705,7 +663,6 @@ void GL_APIENTRY LoadIdentity() ...@@ -705,7 +663,6 @@ void GL_APIENTRY LoadIdentity()
void GL_APIENTRY LoadMatrixf(const GLfloat *m) void GL_APIENTRY LoadMatrixf(const GLfloat *m)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(const GLfloat *m = 0x%016" PRIxPTR ")", (uintptr_t)m); EVENT("(const GLfloat *m = 0x%016" PRIxPTR ")", (uintptr_t)m);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -720,7 +677,6 @@ void GL_APIENTRY LoadMatrixf(const GLfloat *m) ...@@ -720,7 +677,6 @@ void GL_APIENTRY LoadMatrixf(const GLfloat *m)
void GL_APIENTRY LoadMatrixx(const GLfixed *m) void GL_APIENTRY LoadMatrixx(const GLfixed *m)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(const GLfixed *m = 0x%016" PRIxPTR ")", (uintptr_t)m); EVENT("(const GLfixed *m = 0x%016" PRIxPTR ")", (uintptr_t)m);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -735,7 +691,6 @@ void GL_APIENTRY LoadMatrixx(const GLfixed *m) ...@@ -735,7 +691,6 @@ void GL_APIENTRY LoadMatrixx(const GLfixed *m)
void GL_APIENTRY LogicOp(GLenum opcode) void GL_APIENTRY LogicOp(GLenum opcode)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum opcode = 0x%X)", opcode); EVENT("(GLenum opcode = 0x%X)", opcode);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -751,7 +706,6 @@ void GL_APIENTRY LogicOp(GLenum opcode) ...@@ -751,7 +706,6 @@ void GL_APIENTRY LogicOp(GLenum opcode)
void GL_APIENTRY Materialf(GLenum face, GLenum pname, GLfloat param) 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); EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", face, pname, param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -767,7 +721,6 @@ void GL_APIENTRY Materialf(GLenum face, GLenum pname, GLfloat param) ...@@ -767,7 +721,6 @@ void GL_APIENTRY Materialf(GLenum face, GLenum pname, GLfloat param)
void GL_APIENTRY Materialfv(GLenum face, GLenum pname, const GLfloat *params) 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%016" PRIxPTR ")", EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")",
face, pname, (uintptr_t)params); face, pname, (uintptr_t)params);
...@@ -784,7 +737,6 @@ void GL_APIENTRY Materialfv(GLenum face, GLenum pname, const GLfloat *params) ...@@ -784,7 +737,6 @@ void GL_APIENTRY Materialfv(GLenum face, GLenum pname, const GLfloat *params)
void GL_APIENTRY Materialx(GLenum face, GLenum pname, GLfixed param) 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); EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", face, pname, param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -800,7 +752,6 @@ void GL_APIENTRY Materialx(GLenum face, GLenum pname, GLfixed param) ...@@ -800,7 +752,6 @@ void GL_APIENTRY Materialx(GLenum face, GLenum pname, GLfixed param)
void GL_APIENTRY Materialxv(GLenum face, GLenum pname, const 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%016" PRIxPTR ")", EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, const GLfixed *param = 0x%016" PRIxPTR ")",
face, pname, (uintptr_t)param); face, pname, (uintptr_t)param);
...@@ -817,7 +768,6 @@ void GL_APIENTRY Materialxv(GLenum face, GLenum pname, const GLfixed *param) ...@@ -817,7 +768,6 @@ void GL_APIENTRY Materialxv(GLenum face, GLenum pname, const GLfixed *param)
void GL_APIENTRY MatrixMode(GLenum mode) void GL_APIENTRY MatrixMode(GLenum mode)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum mode = 0x%X)", mode); EVENT("(GLenum mode = 0x%X)", mode);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -833,7 +783,6 @@ void GL_APIENTRY MatrixMode(GLenum mode) ...@@ -833,7 +783,6 @@ void GL_APIENTRY MatrixMode(GLenum mode)
void GL_APIENTRY MultMatrixf(const GLfloat *m) void GL_APIENTRY MultMatrixf(const GLfloat *m)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(const GLfloat *m = 0x%016" PRIxPTR ")", (uintptr_t)m); EVENT("(const GLfloat *m = 0x%016" PRIxPTR ")", (uintptr_t)m);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -848,7 +797,6 @@ void GL_APIENTRY MultMatrixf(const GLfloat *m) ...@@ -848,7 +797,6 @@ void GL_APIENTRY MultMatrixf(const GLfloat *m)
void GL_APIENTRY MultMatrixx(const GLfixed *m) void GL_APIENTRY MultMatrixx(const GLfixed *m)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(const GLfixed *m = 0x%016" PRIxPTR ")", (uintptr_t)m); EVENT("(const GLfixed *m = 0x%016" PRIxPTR ")", (uintptr_t)m);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -863,7 +811,6 @@ void GL_APIENTRY MultMatrixx(const GLfixed *m) ...@@ -863,7 +811,6 @@ void GL_APIENTRY MultMatrixx(const GLfixed *m)
void GL_APIENTRY MultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q) 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)", EVENT("(GLenum target = 0x%X, GLfloat s = %f, GLfloat t = %f, GLfloat r = %f, GLfloat q = %f)",
target, s, t, r, q); target, s, t, r, q);
...@@ -879,7 +826,6 @@ void GL_APIENTRY MultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, ...@@ -879,7 +826,6 @@ 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) void GL_APIENTRY MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum texture = 0x%X, GLfixed s = 0x%X, GLfixed t = 0x%X, GLfixed r = 0x%X, GLfixed q = " "(GLenum texture = 0x%X, GLfixed s = 0x%X, GLfixed t = 0x%X, GLfixed r = 0x%X, GLfixed q = "
"0x%X)", "0x%X)",
...@@ -897,7 +843,6 @@ void GL_APIENTRY MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r ...@@ -897,7 +843,6 @@ void GL_APIENTRY MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r
void GL_APIENTRY Normal3f(GLfloat nx, GLfloat ny, GLfloat nz) 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); EVENT("(GLfloat nx = %f, GLfloat ny = %f, GLfloat nz = %f)", nx, ny, nz);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -912,7 +857,6 @@ void GL_APIENTRY Normal3f(GLfloat nx, GLfloat ny, GLfloat nz) ...@@ -912,7 +857,6 @@ void GL_APIENTRY Normal3f(GLfloat nx, GLfloat ny, GLfloat nz)
void GL_APIENTRY Normal3x(GLfixed nx, GLfixed ny, GLfixed 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); EVENT("(GLfixed nx = 0x%X, GLfixed ny = 0x%X, GLfixed nz = 0x%X)", nx, ny, nz);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -927,7 +871,6 @@ void GL_APIENTRY Normal3x(GLfixed nx, GLfixed ny, GLfixed nz) ...@@ -927,7 +871,6 @@ void GL_APIENTRY Normal3x(GLfixed nx, GLfixed ny, GLfixed nz)
void GL_APIENTRY NormalPointer(GLenum type, GLsizei stride, const void *pointer) 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%016" PRIxPTR ")", EVENT("(GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%016" PRIxPTR ")",
type, stride, (uintptr_t)pointer); type, stride, (uintptr_t)pointer);
...@@ -945,7 +888,6 @@ void GL_APIENTRY NormalPointer(GLenum type, GLsizei stride, const void *pointer) ...@@ -945,7 +888,6 @@ 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) void GL_APIENTRY Orthof(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLfloat l = %f, GLfloat r = %f, GLfloat b = %f, GLfloat t = %f, GLfloat n = %f, GLfloat " "(GLfloat l = %f, GLfloat r = %f, GLfloat b = %f, GLfloat t = %f, GLfloat n = %f, GLfloat "
"f = %f)", "f = %f)",
...@@ -963,7 +905,6 @@ void GL_APIENTRY Orthof(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, G ...@@ -963,7 +905,6 @@ 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) void GL_APIENTRY Orthox(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLfixed l = 0x%X, GLfixed r = 0x%X, GLfixed b = 0x%X, GLfixed t = 0x%X, GLfixed n = " "(GLfixed l = 0x%X, GLfixed r = 0x%X, GLfixed b = 0x%X, GLfixed t = 0x%X, GLfixed n = "
"0x%X, GLfixed f = 0x%X)", "0x%X, GLfixed f = 0x%X)",
...@@ -981,7 +922,6 @@ void GL_APIENTRY Orthox(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, G ...@@ -981,7 +922,6 @@ void GL_APIENTRY Orthox(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, G
void GL_APIENTRY PointParameterf(GLenum pname, GLfloat param) void GL_APIENTRY PointParameterf(GLenum pname, GLfloat param)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLfloat param = %f)", pname, param); EVENT("(GLenum pname = 0x%X, GLfloat param = %f)", pname, param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -997,7 +937,6 @@ void GL_APIENTRY PointParameterf(GLenum pname, GLfloat param) ...@@ -997,7 +937,6 @@ void GL_APIENTRY PointParameterf(GLenum pname, GLfloat param)
void GL_APIENTRY PointParameterfv(GLenum pname, const GLfloat *params) void GL_APIENTRY PointParameterfv(GLenum pname, const GLfloat *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")", pname, EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")", pname,
(uintptr_t)params); (uintptr_t)params);
...@@ -1014,7 +953,6 @@ void GL_APIENTRY PointParameterfv(GLenum pname, const GLfloat *params) ...@@ -1014,7 +953,6 @@ void GL_APIENTRY PointParameterfv(GLenum pname, const GLfloat *params)
void GL_APIENTRY PointParameterx(GLenum pname, GLfixed param) void GL_APIENTRY PointParameterx(GLenum pname, GLfixed param)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLfixed param = 0x%X)", pname, param); EVENT("(GLenum pname = 0x%X, GLfixed param = 0x%X)", pname, param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1030,7 +968,6 @@ void GL_APIENTRY PointParameterx(GLenum pname, GLfixed param) ...@@ -1030,7 +968,6 @@ void GL_APIENTRY PointParameterx(GLenum pname, GLfixed param)
void GL_APIENTRY PointParameterxv(GLenum pname, const GLfixed *params) void GL_APIENTRY PointParameterxv(GLenum pname, const GLfixed *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, const GLfixed *params = 0x%016" PRIxPTR ")", pname, EVENT("(GLenum pname = 0x%X, const GLfixed *params = 0x%016" PRIxPTR ")", pname,
(uintptr_t)params); (uintptr_t)params);
...@@ -1047,7 +984,6 @@ void GL_APIENTRY PointParameterxv(GLenum pname, const GLfixed *params) ...@@ -1047,7 +984,6 @@ void GL_APIENTRY PointParameterxv(GLenum pname, const GLfixed *params)
void GL_APIENTRY PointSize(GLfloat size) void GL_APIENTRY PointSize(GLfloat size)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLfloat size = %f)", size); EVENT("(GLfloat size = %f)", size);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1062,7 +998,6 @@ void GL_APIENTRY PointSize(GLfloat size) ...@@ -1062,7 +998,6 @@ void GL_APIENTRY PointSize(GLfloat size)
void GL_APIENTRY PointSizex(GLfixed size) void GL_APIENTRY PointSizex(GLfixed size)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLfixed size = 0x%X)", size); EVENT("(GLfixed size = 0x%X)", size);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1077,7 +1012,6 @@ void GL_APIENTRY PointSizex(GLfixed size) ...@@ -1077,7 +1012,6 @@ void GL_APIENTRY PointSizex(GLfixed size)
void GL_APIENTRY PolygonOffsetx(GLfixed factor, GLfixed units) void GL_APIENTRY PolygonOffsetx(GLfixed factor, GLfixed units)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLfixed factor = 0x%X, GLfixed units = 0x%X)", factor, units); EVENT("(GLfixed factor = 0x%X, GLfixed units = 0x%X)", factor, units);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1092,7 +1026,6 @@ void GL_APIENTRY PolygonOffsetx(GLfixed factor, GLfixed units) ...@@ -1092,7 +1026,6 @@ void GL_APIENTRY PolygonOffsetx(GLfixed factor, GLfixed units)
void GL_APIENTRY PopMatrix() void GL_APIENTRY PopMatrix()
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("()"); EVENT("()");
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1107,7 +1040,6 @@ void GL_APIENTRY PopMatrix() ...@@ -1107,7 +1040,6 @@ void GL_APIENTRY PopMatrix()
void GL_APIENTRY PushMatrix() void GL_APIENTRY PushMatrix()
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("()"); EVENT("()");
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1122,7 +1054,6 @@ void GL_APIENTRY PushMatrix() ...@@ -1122,7 +1054,6 @@ void GL_APIENTRY PushMatrix()
void GL_APIENTRY Rotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z) 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); EVENT("(GLfloat angle = %f, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", angle, x, y, z);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1137,7 +1068,6 @@ void GL_APIENTRY Rotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z) ...@@ -1137,7 +1068,6 @@ void GL_APIENTRY Rotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
void GL_APIENTRY Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed 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, EVENT("(GLfixed angle = 0x%X, GLfixed x = 0x%X, GLfixed y = 0x%X, GLfixed z = 0x%X)", angle, x,
y, z); y, z);
...@@ -1153,7 +1083,6 @@ void GL_APIENTRY Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z) ...@@ -1153,7 +1083,6 @@ void GL_APIENTRY Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
void GL_APIENTRY SampleCoveragex(GLclampx value, GLboolean invert) void GL_APIENTRY SampleCoveragex(GLclampx value, GLboolean invert)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLclampx value = 0x%X, GLboolean invert = %u)", value, invert); EVENT("(GLclampx value = 0x%X, GLboolean invert = %u)", value, invert);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1168,7 +1097,6 @@ void GL_APIENTRY SampleCoveragex(GLclampx value, GLboolean invert) ...@@ -1168,7 +1097,6 @@ void GL_APIENTRY SampleCoveragex(GLclampx value, GLboolean invert)
void GL_APIENTRY Scalef(GLfloat x, GLfloat y, GLfloat z) 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); EVENT("(GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", x, y, z);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1183,7 +1111,6 @@ void GL_APIENTRY Scalef(GLfloat x, GLfloat y, GLfloat z) ...@@ -1183,7 +1111,6 @@ void GL_APIENTRY Scalef(GLfloat x, GLfloat y, GLfloat z)
void GL_APIENTRY Scalex(GLfixed x, GLfixed y, GLfixed 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); EVENT("(GLfixed x = 0x%X, GLfixed y = 0x%X, GLfixed z = 0x%X)", x, y, z);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1198,7 +1125,6 @@ void GL_APIENTRY Scalex(GLfixed x, GLfixed y, GLfixed z) ...@@ -1198,7 +1125,6 @@ void GL_APIENTRY Scalex(GLfixed x, GLfixed y, GLfixed z)
void GL_APIENTRY ShadeModel(GLenum mode) void GL_APIENTRY ShadeModel(GLenum mode)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum mode = 0x%X)", mode); EVENT("(GLenum mode = 0x%X)", mode);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1214,7 +1140,6 @@ void GL_APIENTRY ShadeModel(GLenum mode) ...@@ -1214,7 +1140,6 @@ void GL_APIENTRY ShadeModel(GLenum mode)
void GL_APIENTRY TexCoordPointer(GLint size, GLenum type, GLsizei stride, const void *pointer) void GL_APIENTRY TexCoordPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = " "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -1234,7 +1159,6 @@ void GL_APIENTRY TexCoordPointer(GLint size, GLenum type, GLsizei stride, const ...@@ -1234,7 +1159,6 @@ void GL_APIENTRY TexCoordPointer(GLint size, GLenum type, GLsizei stride, const
void GL_APIENTRY TexEnvf(GLenum target, GLenum pname, GLfloat param) 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); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", target, pname, param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1251,7 +1175,6 @@ void GL_APIENTRY TexEnvf(GLenum target, GLenum pname, GLfloat param) ...@@ -1251,7 +1175,6 @@ void GL_APIENTRY TexEnvf(GLenum target, GLenum pname, GLfloat param)
void GL_APIENTRY TexEnvfv(GLenum target, GLenum pname, const GLfloat *params) 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%016" PRIxPTR ")", EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params); target, pname, (uintptr_t)params);
...@@ -1270,7 +1193,6 @@ void GL_APIENTRY TexEnvfv(GLenum target, GLenum pname, const GLfloat *params) ...@@ -1270,7 +1193,6 @@ void GL_APIENTRY TexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
void GL_APIENTRY TexEnvi(GLenum target, GLenum pname, GLint param) 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); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %d)", target, pname, param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1287,7 +1209,6 @@ void GL_APIENTRY TexEnvi(GLenum target, GLenum pname, GLint param) ...@@ -1287,7 +1209,6 @@ void GL_APIENTRY TexEnvi(GLenum target, GLenum pname, GLint param)
void GL_APIENTRY TexEnviv(GLenum target, GLenum pname, const GLint *params) 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%016" PRIxPTR ")", EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params); target, pname, (uintptr_t)params);
...@@ -1306,7 +1227,6 @@ void GL_APIENTRY TexEnviv(GLenum target, GLenum pname, const GLint *params) ...@@ -1306,7 +1227,6 @@ void GL_APIENTRY TexEnviv(GLenum target, GLenum pname, const GLint *params)
void GL_APIENTRY TexEnvx(GLenum target, GLenum pname, GLfixed param) 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, EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", target, pname,
param); param);
...@@ -1324,7 +1244,6 @@ void GL_APIENTRY TexEnvx(GLenum target, GLenum pname, GLfixed param) ...@@ -1324,7 +1244,6 @@ void GL_APIENTRY TexEnvx(GLenum target, GLenum pname, GLfixed param)
void GL_APIENTRY TexEnvxv(GLenum target, GLenum pname, const GLfixed *params) 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%016" PRIxPTR ")", EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params); target, pname, (uintptr_t)params);
...@@ -1343,7 +1262,6 @@ void GL_APIENTRY TexEnvxv(GLenum target, GLenum pname, const GLfixed *params) ...@@ -1343,7 +1262,6 @@ void GL_APIENTRY TexEnvxv(GLenum target, GLenum pname, const GLfixed *params)
void GL_APIENTRY TexParameterx(GLenum target, GLenum pname, GLfixed param) 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, EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", target, pname,
param); param);
...@@ -1360,7 +1278,6 @@ void GL_APIENTRY TexParameterx(GLenum target, GLenum pname, GLfixed param) ...@@ -1360,7 +1278,6 @@ void GL_APIENTRY TexParameterx(GLenum target, GLenum pname, GLfixed param)
void GL_APIENTRY TexParameterxv(GLenum target, GLenum pname, const GLfixed *params) 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%016" PRIxPTR ")", EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params); target, pname, (uintptr_t)params);
...@@ -1378,7 +1295,6 @@ void GL_APIENTRY TexParameterxv(GLenum target, GLenum pname, const GLfixed *para ...@@ -1378,7 +1295,6 @@ void GL_APIENTRY TexParameterxv(GLenum target, GLenum pname, const GLfixed *para
void GL_APIENTRY Translatef(GLfloat x, GLfloat y, GLfloat z) 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); EVENT("(GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", x, y, z);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1393,7 +1309,6 @@ void GL_APIENTRY Translatef(GLfloat x, GLfloat y, GLfloat z) ...@@ -1393,7 +1309,6 @@ void GL_APIENTRY Translatef(GLfloat x, GLfloat y, GLfloat z)
void GL_APIENTRY Translatex(GLfixed x, GLfixed y, GLfixed 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); EVENT("(GLfixed x = 0x%X, GLfixed y = 0x%X, GLfixed z = 0x%X)", x, y, z);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1408,7 +1323,6 @@ void GL_APIENTRY Translatex(GLfixed x, GLfixed y, GLfixed z) ...@@ -1408,7 +1323,6 @@ void GL_APIENTRY Translatex(GLfixed x, GLfixed y, GLfixed z)
void GL_APIENTRY VertexPointer(GLint size, GLenum type, GLsizei stride, const void *pointer) void GL_APIENTRY VertexPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = " "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
......
src/libGLESv2/entry_points_gles_2_0_autogen.cpp
...@@ -20,7 +20,6 @@ namespace gl ...@@ -20,7 +20,6 @@ namespace gl
{ {
void GL_APIENTRY ActiveTexture(GLenum texture) void GL_APIENTRY ActiveTexture(GLenum texture)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum texture = 0x%X)", texture); EVENT("(GLenum texture = 0x%X)", texture);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -35,7 +34,6 @@ void GL_APIENTRY ActiveTexture(GLenum texture) ...@@ -35,7 +34,6 @@ void GL_APIENTRY ActiveTexture(GLenum texture)
void GL_APIENTRY AttachShader(GLuint program, GLuint shader) void GL_APIENTRY AttachShader(GLuint program, GLuint shader)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLuint shader = %u)", program, shader); EVENT("(GLuint program = %u, GLuint shader = %u)", program, shader);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -50,7 +48,6 @@ void GL_APIENTRY AttachShader(GLuint program, GLuint shader) ...@@ -50,7 +48,6 @@ void GL_APIENTRY AttachShader(GLuint program, GLuint shader)
void GL_APIENTRY BindAttribLocation(GLuint program, GLuint index, const GLchar *name) 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%016" PRIxPTR ")", EVENT("(GLuint program = %u, GLuint index = %u, const GLchar *name = 0x%016" PRIxPTR ")",
program, index, (uintptr_t)name); program, index, (uintptr_t)name);
...@@ -66,7 +63,6 @@ void GL_APIENTRY BindAttribLocation(GLuint program, GLuint index, const GLchar * ...@@ -66,7 +63,6 @@ void GL_APIENTRY BindAttribLocation(GLuint program, GLuint index, const GLchar *
void GL_APIENTRY BindBuffer(GLenum target, GLuint buffer) void GL_APIENTRY BindBuffer(GLenum target, GLuint buffer)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLuint buffer = %u)", target, buffer); EVENT("(GLenum target = 0x%X, GLuint buffer = %u)", target, buffer);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -82,7 +78,6 @@ void GL_APIENTRY BindBuffer(GLenum target, GLuint buffer) ...@@ -82,7 +78,6 @@ void GL_APIENTRY BindBuffer(GLenum target, GLuint buffer)
void GL_APIENTRY BindFramebuffer(GLenum target, GLuint framebuffer) void GL_APIENTRY BindFramebuffer(GLenum target, GLuint framebuffer)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLuint framebuffer = %u)", target, framebuffer); EVENT("(GLenum target = 0x%X, GLuint framebuffer = %u)", target, framebuffer);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -97,7 +92,6 @@ void GL_APIENTRY BindFramebuffer(GLenum target, GLuint framebuffer) ...@@ -97,7 +92,6 @@ void GL_APIENTRY BindFramebuffer(GLenum target, GLuint framebuffer)
void GL_APIENTRY BindRenderbuffer(GLenum target, GLuint renderbuffer) void GL_APIENTRY BindRenderbuffer(GLenum target, GLuint renderbuffer)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLuint renderbuffer = %u)", target, renderbuffer); EVENT("(GLenum target = 0x%X, GLuint renderbuffer = %u)", target, renderbuffer);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -112,7 +106,6 @@ void GL_APIENTRY BindRenderbuffer(GLenum target, GLuint renderbuffer) ...@@ -112,7 +106,6 @@ void GL_APIENTRY BindRenderbuffer(GLenum target, GLuint renderbuffer)
void GL_APIENTRY BindTexture(GLenum target, GLuint texture) void GL_APIENTRY BindTexture(GLenum target, GLuint texture)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLuint texture = %u)", target, texture); EVENT("(GLenum target = 0x%X, GLuint texture = %u)", target, texture);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -128,7 +121,6 @@ void GL_APIENTRY BindTexture(GLenum target, GLuint texture) ...@@ -128,7 +121,6 @@ void GL_APIENTRY BindTexture(GLenum target, GLuint texture)
void GL_APIENTRY BlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) 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, EVENT("(GLfloat red = %f, GLfloat green = %f, GLfloat blue = %f, GLfloat alpha = %f)", red,
green, blue, alpha); green, blue, alpha);
...@@ -144,7 +136,6 @@ void GL_APIENTRY BlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat al ...@@ -144,7 +136,6 @@ void GL_APIENTRY BlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat al
void GL_APIENTRY BlendEquation(GLenum mode) void GL_APIENTRY BlendEquation(GLenum mode)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum mode = 0x%X)", mode); EVENT("(GLenum mode = 0x%X)", mode);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -159,7 +150,6 @@ void GL_APIENTRY BlendEquation(GLenum mode) ...@@ -159,7 +150,6 @@ void GL_APIENTRY BlendEquation(GLenum mode)
void GL_APIENTRY BlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha) void GL_APIENTRY BlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum modeRGB = 0x%X, GLenum modeAlpha = 0x%X)", modeRGB, modeAlpha); EVENT("(GLenum modeRGB = 0x%X, GLenum modeAlpha = 0x%X)", modeRGB, modeAlpha);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -174,7 +164,6 @@ void GL_APIENTRY BlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha) ...@@ -174,7 +164,6 @@ void GL_APIENTRY BlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
void GL_APIENTRY BlendFunc(GLenum sfactor, GLenum dfactor) void GL_APIENTRY BlendFunc(GLenum sfactor, GLenum dfactor)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum sfactor = 0x%X, GLenum dfactor = 0x%X)", sfactor, dfactor); EVENT("(GLenum sfactor = 0x%X, GLenum dfactor = 0x%X)", sfactor, dfactor);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -192,7 +181,6 @@ void GL_APIENTRY BlendFuncSeparate(GLenum sfactorRGB, ...@@ -192,7 +181,6 @@ void GL_APIENTRY BlendFuncSeparate(GLenum sfactorRGB,
GLenum sfactorAlpha, GLenum sfactorAlpha,
GLenum dfactorAlpha) GLenum dfactorAlpha)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum sfactorRGB = 0x%X, GLenum dfactorRGB = 0x%X, GLenum sfactorAlpha = 0x%X, GLenum " "(GLenum sfactorRGB = 0x%X, GLenum dfactorRGB = 0x%X, GLenum sfactorAlpha = 0x%X, GLenum "
"dfactorAlpha = 0x%X)", "dfactorAlpha = 0x%X)",
...@@ -211,7 +199,6 @@ void GL_APIENTRY BlendFuncSeparate(GLenum sfactorRGB, ...@@ -211,7 +199,6 @@ void GL_APIENTRY BlendFuncSeparate(GLenum sfactorRGB,
void GL_APIENTRY BufferData(GLenum target, GLsizeiptr size, const void *data, GLenum usage) void GL_APIENTRY BufferData(GLenum target, GLsizeiptr size, const void *data, GLenum usage)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLsizeiptr size = %llu, const void *data = 0x%016" PRIxPTR EVENT("(GLenum target = 0x%X, GLsizeiptr size = %llu, const void *data = 0x%016" PRIxPTR
", GLenum usage = 0x%X)", ", GLenum usage = 0x%X)",
target, static_cast<unsigned long long>(size), (uintptr_t)data, usage); target, static_cast<unsigned long long>(size), (uintptr_t)data, usage);
...@@ -231,7 +218,6 @@ void GL_APIENTRY BufferData(GLenum target, GLsizeiptr size, const void *data, GL ...@@ -231,7 +218,6 @@ 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) void GL_APIENTRY BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const void *data)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr size = %llu, const void *data = " "(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr size = %llu, const void *data = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -252,7 +238,6 @@ void GL_APIENTRY BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, ...@@ -252,7 +238,6 @@ void GL_APIENTRY BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size,
GLenum GL_APIENTRY CheckFramebufferStatus(GLenum target) GLenum GL_APIENTRY CheckFramebufferStatus(GLenum target)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X)", target); EVENT("(GLenum target = 0x%X)", target);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -269,7 +254,6 @@ GLenum GL_APIENTRY CheckFramebufferStatus(GLenum target) ...@@ -269,7 +254,6 @@ GLenum GL_APIENTRY CheckFramebufferStatus(GLenum target)
void GL_APIENTRY Clear(GLbitfield mask) void GL_APIENTRY Clear(GLbitfield mask)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLbitfield mask = 0x%X)", mask); EVENT("(GLbitfield mask = 0x%X)", mask);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -284,7 +268,6 @@ void GL_APIENTRY Clear(GLbitfield mask) ...@@ -284,7 +268,6 @@ void GL_APIENTRY Clear(GLbitfield mask)
void GL_APIENTRY ClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) 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, EVENT("(GLfloat red = %f, GLfloat green = %f, GLfloat blue = %f, GLfloat alpha = %f)", red,
green, blue, alpha); green, blue, alpha);
...@@ -300,7 +283,6 @@ void GL_APIENTRY ClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat al ...@@ -300,7 +283,6 @@ void GL_APIENTRY ClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat al
void GL_APIENTRY ClearDepthf(GLfloat d) void GL_APIENTRY ClearDepthf(GLfloat d)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLfloat d = %f)", d); EVENT("(GLfloat d = %f)", d);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -315,7 +297,6 @@ void GL_APIENTRY ClearDepthf(GLfloat d) ...@@ -315,7 +297,6 @@ void GL_APIENTRY ClearDepthf(GLfloat d)
void GL_APIENTRY ClearStencil(GLint s) void GL_APIENTRY ClearStencil(GLint s)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLint s = %d)", s); EVENT("(GLint s = %d)", s);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -330,7 +311,6 @@ void GL_APIENTRY ClearStencil(GLint s) ...@@ -330,7 +311,6 @@ void GL_APIENTRY ClearStencil(GLint s)
void GL_APIENTRY ColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha) 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)", EVENT("(GLboolean red = %u, GLboolean green = %u, GLboolean blue = %u, GLboolean alpha = %u)",
red, green, blue, alpha); red, green, blue, alpha);
...@@ -346,7 +326,6 @@ void GL_APIENTRY ColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboo ...@@ -346,7 +326,6 @@ void GL_APIENTRY ColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboo
void GL_APIENTRY CompileShader(GLuint shader) void GL_APIENTRY CompileShader(GLuint shader)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint shader = %u)", shader); EVENT("(GLuint shader = %u)", shader);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -368,7 +347,6 @@ void GL_APIENTRY CompressedTexImage2D(GLenum target, ...@@ -368,7 +347,6 @@ void GL_APIENTRY CompressedTexImage2D(GLenum target,
GLsizei imageSize, GLsizei imageSize,
const void *data) const void *data)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = " "(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 = " "%d, GLsizei height = %d, GLint border = %d, GLsizei imageSize = %d, const void *data = "
...@@ -399,7 +377,6 @@ void GL_APIENTRY CompressedTexSubImage2D(GLenum target, ...@@ -399,7 +377,6 @@ void GL_APIENTRY CompressedTexSubImage2D(GLenum target,
GLsizei imageSize, GLsizei imageSize,
const void *data) const void *data)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLsizei " "(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 " "width = %d, GLsizei height = %d, GLenum format = 0x%X, GLsizei imageSize = %d, const void "
...@@ -429,7 +406,6 @@ void GL_APIENTRY CopyTexImage2D(GLenum target, ...@@ -429,7 +406,6 @@ void GL_APIENTRY CopyTexImage2D(GLenum target,
GLsizei height, GLsizei height,
GLint border) GLint border)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLint x = %d, " "(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)", "GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLint border = %d)",
...@@ -458,7 +434,6 @@ void GL_APIENTRY CopyTexSubImage2D(GLenum target, ...@@ -458,7 +434,6 @@ void GL_APIENTRY CopyTexSubImage2D(GLenum target,
GLsizei width, GLsizei width,
GLsizei height) GLsizei height)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint x " "(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)", "= %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",
...@@ -479,7 +454,6 @@ void GL_APIENTRY CopyTexSubImage2D(GLenum target, ...@@ -479,7 +454,6 @@ void GL_APIENTRY CopyTexSubImage2D(GLenum target,
GLuint GL_APIENTRY CreateProgram() GLuint GL_APIENTRY CreateProgram()
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("()"); EVENT("()");
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -496,7 +470,6 @@ GLuint GL_APIENTRY CreateProgram() ...@@ -496,7 +470,6 @@ GLuint GL_APIENTRY CreateProgram()
GLuint GL_APIENTRY CreateShader(GLenum type) GLuint GL_APIENTRY CreateShader(GLenum type)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum type = 0x%X)", type); EVENT("(GLenum type = 0x%X)", type);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -514,7 +487,6 @@ GLuint GL_APIENTRY CreateShader(GLenum type) ...@@ -514,7 +487,6 @@ GLuint GL_APIENTRY CreateShader(GLenum type)
void GL_APIENTRY CullFace(GLenum mode) void GL_APIENTRY CullFace(GLenum mode)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum mode = 0x%X)", mode); EVENT("(GLenum mode = 0x%X)", mode);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -530,7 +502,6 @@ void GL_APIENTRY CullFace(GLenum mode) ...@@ -530,7 +502,6 @@ void GL_APIENTRY CullFace(GLenum mode)
void GL_APIENTRY DeleteBuffers(GLsizei n, const GLuint *buffers) void GL_APIENTRY DeleteBuffers(GLsizei n, const GLuint *buffers)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *buffers = 0x%016" PRIxPTR ")", n, (uintptr_t)buffers); EVENT("(GLsizei n = %d, const GLuint *buffers = 0x%016" PRIxPTR ")", n, (uintptr_t)buffers);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -545,7 +516,6 @@ void GL_APIENTRY DeleteBuffers(GLsizei n, const GLuint *buffers) ...@@ -545,7 +516,6 @@ void GL_APIENTRY DeleteBuffers(GLsizei n, const GLuint *buffers)
void GL_APIENTRY DeleteFramebuffers(GLsizei n, const GLuint *framebuffers) void GL_APIENTRY DeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *framebuffers = 0x%016" PRIxPTR ")", n, EVENT("(GLsizei n = %d, const GLuint *framebuffers = 0x%016" PRIxPTR ")", n,
(uintptr_t)framebuffers); (uintptr_t)framebuffers);
...@@ -561,7 +531,6 @@ void GL_APIENTRY DeleteFramebuffers(GLsizei n, const GLuint *framebuffers) ...@@ -561,7 +531,6 @@ void GL_APIENTRY DeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
void GL_APIENTRY DeleteProgram(GLuint program) void GL_APIENTRY DeleteProgram(GLuint program)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u)", program); EVENT("(GLuint program = %u)", program);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -576,7 +545,6 @@ void GL_APIENTRY DeleteProgram(GLuint program) ...@@ -576,7 +545,6 @@ void GL_APIENTRY DeleteProgram(GLuint program)
void GL_APIENTRY DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers) void GL_APIENTRY DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *renderbuffers = 0x%016" PRIxPTR ")", n, EVENT("(GLsizei n = %d, const GLuint *renderbuffers = 0x%016" PRIxPTR ")", n,
(uintptr_t)renderbuffers); (uintptr_t)renderbuffers);
...@@ -592,7 +560,6 @@ void GL_APIENTRY DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers) ...@@ -592,7 +560,6 @@ void GL_APIENTRY DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
void GL_APIENTRY DeleteShader(GLuint shader) void GL_APIENTRY DeleteShader(GLuint shader)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint shader = %u)", shader); EVENT("(GLuint shader = %u)", shader);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -607,7 +574,6 @@ void GL_APIENTRY DeleteShader(GLuint shader) ...@@ -607,7 +574,6 @@ void GL_APIENTRY DeleteShader(GLuint shader)
void GL_APIENTRY DeleteTextures(GLsizei n, const GLuint *textures) void GL_APIENTRY DeleteTextures(GLsizei n, const GLuint *textures)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *textures = 0x%016" PRIxPTR ")", n, (uintptr_t)textures); EVENT("(GLsizei n = %d, const GLuint *textures = 0x%016" PRIxPTR ")", n, (uintptr_t)textures);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -622,7 +588,6 @@ void GL_APIENTRY DeleteTextures(GLsizei n, const GLuint *textures) ...@@ -622,7 +588,6 @@ void GL_APIENTRY DeleteTextures(GLsizei n, const GLuint *textures)
void GL_APIENTRY DepthFunc(GLenum func) void GL_APIENTRY DepthFunc(GLenum func)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum func = 0x%X)", func); EVENT("(GLenum func = 0x%X)", func);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -637,7 +602,6 @@ void GL_APIENTRY DepthFunc(GLenum func) ...@@ -637,7 +602,6 @@ void GL_APIENTRY DepthFunc(GLenum func)
void GL_APIENTRY DepthMask(GLboolean flag) void GL_APIENTRY DepthMask(GLboolean flag)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLboolean flag = %u)", flag); EVENT("(GLboolean flag = %u)", flag);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -652,7 +616,6 @@ void GL_APIENTRY DepthMask(GLboolean flag) ...@@ -652,7 +616,6 @@ void GL_APIENTRY DepthMask(GLboolean flag)
void GL_APIENTRY DepthRangef(GLfloat n, GLfloat f) void GL_APIENTRY DepthRangef(GLfloat n, GLfloat f)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLfloat n = %f, GLfloat f = %f)", n, f); EVENT("(GLfloat n = %f, GLfloat f = %f)", n, f);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -667,7 +630,6 @@ void GL_APIENTRY DepthRangef(GLfloat n, GLfloat f) ...@@ -667,7 +630,6 @@ void GL_APIENTRY DepthRangef(GLfloat n, GLfloat f)
void GL_APIENTRY DetachShader(GLuint program, GLuint shader) void GL_APIENTRY DetachShader(GLuint program, GLuint shader)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLuint shader = %u)", program, shader); EVENT("(GLuint program = %u, GLuint shader = %u)", program, shader);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -682,7 +644,6 @@ void GL_APIENTRY DetachShader(GLuint program, GLuint shader) ...@@ -682,7 +644,6 @@ void GL_APIENTRY DetachShader(GLuint program, GLuint shader)
void GL_APIENTRY Disable(GLenum cap) void GL_APIENTRY Disable(GLenum cap)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum cap = 0x%X)", cap); EVENT("(GLenum cap = 0x%X)", cap);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -697,7 +658,6 @@ void GL_APIENTRY Disable(GLenum cap) ...@@ -697,7 +658,6 @@ void GL_APIENTRY Disable(GLenum cap)
void GL_APIENTRY DisableVertexAttribArray(GLuint index) void GL_APIENTRY DisableVertexAttribArray(GLuint index)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u)", index); EVENT("(GLuint index = %u)", index);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -712,7 +672,6 @@ void GL_APIENTRY DisableVertexAttribArray(GLuint index) ...@@ -712,7 +672,6 @@ void GL_APIENTRY DisableVertexAttribArray(GLuint index)
void GL_APIENTRY DrawArrays(GLenum mode, GLint first, GLsizei count) 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); EVENT("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d)", mode, first, count);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -728,7 +687,6 @@ void GL_APIENTRY DrawArrays(GLenum mode, GLint first, GLsizei count) ...@@ -728,7 +687,6 @@ void GL_APIENTRY DrawArrays(GLenum mode, GLint first, GLsizei count)
void GL_APIENTRY DrawElements(GLenum mode, GLsizei count, GLenum type, const void *indices) void GL_APIENTRY DrawElements(GLenum mode, GLsizei count, GLenum type, const void *indices)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = " "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -749,7 +707,6 @@ void GL_APIENTRY DrawElements(GLenum mode, GLsizei count, GLenum type, const voi ...@@ -749,7 +707,6 @@ void GL_APIENTRY DrawElements(GLenum mode, GLsizei count, GLenum type, const voi
void GL_APIENTRY Enable(GLenum cap) void GL_APIENTRY Enable(GLenum cap)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum cap = 0x%X)", cap); EVENT("(GLenum cap = 0x%X)", cap);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -764,7 +721,6 @@ void GL_APIENTRY Enable(GLenum cap) ...@@ -764,7 +721,6 @@ void GL_APIENTRY Enable(GLenum cap)
void GL_APIENTRY EnableVertexAttribArray(GLuint index) void GL_APIENTRY EnableVertexAttribArray(GLuint index)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u)", index); EVENT("(GLuint index = %u)", index);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -779,7 +735,6 @@ void GL_APIENTRY EnableVertexAttribArray(GLuint index) ...@@ -779,7 +735,6 @@ void GL_APIENTRY EnableVertexAttribArray(GLuint index)
void GL_APIENTRY Finish() void GL_APIENTRY Finish()
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("()"); EVENT("()");
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -794,7 +749,6 @@ void GL_APIENTRY Finish() ...@@ -794,7 +749,6 @@ void GL_APIENTRY Finish()
void GL_APIENTRY Flush() void GL_APIENTRY Flush()
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("()"); EVENT("()");
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -812,7 +766,6 @@ void GL_APIENTRY FramebufferRenderbuffer(GLenum target, ...@@ -812,7 +766,6 @@ void GL_APIENTRY FramebufferRenderbuffer(GLenum target,
GLenum renderbuffertarget, GLenum renderbuffertarget,
GLuint renderbuffer) GLuint renderbuffer)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum renderbuffertarget = 0x%X, GLuint " "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum renderbuffertarget = 0x%X, GLuint "
"renderbuffer = %u)", "renderbuffer = %u)",
...@@ -836,7 +789,6 @@ void GL_APIENTRY FramebufferTexture2D(GLenum target, ...@@ -836,7 +789,6 @@ void GL_APIENTRY FramebufferTexture2D(GLenum target,
GLuint texture, GLuint texture,
GLint level) GLint level)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, GLuint texture " "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, GLuint texture "
"= %u, GLint level = %d)", "= %u, GLint level = %d)",
...@@ -857,7 +809,6 @@ void GL_APIENTRY FramebufferTexture2D(GLenum target, ...@@ -857,7 +809,6 @@ void GL_APIENTRY FramebufferTexture2D(GLenum target,
void GL_APIENTRY FrontFace(GLenum mode) void GL_APIENTRY FrontFace(GLenum mode)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum mode = 0x%X)", mode); EVENT("(GLenum mode = 0x%X)", mode);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -872,7 +823,6 @@ void GL_APIENTRY FrontFace(GLenum mode) ...@@ -872,7 +823,6 @@ void GL_APIENTRY FrontFace(GLenum mode)
void GL_APIENTRY GenBuffers(GLsizei n, GLuint *buffers) void GL_APIENTRY GenBuffers(GLsizei n, GLuint *buffers)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *buffers = 0x%016" PRIxPTR ")", n, (uintptr_t)buffers); EVENT("(GLsizei n = %d, GLuint *buffers = 0x%016" PRIxPTR ")", n, (uintptr_t)buffers);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -887,7 +837,6 @@ void GL_APIENTRY GenBuffers(GLsizei n, GLuint *buffers) ...@@ -887,7 +837,6 @@ void GL_APIENTRY GenBuffers(GLsizei n, GLuint *buffers)
void GL_APIENTRY GenFramebuffers(GLsizei n, GLuint *framebuffers) void GL_APIENTRY GenFramebuffers(GLsizei n, GLuint *framebuffers)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *framebuffers = 0x%016" PRIxPTR ")", n, (uintptr_t)framebuffers); EVENT("(GLsizei n = %d, GLuint *framebuffers = 0x%016" PRIxPTR ")", n, (uintptr_t)framebuffers);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -902,7 +851,6 @@ void GL_APIENTRY GenFramebuffers(GLsizei n, GLuint *framebuffers) ...@@ -902,7 +851,6 @@ void GL_APIENTRY GenFramebuffers(GLsizei n, GLuint *framebuffers)
void GL_APIENTRY GenRenderbuffers(GLsizei n, GLuint *renderbuffers) void GL_APIENTRY GenRenderbuffers(GLsizei n, GLuint *renderbuffers)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *renderbuffers = 0x%016" PRIxPTR ")", n, EVENT("(GLsizei n = %d, GLuint *renderbuffers = 0x%016" PRIxPTR ")", n,
(uintptr_t)renderbuffers); (uintptr_t)renderbuffers);
...@@ -918,7 +866,6 @@ void GL_APIENTRY GenRenderbuffers(GLsizei n, GLuint *renderbuffers) ...@@ -918,7 +866,6 @@ void GL_APIENTRY GenRenderbuffers(GLsizei n, GLuint *renderbuffers)
void GL_APIENTRY GenTextures(GLsizei n, GLuint *textures) void GL_APIENTRY GenTextures(GLsizei n, GLuint *textures)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *textures = 0x%016" PRIxPTR ")", n, (uintptr_t)textures); EVENT("(GLsizei n = %d, GLuint *textures = 0x%016" PRIxPTR ")", n, (uintptr_t)textures);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -933,7 +880,6 @@ void GL_APIENTRY GenTextures(GLsizei n, GLuint *textures) ...@@ -933,7 +880,6 @@ void GL_APIENTRY GenTextures(GLsizei n, GLuint *textures)
void GL_APIENTRY GenerateMipmap(GLenum target) void GL_APIENTRY GenerateMipmap(GLenum target)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X)", target); EVENT("(GLenum target = 0x%X)", target);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -955,7 +901,6 @@ void GL_APIENTRY GetActiveAttrib(GLuint program, ...@@ -955,7 +901,6 @@ void GL_APIENTRY GetActiveAttrib(GLuint program,
GLenum *type, GLenum *type,
GLchar *name) GLchar *name)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = " "(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = "
"0x%016" PRIxPTR ", GLint *size = 0x%016" PRIxPTR ", GLenum *type = 0x%016" PRIxPTR "0x%016" PRIxPTR ", GLint *size = 0x%016" PRIxPTR ", GLenum *type = 0x%016" PRIxPTR
...@@ -982,7 +927,6 @@ void GL_APIENTRY GetActiveUniform(GLuint program, ...@@ -982,7 +927,6 @@ void GL_APIENTRY GetActiveUniform(GLuint program,
GLenum *type, GLenum *type,
GLchar *name) GLchar *name)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = " "(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = "
"0x%016" PRIxPTR ", GLint *size = 0x%016" PRIxPTR ", GLenum *type = 0x%016" PRIxPTR "0x%016" PRIxPTR ", GLint *size = 0x%016" PRIxPTR ", GLenum *type = 0x%016" PRIxPTR
...@@ -1006,7 +950,6 @@ void GL_APIENTRY GetAttachedShaders(GLuint program, ...@@ -1006,7 +950,6 @@ void GL_APIENTRY GetAttachedShaders(GLuint program,
GLsizei *count, GLsizei *count,
GLuint *shaders) GLuint *shaders)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLsizei maxCount = %d, GLsizei *count = 0x%016" PRIxPTR EVENT("(GLuint program = %u, GLsizei maxCount = %d, GLsizei *count = 0x%016" PRIxPTR
", GLuint *shaders = 0x%016" PRIxPTR ")", ", GLuint *shaders = 0x%016" PRIxPTR ")",
program, maxCount, (uintptr_t)count, (uintptr_t)shaders); program, maxCount, (uintptr_t)count, (uintptr_t)shaders);
...@@ -1024,7 +967,6 @@ void GL_APIENTRY GetAttachedShaders(GLuint program, ...@@ -1024,7 +967,6 @@ void GL_APIENTRY GetAttachedShaders(GLuint program,
GLint GL_APIENTRY GetAttribLocation(GLuint program, const GLchar *name) GLint GL_APIENTRY GetAttribLocation(GLuint program, const GLchar *name)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, const GLchar *name = 0x%016" PRIxPTR ")", program, EVENT("(GLuint program = %u, const GLchar *name = 0x%016" PRIxPTR ")", program,
(uintptr_t)name); (uintptr_t)name);
...@@ -1042,7 +984,6 @@ GLint GL_APIENTRY GetAttribLocation(GLuint program, const GLchar *name) ...@@ -1042,7 +984,6 @@ GLint GL_APIENTRY GetAttribLocation(GLuint program, const GLchar *name)
void GL_APIENTRY GetBooleanv(GLenum pname, GLboolean *data) void GL_APIENTRY GetBooleanv(GLenum pname, GLboolean *data)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLboolean *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data); EVENT("(GLenum pname = 0x%X, GLboolean *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1057,7 +998,6 @@ void GL_APIENTRY GetBooleanv(GLenum pname, GLboolean *data) ...@@ -1057,7 +998,6 @@ void GL_APIENTRY GetBooleanv(GLenum pname, GLboolean *data)
void GL_APIENTRY GetBufferParameteriv(GLenum target, GLenum pname, GLint *params) 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%016" PRIxPTR ")", target, EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
pname, (uintptr_t)params); pname, (uintptr_t)params);
...@@ -1075,7 +1015,6 @@ void GL_APIENTRY GetBufferParameteriv(GLenum target, GLenum pname, GLint *params ...@@ -1075,7 +1015,6 @@ void GL_APIENTRY GetBufferParameteriv(GLenum target, GLenum pname, GLint *params
GLenum GL_APIENTRY GetError() GLenum GL_APIENTRY GetError()
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("()"); EVENT("()");
Context *context = GetGlobalContext(); Context *context = GetGlobalContext();
...@@ -1092,7 +1031,6 @@ GLenum GL_APIENTRY GetError() ...@@ -1092,7 +1031,6 @@ GLenum GL_APIENTRY GetError()
void GL_APIENTRY GetFloatv(GLenum pname, GLfloat *data) void GL_APIENTRY GetFloatv(GLenum pname, GLfloat *data)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLfloat *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data); EVENT("(GLenum pname = 0x%X, GLfloat *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1110,7 +1048,6 @@ void GL_APIENTRY GetFramebufferAttachmentParameteriv(GLenum target, ...@@ -1110,7 +1048,6 @@ void GL_APIENTRY GetFramebufferAttachmentParameteriv(GLenum target,
GLenum pname, GLenum pname,
GLint *params) GLint *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLint *params = " "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLint *params = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -1129,7 +1066,6 @@ void GL_APIENTRY GetFramebufferAttachmentParameteriv(GLenum target, ...@@ -1129,7 +1066,6 @@ void GL_APIENTRY GetFramebufferAttachmentParameteriv(GLenum target,
void GL_APIENTRY GetIntegerv(GLenum pname, GLint *data) void GL_APIENTRY GetIntegerv(GLenum pname, GLint *data)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLint *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data); EVENT("(GLenum pname = 0x%X, GLint *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1147,7 +1083,6 @@ void GL_APIENTRY GetProgramInfoLog(GLuint program, ...@@ -1147,7 +1083,6 @@ void GL_APIENTRY GetProgramInfoLog(GLuint program,
GLsizei *length, GLsizei *length,
GLchar *infoLog) GLchar *infoLog)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR EVENT("(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
", GLchar *infoLog = 0x%016" PRIxPTR ")", ", GLchar *infoLog = 0x%016" PRIxPTR ")",
program, bufSize, (uintptr_t)length, (uintptr_t)infoLog); program, bufSize, (uintptr_t)length, (uintptr_t)infoLog);
...@@ -1165,7 +1100,6 @@ void GL_APIENTRY GetProgramInfoLog(GLuint program, ...@@ -1165,7 +1100,6 @@ void GL_APIENTRY GetProgramInfoLog(GLuint program,
void GL_APIENTRY GetProgramiv(GLuint program, GLenum pname, GLint *params) 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%016" PRIxPTR ")", program, EVENT("(GLuint program = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", program,
pname, (uintptr_t)params); pname, (uintptr_t)params);
...@@ -1181,7 +1115,6 @@ void GL_APIENTRY GetProgramiv(GLuint program, GLenum pname, GLint *params) ...@@ -1181,7 +1115,6 @@ void GL_APIENTRY GetProgramiv(GLuint program, GLenum pname, GLint *params)
void GL_APIENTRY GetRenderbufferParameteriv(GLenum target, 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%016" PRIxPTR ")", target, EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
pname, (uintptr_t)params); pname, (uintptr_t)params);
...@@ -1198,7 +1131,6 @@ void GL_APIENTRY GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint * ...@@ -1198,7 +1131,6 @@ void GL_APIENTRY GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *
void GL_APIENTRY GetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog) 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%016" PRIxPTR EVENT("(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
", GLchar *infoLog = 0x%016" PRIxPTR ")", ", GLchar *infoLog = 0x%016" PRIxPTR ")",
shader, bufSize, (uintptr_t)length, (uintptr_t)infoLog); shader, bufSize, (uintptr_t)length, (uintptr_t)infoLog);
...@@ -1219,7 +1151,6 @@ void GL_APIENTRY GetShaderPrecisionFormat(GLenum shadertype, ...@@ -1219,7 +1151,6 @@ void GL_APIENTRY GetShaderPrecisionFormat(GLenum shadertype,
GLint *range, GLint *range,
GLint *precision) GLint *precision)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum shadertype = 0x%X, GLenum precisiontype = 0x%X, GLint *range = 0x%016" PRIxPTR EVENT("(GLenum shadertype = 0x%X, GLenum precisiontype = 0x%X, GLint *range = 0x%016" PRIxPTR
", GLint *precision = 0x%016" PRIxPTR ")", ", GLint *precision = 0x%016" PRIxPTR ")",
shadertype, precisiontype, (uintptr_t)range, (uintptr_t)precision); shadertype, precisiontype, (uintptr_t)range, (uintptr_t)precision);
...@@ -1237,7 +1168,6 @@ void GL_APIENTRY GetShaderPrecisionFormat(GLenum shadertype, ...@@ -1237,7 +1168,6 @@ void GL_APIENTRY GetShaderPrecisionFormat(GLenum shadertype,
void GL_APIENTRY GetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source) 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%016" PRIxPTR EVENT("(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
", GLchar *source = 0x%016" PRIxPTR ")", ", GLchar *source = 0x%016" PRIxPTR ")",
shader, bufSize, (uintptr_t)length, (uintptr_t)source); shader, bufSize, (uintptr_t)length, (uintptr_t)source);
...@@ -1255,7 +1185,6 @@ void GL_APIENTRY GetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length ...@@ -1255,7 +1185,6 @@ void GL_APIENTRY GetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length
void GL_APIENTRY GetShaderiv(GLuint shader, GLenum pname, GLint *params) 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%016" PRIxPTR ")", shader, EVENT("(GLuint shader = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", shader,
pname, (uintptr_t)params); pname, (uintptr_t)params);
...@@ -1271,7 +1200,6 @@ void GL_APIENTRY GetShaderiv(GLuint shader, GLenum pname, GLint *params) ...@@ -1271,7 +1200,6 @@ void GL_APIENTRY GetShaderiv(GLuint shader, GLenum pname, GLint *params)
const GLubyte *GL_APIENTRY GetString(GLenum name) const GLubyte *GL_APIENTRY GetString(GLenum name)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum name = 0x%X)", name); EVENT("(GLenum name = 0x%X)", name);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1288,7 +1216,6 @@ const GLubyte *GL_APIENTRY GetString(GLenum name) ...@@ -1288,7 +1216,6 @@ const GLubyte *GL_APIENTRY GetString(GLenum name)
void GL_APIENTRY GetTexParameterfv(GLenum target, GLenum pname, GLfloat *params) 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%016" PRIxPTR ")", EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params); target, pname, (uintptr_t)params);
...@@ -1306,7 +1233,6 @@ void GL_APIENTRY GetTexParameterfv(GLenum target, GLenum pname, GLfloat *params) ...@@ -1306,7 +1233,6 @@ void GL_APIENTRY GetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
void GL_APIENTRY GetTexParameteriv(GLenum target, GLenum pname, GLint *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%016" PRIxPTR ")", target, EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
pname, (uintptr_t)params); pname, (uintptr_t)params);
...@@ -1324,7 +1250,6 @@ void GL_APIENTRY GetTexParameteriv(GLenum target, GLenum pname, GLint *params) ...@@ -1324,7 +1250,6 @@ void GL_APIENTRY GetTexParameteriv(GLenum target, GLenum pname, GLint *params)
GLint GL_APIENTRY GetUniformLocation(GLuint program, const GLchar *name) GLint GL_APIENTRY GetUniformLocation(GLuint program, const GLchar *name)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, const GLchar *name = 0x%016" PRIxPTR ")", program, EVENT("(GLuint program = %u, const GLchar *name = 0x%016" PRIxPTR ")", program,
(uintptr_t)name); (uintptr_t)name);
...@@ -1342,7 +1267,6 @@ GLint GL_APIENTRY GetUniformLocation(GLuint program, const GLchar *name) ...@@ -1342,7 +1267,6 @@ GLint GL_APIENTRY GetUniformLocation(GLuint program, const GLchar *name)
void GL_APIENTRY GetUniformfv(GLuint program, GLint location, GLfloat *params) void GL_APIENTRY GetUniformfv(GLuint program, GLint location, GLfloat *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLint location = %d, GLfloat *params = 0x%016" PRIxPTR ")", EVENT("(GLuint program = %u, GLint location = %d, GLfloat *params = 0x%016" PRIxPTR ")",
program, location, (uintptr_t)params); program, location, (uintptr_t)params);
...@@ -1358,7 +1282,6 @@ void GL_APIENTRY GetUniformfv(GLuint program, GLint location, GLfloat *params) ...@@ -1358,7 +1282,6 @@ void GL_APIENTRY GetUniformfv(GLuint program, GLint location, GLfloat *params)
void GL_APIENTRY GetUniformiv(GLuint program, GLint location, GLint *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%016" PRIxPTR ")", program, EVENT("(GLuint program = %u, GLint location = %d, GLint *params = 0x%016" PRIxPTR ")", program,
location, (uintptr_t)params); location, (uintptr_t)params);
...@@ -1374,7 +1297,6 @@ void GL_APIENTRY GetUniformiv(GLuint program, GLint location, GLint *params) ...@@ -1374,7 +1297,6 @@ void GL_APIENTRY GetUniformiv(GLuint program, GLint location, GLint *params)
void GL_APIENTRY GetVertexAttribPointerv(GLuint index, GLenum pname, void **pointer) 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%016" PRIxPTR ")", index, EVENT("(GLuint index = %u, GLenum pname = 0x%X, void **pointer = 0x%016" PRIxPTR ")", index,
pname, (uintptr_t)pointer); pname, (uintptr_t)pointer);
...@@ -1391,7 +1313,6 @@ void GL_APIENTRY GetVertexAttribPointerv(GLuint index, GLenum pname, void **poin ...@@ -1391,7 +1313,6 @@ void GL_APIENTRY GetVertexAttribPointerv(GLuint index, GLenum pname, void **poin
void GL_APIENTRY GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params) 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%016" PRIxPTR ")", index, EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")", index,
pname, (uintptr_t)params); pname, (uintptr_t)params);
...@@ -1407,7 +1328,6 @@ void GL_APIENTRY GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params) ...@@ -1407,7 +1328,6 @@ void GL_APIENTRY GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
void GL_APIENTRY GetVertexAttribiv(GLuint index, GLenum pname, GLint *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%016" PRIxPTR ")", index, EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", index,
pname, (uintptr_t)params); pname, (uintptr_t)params);
...@@ -1423,7 +1343,6 @@ void GL_APIENTRY GetVertexAttribiv(GLuint index, GLenum pname, GLint *params) ...@@ -1423,7 +1343,6 @@ void GL_APIENTRY GetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
void GL_APIENTRY Hint(GLenum target, GLenum mode) void GL_APIENTRY Hint(GLenum target, GLenum mode)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum mode = 0x%X)", target, mode); EVENT("(GLenum target = 0x%X, GLenum mode = 0x%X)", target, mode);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1438,7 +1357,6 @@ void GL_APIENTRY Hint(GLenum target, GLenum mode) ...@@ -1438,7 +1357,6 @@ void GL_APIENTRY Hint(GLenum target, GLenum mode)
GLboolean GL_APIENTRY IsBuffer(GLuint buffer) GLboolean GL_APIENTRY IsBuffer(GLuint buffer)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint buffer = %u)", buffer); EVENT("(GLuint buffer = %u)", buffer);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1455,7 +1373,6 @@ GLboolean GL_APIENTRY IsBuffer(GLuint buffer) ...@@ -1455,7 +1373,6 @@ GLboolean GL_APIENTRY IsBuffer(GLuint buffer)
GLboolean GL_APIENTRY IsEnabled(GLenum cap) GLboolean GL_APIENTRY IsEnabled(GLenum cap)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum cap = 0x%X)", cap); EVENT("(GLenum cap = 0x%X)", cap);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1472,7 +1389,6 @@ GLboolean GL_APIENTRY IsEnabled(GLenum cap) ...@@ -1472,7 +1389,6 @@ GLboolean GL_APIENTRY IsEnabled(GLenum cap)
GLboolean GL_APIENTRY IsFramebuffer(GLuint framebuffer) GLboolean GL_APIENTRY IsFramebuffer(GLuint framebuffer)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint framebuffer = %u)", framebuffer); EVENT("(GLuint framebuffer = %u)", framebuffer);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1489,7 +1405,6 @@ GLboolean GL_APIENTRY IsFramebuffer(GLuint framebuffer) ...@@ -1489,7 +1405,6 @@ GLboolean GL_APIENTRY IsFramebuffer(GLuint framebuffer)
GLboolean GL_APIENTRY IsProgram(GLuint program) GLboolean GL_APIENTRY IsProgram(GLuint program)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u)", program); EVENT("(GLuint program = %u)", program);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1506,7 +1421,6 @@ GLboolean GL_APIENTRY IsProgram(GLuint program) ...@@ -1506,7 +1421,6 @@ GLboolean GL_APIENTRY IsProgram(GLuint program)
GLboolean GL_APIENTRY IsRenderbuffer(GLuint renderbuffer) GLboolean GL_APIENTRY IsRenderbuffer(GLuint renderbuffer)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint renderbuffer = %u)", renderbuffer); EVENT("(GLuint renderbuffer = %u)", renderbuffer);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1523,7 +1437,6 @@ GLboolean GL_APIENTRY IsRenderbuffer(GLuint renderbuffer) ...@@ -1523,7 +1437,6 @@ GLboolean GL_APIENTRY IsRenderbuffer(GLuint renderbuffer)
GLboolean GL_APIENTRY IsShader(GLuint shader) GLboolean GL_APIENTRY IsShader(GLuint shader)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint shader = %u)", shader); EVENT("(GLuint shader = %u)", shader);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1540,7 +1453,6 @@ GLboolean GL_APIENTRY IsShader(GLuint shader) ...@@ -1540,7 +1453,6 @@ GLboolean GL_APIENTRY IsShader(GLuint shader)
GLboolean GL_APIENTRY IsTexture(GLuint texture) GLboolean GL_APIENTRY IsTexture(GLuint texture)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint texture = %u)", texture); EVENT("(GLuint texture = %u)", texture);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1557,7 +1469,6 @@ GLboolean GL_APIENTRY IsTexture(GLuint texture) ...@@ -1557,7 +1469,6 @@ GLboolean GL_APIENTRY IsTexture(GLuint texture)
void GL_APIENTRY LineWidth(GLfloat width) void GL_APIENTRY LineWidth(GLfloat width)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLfloat width = %f)", width); EVENT("(GLfloat width = %f)", width);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1572,7 +1483,6 @@ void GL_APIENTRY LineWidth(GLfloat width) ...@@ -1572,7 +1483,6 @@ void GL_APIENTRY LineWidth(GLfloat width)
void GL_APIENTRY LinkProgram(GLuint program) void GL_APIENTRY LinkProgram(GLuint program)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u)", program); EVENT("(GLuint program = %u)", program);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1587,7 +1497,6 @@ void GL_APIENTRY LinkProgram(GLuint program) ...@@ -1587,7 +1497,6 @@ void GL_APIENTRY LinkProgram(GLuint program)
void GL_APIENTRY PixelStorei(GLenum pname, GLint param) void GL_APIENTRY PixelStorei(GLenum pname, GLint param)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLint param = %d)", pname, param); EVENT("(GLenum pname = 0x%X, GLint param = %d)", pname, param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1602,7 +1511,6 @@ void GL_APIENTRY PixelStorei(GLenum pname, GLint param) ...@@ -1602,7 +1511,6 @@ void GL_APIENTRY PixelStorei(GLenum pname, GLint param)
void GL_APIENTRY PolygonOffset(GLfloat factor, GLfloat units) void GL_APIENTRY PolygonOffset(GLfloat factor, GLfloat units)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLfloat factor = %f, GLfloat units = %f)", factor, units); EVENT("(GLfloat factor = %f, GLfloat units = %f)", factor, units);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1623,7 +1531,6 @@ void GL_APIENTRY ReadPixels(GLint x, ...@@ -1623,7 +1531,6 @@ void GL_APIENTRY ReadPixels(GLint x,
GLenum type, GLenum type,
void *pixels) void *pixels)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = " "(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = "
"0x%X, GLenum type = 0x%X, void *pixels = 0x%016" PRIxPTR ")", "0x%X, GLenum type = 0x%X, void *pixels = 0x%016" PRIxPTR ")",
...@@ -1642,7 +1549,6 @@ void GL_APIENTRY ReadPixels(GLint x, ...@@ -1642,7 +1549,6 @@ void GL_APIENTRY ReadPixels(GLint x,
void GL_APIENTRY ReleaseShaderCompiler() void GL_APIENTRY ReleaseShaderCompiler()
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("()"); EVENT("()");
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1660,7 +1566,6 @@ void GL_APIENTRY RenderbufferStorage(GLenum target, ...@@ -1660,7 +1566,6 @@ void GL_APIENTRY RenderbufferStorage(GLenum target,
GLsizei width, GLsizei width,
GLsizei height) GLsizei height)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = " "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = "
"%d)", "%d)",
...@@ -1679,7 +1584,6 @@ void GL_APIENTRY RenderbufferStorage(GLenum target, ...@@ -1679,7 +1584,6 @@ void GL_APIENTRY RenderbufferStorage(GLenum target,
void GL_APIENTRY SampleCoverage(GLfloat value, GLboolean invert) void GL_APIENTRY SampleCoverage(GLfloat value, GLboolean invert)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLfloat value = %f, GLboolean invert = %u)", value, invert); EVENT("(GLfloat value = %f, GLboolean invert = %u)", value, invert);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1694,7 +1598,6 @@ void GL_APIENTRY SampleCoverage(GLfloat value, GLboolean invert) ...@@ -1694,7 +1598,6 @@ void GL_APIENTRY SampleCoverage(GLfloat value, GLboolean invert)
void GL_APIENTRY Scissor(GLint x, GLint y, GLsizei width, GLsizei height) 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, EVENT("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", x, y, width,
height); height);
...@@ -1714,7 +1617,6 @@ void GL_APIENTRY ShaderBinary(GLsizei count, ...@@ -1714,7 +1617,6 @@ void GL_APIENTRY ShaderBinary(GLsizei count,
const void *binary, const void *binary,
GLsizei length) GLsizei length)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei count = %d, const GLuint *shaders = 0x%016" PRIxPTR EVENT("(GLsizei count = %d, const GLuint *shaders = 0x%016" PRIxPTR
", GLenum binaryformat = 0x%X, const void *binary = 0x%016" PRIxPTR ", GLenum binaryformat = 0x%X, const void *binary = 0x%016" PRIxPTR
", GLsizei length = %d)", ", GLsizei length = %d)",
...@@ -1736,7 +1638,6 @@ void GL_APIENTRY ShaderSource(GLuint shader, ...@@ -1736,7 +1638,6 @@ void GL_APIENTRY ShaderSource(GLuint shader,
const GLchar *const *string, const GLchar *const *string,
const GLint *length) const GLint *length)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint shader = %u, GLsizei count = %d, const GLchar *const*string = 0x%016" PRIxPTR EVENT("(GLuint shader = %u, GLsizei count = %d, const GLchar *const*string = 0x%016" PRIxPTR
", const GLint *length = 0x%016" PRIxPTR ")", ", const GLint *length = 0x%016" PRIxPTR ")",
shader, count, (uintptr_t)string, (uintptr_t)length); shader, count, (uintptr_t)string, (uintptr_t)length);
...@@ -1754,7 +1655,6 @@ void GL_APIENTRY ShaderSource(GLuint shader, ...@@ -1754,7 +1655,6 @@ void GL_APIENTRY ShaderSource(GLuint shader,
void GL_APIENTRY StencilFunc(GLenum func, GLint ref, GLuint mask) 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); EVENT("(GLenum func = 0x%X, GLint ref = %d, GLuint mask = %u)", func, ref, mask);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1769,7 +1669,6 @@ void GL_APIENTRY StencilFunc(GLenum func, GLint ref, GLuint mask) ...@@ -1769,7 +1669,6 @@ void GL_APIENTRY StencilFunc(GLenum func, GLint ref, GLuint mask)
void GL_APIENTRY StencilFuncSeparate(GLenum face, 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, EVENT("(GLenum face = 0x%X, GLenum func = 0x%X, GLint ref = %d, GLuint mask = %u)", face, func,
ref, mask); ref, mask);
...@@ -1786,7 +1685,6 @@ void GL_APIENTRY StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint ...@@ -1786,7 +1685,6 @@ void GL_APIENTRY StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint
void GL_APIENTRY StencilMask(GLuint mask) void GL_APIENTRY StencilMask(GLuint mask)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint mask = %u)", mask); EVENT("(GLuint mask = %u)", mask);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1801,7 +1699,6 @@ void GL_APIENTRY StencilMask(GLuint mask) ...@@ -1801,7 +1699,6 @@ void GL_APIENTRY StencilMask(GLuint mask)
void GL_APIENTRY StencilMaskSeparate(GLenum face, GLuint mask) void GL_APIENTRY StencilMaskSeparate(GLenum face, GLuint mask)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum face = 0x%X, GLuint mask = %u)", face, mask); EVENT("(GLenum face = 0x%X, GLuint mask = %u)", face, mask);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1816,7 +1713,6 @@ void GL_APIENTRY StencilMaskSeparate(GLenum face, GLuint mask) ...@@ -1816,7 +1713,6 @@ void GL_APIENTRY StencilMaskSeparate(GLenum face, GLuint mask)
void GL_APIENTRY StencilOp(GLenum fail, GLenum zfail, GLenum zpass) 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); EVENT("(GLenum fail = 0x%X, GLenum zfail = 0x%X, GLenum zpass = 0x%X)", fail, zfail, zpass);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1831,7 +1727,6 @@ void GL_APIENTRY StencilOp(GLenum fail, GLenum zfail, GLenum zpass) ...@@ -1831,7 +1727,6 @@ void GL_APIENTRY StencilOp(GLenum fail, GLenum zfail, GLenum zpass)
void GL_APIENTRY StencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass) 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)", EVENT("(GLenum face = 0x%X, GLenum sfail = 0x%X, GLenum dpfail = 0x%X, GLenum dppass = 0x%X)",
face, sfail, dpfail, dppass); face, sfail, dpfail, dppass);
...@@ -1856,7 +1751,6 @@ void GL_APIENTRY TexImage2D(GLenum target, ...@@ -1856,7 +1751,6 @@ void GL_APIENTRY TexImage2D(GLenum target,
GLenum type, GLenum type,
const void *pixels) const void *pixels)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, " "(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 " "GLsizei height = %d, GLint border = %d, GLenum format = 0x%X, GLenum type = 0x%X, const "
...@@ -1879,7 +1773,6 @@ void GL_APIENTRY TexImage2D(GLenum target, ...@@ -1879,7 +1773,6 @@ void GL_APIENTRY TexImage2D(GLenum target,
void GL_APIENTRY TexParameterf(GLenum target, GLenum pname, GLfloat param) 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); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", target, pname, param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1895,7 +1788,6 @@ void GL_APIENTRY TexParameterf(GLenum target, GLenum pname, GLfloat param) ...@@ -1895,7 +1788,6 @@ void GL_APIENTRY TexParameterf(GLenum target, GLenum pname, GLfloat param)
void GL_APIENTRY TexParameterfv(GLenum target, GLenum pname, const GLfloat *params) 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%016" PRIxPTR ")", EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params); target, pname, (uintptr_t)params);
...@@ -1913,7 +1805,6 @@ void GL_APIENTRY TexParameterfv(GLenum target, GLenum pname, const GLfloat *para ...@@ -1913,7 +1805,6 @@ void GL_APIENTRY TexParameterfv(GLenum target, GLenum pname, const GLfloat *para
void GL_APIENTRY TexParameteri(GLenum target, GLenum pname, GLint param) 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); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %d)", target, pname, param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1929,7 +1820,6 @@ void GL_APIENTRY TexParameteri(GLenum target, GLenum pname, GLint param) ...@@ -1929,7 +1820,6 @@ void GL_APIENTRY TexParameteri(GLenum target, GLenum pname, GLint param)
void GL_APIENTRY TexParameteriv(GLenum target, GLenum pname, const GLint *params) 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%016" PRIxPTR ")", EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params); target, pname, (uintptr_t)params);
...@@ -1955,7 +1845,6 @@ void GL_APIENTRY TexSubImage2D(GLenum target, ...@@ -1955,7 +1845,6 @@ void GL_APIENTRY TexSubImage2D(GLenum target,
GLenum type, GLenum type,
const void *pixels) const void *pixels)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLsizei " "(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 " "width = %d, GLsizei height = %d, GLenum format = 0x%X, GLenum type = 0x%X, const void "
...@@ -1978,7 +1867,6 @@ void GL_APIENTRY TexSubImage2D(GLenum target, ...@@ -1978,7 +1867,6 @@ void GL_APIENTRY TexSubImage2D(GLenum target,
void GL_APIENTRY Uniform1f(GLint location, GLfloat v0) void GL_APIENTRY Uniform1f(GLint location, GLfloat v0)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLint location = %d, GLfloat v0 = %f)", location, v0); EVENT("(GLint location = %d, GLfloat v0 = %f)", location, v0);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1993,7 +1881,6 @@ void GL_APIENTRY Uniform1f(GLint location, GLfloat v0) ...@@ -1993,7 +1881,6 @@ void GL_APIENTRY Uniform1f(GLint location, GLfloat v0)
void GL_APIENTRY Uniform1fv(GLint location, GLsizei count, const GLfloat *value) 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%016" PRIxPTR ")", EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value); location, count, (uintptr_t)value);
...@@ -2009,7 +1896,6 @@ void GL_APIENTRY Uniform1fv(GLint location, GLsizei count, const GLfloat *value) ...@@ -2009,7 +1896,6 @@ void GL_APIENTRY Uniform1fv(GLint location, GLsizei count, const GLfloat *value)
void GL_APIENTRY Uniform1i(GLint location, GLint v0) void GL_APIENTRY Uniform1i(GLint location, GLint v0)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLint location = %d, GLint v0 = %d)", location, v0); EVENT("(GLint location = %d, GLint v0 = %d)", location, v0);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -2024,7 +1910,6 @@ void GL_APIENTRY Uniform1i(GLint location, GLint v0) ...@@ -2024,7 +1910,6 @@ void GL_APIENTRY Uniform1i(GLint location, GLint v0)
void GL_APIENTRY Uniform1iv(GLint location, GLsizei count, const GLint *value) 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%016" PRIxPTR ")", EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value); location, count, (uintptr_t)value);
...@@ -2040,7 +1925,6 @@ void GL_APIENTRY Uniform1iv(GLint location, GLsizei count, const GLint *value) ...@@ -2040,7 +1925,6 @@ void GL_APIENTRY Uniform1iv(GLint location, GLsizei count, const GLint *value)
void GL_APIENTRY Uniform2f(GLint location, GLfloat v0, GLfloat v1) 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); EVENT("(GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f)", location, v0, v1);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -2055,7 +1939,6 @@ void GL_APIENTRY Uniform2f(GLint location, GLfloat v0, GLfloat v1) ...@@ -2055,7 +1939,6 @@ void GL_APIENTRY Uniform2f(GLint location, GLfloat v0, GLfloat v1)
void GL_APIENTRY Uniform2fv(GLint location, GLsizei count, const GLfloat *value) 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%016" PRIxPTR ")", EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value); location, count, (uintptr_t)value);
...@@ -2071,7 +1954,6 @@ void GL_APIENTRY Uniform2fv(GLint location, GLsizei count, const GLfloat *value) ...@@ -2071,7 +1954,6 @@ void GL_APIENTRY Uniform2fv(GLint location, GLsizei count, const GLfloat *value)
void GL_APIENTRY Uniform2i(GLint location, GLint v0, GLint v1) 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); EVENT("(GLint location = %d, GLint v0 = %d, GLint v1 = %d)", location, v0, v1);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -2086,7 +1968,6 @@ void GL_APIENTRY Uniform2i(GLint location, GLint v0, GLint v1) ...@@ -2086,7 +1968,6 @@ void GL_APIENTRY Uniform2i(GLint location, GLint v0, GLint v1)
void GL_APIENTRY Uniform2iv(GLint location, GLsizei count, const GLint *value) 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%016" PRIxPTR ")", EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value); location, count, (uintptr_t)value);
...@@ -2102,7 +1983,6 @@ void GL_APIENTRY Uniform2iv(GLint location, GLsizei count, const GLint *value) ...@@ -2102,7 +1983,6 @@ void GL_APIENTRY Uniform2iv(GLint location, GLsizei count, const GLint *value)
void GL_APIENTRY Uniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2) 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, EVENT("(GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = %f)", location, v0,
v1, v2); v1, v2);
...@@ -2118,7 +1998,6 @@ void GL_APIENTRY Uniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2) ...@@ -2118,7 +1998,6 @@ void GL_APIENTRY Uniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
void GL_APIENTRY Uniform3fv(GLint location, GLsizei count, const GLfloat *value) 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%016" PRIxPTR ")", EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value); location, count, (uintptr_t)value);
...@@ -2134,7 +2013,6 @@ void GL_APIENTRY Uniform3fv(GLint location, GLsizei count, const GLfloat *value) ...@@ -2134,7 +2013,6 @@ void GL_APIENTRY Uniform3fv(GLint location, GLsizei count, const GLfloat *value)
void GL_APIENTRY Uniform3i(GLint location, GLint v0, GLint v1, GLint v2) 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, EVENT("(GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d)", location, v0, v1,
v2); v2);
...@@ -2150,7 +2028,6 @@ void GL_APIENTRY Uniform3i(GLint location, GLint v0, GLint v1, GLint v2) ...@@ -2150,7 +2028,6 @@ void GL_APIENTRY Uniform3i(GLint location, GLint v0, GLint v1, GLint v2)
void GL_APIENTRY Uniform3iv(GLint location, GLsizei count, const GLint *value) 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%016" PRIxPTR ")", EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value); location, count, (uintptr_t)value);
...@@ -2166,7 +2043,6 @@ void GL_APIENTRY Uniform3iv(GLint location, GLsizei count, const GLint *value) ...@@ -2166,7 +2043,6 @@ 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) void GL_APIENTRY Uniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = %f, GLfloat v3 = %f)", "(GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = %f, GLfloat v3 = %f)",
location, v0, v1, v2, v3); location, v0, v1, v2, v3);
...@@ -2183,7 +2059,6 @@ void GL_APIENTRY Uniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, G ...@@ -2183,7 +2059,6 @@ void GL_APIENTRY Uniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, G
void GL_APIENTRY Uniform4fv(GLint location, GLsizei count, const GLfloat *value) 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%016" PRIxPTR ")", EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value); location, count, (uintptr_t)value);
...@@ -2199,7 +2074,6 @@ void GL_APIENTRY Uniform4fv(GLint location, GLsizei count, const GLfloat *value) ...@@ -2199,7 +2074,6 @@ 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) 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)", EVENT("(GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d, GLint v3 = %d)",
location, v0, v1, v2, v3); location, v0, v1, v2, v3);
...@@ -2215,7 +2089,6 @@ void GL_APIENTRY Uniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v ...@@ -2215,7 +2089,6 @@ 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) 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%016" PRIxPTR ")", EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value); location, count, (uintptr_t)value);
...@@ -2234,7 +2107,6 @@ void GL_APIENTRY UniformMatrix2fv(GLint location, ...@@ -2234,7 +2107,6 @@ void GL_APIENTRY UniformMatrix2fv(GLint location,
GLboolean transpose, GLboolean transpose,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
"= 0x%016" PRIxPTR ")", "= 0x%016" PRIxPTR ")",
...@@ -2256,7 +2128,6 @@ void GL_APIENTRY UniformMatrix3fv(GLint location, ...@@ -2256,7 +2128,6 @@ void GL_APIENTRY UniformMatrix3fv(GLint location,
GLboolean transpose, GLboolean transpose,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
"= 0x%016" PRIxPTR ")", "= 0x%016" PRIxPTR ")",
...@@ -2278,7 +2149,6 @@ void GL_APIENTRY UniformMatrix4fv(GLint location, ...@@ -2278,7 +2149,6 @@ void GL_APIENTRY UniformMatrix4fv(GLint location,
GLboolean transpose, GLboolean transpose,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
"= 0x%016" PRIxPTR ")", "= 0x%016" PRIxPTR ")",
...@@ -2297,7 +2167,6 @@ void GL_APIENTRY UniformMatrix4fv(GLint location, ...@@ -2297,7 +2167,6 @@ void GL_APIENTRY UniformMatrix4fv(GLint location,
void GL_APIENTRY UseProgram(GLuint program) void GL_APIENTRY UseProgram(GLuint program)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u)", program); EVENT("(GLuint program = %u)", program);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -2312,7 +2181,6 @@ void GL_APIENTRY UseProgram(GLuint program) ...@@ -2312,7 +2181,6 @@ void GL_APIENTRY UseProgram(GLuint program)
void GL_APIENTRY ValidateProgram(GLuint program) void GL_APIENTRY ValidateProgram(GLuint program)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u)", program); EVENT("(GLuint program = %u)", program);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -2327,7 +2195,6 @@ void GL_APIENTRY ValidateProgram(GLuint program) ...@@ -2327,7 +2195,6 @@ void GL_APIENTRY ValidateProgram(GLuint program)
void GL_APIENTRY VertexAttrib1f(GLuint index, GLfloat x) void GL_APIENTRY VertexAttrib1f(GLuint index, GLfloat x)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, GLfloat x = %f)", index, x); EVENT("(GLuint index = %u, GLfloat x = %f)", index, x);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -2342,7 +2209,6 @@ void GL_APIENTRY VertexAttrib1f(GLuint index, GLfloat x) ...@@ -2342,7 +2209,6 @@ void GL_APIENTRY VertexAttrib1f(GLuint index, GLfloat x)
void GL_APIENTRY VertexAttrib1fv(GLuint index, const GLfloat *v) void GL_APIENTRY VertexAttrib1fv(GLuint index, const GLfloat *v)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v); EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -2357,7 +2223,6 @@ void GL_APIENTRY VertexAttrib1fv(GLuint index, const GLfloat *v) ...@@ -2357,7 +2223,6 @@ void GL_APIENTRY VertexAttrib1fv(GLuint index, const GLfloat *v)
void GL_APIENTRY VertexAttrib2f(GLuint index, GLfloat x, GLfloat y) 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); EVENT("(GLuint index = %u, GLfloat x = %f, GLfloat y = %f)", index, x, y);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -2372,7 +2237,6 @@ void GL_APIENTRY VertexAttrib2f(GLuint index, GLfloat x, GLfloat y) ...@@ -2372,7 +2237,6 @@ void GL_APIENTRY VertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
void GL_APIENTRY VertexAttrib2fv(GLuint index, const GLfloat *v) void GL_APIENTRY VertexAttrib2fv(GLuint index, const GLfloat *v)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v); EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -2387,7 +2251,6 @@ void GL_APIENTRY VertexAttrib2fv(GLuint index, const GLfloat *v) ...@@ -2387,7 +2251,6 @@ void GL_APIENTRY VertexAttrib2fv(GLuint index, const GLfloat *v)
void GL_APIENTRY VertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z) 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); EVENT("(GLuint index = %u, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", index, x, y, z);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -2402,7 +2265,6 @@ void GL_APIENTRY VertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z) ...@@ -2402,7 +2265,6 @@ void GL_APIENTRY VertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
void GL_APIENTRY VertexAttrib3fv(GLuint index, const GLfloat *v) void GL_APIENTRY VertexAttrib3fv(GLuint index, const GLfloat *v)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v); EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -2417,7 +2279,6 @@ void GL_APIENTRY VertexAttrib3fv(GLuint index, const GLfloat *v) ...@@ -2417,7 +2279,6 @@ void GL_APIENTRY VertexAttrib3fv(GLuint index, const GLfloat *v)
void GL_APIENTRY VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w) 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)", EVENT("(GLuint index = %u, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f, GLfloat w = %f)",
index, x, y, z, w); index, x, y, z, w);
...@@ -2433,7 +2294,6 @@ void GL_APIENTRY VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, G ...@@ -2433,7 +2294,6 @@ void GL_APIENTRY VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, G
void GL_APIENTRY VertexAttrib4fv(GLuint index, const GLfloat *v) void GL_APIENTRY VertexAttrib4fv(GLuint index, const GLfloat *v)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v); EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -2453,7 +2313,6 @@ void GL_APIENTRY VertexAttribPointer(GLuint index, ...@@ -2453,7 +2313,6 @@ void GL_APIENTRY VertexAttribPointer(GLuint index,
GLsizei stride, GLsizei stride,
const void *pointer) const void *pointer)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint index = %u, GLint size = %d, GLenum type = 0x%X, GLboolean normalized = %u, " "(GLuint index = %u, GLint size = %d, GLenum type = 0x%X, GLboolean normalized = %u, "
"GLsizei stride = %d, const void *pointer = 0x%016" PRIxPTR ")", "GLsizei stride = %d, const void *pointer = 0x%016" PRIxPTR ")",
...@@ -2474,7 +2333,6 @@ void GL_APIENTRY VertexAttribPointer(GLuint index, ...@@ -2474,7 +2333,6 @@ void GL_APIENTRY VertexAttribPointer(GLuint index,
void GL_APIENTRY Viewport(GLint x, GLint y, GLsizei width, GLsizei height) 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, EVENT("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", x, y, width,
height); height);
......
src/libGLESv2/entry_points_gles_3_0_autogen.cpp
...@@ -20,7 +20,6 @@ namespace gl ...@@ -20,7 +20,6 @@ namespace gl
{ {
void GL_APIENTRY BeginQuery(GLenum target, GLuint id) void GL_APIENTRY BeginQuery(GLenum target, GLuint id)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLuint id = %u)", target, id); EVENT("(GLenum target = 0x%X, GLuint id = %u)", target, id);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -36,7 +35,6 @@ void GL_APIENTRY BeginQuery(GLenum target, GLuint id) ...@@ -36,7 +35,6 @@ void GL_APIENTRY BeginQuery(GLenum target, GLuint id)
void GL_APIENTRY BeginTransformFeedback(GLenum primitiveMode) void GL_APIENTRY BeginTransformFeedback(GLenum primitiveMode)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum primitiveMode = 0x%X)", primitiveMode); EVENT("(GLenum primitiveMode = 0x%X)", primitiveMode);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -53,7 +51,6 @@ void GL_APIENTRY BeginTransformFeedback(GLenum primitiveMode) ...@@ -53,7 +51,6 @@ void GL_APIENTRY BeginTransformFeedback(GLenum primitiveMode)
void GL_APIENTRY BindBufferBase(GLenum target, GLuint index, GLuint buffer) 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); EVENT("(GLenum target = 0x%X, GLuint index = %u, GLuint buffer = %u)", target, index, buffer);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -71,7 +68,6 @@ void GL_APIENTRY BindBufferBase(GLenum target, GLuint index, GLuint buffer) ...@@ -71,7 +68,6 @@ void GL_APIENTRY BindBufferBase(GLenum target, GLuint index, GLuint buffer)
void GL_APIENTRY void GL_APIENTRY
BindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size) BindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLuint index = %u, GLuint buffer = %u, GLintptr offset = %llu, " "(GLenum target = 0x%X, GLuint index = %u, GLuint buffer = %u, GLintptr offset = %llu, "
"GLsizeiptr size = %llu)", "GLsizeiptr size = %llu)",
...@@ -92,7 +88,6 @@ BindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLs ...@@ -92,7 +88,6 @@ BindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLs
void GL_APIENTRY BindSampler(GLuint unit, GLuint sampler) void GL_APIENTRY BindSampler(GLuint unit, GLuint sampler)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint unit = %u, GLuint sampler = %u)", unit, sampler); EVENT("(GLuint unit = %u, GLuint sampler = %u)", unit, sampler);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -107,7 +102,6 @@ void GL_APIENTRY BindSampler(GLuint unit, GLuint sampler) ...@@ -107,7 +102,6 @@ void GL_APIENTRY BindSampler(GLuint unit, GLuint sampler)
void GL_APIENTRY BindTransformFeedback(GLenum target, GLuint id) void GL_APIENTRY BindTransformFeedback(GLenum target, GLuint id)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLuint id = %u)", target, id); EVENT("(GLenum target = 0x%X, GLuint id = %u)", target, id);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -122,7 +116,6 @@ void GL_APIENTRY BindTransformFeedback(GLenum target, GLuint id) ...@@ -122,7 +116,6 @@ void GL_APIENTRY BindTransformFeedback(GLenum target, GLuint id)
void GL_APIENTRY BindVertexArray(GLuint array) void GL_APIENTRY BindVertexArray(GLuint array)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint array = %u)", array); EVENT("(GLuint array = %u)", array);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -146,7 +139,6 @@ void GL_APIENTRY BlitFramebuffer(GLint srcX0, ...@@ -146,7 +139,6 @@ void GL_APIENTRY BlitFramebuffer(GLint srcX0,
GLbitfield mask, GLbitfield mask,
GLenum filter) GLenum filter)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLint srcX0 = %d, GLint srcY0 = %d, GLint srcX1 = %d, GLint srcY1 = %d, GLint dstX0 = " "(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 " "%d, GLint dstY0 = %d, GLint dstX1 = %d, GLint dstY1 = %d, GLbitfield mask = 0x%X, GLenum "
...@@ -168,7 +160,6 @@ void GL_APIENTRY BlitFramebuffer(GLint srcX0, ...@@ -168,7 +160,6 @@ void GL_APIENTRY BlitFramebuffer(GLint srcX0,
void GL_APIENTRY ClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil) 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)", EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, GLfloat depth = %f, GLint stencil = %d)",
buffer, drawbuffer, depth, stencil); buffer, drawbuffer, depth, stencil);
...@@ -185,7 +176,6 @@ void GL_APIENTRY ClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, G ...@@ -185,7 +176,6 @@ void GL_APIENTRY ClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, G
void GL_APIENTRY ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value) 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%016" PRIxPTR ")", EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLfloat *value = 0x%016" PRIxPTR ")",
buffer, drawbuffer, (uintptr_t)value); buffer, drawbuffer, (uintptr_t)value);
...@@ -201,7 +191,6 @@ void GL_APIENTRY ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *v ...@@ -201,7 +191,6 @@ void GL_APIENTRY ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *v
void GL_APIENTRY ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value) 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%016" PRIxPTR ")", EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLint *value = 0x%016" PRIxPTR ")",
buffer, drawbuffer, (uintptr_t)value); buffer, drawbuffer, (uintptr_t)value);
...@@ -217,7 +206,6 @@ void GL_APIENTRY ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *val ...@@ -217,7 +206,6 @@ void GL_APIENTRY ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *val
void GL_APIENTRY ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value) 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%016" PRIxPTR ")", EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLuint *value = 0x%016" PRIxPTR ")",
buffer, drawbuffer, (uintptr_t)value); buffer, drawbuffer, (uintptr_t)value);
...@@ -233,7 +221,6 @@ void GL_APIENTRY ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *v ...@@ -233,7 +221,6 @@ void GL_APIENTRY ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *v
GLenum GL_APIENTRY ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) GLenum GL_APIENTRY ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsync sync = 0x%016" PRIxPTR ", GLbitfield flags = 0x%X, GLuint64 timeout = %llu)", EVENT("(GLsync sync = 0x%016" PRIxPTR ", GLbitfield flags = 0x%X, GLuint64 timeout = %llu)",
(uintptr_t)sync, flags, static_cast<unsigned long long>(timeout)); (uintptr_t)sync, flags, static_cast<unsigned long long>(timeout));
...@@ -259,7 +246,6 @@ void GL_APIENTRY CompressedTexImage3D(GLenum target, ...@@ -259,7 +246,6 @@ void GL_APIENTRY CompressedTexImage3D(GLenum target,
GLsizei imageSize, GLsizei imageSize,
const void *data) const void *data)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = " "(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, " "%d, GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLsizei imageSize = %d, "
...@@ -292,7 +278,6 @@ void GL_APIENTRY CompressedTexSubImage3D(GLenum target, ...@@ -292,7 +278,6 @@ void GL_APIENTRY CompressedTexSubImage3D(GLenum target,
GLsizei imageSize, GLsizei imageSize,
const void *data) const void *data)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint " "(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 " "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format "
...@@ -320,7 +305,6 @@ void GL_APIENTRY CopyBufferSubData(GLenum readTarget, ...@@ -320,7 +305,6 @@ void GL_APIENTRY CopyBufferSubData(GLenum readTarget,
GLintptr writeOffset, GLintptr writeOffset,
GLsizeiptr size) GLsizeiptr size)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum readTarget = 0x%X, GLenum writeTarget = 0x%X, GLintptr readOffset = %llu, " "(GLenum readTarget = 0x%X, GLenum writeTarget = 0x%X, GLintptr readOffset = %llu, "
"GLintptr writeOffset = %llu, GLsizeiptr size = %llu)", "GLintptr writeOffset = %llu, GLsizeiptr size = %llu)",
...@@ -352,7 +336,6 @@ void GL_APIENTRY CopyTexSubImage3D(GLenum target, ...@@ -352,7 +336,6 @@ void GL_APIENTRY CopyTexSubImage3D(GLenum target,
GLsizei width, GLsizei width,
GLsizei height) GLsizei height)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint " "(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)", "zoffset = %d, GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",
...@@ -374,7 +357,6 @@ void GL_APIENTRY CopyTexSubImage3D(GLenum target, ...@@ -374,7 +357,6 @@ void GL_APIENTRY CopyTexSubImage3D(GLenum target,
void GL_APIENTRY DeleteQueries(GLsizei n, const GLuint *ids) void GL_APIENTRY DeleteQueries(GLsizei n, const GLuint *ids)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids); EVENT("(GLsizei n = %d, const GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -389,7 +371,6 @@ void GL_APIENTRY DeleteQueries(GLsizei n, const GLuint *ids) ...@@ -389,7 +371,6 @@ void GL_APIENTRY DeleteQueries(GLsizei n, const GLuint *ids)
void GL_APIENTRY DeleteSamplers(GLsizei count, const GLuint *samplers) void GL_APIENTRY DeleteSamplers(GLsizei count, const GLuint *samplers)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei count = %d, const GLuint *samplers = 0x%016" PRIxPTR ")", count, EVENT("(GLsizei count = %d, const GLuint *samplers = 0x%016" PRIxPTR ")", count,
(uintptr_t)samplers); (uintptr_t)samplers);
...@@ -405,7 +386,6 @@ void GL_APIENTRY DeleteSamplers(GLsizei count, const GLuint *samplers) ...@@ -405,7 +386,6 @@ void GL_APIENTRY DeleteSamplers(GLsizei count, const GLuint *samplers)
void GL_APIENTRY DeleteSync(GLsync sync) void GL_APIENTRY DeleteSync(GLsync sync)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsync sync = 0x%016" PRIxPTR ")", (uintptr_t)sync); EVENT("(GLsync sync = 0x%016" PRIxPTR ")", (uintptr_t)sync);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -420,7 +400,6 @@ void GL_APIENTRY DeleteSync(GLsync sync) ...@@ -420,7 +400,6 @@ void GL_APIENTRY DeleteSync(GLsync sync)
void GL_APIENTRY DeleteTransformFeedbacks(GLsizei n, const GLuint *ids) void GL_APIENTRY DeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids); EVENT("(GLsizei n = %d, const GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -435,7 +414,6 @@ void GL_APIENTRY DeleteTransformFeedbacks(GLsizei n, const GLuint *ids) ...@@ -435,7 +414,6 @@ void GL_APIENTRY DeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
void GL_APIENTRY DeleteVertexArrays(GLsizei n, const GLuint *arrays) void GL_APIENTRY DeleteVertexArrays(GLsizei n, const GLuint *arrays)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *arrays = 0x%016" PRIxPTR ")", n, (uintptr_t)arrays); EVENT("(GLsizei n = %d, const GLuint *arrays = 0x%016" PRIxPTR ")", n, (uintptr_t)arrays);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -450,7 +428,6 @@ void GL_APIENTRY DeleteVertexArrays(GLsizei n, const GLuint *arrays) ...@@ -450,7 +428,6 @@ void GL_APIENTRY DeleteVertexArrays(GLsizei n, const GLuint *arrays)
void GL_APIENTRY DrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount) 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)", EVENT("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d, GLsizei instancecount = %d)",
mode, first, count, instancecount); mode, first, count, instancecount);
...@@ -468,7 +445,6 @@ void GL_APIENTRY DrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GL ...@@ -468,7 +445,6 @@ void GL_APIENTRY DrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GL
void GL_APIENTRY DrawBuffers(GLsizei n, const GLenum *bufs) void GL_APIENTRY DrawBuffers(GLsizei n, const GLenum *bufs)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLenum *bufs = 0x%016" PRIxPTR ")", n, (uintptr_t)bufs); EVENT("(GLsizei n = %d, const GLenum *bufs = 0x%016" PRIxPTR ")", n, (uintptr_t)bufs);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -487,7 +463,6 @@ void GL_APIENTRY DrawElementsInstanced(GLenum mode, ...@@ -487,7 +463,6 @@ void GL_APIENTRY DrawElementsInstanced(GLenum mode,
const void *indices, const void *indices,
GLsizei instancecount) GLsizei instancecount)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = " "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = "
"0x%016" PRIxPTR ", GLsizei instancecount = %d)", "0x%016" PRIxPTR ", GLsizei instancecount = %d)",
...@@ -514,7 +489,6 @@ void GL_APIENTRY DrawRangeElements(GLenum mode, ...@@ -514,7 +489,6 @@ void GL_APIENTRY DrawRangeElements(GLenum mode,
GLenum type, GLenum type,
const void *indices) const void *indices)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum mode = 0x%X, GLuint start = %u, GLuint end = %u, GLsizei count = %d, GLenum type " "(GLenum mode = 0x%X, GLuint start = %u, GLuint end = %u, GLsizei count = %d, GLenum type "
"= 0x%X, const void *indices = 0x%016" PRIxPTR ")", "= 0x%X, const void *indices = 0x%016" PRIxPTR ")",
...@@ -535,7 +509,6 @@ void GL_APIENTRY DrawRangeElements(GLenum mode, ...@@ -535,7 +509,6 @@ void GL_APIENTRY DrawRangeElements(GLenum mode,
void GL_APIENTRY EndQuery(GLenum target) void GL_APIENTRY EndQuery(GLenum target)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X)", target); EVENT("(GLenum target = 0x%X)", target);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -551,7 +524,6 @@ void GL_APIENTRY EndQuery(GLenum target) ...@@ -551,7 +524,6 @@ void GL_APIENTRY EndQuery(GLenum target)
void GL_APIENTRY EndTransformFeedback() void GL_APIENTRY EndTransformFeedback()
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("()"); EVENT("()");
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -566,7 +538,6 @@ void GL_APIENTRY EndTransformFeedback() ...@@ -566,7 +538,6 @@ void GL_APIENTRY EndTransformFeedback()
GLsync GL_APIENTRY FenceSync(GLenum condition, GLbitfield flags) GLsync GL_APIENTRY FenceSync(GLenum condition, GLbitfield flags)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum condition = 0x%X, GLbitfield flags = 0x%X)", condition, flags); EVENT("(GLenum condition = 0x%X, GLbitfield flags = 0x%X)", condition, flags);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -583,7 +554,6 @@ GLsync GL_APIENTRY FenceSync(GLenum condition, GLbitfield flags) ...@@ -583,7 +554,6 @@ GLsync GL_APIENTRY FenceSync(GLenum condition, GLbitfield flags)
void GL_APIENTRY FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length) void GL_APIENTRY FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr length = %llu)", target, EVENT("(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr length = %llu)", target,
static_cast<unsigned long long>(offset), static_cast<unsigned long long>(length)); static_cast<unsigned long long>(offset), static_cast<unsigned long long>(length));
...@@ -602,7 +572,6 @@ void GL_APIENTRY FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeip ...@@ -602,7 +572,6 @@ void GL_APIENTRY FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeip
void GL_APIENTRY void GL_APIENTRY
FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer) FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %u, GLint level = %d, " "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %u, GLint level = %d, "
"GLint layer = %d)", "GLint layer = %d)",
...@@ -621,7 +590,6 @@ FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint ...@@ -621,7 +590,6 @@ FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint
void GL_APIENTRY GenQueries(GLsizei n, GLuint *ids) void GL_APIENTRY GenQueries(GLsizei n, GLuint *ids)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids); EVENT("(GLsizei n = %d, GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -636,7 +604,6 @@ void GL_APIENTRY GenQueries(GLsizei n, GLuint *ids) ...@@ -636,7 +604,6 @@ void GL_APIENTRY GenQueries(GLsizei n, GLuint *ids)
void GL_APIENTRY GenSamplers(GLsizei count, GLuint *samplers) void GL_APIENTRY GenSamplers(GLsizei count, GLuint *samplers)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei count = %d, GLuint *samplers = 0x%016" PRIxPTR ")", count, (uintptr_t)samplers); EVENT("(GLsizei count = %d, GLuint *samplers = 0x%016" PRIxPTR ")", count, (uintptr_t)samplers);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -651,7 +618,6 @@ void GL_APIENTRY GenSamplers(GLsizei count, GLuint *samplers) ...@@ -651,7 +618,6 @@ void GL_APIENTRY GenSamplers(GLsizei count, GLuint *samplers)
void GL_APIENTRY GenTransformFeedbacks(GLsizei n, GLuint *ids) void GL_APIENTRY GenTransformFeedbacks(GLsizei n, GLuint *ids)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids); EVENT("(GLsizei n = %d, GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -666,7 +632,6 @@ void GL_APIENTRY GenTransformFeedbacks(GLsizei n, GLuint *ids) ...@@ -666,7 +632,6 @@ void GL_APIENTRY GenTransformFeedbacks(GLsizei n, GLuint *ids)
void GL_APIENTRY GenVertexArrays(GLsizei n, GLuint *arrays) void GL_APIENTRY GenVertexArrays(GLsizei n, GLuint *arrays)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *arrays = 0x%016" PRIxPTR ")", n, (uintptr_t)arrays); EVENT("(GLsizei n = %d, GLuint *arrays = 0x%016" PRIxPTR ")", n, (uintptr_t)arrays);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -685,7 +650,6 @@ void GL_APIENTRY GetActiveUniformBlockName(GLuint program, ...@@ -685,7 +650,6 @@ void GL_APIENTRY GetActiveUniformBlockName(GLuint program,
GLsizei *length, GLsizei *length,
GLchar *uniformBlockName) GLchar *uniformBlockName)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLuint uniformBlockIndex = %u, GLsizei bufSize = %d, GLsizei " "(GLuint program = %u, GLuint uniformBlockIndex = %u, GLsizei bufSize = %d, GLsizei "
"*length = 0x%016" PRIxPTR ", GLchar *uniformBlockName = 0x%016" PRIxPTR ")", "*length = 0x%016" PRIxPTR ", GLchar *uniformBlockName = 0x%016" PRIxPTR ")",
...@@ -709,7 +673,6 @@ void GL_APIENTRY GetActiveUniformBlockiv(GLuint program, ...@@ -709,7 +673,6 @@ void GL_APIENTRY GetActiveUniformBlockiv(GLuint program,
GLenum pname, GLenum pname,
GLint *params) GLint *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLuint uniformBlockIndex = %u, GLenum pname = 0x%X, GLint *params = " "(GLuint program = %u, GLuint uniformBlockIndex = %u, GLenum pname = 0x%X, GLint *params = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -732,7 +695,6 @@ void GL_APIENTRY GetActiveUniformsiv(GLuint program, ...@@ -732,7 +695,6 @@ void GL_APIENTRY GetActiveUniformsiv(GLuint program,
GLenum pname, GLenum pname,
GLint *params) GLint *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLsizei uniformCount = %d, const GLuint *uniformIndices = " "(GLuint program = %u, GLsizei uniformCount = %d, const GLuint *uniformIndices = "
"0x%016" PRIxPTR ", GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", "0x%016" PRIxPTR ", GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")",
...@@ -751,7 +713,6 @@ void GL_APIENTRY GetActiveUniformsiv(GLuint program, ...@@ -751,7 +713,6 @@ void GL_APIENTRY GetActiveUniformsiv(GLuint program,
void GL_APIENTRY GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params) 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%016" PRIxPTR ")", EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint64 *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params); target, pname, (uintptr_t)params);
...@@ -769,7 +730,6 @@ void GL_APIENTRY GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *pa ...@@ -769,7 +730,6 @@ void GL_APIENTRY GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *pa
void GL_APIENTRY GetBufferPointerv(GLenum target, GLenum pname, void **params) 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%016" PRIxPTR ")", target, EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, void **params = 0x%016" PRIxPTR ")", target,
pname, (uintptr_t)params); pname, (uintptr_t)params);
...@@ -787,7 +747,6 @@ void GL_APIENTRY GetBufferPointerv(GLenum target, GLenum pname, void **params) ...@@ -787,7 +747,6 @@ void GL_APIENTRY GetBufferPointerv(GLenum target, GLenum pname, void **params)
GLint GL_APIENTRY GetFragDataLocation(GLuint program, const GLchar *name) GLint GL_APIENTRY GetFragDataLocation(GLuint program, const GLchar *name)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, const GLchar *name = 0x%016" PRIxPTR ")", program, EVENT("(GLuint program = %u, const GLchar *name = 0x%016" PRIxPTR ")", program,
(uintptr_t)name); (uintptr_t)name);
...@@ -805,7 +764,6 @@ GLint GL_APIENTRY GetFragDataLocation(GLuint program, const GLchar *name) ...@@ -805,7 +764,6 @@ GLint GL_APIENTRY GetFragDataLocation(GLuint program, const GLchar *name)
void GL_APIENTRY GetInteger64i_v(GLenum target, GLuint index, GLint64 *data) 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%016" PRIxPTR ")", target, EVENT("(GLenum target = 0x%X, GLuint index = %u, GLint64 *data = 0x%016" PRIxPTR ")", target,
index, (uintptr_t)data); index, (uintptr_t)data);
...@@ -821,7 +779,6 @@ void GL_APIENTRY GetInteger64i_v(GLenum target, GLuint index, GLint64 *data) ...@@ -821,7 +779,6 @@ void GL_APIENTRY GetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
void GL_APIENTRY GetInteger64v(GLenum pname, GLint64 *data) void GL_APIENTRY GetInteger64v(GLenum pname, GLint64 *data)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLint64 *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data); EVENT("(GLenum pname = 0x%X, GLint64 *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -836,7 +793,6 @@ void GL_APIENTRY GetInteger64v(GLenum pname, GLint64 *data) ...@@ -836,7 +793,6 @@ void GL_APIENTRY GetInteger64v(GLenum pname, GLint64 *data)
void GL_APIENTRY GetIntegeri_v(GLenum target, GLuint index, GLint *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%016" PRIxPTR ")", target, EVENT("(GLenum target = 0x%X, GLuint index = %u, GLint *data = 0x%016" PRIxPTR ")", target,
index, (uintptr_t)data); index, (uintptr_t)data);
...@@ -856,7 +812,6 @@ void GL_APIENTRY GetInternalformativ(GLenum target, ...@@ -856,7 +812,6 @@ void GL_APIENTRY GetInternalformativ(GLenum target,
GLsizei bufSize, GLsizei bufSize,
GLint *params) GLint *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLenum pname = 0x%X, GLsizei bufSize " "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLenum pname = 0x%X, GLsizei bufSize "
"= %d, GLint *params = 0x%016" PRIxPTR ")", "= %d, GLint *params = 0x%016" PRIxPTR ")",
...@@ -879,7 +834,6 @@ void GL_APIENTRY GetProgramBinary(GLuint program, ...@@ -879,7 +834,6 @@ void GL_APIENTRY GetProgramBinary(GLuint program,
GLenum *binaryFormat, GLenum *binaryFormat,
void *binary) void *binary)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR EVENT("(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
", GLenum *binaryFormat = 0x%016" PRIxPTR ", void *binary = 0x%016" PRIxPTR ")", ", GLenum *binaryFormat = 0x%016" PRIxPTR ", void *binary = 0x%016" PRIxPTR ")",
program, bufSize, (uintptr_t)length, (uintptr_t)binaryFormat, (uintptr_t)binary); program, bufSize, (uintptr_t)length, (uintptr_t)binaryFormat, (uintptr_t)binary);
...@@ -897,7 +851,6 @@ void GL_APIENTRY GetProgramBinary(GLuint program, ...@@ -897,7 +851,6 @@ void GL_APIENTRY GetProgramBinary(GLuint program,
void GL_APIENTRY GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params) 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%016" PRIxPTR ")", id, pname, EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLuint *params = 0x%016" PRIxPTR ")", id, pname,
(uintptr_t)params); (uintptr_t)params);
...@@ -913,7 +866,6 @@ void GL_APIENTRY GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params) ...@@ -913,7 +866,6 @@ void GL_APIENTRY GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
void GL_APIENTRY GetQueryiv(GLenum target, GLenum pname, GLint *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%016" PRIxPTR ")", target, EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
pname, (uintptr_t)params); pname, (uintptr_t)params);
...@@ -930,7 +882,6 @@ void GL_APIENTRY GetQueryiv(GLenum target, GLenum pname, GLint *params) ...@@ -930,7 +882,6 @@ void GL_APIENTRY GetQueryiv(GLenum target, GLenum pname, GLint *params)
void GL_APIENTRY GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *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%016" PRIxPTR ")", EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")",
sampler, pname, (uintptr_t)params); sampler, pname, (uintptr_t)params);
...@@ -947,7 +898,6 @@ void GL_APIENTRY GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *pa ...@@ -947,7 +898,6 @@ void GL_APIENTRY GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *pa
void GL_APIENTRY GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params) 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%016" PRIxPTR ")", sampler, EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", sampler,
pname, (uintptr_t)params); pname, (uintptr_t)params);
...@@ -964,7 +914,6 @@ void GL_APIENTRY GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *para ...@@ -964,7 +914,6 @@ void GL_APIENTRY GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *para
const GLubyte *GL_APIENTRY GetStringi(GLenum name, GLuint index) const GLubyte *GL_APIENTRY GetStringi(GLenum name, GLuint index)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum name = 0x%X, GLuint index = %u)", name, index); EVENT("(GLenum name = 0x%X, GLuint index = %u)", name, index);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -982,7 +931,6 @@ const GLubyte *GL_APIENTRY GetStringi(GLenum name, GLuint index) ...@@ -982,7 +931,6 @@ const GLubyte *GL_APIENTRY GetStringi(GLenum name, GLuint index)
void GL_APIENTRY void GL_APIENTRY
GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values) GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsync sync = 0x%016" PRIxPTR EVENT("(GLsync sync = 0x%016" PRIxPTR
", GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR ", GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
", GLint *values = 0x%016" PRIxPTR ")", ", GLint *values = 0x%016" PRIxPTR ")",
...@@ -1007,7 +955,6 @@ void GL_APIENTRY GetTransformFeedbackVarying(GLuint program, ...@@ -1007,7 +955,6 @@ void GL_APIENTRY GetTransformFeedbackVarying(GLuint program,
GLenum *type, GLenum *type,
GLchar *name) GLchar *name)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = " "(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = "
"0x%016" PRIxPTR ", GLsizei *size = 0x%016" PRIxPTR ", GLenum *type = 0x%016" PRIxPTR "0x%016" PRIxPTR ", GLsizei *size = 0x%016" PRIxPTR ", GLenum *type = 0x%016" PRIxPTR
...@@ -1029,7 +976,6 @@ void GL_APIENTRY GetTransformFeedbackVarying(GLuint program, ...@@ -1029,7 +976,6 @@ void GL_APIENTRY GetTransformFeedbackVarying(GLuint program,
GLuint GL_APIENTRY GetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName) GLuint GL_APIENTRY GetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, const GLchar *uniformBlockName = 0x%016" PRIxPTR ")", program, EVENT("(GLuint program = %u, const GLchar *uniformBlockName = 0x%016" PRIxPTR ")", program,
(uintptr_t)uniformBlockName); (uintptr_t)uniformBlockName);
...@@ -1051,7 +997,6 @@ void GL_APIENTRY GetUniformIndices(GLuint program, ...@@ -1051,7 +997,6 @@ void GL_APIENTRY GetUniformIndices(GLuint program,
const GLchar *const *uniformNames, const GLchar *const *uniformNames,
GLuint *uniformIndices) GLuint *uniformIndices)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLsizei uniformCount = %d, const GLchar *const*uniformNames = " "(GLuint program = %u, GLsizei uniformCount = %d, const GLchar *const*uniformNames = "
"0x%016" PRIxPTR ", GLuint *uniformIndices = 0x%016" PRIxPTR ")", "0x%016" PRIxPTR ", GLuint *uniformIndices = 0x%016" PRIxPTR ")",
...@@ -1070,7 +1015,6 @@ void GL_APIENTRY GetUniformIndices(GLuint program, ...@@ -1070,7 +1015,6 @@ void GL_APIENTRY GetUniformIndices(GLuint program,
void GL_APIENTRY GetUniformuiv(GLuint program, GLint location, GLuint *params) void GL_APIENTRY GetUniformuiv(GLuint program, GLint location, GLuint *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLint location = %d, GLuint *params = 0x%016" PRIxPTR ")", program, EVENT("(GLuint program = %u, GLint location = %d, GLuint *params = 0x%016" PRIxPTR ")", program,
location, (uintptr_t)params); location, (uintptr_t)params);
...@@ -1086,7 +1030,6 @@ void GL_APIENTRY GetUniformuiv(GLuint program, GLint location, GLuint *params) ...@@ -1086,7 +1030,6 @@ void GL_APIENTRY GetUniformuiv(GLuint program, GLint location, GLuint *params)
void GL_APIENTRY GetVertexAttribIiv(GLuint index, GLenum pname, GLint *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%016" PRIxPTR ")", index, EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", index,
pname, (uintptr_t)params); pname, (uintptr_t)params);
...@@ -1102,7 +1045,6 @@ void GL_APIENTRY GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params) ...@@ -1102,7 +1045,6 @@ void GL_APIENTRY GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
void GL_APIENTRY GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *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%016" PRIxPTR ")", index, EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLuint *params = 0x%016" PRIxPTR ")", index,
pname, (uintptr_t)params); pname, (uintptr_t)params);
...@@ -1120,7 +1062,6 @@ void GL_APIENTRY InvalidateFramebuffer(GLenum target, ...@@ -1120,7 +1062,6 @@ void GL_APIENTRY InvalidateFramebuffer(GLenum target,
GLsizei numAttachments, GLsizei numAttachments,
const GLenum *attachments) const GLenum *attachments)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = " "(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -1145,7 +1086,6 @@ void GL_APIENTRY InvalidateSubFramebuffer(GLenum target, ...@@ -1145,7 +1086,6 @@ void GL_APIENTRY InvalidateSubFramebuffer(GLenum target,
GLsizei width, GLsizei width,
GLsizei height) GLsizei height)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = " "(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = "
"0x%016" PRIxPTR ", GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", "0x%016" PRIxPTR ", GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",
...@@ -1166,7 +1106,6 @@ void GL_APIENTRY InvalidateSubFramebuffer(GLenum target, ...@@ -1166,7 +1106,6 @@ void GL_APIENTRY InvalidateSubFramebuffer(GLenum target,
GLboolean GL_APIENTRY IsQuery(GLuint id) GLboolean GL_APIENTRY IsQuery(GLuint id)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint id = %u)", id); EVENT("(GLuint id = %u)", id);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1183,7 +1122,6 @@ GLboolean GL_APIENTRY IsQuery(GLuint id) ...@@ -1183,7 +1122,6 @@ GLboolean GL_APIENTRY IsQuery(GLuint id)
GLboolean GL_APIENTRY IsSampler(GLuint sampler) GLboolean GL_APIENTRY IsSampler(GLuint sampler)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint sampler = %u)", sampler); EVENT("(GLuint sampler = %u)", sampler);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1200,7 +1138,6 @@ GLboolean GL_APIENTRY IsSampler(GLuint sampler) ...@@ -1200,7 +1138,6 @@ GLboolean GL_APIENTRY IsSampler(GLuint sampler)
GLboolean GL_APIENTRY IsSync(GLsync sync) GLboolean GL_APIENTRY IsSync(GLsync sync)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsync sync = 0x%016" PRIxPTR ")", (uintptr_t)sync); EVENT("(GLsync sync = 0x%016" PRIxPTR ")", (uintptr_t)sync);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1217,7 +1154,6 @@ GLboolean GL_APIENTRY IsSync(GLsync sync) ...@@ -1217,7 +1154,6 @@ GLboolean GL_APIENTRY IsSync(GLsync sync)
GLboolean GL_APIENTRY IsTransformFeedback(GLuint id) GLboolean GL_APIENTRY IsTransformFeedback(GLuint id)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint id = %u)", id); EVENT("(GLuint id = %u)", id);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1234,7 +1170,6 @@ GLboolean GL_APIENTRY IsTransformFeedback(GLuint id) ...@@ -1234,7 +1170,6 @@ GLboolean GL_APIENTRY IsTransformFeedback(GLuint id)
GLboolean GL_APIENTRY IsVertexArray(GLuint array) GLboolean GL_APIENTRY IsVertexArray(GLuint array)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint array = %u)", array); EVENT("(GLuint array = %u)", array);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1254,7 +1189,6 @@ void *GL_APIENTRY MapBufferRange(GLenum target, ...@@ -1254,7 +1189,6 @@ void *GL_APIENTRY MapBufferRange(GLenum target,
GLsizeiptr length, GLsizeiptr length,
GLbitfield access) GLbitfield access)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr length = %llu, GLbitfield " "(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr length = %llu, GLbitfield "
"access = 0x%X)", "access = 0x%X)",
...@@ -1277,7 +1211,6 @@ void *GL_APIENTRY MapBufferRange(GLenum target, ...@@ -1277,7 +1211,6 @@ void *GL_APIENTRY MapBufferRange(GLenum target,
void GL_APIENTRY PauseTransformFeedback() void GL_APIENTRY PauseTransformFeedback()
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("()"); EVENT("()");
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1295,7 +1228,6 @@ void GL_APIENTRY ProgramBinary(GLuint program, ...@@ -1295,7 +1228,6 @@ void GL_APIENTRY ProgramBinary(GLuint program,
const void *binary, const void *binary,
GLsizei length) GLsizei length)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLenum binaryFormat = 0x%X, const void *binary = 0x%016" PRIxPTR EVENT("(GLuint program = %u, GLenum binaryFormat = 0x%X, const void *binary = 0x%016" PRIxPTR
", GLsizei length = %d)", ", GLsizei length = %d)",
program, binaryFormat, (uintptr_t)binary, length); program, binaryFormat, (uintptr_t)binary, length);
...@@ -1313,7 +1245,6 @@ void GL_APIENTRY ProgramBinary(GLuint program, ...@@ -1313,7 +1245,6 @@ void GL_APIENTRY ProgramBinary(GLuint program,
void GL_APIENTRY ProgramParameteri(GLuint program, GLenum pname, GLint value) 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); EVENT("(GLuint program = %u, GLenum pname = 0x%X, GLint value = %d)", program, pname, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1328,7 +1259,6 @@ void GL_APIENTRY ProgramParameteri(GLuint program, GLenum pname, GLint value) ...@@ -1328,7 +1259,6 @@ void GL_APIENTRY ProgramParameteri(GLuint program, GLenum pname, GLint value)
void GL_APIENTRY ReadBuffer(GLenum src) void GL_APIENTRY ReadBuffer(GLenum src)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum src = 0x%X)", src); EVENT("(GLenum src = 0x%X)", src);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1347,7 +1277,6 @@ void GL_APIENTRY RenderbufferStorageMultisample(GLenum target, ...@@ -1347,7 +1277,6 @@ void GL_APIENTRY RenderbufferStorageMultisample(GLenum target,
GLsizei width, GLsizei width,
GLsizei height) GLsizei height)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width " "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width "
"= %d, GLsizei height = %d)", "= %d, GLsizei height = %d)",
...@@ -1367,7 +1296,6 @@ void GL_APIENTRY RenderbufferStorageMultisample(GLenum target, ...@@ -1367,7 +1296,6 @@ void GL_APIENTRY RenderbufferStorageMultisample(GLenum target,
void GL_APIENTRY ResumeTransformFeedback() void GL_APIENTRY ResumeTransformFeedback()
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("()"); EVENT("()");
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1382,7 +1310,6 @@ void GL_APIENTRY ResumeTransformFeedback() ...@@ -1382,7 +1310,6 @@ void GL_APIENTRY ResumeTransformFeedback()
void GL_APIENTRY SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param) 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); EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLfloat param = %f)", sampler, pname, param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1397,7 +1324,6 @@ void GL_APIENTRY SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param) ...@@ -1397,7 +1324,6 @@ void GL_APIENTRY SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
void GL_APIENTRY SamplerParameterfv(GLuint sampler, GLenum pname, const 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%016" PRIxPTR ")", EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLfloat *param = 0x%016" PRIxPTR ")",
sampler, pname, (uintptr_t)param); sampler, pname, (uintptr_t)param);
...@@ -1413,7 +1339,6 @@ void GL_APIENTRY SamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat ...@@ -1413,7 +1339,6 @@ void GL_APIENTRY SamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat
void GL_APIENTRY SamplerParameteri(GLuint sampler, GLenum pname, GLint param) 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); EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLint param = %d)", sampler, pname, param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1428,7 +1353,6 @@ void GL_APIENTRY SamplerParameteri(GLuint sampler, GLenum pname, GLint param) ...@@ -1428,7 +1353,6 @@ void GL_APIENTRY SamplerParameteri(GLuint sampler, GLenum pname, GLint param)
void GL_APIENTRY SamplerParameteriv(GLuint sampler, GLenum pname, const 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%016" PRIxPTR ")", EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLint *param = 0x%016" PRIxPTR ")",
sampler, pname, (uintptr_t)param); sampler, pname, (uintptr_t)param);
...@@ -1453,7 +1377,6 @@ void GL_APIENTRY TexImage3D(GLenum target, ...@@ -1453,7 +1377,6 @@ void GL_APIENTRY TexImage3D(GLenum target,
GLenum type, GLenum type,
const void *pixels) const void *pixels)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, " "(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 " "GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLenum format = 0x%X, GLenum "
...@@ -1478,7 +1401,6 @@ void GL_APIENTRY TexImage3D(GLenum target, ...@@ -1478,7 +1401,6 @@ void GL_APIENTRY TexImage3D(GLenum target,
void GL_APIENTRY void GL_APIENTRY
TexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height) TexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = " "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = "
"%d, GLsizei height = %d)", "%d, GLsizei height = %d)",
...@@ -1503,7 +1425,6 @@ void GL_APIENTRY TexStorage3D(GLenum target, ...@@ -1503,7 +1425,6 @@ void GL_APIENTRY TexStorage3D(GLenum target,
GLsizei height, GLsizei height,
GLsizei depth) GLsizei depth)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = " "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = "
"%d, GLsizei height = %d, GLsizei depth = %d)", "%d, GLsizei height = %d, GLsizei depth = %d)",
...@@ -1533,7 +1454,6 @@ void GL_APIENTRY TexSubImage3D(GLenum target, ...@@ -1533,7 +1454,6 @@ void GL_APIENTRY TexSubImage3D(GLenum target,
GLenum type, GLenum type,
const void *pixels) const void *pixels)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint " "(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 " "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format "
...@@ -1560,7 +1480,6 @@ void GL_APIENTRY TransformFeedbackVaryings(GLuint program, ...@@ -1560,7 +1480,6 @@ void GL_APIENTRY TransformFeedbackVaryings(GLuint program,
const GLchar *const *varyings, const GLchar *const *varyings,
GLenum bufferMode) GLenum bufferMode)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLsizei count = %d, const GLchar *const*varyings = 0x%016" PRIxPTR EVENT("(GLuint program = %u, GLsizei count = %d, const GLchar *const*varyings = 0x%016" PRIxPTR
", GLenum bufferMode = 0x%X)", ", GLenum bufferMode = 0x%X)",
program, count, (uintptr_t)varyings, bufferMode); program, count, (uintptr_t)varyings, bufferMode);
...@@ -1578,7 +1497,6 @@ void GL_APIENTRY TransformFeedbackVaryings(GLuint program, ...@@ -1578,7 +1497,6 @@ void GL_APIENTRY TransformFeedbackVaryings(GLuint program,
void GL_APIENTRY Uniform1ui(GLint location, GLuint v0) void GL_APIENTRY Uniform1ui(GLint location, GLuint v0)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLint location = %d, GLuint v0 = %u)", location, v0); EVENT("(GLint location = %d, GLuint v0 = %u)", location, v0);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1593,7 +1511,6 @@ void GL_APIENTRY Uniform1ui(GLint location, GLuint v0) ...@@ -1593,7 +1511,6 @@ void GL_APIENTRY Uniform1ui(GLint location, GLuint v0)
void GL_APIENTRY Uniform1uiv(GLint location, GLsizei count, const GLuint *value) 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%016" PRIxPTR ")", EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value); location, count, (uintptr_t)value);
...@@ -1609,7 +1526,6 @@ void GL_APIENTRY Uniform1uiv(GLint location, GLsizei count, const GLuint *value) ...@@ -1609,7 +1526,6 @@ void GL_APIENTRY Uniform1uiv(GLint location, GLsizei count, const GLuint *value)
void GL_APIENTRY Uniform2ui(GLint location, GLuint v0, GLuint v1) 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); EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u)", location, v0, v1);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1624,7 +1540,6 @@ void GL_APIENTRY Uniform2ui(GLint location, GLuint v0, GLuint v1) ...@@ -1624,7 +1540,6 @@ void GL_APIENTRY Uniform2ui(GLint location, GLuint v0, GLuint v1)
void GL_APIENTRY Uniform2uiv(GLint location, GLsizei count, const GLuint *value) 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%016" PRIxPTR ")", EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value); location, count, (uintptr_t)value);
...@@ -1640,7 +1555,6 @@ void GL_APIENTRY Uniform2uiv(GLint location, GLsizei count, const GLuint *value) ...@@ -1640,7 +1555,6 @@ void GL_APIENTRY Uniform2uiv(GLint location, GLsizei count, const GLuint *value)
void GL_APIENTRY Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2) 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, EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = %u)", location, v0, v1,
v2); v2);
...@@ -1656,7 +1570,6 @@ void GL_APIENTRY Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2) ...@@ -1656,7 +1570,6 @@ void GL_APIENTRY Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
void GL_APIENTRY Uniform3uiv(GLint location, GLsizei count, const GLuint *value) 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%016" PRIxPTR ")", EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value); location, count, (uintptr_t)value);
...@@ -1672,7 +1585,6 @@ void GL_APIENTRY Uniform3uiv(GLint location, GLsizei count, const GLuint *value) ...@@ -1672,7 +1585,6 @@ 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) 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)", EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = %u, GLuint v3 = %u)",
location, v0, v1, v2, v3); location, v0, v1, v2, v3);
...@@ -1688,7 +1600,6 @@ void GL_APIENTRY Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLu ...@@ -1688,7 +1600,6 @@ void GL_APIENTRY Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLu
void GL_APIENTRY Uniform4uiv(GLint location, GLsizei count, const GLuint *value) 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%016" PRIxPTR ")", EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value); location, count, (uintptr_t)value);
...@@ -1706,7 +1617,6 @@ void GL_APIENTRY UniformBlockBinding(GLuint program, ...@@ -1706,7 +1617,6 @@ void GL_APIENTRY UniformBlockBinding(GLuint program,
GLuint uniformBlockIndex, GLuint uniformBlockIndex,
GLuint uniformBlockBinding) GLuint uniformBlockBinding)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLuint uniformBlockIndex = %u, GLuint uniformBlockBinding = %u)", EVENT("(GLuint program = %u, GLuint uniformBlockIndex = %u, GLuint uniformBlockBinding = %u)",
program, uniformBlockIndex, uniformBlockBinding); program, uniformBlockIndex, uniformBlockBinding);
...@@ -1726,7 +1636,6 @@ void GL_APIENTRY UniformMatrix2x3fv(GLint location, ...@@ -1726,7 +1636,6 @@ void GL_APIENTRY UniformMatrix2x3fv(GLint location,
GLboolean transpose, GLboolean transpose,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
"= 0x%016" PRIxPTR ")", "= 0x%016" PRIxPTR ")",
...@@ -1748,7 +1657,6 @@ void GL_APIENTRY UniformMatrix2x4fv(GLint location, ...@@ -1748,7 +1657,6 @@ void GL_APIENTRY UniformMatrix2x4fv(GLint location,
GLboolean transpose, GLboolean transpose,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
"= 0x%016" PRIxPTR ")", "= 0x%016" PRIxPTR ")",
...@@ -1770,7 +1678,6 @@ void GL_APIENTRY UniformMatrix3x2fv(GLint location, ...@@ -1770,7 +1678,6 @@ void GL_APIENTRY UniformMatrix3x2fv(GLint location,
GLboolean transpose, GLboolean transpose,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
"= 0x%016" PRIxPTR ")", "= 0x%016" PRIxPTR ")",
...@@ -1792,7 +1699,6 @@ void GL_APIENTRY UniformMatrix3x4fv(GLint location, ...@@ -1792,7 +1699,6 @@ void GL_APIENTRY UniformMatrix3x4fv(GLint location,
GLboolean transpose, GLboolean transpose,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
"= 0x%016" PRIxPTR ")", "= 0x%016" PRIxPTR ")",
...@@ -1814,7 +1720,6 @@ void GL_APIENTRY UniformMatrix4x2fv(GLint location, ...@@ -1814,7 +1720,6 @@ void GL_APIENTRY UniformMatrix4x2fv(GLint location,
GLboolean transpose, GLboolean transpose,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
"= 0x%016" PRIxPTR ")", "= 0x%016" PRIxPTR ")",
...@@ -1836,7 +1741,6 @@ void GL_APIENTRY UniformMatrix4x3fv(GLint location, ...@@ -1836,7 +1741,6 @@ void GL_APIENTRY UniformMatrix4x3fv(GLint location,
GLboolean transpose, GLboolean transpose,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value " "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
"= 0x%016" PRIxPTR ")", "= 0x%016" PRIxPTR ")",
...@@ -1855,7 +1759,6 @@ void GL_APIENTRY UniformMatrix4x3fv(GLint location, ...@@ -1855,7 +1759,6 @@ void GL_APIENTRY UniformMatrix4x3fv(GLint location,
GLboolean GL_APIENTRY UnmapBuffer(GLenum target) GLboolean GL_APIENTRY UnmapBuffer(GLenum target)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X)", target); EVENT("(GLenum target = 0x%X)", target);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1873,7 +1776,6 @@ GLboolean GL_APIENTRY UnmapBuffer(GLenum target) ...@@ -1873,7 +1776,6 @@ GLboolean GL_APIENTRY UnmapBuffer(GLenum target)
void GL_APIENTRY VertexAttribDivisor(GLuint index, GLuint divisor) void GL_APIENTRY VertexAttribDivisor(GLuint index, GLuint divisor)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, GLuint divisor = %u)", index, divisor); EVENT("(GLuint index = %u, GLuint divisor = %u)", index, divisor);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1888,7 +1790,6 @@ void GL_APIENTRY VertexAttribDivisor(GLuint index, GLuint divisor) ...@@ -1888,7 +1790,6 @@ void GL_APIENTRY VertexAttribDivisor(GLuint index, GLuint divisor)
void GL_APIENTRY VertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w) 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, EVENT("(GLuint index = %u, GLint x = %d, GLint y = %d, GLint z = %d, GLint w = %d)", index, x,
y, z, w); y, z, w);
...@@ -1904,7 +1805,6 @@ void GL_APIENTRY VertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint ...@@ -1904,7 +1805,6 @@ void GL_APIENTRY VertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint
void GL_APIENTRY VertexAttribI4iv(GLuint index, const GLint *v) void GL_APIENTRY VertexAttribI4iv(GLuint index, const GLint *v)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, const GLint *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v); EVENT("(GLuint index = %u, const GLint *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1919,7 +1819,6 @@ void GL_APIENTRY VertexAttribI4iv(GLuint index, const GLint *v) ...@@ -1919,7 +1819,6 @@ void GL_APIENTRY VertexAttribI4iv(GLuint index, const GLint *v)
void GL_APIENTRY VertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w) 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, EVENT("(GLuint index = %u, GLuint x = %u, GLuint y = %u, GLuint z = %u, GLuint w = %u)", index,
x, y, z, w); x, y, z, w);
...@@ -1935,7 +1834,6 @@ void GL_APIENTRY VertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GL ...@@ -1935,7 +1834,6 @@ void GL_APIENTRY VertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GL
void GL_APIENTRY VertexAttribI4uiv(GLuint index, const GLuint *v) void GL_APIENTRY VertexAttribI4uiv(GLuint index, const GLuint *v)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, const GLuint *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v); EVENT("(GLuint index = %u, const GLuint *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1951,7 +1849,6 @@ void GL_APIENTRY VertexAttribI4uiv(GLuint index, const GLuint *v) ...@@ -1951,7 +1849,6 @@ void GL_APIENTRY VertexAttribI4uiv(GLuint index, const GLuint *v)
void GL_APIENTRY void GL_APIENTRY
VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer) VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint index = %u, GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void " "(GLuint index = %u, GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void "
"*pointer = 0x%016" PRIxPTR ")", "*pointer = 0x%016" PRIxPTR ")",
...@@ -1971,7 +1868,6 @@ VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, cons ...@@ -1971,7 +1868,6 @@ VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, cons
void GL_APIENTRY WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) void GL_APIENTRY WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsync sync = 0x%016" PRIxPTR ", GLbitfield flags = 0x%X, GLuint64 timeout = %llu)", EVENT("(GLsync sync = 0x%016" PRIxPTR ", GLbitfield flags = 0x%X, GLuint64 timeout = %llu)",
(uintptr_t)sync, flags, static_cast<unsigned long long>(timeout)); (uintptr_t)sync, flags, static_cast<unsigned long long>(timeout));
......
src/libGLESv2/entry_points_gles_3_1_autogen.cpp
...@@ -20,7 +20,6 @@ namespace gl ...@@ -20,7 +20,6 @@ namespace gl
{ {
void GL_APIENTRY ActiveShaderProgram(GLuint pipeline, GLuint program) void GL_APIENTRY ActiveShaderProgram(GLuint pipeline, GLuint program)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint pipeline = %u, GLuint program = %u)", pipeline, program); EVENT("(GLuint pipeline = %u, GLuint program = %u)", pipeline, program);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -41,7 +40,6 @@ void GL_APIENTRY BindImageTexture(GLuint unit, ...@@ -41,7 +40,6 @@ void GL_APIENTRY BindImageTexture(GLuint unit,
GLenum access, GLenum access,
GLenum format) GLenum format)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint unit = %u, GLuint texture = %u, GLint level = %d, GLboolean layered = %u, GLint " "(GLuint unit = %u, GLuint texture = %u, GLint level = %d, GLboolean layered = %u, GLint "
"layer = %d, GLenum access = 0x%X, GLenum format = 0x%X)", "layer = %d, GLenum access = 0x%X, GLenum format = 0x%X)",
...@@ -60,7 +58,6 @@ void GL_APIENTRY BindImageTexture(GLuint unit, ...@@ -60,7 +58,6 @@ void GL_APIENTRY BindImageTexture(GLuint unit,
void GL_APIENTRY BindProgramPipeline(GLuint pipeline) void GL_APIENTRY BindProgramPipeline(GLuint pipeline)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint pipeline = %u)", pipeline); EVENT("(GLuint pipeline = %u)", pipeline);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -78,7 +75,6 @@ void GL_APIENTRY BindVertexBuffer(GLuint bindingindex, ...@@ -78,7 +75,6 @@ void GL_APIENTRY BindVertexBuffer(GLuint bindingindex,
GLintptr offset, GLintptr offset,
GLsizei stride) GLsizei stride)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint bindingindex = %u, GLuint buffer = %u, GLintptr offset = %llu, GLsizei stride = " "(GLuint bindingindex = %u, GLuint buffer = %u, GLintptr offset = %llu, GLsizei stride = "
"%d)", "%d)",
...@@ -97,7 +93,6 @@ void GL_APIENTRY BindVertexBuffer(GLuint bindingindex, ...@@ -97,7 +93,6 @@ void GL_APIENTRY BindVertexBuffer(GLuint bindingindex,
GLuint GL_APIENTRY CreateShaderProgramv(GLenum type, GLsizei count, const GLchar *const *strings) 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%016" PRIxPTR EVENT("(GLenum type = 0x%X, GLsizei count = %d, const GLchar *const*strings = 0x%016" PRIxPTR
")", ")",
type, count, (uintptr_t)strings); type, count, (uintptr_t)strings);
...@@ -118,7 +113,6 @@ GLuint GL_APIENTRY CreateShaderProgramv(GLenum type, GLsizei count, const GLchar ...@@ -118,7 +113,6 @@ GLuint GL_APIENTRY CreateShaderProgramv(GLenum type, GLsizei count, const GLchar
void GL_APIENTRY DeleteProgramPipelines(GLsizei n, const GLuint *pipelines) void GL_APIENTRY DeleteProgramPipelines(GLsizei n, const GLuint *pipelines)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *pipelines = 0x%016" PRIxPTR ")", n, (uintptr_t)pipelines); EVENT("(GLsizei n = %d, const GLuint *pipelines = 0x%016" PRIxPTR ")", n, (uintptr_t)pipelines);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -133,7 +127,6 @@ void GL_APIENTRY DeleteProgramPipelines(GLsizei n, const GLuint *pipelines) ...@@ -133,7 +127,6 @@ 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) 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)", 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); num_groups_x, num_groups_y, num_groups_z);
...@@ -150,7 +143,6 @@ void GL_APIENTRY DispatchCompute(GLuint num_groups_x, GLuint num_groups_y, GLuin ...@@ -150,7 +143,6 @@ void GL_APIENTRY DispatchCompute(GLuint num_groups_x, GLuint num_groups_y, GLuin
void GL_APIENTRY DispatchComputeIndirect(GLintptr indirect) void GL_APIENTRY DispatchComputeIndirect(GLintptr indirect)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLintptr indirect = %llu)", static_cast<unsigned long long>(indirect)); EVENT("(GLintptr indirect = %llu)", static_cast<unsigned long long>(indirect));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -165,7 +157,6 @@ void GL_APIENTRY DispatchComputeIndirect(GLintptr indirect) ...@@ -165,7 +157,6 @@ void GL_APIENTRY DispatchComputeIndirect(GLintptr indirect)
void GL_APIENTRY DrawArraysIndirect(GLenum mode, const void *indirect) void GL_APIENTRY DrawArraysIndirect(GLenum mode, const void *indirect)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum mode = 0x%X, const void *indirect = 0x%016" PRIxPTR ")", mode, EVENT("(GLenum mode = 0x%X, const void *indirect = 0x%016" PRIxPTR ")", mode,
(uintptr_t)indirect); (uintptr_t)indirect);
...@@ -182,7 +173,6 @@ void GL_APIENTRY DrawArraysIndirect(GLenum mode, const void *indirect) ...@@ -182,7 +173,6 @@ void GL_APIENTRY DrawArraysIndirect(GLenum mode, const void *indirect)
void GL_APIENTRY DrawElementsIndirect(GLenum mode, GLenum type, 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%016" PRIxPTR ")", EVENT("(GLenum mode = 0x%X, GLenum type = 0x%X, const void *indirect = 0x%016" PRIxPTR ")",
mode, type, (uintptr_t)indirect); mode, type, (uintptr_t)indirect);
...@@ -201,7 +191,6 @@ void GL_APIENTRY DrawElementsIndirect(GLenum mode, GLenum type, const void *indi ...@@ -201,7 +191,6 @@ void GL_APIENTRY DrawElementsIndirect(GLenum mode, GLenum type, const void *indi
void GL_APIENTRY FramebufferParameteri(GLenum target, GLenum pname, GLint param) 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); EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %d)", target, pname, param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -217,7 +206,6 @@ void GL_APIENTRY FramebufferParameteri(GLenum target, GLenum pname, GLint param) ...@@ -217,7 +206,6 @@ void GL_APIENTRY FramebufferParameteri(GLenum target, GLenum pname, GLint param)
void GL_APIENTRY GenProgramPipelines(GLsizei n, GLuint *pipelines) void GL_APIENTRY GenProgramPipelines(GLsizei n, GLuint *pipelines)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *pipelines = 0x%016" PRIxPTR ")", n, (uintptr_t)pipelines); EVENT("(GLsizei n = %d, GLuint *pipelines = 0x%016" PRIxPTR ")", n, (uintptr_t)pipelines);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -232,7 +220,6 @@ void GL_APIENTRY GenProgramPipelines(GLsizei n, GLuint *pipelines) ...@@ -232,7 +220,6 @@ void GL_APIENTRY GenProgramPipelines(GLsizei n, GLuint *pipelines)
void GL_APIENTRY GetBooleani_v(GLenum target, GLuint index, GLboolean *data) 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%016" PRIxPTR ")", target, EVENT("(GLenum target = 0x%X, GLuint index = %u, GLboolean *data = 0x%016" PRIxPTR ")", target,
index, (uintptr_t)data); index, (uintptr_t)data);
...@@ -248,7 +235,6 @@ void GL_APIENTRY GetBooleani_v(GLenum target, GLuint index, GLboolean *data) ...@@ -248,7 +235,6 @@ void GL_APIENTRY GetBooleani_v(GLenum target, GLuint index, GLboolean *data)
void GL_APIENTRY GetFramebufferParameteriv(GLenum target, GLenum pname, GLint *params) 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%016" PRIxPTR ")", target, EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
pname, (uintptr_t)params); pname, (uintptr_t)params);
...@@ -265,7 +251,6 @@ void GL_APIENTRY GetFramebufferParameteriv(GLenum target, GLenum pname, GLint *p ...@@ -265,7 +251,6 @@ void GL_APIENTRY GetFramebufferParameteriv(GLenum target, GLenum pname, GLint *p
void GL_APIENTRY GetMultisamplefv(GLenum pname, GLuint index, GLfloat *val) 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%016" PRIxPTR ")", pname, EVENT("(GLenum pname = 0x%X, GLuint index = %u, GLfloat *val = 0x%016" PRIxPTR ")", pname,
index, (uintptr_t)val); index, (uintptr_t)val);
...@@ -284,7 +269,6 @@ void GL_APIENTRY GetProgramInterfaceiv(GLuint program, ...@@ -284,7 +269,6 @@ void GL_APIENTRY GetProgramInterfaceiv(GLuint program,
GLenum pname, GLenum pname,
GLint *params) GLint *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLenum programInterface = 0x%X, GLenum pname = 0x%X, GLint *params " "(GLuint program = %u, GLenum programInterface = 0x%X, GLenum pname = 0x%X, GLint *params "
"= 0x%016" PRIxPTR ")", "= 0x%016" PRIxPTR ")",
...@@ -306,7 +290,6 @@ void GL_APIENTRY GetProgramPipelineInfoLog(GLuint pipeline, ...@@ -306,7 +290,6 @@ void GL_APIENTRY GetProgramPipelineInfoLog(GLuint pipeline,
GLsizei *length, GLsizei *length,
GLchar *infoLog) GLchar *infoLog)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint pipeline = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR EVENT("(GLuint pipeline = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
", GLchar *infoLog = 0x%016" PRIxPTR ")", ", GLchar *infoLog = 0x%016" PRIxPTR ")",
pipeline, bufSize, (uintptr_t)length, (uintptr_t)infoLog); pipeline, bufSize, (uintptr_t)length, (uintptr_t)infoLog);
...@@ -324,7 +307,6 @@ void GL_APIENTRY GetProgramPipelineInfoLog(GLuint pipeline, ...@@ -324,7 +307,6 @@ void GL_APIENTRY GetProgramPipelineInfoLog(GLuint pipeline,
void GL_APIENTRY GetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params) 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%016" PRIxPTR ")", EVENT("(GLuint pipeline = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")",
pipeline, pname, (uintptr_t)params); pipeline, pname, (uintptr_t)params);
...@@ -343,7 +325,6 @@ GLuint GL_APIENTRY GetProgramResourceIndex(GLuint program, ...@@ -343,7 +325,6 @@ GLuint GL_APIENTRY GetProgramResourceIndex(GLuint program,
GLenum programInterface, GLenum programInterface,
const GLchar *name) const GLchar *name)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%016" PRIxPTR "(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%016" PRIxPTR
")", ")",
...@@ -366,7 +347,6 @@ GLint GL_APIENTRY GetProgramResourceLocation(GLuint program, ...@@ -366,7 +347,6 @@ GLint GL_APIENTRY GetProgramResourceLocation(GLuint program,
GLenum programInterface, GLenum programInterface,
const GLchar *name) const GLchar *name)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%016" PRIxPTR "(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%016" PRIxPTR
")", ")",
...@@ -392,7 +372,6 @@ void GL_APIENTRY GetProgramResourceName(GLuint program, ...@@ -392,7 +372,6 @@ void GL_APIENTRY GetProgramResourceName(GLuint program,
GLsizei *length, GLsizei *length,
GLchar *name) GLchar *name)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLenum programInterface = 0x%X, GLuint index = %u, GLsizei bufSize " "(GLuint program = %u, GLenum programInterface = 0x%X, GLuint index = %u, GLsizei bufSize "
"= %d, GLsizei *length = 0x%016" PRIxPTR ", GLchar *name = 0x%016" PRIxPTR ")", "= %d, GLsizei *length = 0x%016" PRIxPTR ", GLchar *name = 0x%016" PRIxPTR ")",
...@@ -420,7 +399,6 @@ void GL_APIENTRY GetProgramResourceiv(GLuint program, ...@@ -420,7 +399,6 @@ void GL_APIENTRY GetProgramResourceiv(GLuint program,
GLsizei *length, GLsizei *length,
GLint *params) GLint *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLenum programInterface = 0x%X, GLuint index = %u, GLsizei " "(GLuint program = %u, GLenum programInterface = 0x%X, GLuint index = %u, GLsizei "
"propCount = %d, const GLenum *props = 0x%016" PRIxPTR "propCount = %d, const GLenum *props = 0x%016" PRIxPTR
...@@ -444,7 +422,6 @@ void GL_APIENTRY GetProgramResourceiv(GLuint program, ...@@ -444,7 +422,6 @@ void GL_APIENTRY GetProgramResourceiv(GLuint program,
void GL_APIENTRY GetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params) void GL_APIENTRY GetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLfloat *params = " "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLfloat *params = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -464,7 +441,6 @@ void GL_APIENTRY GetTexLevelParameterfv(GLenum target, GLint level, GLenum pname ...@@ -464,7 +441,6 @@ void GL_APIENTRY GetTexLevelParameterfv(GLenum target, GLint level, GLenum pname
void GL_APIENTRY GetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params) void GL_APIENTRY GetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLint *params = " "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLint *params = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -484,7 +460,6 @@ void GL_APIENTRY GetTexLevelParameteriv(GLenum target, GLint level, GLenum pname ...@@ -484,7 +460,6 @@ void GL_APIENTRY GetTexLevelParameteriv(GLenum target, GLint level, GLenum pname
GLboolean GL_APIENTRY IsProgramPipeline(GLuint pipeline) GLboolean GL_APIENTRY IsProgramPipeline(GLuint pipeline)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint pipeline = %u)", pipeline); EVENT("(GLuint pipeline = %u)", pipeline);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -501,7 +476,6 @@ GLboolean GL_APIENTRY IsProgramPipeline(GLuint pipeline) ...@@ -501,7 +476,6 @@ GLboolean GL_APIENTRY IsProgramPipeline(GLuint pipeline)
void GL_APIENTRY MemoryBarrier(GLbitfield barriers) void GL_APIENTRY MemoryBarrier(GLbitfield barriers)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLbitfield barriers = 0x%X)", barriers); EVENT("(GLbitfield barriers = 0x%X)", barriers);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -516,7 +490,6 @@ void GL_APIENTRY MemoryBarrier(GLbitfield barriers) ...@@ -516,7 +490,6 @@ void GL_APIENTRY MemoryBarrier(GLbitfield barriers)
void GL_APIENTRY MemoryBarrierByRegion(GLbitfield barriers) void GL_APIENTRY MemoryBarrierByRegion(GLbitfield barriers)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLbitfield barriers = 0x%X)", barriers); EVENT("(GLbitfield barriers = 0x%X)", barriers);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -531,7 +504,6 @@ void GL_APIENTRY MemoryBarrierByRegion(GLbitfield barriers) ...@@ -531,7 +504,6 @@ void GL_APIENTRY MemoryBarrierByRegion(GLbitfield barriers)
void GL_APIENTRY ProgramUniform1f(GLuint program, GLint location, GLfloat v0) 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); EVENT("(GLuint program = %u, GLint location = %d, GLfloat v0 = %f)", program, location, v0);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -549,7 +521,6 @@ void GL_APIENTRY ProgramUniform1fv(GLuint program, ...@@ -549,7 +521,6 @@ void GL_APIENTRY ProgramUniform1fv(GLuint program,
GLsizei count, GLsizei count,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -568,7 +539,6 @@ void GL_APIENTRY ProgramUniform1fv(GLuint program, ...@@ -568,7 +539,6 @@ void GL_APIENTRY ProgramUniform1fv(GLuint program,
void GL_APIENTRY ProgramUniform1i(GLuint program, GLint location, GLint v0) 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); EVENT("(GLuint program = %u, GLint location = %d, GLint v0 = %d)", program, location, v0);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -586,7 +556,6 @@ void GL_APIENTRY ProgramUniform1iv(GLuint program, ...@@ -586,7 +556,6 @@ void GL_APIENTRY ProgramUniform1iv(GLuint program,
GLsizei count, GLsizei count,
const GLint *value) const GLint *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -605,7 +574,6 @@ void GL_APIENTRY ProgramUniform1iv(GLuint program, ...@@ -605,7 +574,6 @@ void GL_APIENTRY ProgramUniform1iv(GLuint program,
void GL_APIENTRY ProgramUniform1ui(GLuint program, GLint location, GLuint v0) 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); EVENT("(GLuint program = %u, GLint location = %d, GLuint v0 = %u)", program, location, v0);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -623,7 +591,6 @@ void GL_APIENTRY ProgramUniform1uiv(GLuint program, ...@@ -623,7 +591,6 @@ void GL_APIENTRY ProgramUniform1uiv(GLuint program,
GLsizei count, GLsizei count,
const GLuint *value) const GLuint *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -642,7 +609,6 @@ void GL_APIENTRY ProgramUniform1uiv(GLuint program, ...@@ -642,7 +609,6 @@ void GL_APIENTRY ProgramUniform1uiv(GLuint program,
void GL_APIENTRY ProgramUniform2f(GLuint program, GLint location, GLfloat v0, GLfloat v1) 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, EVENT("(GLuint program = %u, GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f)", program,
location, v0, v1); location, v0, v1);
...@@ -662,7 +628,6 @@ void GL_APIENTRY ProgramUniform2fv(GLuint program, ...@@ -662,7 +628,6 @@ void GL_APIENTRY ProgramUniform2fv(GLuint program,
GLsizei count, GLsizei count,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -681,7 +646,6 @@ void GL_APIENTRY ProgramUniform2fv(GLuint program, ...@@ -681,7 +646,6 @@ void GL_APIENTRY ProgramUniform2fv(GLuint program,
void GL_APIENTRY ProgramUniform2i(GLuint program, GLint location, GLint v0, GLint v1) 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, EVENT("(GLuint program = %u, GLint location = %d, GLint v0 = %d, GLint v1 = %d)", program,
location, v0, v1); location, v0, v1);
...@@ -701,7 +665,6 @@ void GL_APIENTRY ProgramUniform2iv(GLuint program, ...@@ -701,7 +665,6 @@ void GL_APIENTRY ProgramUniform2iv(GLuint program,
GLsizei count, GLsizei count,
const GLint *value) const GLint *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -720,7 +683,6 @@ void GL_APIENTRY ProgramUniform2iv(GLuint program, ...@@ -720,7 +683,6 @@ void GL_APIENTRY ProgramUniform2iv(GLuint program,
void GL_APIENTRY ProgramUniform2ui(GLuint program, GLint location, GLuint v0, GLuint v1) 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, EVENT("(GLuint program = %u, GLint location = %d, GLuint v0 = %u, GLuint v1 = %u)", program,
location, v0, v1); location, v0, v1);
...@@ -740,7 +702,6 @@ void GL_APIENTRY ProgramUniform2uiv(GLuint program, ...@@ -740,7 +702,6 @@ void GL_APIENTRY ProgramUniform2uiv(GLuint program,
GLsizei count, GLsizei count,
const GLuint *value) const GLuint *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -760,7 +721,6 @@ void GL_APIENTRY ProgramUniform2uiv(GLuint program, ...@@ -760,7 +721,6 @@ void GL_APIENTRY ProgramUniform2uiv(GLuint program,
void GL_APIENTRY void GL_APIENTRY
ProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2) ProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = " "(GLuint program = %u, GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = "
"%f)", "%f)",
...@@ -782,7 +742,6 @@ void GL_APIENTRY ProgramUniform3fv(GLuint program, ...@@ -782,7 +742,6 @@ void GL_APIENTRY ProgramUniform3fv(GLuint program,
GLsizei count, GLsizei count,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -801,7 +760,6 @@ void GL_APIENTRY ProgramUniform3fv(GLuint program, ...@@ -801,7 +760,6 @@ void GL_APIENTRY ProgramUniform3fv(GLuint program,
void GL_APIENTRY ProgramUniform3i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2) 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)", EVENT("(GLuint program = %u, GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d)",
program, location, v0, v1, v2); program, location, v0, v1, v2);
...@@ -821,7 +779,6 @@ void GL_APIENTRY ProgramUniform3iv(GLuint program, ...@@ -821,7 +779,6 @@ void GL_APIENTRY ProgramUniform3iv(GLuint program,
GLsizei count, GLsizei count,
const GLint *value) const GLint *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -840,7 +797,6 @@ void GL_APIENTRY ProgramUniform3iv(GLuint program, ...@@ -840,7 +797,6 @@ void GL_APIENTRY ProgramUniform3iv(GLuint program,
void GL_APIENTRY ProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2) void GL_APIENTRY ProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = " "(GLuint program = %u, GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = "
"%u)", "%u)",
...@@ -862,7 +818,6 @@ void GL_APIENTRY ProgramUniform3uiv(GLuint program, ...@@ -862,7 +818,6 @@ void GL_APIENTRY ProgramUniform3uiv(GLuint program,
GLsizei count, GLsizei count,
const GLuint *value) const GLuint *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -882,7 +837,6 @@ void GL_APIENTRY ProgramUniform3uiv(GLuint program, ...@@ -882,7 +837,6 @@ void GL_APIENTRY ProgramUniform3uiv(GLuint program,
void GL_APIENTRY void GL_APIENTRY
ProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3) ProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = " "(GLuint program = %u, GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = "
"%f, GLfloat v3 = %f)", "%f, GLfloat v3 = %f)",
...@@ -904,7 +858,6 @@ void GL_APIENTRY ProgramUniform4fv(GLuint program, ...@@ -904,7 +858,6 @@ void GL_APIENTRY ProgramUniform4fv(GLuint program,
GLsizei count, GLsizei count,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -924,7 +877,6 @@ void GL_APIENTRY ProgramUniform4fv(GLuint program, ...@@ -924,7 +877,6 @@ void GL_APIENTRY ProgramUniform4fv(GLuint program,
void GL_APIENTRY void GL_APIENTRY
ProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3) ProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d, " "(GLuint program = %u, GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d, "
"GLint v3 = %d)", "GLint v3 = %d)",
...@@ -946,7 +898,6 @@ void GL_APIENTRY ProgramUniform4iv(GLuint program, ...@@ -946,7 +898,6 @@ void GL_APIENTRY ProgramUniform4iv(GLuint program,
GLsizei count, GLsizei count,
const GLint *value) const GLint *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -966,7 +917,6 @@ void GL_APIENTRY ProgramUniform4iv(GLuint program, ...@@ -966,7 +917,6 @@ void GL_APIENTRY ProgramUniform4iv(GLuint program,
void GL_APIENTRY void GL_APIENTRY
ProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3) ProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = " "(GLuint program = %u, GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = "
"%u, GLuint v3 = %u)", "%u, GLuint v3 = %u)",
...@@ -988,7 +938,6 @@ void GL_APIENTRY ProgramUniform4uiv(GLuint program, ...@@ -988,7 +938,6 @@ void GL_APIENTRY ProgramUniform4uiv(GLuint program,
GLsizei count, GLsizei count,
const GLuint *value) const GLuint *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = "
"0x%016" PRIxPTR ")", "0x%016" PRIxPTR ")",
...@@ -1011,7 +960,6 @@ void GL_APIENTRY ProgramUniformMatrix2fv(GLuint program, ...@@ -1011,7 +960,6 @@ void GL_APIENTRY ProgramUniformMatrix2fv(GLuint program,
GLboolean transpose, GLboolean transpose,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
"const GLfloat *value = 0x%016" PRIxPTR ")", "const GLfloat *value = 0x%016" PRIxPTR ")",
...@@ -1034,7 +982,6 @@ void GL_APIENTRY ProgramUniformMatrix2x3fv(GLuint program, ...@@ -1034,7 +982,6 @@ void GL_APIENTRY ProgramUniformMatrix2x3fv(GLuint program,
GLboolean transpose, GLboolean transpose,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
"const GLfloat *value = 0x%016" PRIxPTR ")", "const GLfloat *value = 0x%016" PRIxPTR ")",
...@@ -1057,7 +1004,6 @@ void GL_APIENTRY ProgramUniformMatrix2x4fv(GLuint program, ...@@ -1057,7 +1004,6 @@ void GL_APIENTRY ProgramUniformMatrix2x4fv(GLuint program,
GLboolean transpose, GLboolean transpose,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
"const GLfloat *value = 0x%016" PRIxPTR ")", "const GLfloat *value = 0x%016" PRIxPTR ")",
...@@ -1080,7 +1026,6 @@ void GL_APIENTRY ProgramUniformMatrix3fv(GLuint program, ...@@ -1080,7 +1026,6 @@ void GL_APIENTRY ProgramUniformMatrix3fv(GLuint program,
GLboolean transpose, GLboolean transpose,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
"const GLfloat *value = 0x%016" PRIxPTR ")", "const GLfloat *value = 0x%016" PRIxPTR ")",
...@@ -1103,7 +1048,6 @@ void GL_APIENTRY ProgramUniformMatrix3x2fv(GLuint program, ...@@ -1103,7 +1048,6 @@ void GL_APIENTRY ProgramUniformMatrix3x2fv(GLuint program,
GLboolean transpose, GLboolean transpose,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
"const GLfloat *value = 0x%016" PRIxPTR ")", "const GLfloat *value = 0x%016" PRIxPTR ")",
...@@ -1126,7 +1070,6 @@ void GL_APIENTRY ProgramUniformMatrix3x4fv(GLuint program, ...@@ -1126,7 +1070,6 @@ void GL_APIENTRY ProgramUniformMatrix3x4fv(GLuint program,
GLboolean transpose, GLboolean transpose,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
"const GLfloat *value = 0x%016" PRIxPTR ")", "const GLfloat *value = 0x%016" PRIxPTR ")",
...@@ -1149,7 +1092,6 @@ void GL_APIENTRY ProgramUniformMatrix4fv(GLuint program, ...@@ -1149,7 +1092,6 @@ void GL_APIENTRY ProgramUniformMatrix4fv(GLuint program,
GLboolean transpose, GLboolean transpose,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
"const GLfloat *value = 0x%016" PRIxPTR ")", "const GLfloat *value = 0x%016" PRIxPTR ")",
...@@ -1172,7 +1114,6 @@ void GL_APIENTRY ProgramUniformMatrix4x2fv(GLuint program, ...@@ -1172,7 +1114,6 @@ void GL_APIENTRY ProgramUniformMatrix4x2fv(GLuint program,
GLboolean transpose, GLboolean transpose,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
"const GLfloat *value = 0x%016" PRIxPTR ")", "const GLfloat *value = 0x%016" PRIxPTR ")",
...@@ -1195,7 +1136,6 @@ void GL_APIENTRY ProgramUniformMatrix4x3fv(GLuint program, ...@@ -1195,7 +1136,6 @@ void GL_APIENTRY ProgramUniformMatrix4x3fv(GLuint program,
GLboolean transpose, GLboolean transpose,
const GLfloat *value) const GLfloat *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, " "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
"const GLfloat *value = 0x%016" PRIxPTR ")", "const GLfloat *value = 0x%016" PRIxPTR ")",
...@@ -1214,7 +1154,6 @@ void GL_APIENTRY ProgramUniformMatrix4x3fv(GLuint program, ...@@ -1214,7 +1154,6 @@ void GL_APIENTRY ProgramUniformMatrix4x3fv(GLuint program,
void GL_APIENTRY SampleMaski(GLuint maskNumber, GLbitfield mask) void GL_APIENTRY SampleMaski(GLuint maskNumber, GLbitfield mask)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint maskNumber = %u, GLbitfield mask = 0x%X)", maskNumber, mask); EVENT("(GLuint maskNumber = %u, GLbitfield mask = 0x%X)", maskNumber, mask);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1234,7 +1173,6 @@ void GL_APIENTRY TexStorage2DMultisample(GLenum target, ...@@ -1234,7 +1173,6 @@ void GL_APIENTRY TexStorage2DMultisample(GLenum target,
GLsizei height, GLsizei height,
GLboolean fixedsamplelocations) GLboolean fixedsamplelocations)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width " "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width "
"= %d, GLsizei height = %d, GLboolean fixedsamplelocations = %u)", "= %d, GLsizei height = %d, GLboolean fixedsamplelocations = %u)",
...@@ -1256,7 +1194,6 @@ void GL_APIENTRY TexStorage2DMultisample(GLenum target, ...@@ -1256,7 +1194,6 @@ void GL_APIENTRY TexStorage2DMultisample(GLenum target,
void GL_APIENTRY UseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program) 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, EVENT("(GLuint pipeline = %u, GLbitfield stages = 0x%X, GLuint program = %u)", pipeline, stages,
program); program);
...@@ -1273,7 +1210,6 @@ void GL_APIENTRY UseProgramStages(GLuint pipeline, GLbitfield stages, GLuint pro ...@@ -1273,7 +1210,6 @@ void GL_APIENTRY UseProgramStages(GLuint pipeline, GLbitfield stages, GLuint pro
void GL_APIENTRY ValidateProgramPipeline(GLuint pipeline) void GL_APIENTRY ValidateProgramPipeline(GLuint pipeline)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint pipeline = %u)", pipeline); EVENT("(GLuint pipeline = %u)", pipeline);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1288,7 +1224,6 @@ void GL_APIENTRY ValidateProgramPipeline(GLuint pipeline) ...@@ -1288,7 +1224,6 @@ void GL_APIENTRY ValidateProgramPipeline(GLuint pipeline)
void GL_APIENTRY VertexAttribBinding(GLuint attribindex, GLuint bindingindex) void GL_APIENTRY VertexAttribBinding(GLuint attribindex, GLuint bindingindex)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint attribindex = %u, GLuint bindingindex = %u)", attribindex, bindingindex); EVENT("(GLuint attribindex = %u, GLuint bindingindex = %u)", attribindex, bindingindex);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
...@@ -1308,7 +1243,6 @@ void GL_APIENTRY VertexAttribFormat(GLuint attribindex, ...@@ -1308,7 +1243,6 @@ void GL_APIENTRY VertexAttribFormat(GLuint attribindex,
GLboolean normalized, GLboolean normalized,
GLuint relativeoffset) GLuint relativeoffset)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint attribindex = %u, GLint size = %d, GLenum type = 0x%X, GLboolean normalized = %u, " "(GLuint attribindex = %u, GLint size = %d, GLenum type = 0x%X, GLboolean normalized = %u, "
"GLuint relativeoffset = %u)", "GLuint relativeoffset = %u)",
...@@ -1332,7 +1266,6 @@ void GL_APIENTRY VertexAttribIFormat(GLuint attribindex, ...@@ -1332,7 +1266,6 @@ void GL_APIENTRY VertexAttribIFormat(GLuint attribindex,
GLenum type, GLenum type,
GLuint relativeoffset) GLuint relativeoffset)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLuint attribindex = %u, GLint size = %d, GLenum type = 0x%X, GLuint relativeoffset = " "(GLuint attribindex = %u, GLint size = %d, GLenum type = 0x%X, GLuint relativeoffset = "
"%u)", "%u)",
...@@ -1352,7 +1285,6 @@ void GL_APIENTRY VertexAttribIFormat(GLuint attribindex, ...@@ -1352,7 +1285,6 @@ void GL_APIENTRY VertexAttribIFormat(GLuint attribindex,
void GL_APIENTRY VertexBindingDivisor(GLuint bindingindex, GLuint divisor) void GL_APIENTRY VertexBindingDivisor(GLuint bindingindex, GLuint divisor)
{ {
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint bindingindex = %u, GLuint divisor = %u)", bindingindex, divisor); EVENT("(GLuint bindingindex = %u, GLuint divisor = %u)", bindingindex, divisor);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
......
src/libGLESv2/entry_points_gles_ext_autogen.cpp
This source diff could not be displayed because it is too large. You can view the blob instead.
src/libGLESv2/global_state.cpp
...@@ -35,6 +35,11 @@ namespace ...@@ -35,6 +35,11 @@ namespace
{ {
static TLSIndex threadTLS = TLS_INVALID_INDEX; static TLSIndex threadTLS = TLS_INVALID_INDEX;
Debug *g_Debug = nullptr; Debug *g_Debug = nullptr;
std::atomic<std::mutex *> g_Mutex;
static_assert(std::is_trivially_constructible<decltype(g_Mutex)>::value,
"global mutex is not trivially constructible");
static_assert(std::is_trivially_destructible<decltype(g_Mutex)>::value,
"global mutex is not trivially destructible");
Thread *AllocateCurrentThread() Thread *AllocateCurrentThread()
{ {
...@@ -56,15 +61,34 @@ Thread *AllocateCurrentThread() ...@@ -56,15 +61,34 @@ Thread *AllocateCurrentThread()
void AllocateDebug() void AllocateDebug()
{ {
// TODO(geofflang): Lock around global allocation. http://anglebug.com/2464 // All EGL calls use a global lock, this is thread safe
if (g_Debug == nullptr) if (g_Debug == nullptr)
{ {
g_Debug = new Debug(); g_Debug = new Debug();
} }
} }
void AllocateMutex()
{
if (g_Mutex == nullptr)
{
std::unique_ptr<std::mutex> newMutex(new std::mutex());
std::mutex *expected = nullptr;
if (g_Mutex.compare_exchange_strong(expected, newMutex.get()))
{
newMutex.release();
}
}
}
} // anonymous namespace } // anonymous namespace
std::mutex &GetGlobalMutex()
{
AllocateMutex();
return *g_Mutex;
}
Thread *GetCurrentThread() Thread *GetCurrentThread()
{ {
// Create a TLS index if one has not been created for this DLL // Create a TLS index if one has not been created for this DLL
...@@ -109,21 +133,6 @@ void SetContextCurrent(Thread *thread, gl::Context *context) ...@@ -109,21 +133,6 @@ void SetContextCurrent(Thread *thread, gl::Context *context)
} }
} // namespace egl } // 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 #ifdef ANGLE_PLATFORM_WINDOWS
namespace egl namespace egl
{ {
...@@ -143,11 +152,19 @@ void DealocateDebug() ...@@ -143,11 +152,19 @@ void DealocateDebug()
SafeDelete(g_Debug); SafeDelete(g_Debug);
} }
void DealocateMutex()
{
std::mutex *mutex = g_Mutex.exchange(nullptr);
SafeDelete(mutex);
}
bool InitializeProcess() bool InitializeProcess()
{ {
ASSERT(g_Debug == nullptr); ASSERT(g_Debug == nullptr);
AllocateDebug(); AllocateDebug();
AllocateMutex();
threadTLS = CreateTLSIndex(); threadTLS = CreateTLSIndex();
if (threadTLS == TLS_INVALID_INDEX) if (threadTLS == TLS_INVALID_INDEX)
{ {
...@@ -161,6 +178,8 @@ bool TerminateProcess() ...@@ -161,6 +178,8 @@ bool TerminateProcess()
{ {
DealocateDebug(); DealocateDebug();
DealocateMutex();
if (!DeallocateCurrentThread()) if (!DeallocateCurrentThread())
{ {
return false; return false;
......
src/libGLESv2/global_state.h
...@@ -21,11 +21,15 @@ namespace egl ...@@ -21,11 +21,15 @@ namespace egl
class Debug; class Debug;
class Thread; class Thread;
std::mutex &GetGlobalMutex();
Thread *GetCurrentThread(); Thread *GetCurrentThread();
Debug *GetDebug(); Debug *GetDebug();
void SetContextCurrent(Thread *thread, gl::Context *context); void SetContextCurrent(Thread *thread, gl::Context *context);
} // namespace egl } // namespace egl
#define ANGLE_SCOPED_GLOBAL_LOCK() \
std::lock_guard<std::mutex> globalMutexLock(egl::GetGlobalMutex())
namespace gl namespace gl
{ {
extern Context *gSingleThreadedContext; extern Context *gSingleThreadedContext;
...@@ -54,16 +58,4 @@ ANGLE_INLINE Context *GetValidGlobalContext() ...@@ -54,16 +58,4 @@ ANGLE_INLINE Context *GetValidGlobalContext()
} // namespace gl } // namespace gl
#if ANGLE_FORCE_THREAD_SAFETY == ANGLE_ENABLED
namespace angle
{
std::mutex &GetGlobalMutex();
} // namespace angle
# define ANGLE_SCOPED_GLOBAL_LOCK() \
std::lock_guard<std::mutex> globalMutexLock(angle::GetGlobalMutex())
#else
# define ANGLE_SCOPED_GLOBAL_LOCK()
#endif
#endif // LIBGLESV2_GLOBALSTATE_H_ #endif // LIBGLESV2_GLOBALSTATE_H_
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment