Skip to content

A
angle
Commit e9503ae9 by Jamie Madill Committed by Commit Bot
Options

Revert "Add compiler printf attribute to relevant functions"

This reverts commit 27a472c6. Reason for revert: Causing failures on 32-bit Linux configs: https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8931673733828416640/+/steps/compile/0/stdout ../../third_party/angle/src/libGLESv2/entry_points_egl.cpp:257:11: error: reinterpret_cast from 'EGLNativeWindowType' (aka 'unsigned long') to 'uintptr_t' (aka 'unsigned int') is not allowed reinterpret_cast<uintptr_t>(win), reinterpret_cast<uintptr_t>(attrib_list)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../../third_party/angle/src/common/debug.h:230:112: note: expanded from macro 'EVENT' #define EVENT(message, ...) gl::ScopedPerfEventHelper scopedPerfEventHelper("%s" message "\n", __FUNCTION__, ##__VA_ARGS__); ^~~~~~~~~~~ ../../third_party/angle/src/libGLESv2/entry_points_egl.cpp:314:11: error: reinterpret_cast from 'EGLNativePixmapType' (aka 'unsigned long') to 'uintptr_t' (aka 'unsigned int') is not allowed reinterpret_cast<uintptr_t>(pixmap), reinterpret_cast<uintptr_t>(attrib_list)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Original change's description: > Add compiler printf attribute to relevant functions > > This commit includes fixes to undefined behavior caught by this > attribute. The following changes have been made: > > - 0x%0.8p is changed to %016 PRIxPTR. Both 0 and . have undefined behavior with > p. Additionally, %p already prints 0x with both gcc and clang. This > results in a small output change: > > void *x = (void *)0x1234; > void *y = (void *)0x1234567890abcdef; > > printf("|%0.8p|\n", x); > printf("|%0.8p|\n", y); > > printf("|%016" PRIxPTR "|\n", reinterpret_cast<uintptr_t>(x)); > printf("|%016" PRIxPTR "|\n", reinterpret_cast<uintptr_t>(y)); > > prints: > > |0x00001234| > |0x1234567890abcdef| > |0x0000000000001234| > |0x1234567890abcdef| > > - %d used for GLintptr, GLsizeiptr, EGLTime and EGLnsecsANDROID is > changed to %llu and the relevant argument is cast to unsigned long > long. This is due to these types being typedefs to unknown types (on > Linux for example, these are unsigned long, and my guess would be > unsigned long long on Windows where long is 32 bits). > - %llu is used for GLuint64, which could be unsigned long (as is on > Linux). Those arguments are cast to unsigned long long. > - %p is used for some EGLNative types, but those types may not be a > pointer. Those arguments are cast to uintptr_t and printed as above. > > Bug: angleproject:2928 > Change-Id: I63e9e998c72701ce8582f1ebf25d6374be9090e4 > Reviewed-on: https://chromium-review.googlesource.com/c/1289232 > Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> > Reviewed-by: Yuly Novikov <ynovikov@chromium.org> TBR=ynovikov@chromium.org,jmadill@chromium.org,syoussefi@chromium.org Change-Id: I4f3cea64977bee9f889db6c995371bd2bbc6d81b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: angleproject:2928 Reviewed-on: https://chromium-review.googlesource.com/c/1299480 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 479918de
Showing with 584 additions and 794 deletions
scripts/generate_entry_points.py
...@@ -298,34 +298,6 @@ def just_the_name_packed(param, reserved_set): ...@@ -298,34 +298,6 @@ def just_the_name_packed(param, reserved_set):
else: else:
return name return name
static_cast_to_dict = {
"GLintptr": "unsigned long long",
"GLsizeiptr": "unsigned long long",
"GLuint64": "unsigned long long",
}
reinterpret_cast_to_dict = {
"GLsync": "uintptr_t",
"GLDEBUGPROC": "uintptr_t",
"GLDEBUGPROCKHR": "uintptr_t",
"GLeglImageOES": "uintptr_t",
}
def param_print_argument(param):
name_only = just_the_name(param)
type_only = just_the_type(param)
if "*" in param:
return "reinterpret_cast<uintptr_t>(" + name_only + ")"
if type_only in reinterpret_cast_to_dict:
return "reinterpret_cast<" + reinterpret_cast_to_dict[type_only] + ">(" + name_only + ")"
if type_only in static_cast_to_dict:
return "static_cast<" + static_cast_to_dict[type_only] + ">(" + name_only + ")"
return name_only
format_dict = { format_dict = {
"GLbitfield": "0x%X", "GLbitfield": "0x%X",
"GLboolean": "%u", "GLboolean": "%u",
...@@ -334,22 +306,22 @@ format_dict = { ...@@ -334,22 +306,22 @@ format_dict = {
"GLfixed": "0x%X", "GLfixed": "0x%X",
"GLfloat": "%f", "GLfloat": "%f",
"GLint": "%d", "GLint": "%d",
"GLintptr": "%llu", "GLintptr": "%d",
"GLshort": "%d", "GLshort": "%d",
"GLsizei": "%d", "GLsizei": "%d",
"GLsizeiptr": "%llu", "GLsizeiptr": "%d",
"GLsync": "0x%016\" PRIxPTR \"", "GLsync": "0x%0.8p",
"GLubyte": "%d", "GLubyte": "%d",
"GLuint": "%u", "GLuint": "%u",
"GLuint64": "%llu", "GLuint64": "%llu",
"GLDEBUGPROC": "0x%016\" PRIxPTR \"", "GLDEBUGPROC": "0x%0.8p",
"GLDEBUGPROCKHR": "0x%016\" PRIxPTR \"", "GLDEBUGPROCKHR": "0x%0.8p",
"GLeglImageOES": "0x%016\" PRIxPTR \"", "GLeglImageOES": "0x%0.8p",
} }
def param_format_string(param): def param_format_string(param):
if "*" in param: if "*" in param:
return param + " = 0x%016\" PRIxPTR \"" return param + " = 0x%0.8p"
else: else:
type_only = just_the_type(param) type_only = just_the_type(param)
if type_only not in format_dict: if type_only not in format_dict:
...@@ -386,7 +358,7 @@ def format_entry_point_def(cmd_name, proto, params, is_explicit_context): ...@@ -386,7 +358,7 @@ def format_entry_point_def(cmd_name, proto, params, is_explicit_context):
packed_gl_enum_conversions += ["\n " + internal_type + " " + internal_name +" = FromGLenum<" + packed_gl_enum_conversions += ["\n " + internal_type + " " + internal_name +" = FromGLenum<" +
internal_type + ">(" + name + ");"] internal_type + ">(" + name + ");"]
pass_params = [param_print_argument(param) for param in params] pass_params = [just_the_name(param) for param in params]
format_params = [param_format_string(param) for param in params] format_params = [param_format_string(param) for param in params]
return_type = proto[:-len(cmd_name)] return_type = proto[:-len(cmd_name)]
default_return = default_return_value(cmd_name, return_type.strip()) default_return = default_return_value(cmd_name, return_type.strip())
......
src/common/angleutils.h
...@@ -297,16 +297,6 @@ std::string ToString(const T &value) ...@@ -297,16 +297,6 @@ std::string ToString(const T &value)
#define ANGLE_NOINLINE #define ANGLE_NOINLINE
#endif #endif
#if defined(__clang__) || (defined(__GNUC__) && defined(__has_attribute))
#if __has_attribute(format)
#define ANGLE_FORMAT_PRINTF(fmt, args) __attribute__((format(__printf__, fmt, args)))
#else
#define ANGLE_FORMAT_PRINTF(fmt, args)
#endif
#else
#define ANGLE_FORMAT_PRINTF(fmt, args)
#endif
#ifndef ANGLE_STRINGIFY #ifndef ANGLE_STRINGIFY
#define ANGLE_STRINGIFY(x) #x #define ANGLE_STRINGIFY(x) #x
#endif #endif
......
src/common/debug.h
...@@ -31,8 +31,7 @@ namespace gl ...@@ -31,8 +31,7 @@ namespace gl
class ScopedPerfEventHelper : angle::NonCopyable class ScopedPerfEventHelper : angle::NonCopyable
{ {
public: public:
ANGLE_FORMAT_PRINTF(2, 3) ScopedPerfEventHelper(const char* format, ...);
ScopedPerfEventHelper(const char *format, ...);
~ScopedPerfEventHelper(); ~ScopedPerfEventHelper();
}; };
......
src/gpu_info_util/SystemInfo_android.cpp
...@@ -97,7 +97,6 @@ class VulkanLibrary final : NonCopyable ...@@ -97,7 +97,6 @@ class VulkanLibrary final : NonCopyable
VkInstance mInstance = VK_NULL_HANDLE; VkInstance mInstance = VK_NULL_HANDLE;
}; };
ANGLE_FORMAT_PRINTF(1, 2)
std::string FormatString(const char *fmt, ...) std::string FormatString(const char *fmt, ...)
{ {
va_list vararg; va_list vararg;
......
src/libANGLE/angletypes.h
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include "libANGLE/Error.h" #include "libANGLE/Error.h"
#include "libANGLE/RefCountObject.h" #include "libANGLE/RefCountObject.h"
#include <inttypes.h>
#include <stdint.h> #include <stdint.h>
#include <bitset> #include <bitset>
......
src/libGLESv2/entry_points_egl.cpp
...@@ -67,8 +67,7 @@ EGLint EGLAPIENTRY GetError(void) ...@@ -67,8 +67,7 @@ EGLint EGLAPIENTRY GetError(void)
EGLDisplay EGLAPIENTRY GetDisplay(EGLNativeDisplayType display_id) EGLDisplay EGLAPIENTRY GetDisplay(EGLNativeDisplayType display_id)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLNativeDisplayType display_id = 0x%016" PRIxPTR ")", EVENT("(EGLNativeDisplayType display_id = 0x%0.8p)", display_id);
(uintptr_t)display_id);
return Display::GetDisplayFromNativeDisplay(display_id, AttributeMap()); return Display::GetDisplayFromNativeDisplay(display_id, AttributeMap());
} }
...@@ -76,10 +75,8 @@ EGLDisplay EGLAPIENTRY GetDisplay(EGLNativeDisplayType display_id) ...@@ -76,10 +75,8 @@ EGLDisplay EGLAPIENTRY GetDisplay(EGLNativeDisplayType display_id)
EGLBoolean EGLAPIENTRY Initialize(EGLDisplay dpy, EGLint *major, EGLint *minor) EGLBoolean EGLAPIENTRY Initialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLint *major = 0x%016" PRIxPTR EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint *major = 0x%0.8p, EGLint *minor = 0x%0.8p)", dpy,
", EGLint *minor = 0x%016" PRIxPTR ")", major, minor);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(major),
reinterpret_cast<uintptr_t>(minor));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -101,7 +98,7 @@ EGLBoolean EGLAPIENTRY Initialize(EGLDisplay dpy, EGLint *major, EGLint *minor) ...@@ -101,7 +98,7 @@ EGLBoolean EGLAPIENTRY Initialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
EGLBoolean EGLAPIENTRY Terminate(EGLDisplay dpy) EGLBoolean EGLAPIENTRY Terminate(EGLDisplay dpy)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ")", reinterpret_cast<uintptr_t>(dpy)); EVENT("(EGLDisplay dpy = 0x%0.8p)", dpy);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -123,8 +120,7 @@ EGLBoolean EGLAPIENTRY Terminate(EGLDisplay dpy) ...@@ -123,8 +120,7 @@ EGLBoolean EGLAPIENTRY Terminate(EGLDisplay dpy)
const char *EGLAPIENTRY QueryString(EGLDisplay dpy, EGLint name) const char *EGLAPIENTRY QueryString(EGLDisplay dpy, EGLint name)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLint name = %d)", EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint name = %d)", dpy, name);
reinterpret_cast<uintptr_t>(dpy), name);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -172,11 +168,10 @@ EGLBoolean EGLAPIENTRY GetConfigs(EGLDisplay dpy, ...@@ -172,11 +168,10 @@ EGLBoolean EGLAPIENTRY GetConfigs(EGLDisplay dpy,
EGLint *num_config) EGLint *num_config)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig *configs = 0x%016" PRIxPTR EVENT(
", " "(EGLDisplay dpy = 0x%0.8p, EGLConfig *configs = 0x%0.8p, "
"EGLint config_size = %d, EGLint *num_config = 0x%016" PRIxPTR ")", "EGLint config_size = %d, EGLint *num_config = 0x%0.8p)",
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(configs), config_size, dpy, configs, config_size, num_config);
reinterpret_cast<uintptr_t>(num_config));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -197,13 +192,10 @@ EGLBoolean EGLAPIENTRY ChooseConfig(EGLDisplay dpy, ...@@ -197,13 +192,10 @@ EGLBoolean EGLAPIENTRY ChooseConfig(EGLDisplay dpy,
EGLint *num_config) EGLint *num_config)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", const EGLint *attrib_list = 0x%016" PRIxPTR EVENT(
", " "(EGLDisplay dpy = 0x%0.8p, const EGLint *attrib_list = 0x%0.8p, "
"EGLConfig *configs = 0x%016" PRIxPTR "EGLConfig *configs = 0x%0.8p, EGLint config_size = %d, EGLint *num_config = 0x%0.8p)",
", EGLint config_size = %d, EGLint *num_config = 0x%016" PRIxPTR ")", dpy, attrib_list, configs, config_size, num_config);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(attrib_list),
reinterpret_cast<uintptr_t>(configs), config_size,
reinterpret_cast<uintptr_t>(num_config));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -224,11 +216,10 @@ EGLBoolean EGLAPIENTRY GetConfigAttrib(EGLDisplay dpy, ...@@ -224,11 +216,10 @@ EGLBoolean EGLAPIENTRY GetConfigAttrib(EGLDisplay dpy,
EGLint *value) EGLint *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR EVENT(
", EGLint attribute = %d, EGLint " "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLint attribute = %d, EGLint "
"*value = 0x%016" PRIxPTR ")", "*value = 0x%0.8p)",
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(config), attribute, dpy, config, attribute, value);
reinterpret_cast<uintptr_t>(value));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -249,12 +240,10 @@ EGLSurface EGLAPIENTRY CreateWindowSurface(EGLDisplay dpy, ...@@ -249,12 +240,10 @@ EGLSurface EGLAPIENTRY CreateWindowSurface(EGLDisplay dpy,
const EGLint *attrib_list) const EGLint *attrib_list)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR EVENT(
", EGLNativeWindowType win = 0x%016" PRIxPTR "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLNativeWindowType win = 0x%0.8p, "
", " "const EGLint *attrib_list = 0x%0.8p)",
"const EGLint *attrib_list = 0x%016" PRIxPTR ")", dpy, config, win, attrib_list);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(config),
reinterpret_cast<uintptr_t>(win), reinterpret_cast<uintptr_t>(attrib_list));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -278,11 +267,10 @@ EGLSurface EGLAPIENTRY CreatePbufferSurface(EGLDisplay dpy, ...@@ -278,11 +267,10 @@ EGLSurface EGLAPIENTRY CreatePbufferSurface(EGLDisplay dpy,
const EGLint *attrib_list) const EGLint *attrib_list)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR EVENT(
", const EGLint *attrib_list = " "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, const EGLint *attrib_list = "
"0x%016" PRIxPTR ")", "0x%0.8p)",
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(config), dpy, config, attrib_list);
reinterpret_cast<uintptr_t>(attrib_list));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -305,13 +293,11 @@ EGLSurface EGLAPIENTRY CreatePixmapSurface(EGLDisplay dpy, ...@@ -305,13 +293,11 @@ EGLSurface EGLAPIENTRY CreatePixmapSurface(EGLDisplay dpy,
const EGLint *attrib_list) const EGLint *attrib_list)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR EVENT(
", EGLNativePixmapType pixmap = " "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLNativePixmapType pixmap = "
"0x%016" PRIxPTR "0x%0.8p, "
", " "const EGLint *attrib_list = 0x%0.8p)",
"const EGLint *attrib_list = 0x%016" PRIxPTR ")", dpy, config, pixmap, attrib_list);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(config),
reinterpret_cast<uintptr_t>(pixmap), reinterpret_cast<uintptr_t>(attrib_list));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -329,8 +315,7 @@ EGLSurface EGLAPIENTRY CreatePixmapSurface(EGLDisplay dpy, ...@@ -329,8 +315,7 @@ EGLSurface EGLAPIENTRY CreatePixmapSurface(EGLDisplay dpy,
EGLBoolean EGLAPIENTRY DestroySurface(EGLDisplay dpy, EGLSurface surface) EGLBoolean EGLAPIENTRY DestroySurface(EGLDisplay dpy, EGLSurface surface)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR ")", EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p)", dpy, surface);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(surface));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -352,11 +337,10 @@ EGLBoolean EGLAPIENTRY QuerySurface(EGLDisplay dpy, ...@@ -352,11 +337,10 @@ EGLBoolean EGLAPIENTRY QuerySurface(EGLDisplay dpy,
EGLint *value) EGLint *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR EVENT(
", EGLint attribute = %d, EGLint " "(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint attribute = %d, EGLint "
"*value = 0x%016" PRIxPTR ")", "*value = 0x%0.8p)",
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(surface), attribute, dpy, surface, attribute, value);
reinterpret_cast<uintptr_t>(value));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
const Display *display = static_cast<const Display *>(dpy); const Display *display = static_cast<const Display *>(dpy);
...@@ -377,13 +361,11 @@ EGLContext EGLAPIENTRY CreateContext(EGLDisplay dpy, ...@@ -377,13 +361,11 @@ EGLContext EGLAPIENTRY CreateContext(EGLDisplay dpy,
const EGLint *attrib_list) const EGLint *attrib_list)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR EVENT(
", EGLContext share_context = " "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLContext share_context = "
"0x%016" PRIxPTR "0x%0.8p, "
", " "const EGLint *attrib_list = 0x%0.8p)",
"const EGLint *attrib_list = 0x%016" PRIxPTR ")", dpy, config, share_context, attrib_list);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(config),
reinterpret_cast<uintptr_t>(share_context), reinterpret_cast<uintptr_t>(attrib_list));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -407,8 +389,7 @@ EGLContext EGLAPIENTRY CreateContext(EGLDisplay dpy, ...@@ -407,8 +389,7 @@ EGLContext EGLAPIENTRY CreateContext(EGLDisplay dpy,
EGLBoolean EGLAPIENTRY DestroyContext(EGLDisplay dpy, EGLContext ctx) EGLBoolean EGLAPIENTRY DestroyContext(EGLDisplay dpy, EGLContext ctx)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLContext ctx = 0x%016" PRIxPTR ")", EVENT("(EGLDisplay dpy = 0x%0.8p, EGLContext ctx = 0x%0.8p)", dpy, ctx);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(ctx));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -434,12 +415,10 @@ EGLBoolean EGLAPIENTRY DestroyContext(EGLDisplay dpy, EGLContext ctx) ...@@ -434,12 +415,10 @@ EGLBoolean EGLAPIENTRY DestroyContext(EGLDisplay dpy, EGLContext ctx)
EGLBoolean EGLAPIENTRY MakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx) EGLBoolean EGLAPIENTRY MakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface draw = 0x%016" PRIxPTR EVENT(
", EGLSurface read = 0x%016" PRIxPTR "(EGLDisplay dpy = 0x%0.8p, EGLSurface draw = 0x%0.8p, EGLSurface read = 0x%0.8p, "
", " "EGLContext ctx = 0x%0.8p)",
"EGLContext ctx = 0x%016" PRIxPTR ")", dpy, draw, read, ctx);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(draw),
reinterpret_cast<uintptr_t>(read), reinterpret_cast<uintptr_t>(ctx));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -515,11 +494,10 @@ EGLDisplay EGLAPIENTRY GetCurrentDisplay(void) ...@@ -515,11 +494,10 @@ EGLDisplay EGLAPIENTRY GetCurrentDisplay(void)
EGLBoolean EGLAPIENTRY QueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value) EGLBoolean EGLAPIENTRY QueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLContext ctx = 0x%016" PRIxPTR EVENT(
", EGLint attribute = %d, EGLint *value " "(EGLDisplay dpy = 0x%0.8p, EGLContext ctx = 0x%0.8p, EGLint attribute = %d, EGLint *value "
"= 0x%016" PRIxPTR ")", "= 0x%0.8p)",
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(ctx), attribute, dpy, ctx, attribute, value);
reinterpret_cast<uintptr_t>(value));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -575,8 +553,7 @@ EGLBoolean EGLAPIENTRY WaitNative(EGLint engine) ...@@ -575,8 +553,7 @@ EGLBoolean EGLAPIENTRY WaitNative(EGLint engine)
EGLBoolean EGLAPIENTRY SwapBuffers(EGLDisplay dpy, EGLSurface surface) EGLBoolean EGLAPIENTRY SwapBuffers(EGLDisplay dpy, EGLSurface surface)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR ")", EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p)", dpy, surface);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(surface));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -595,11 +572,10 @@ EGLBoolean EGLAPIENTRY SwapBuffers(EGLDisplay dpy, EGLSurface surface) ...@@ -595,11 +572,10 @@ EGLBoolean EGLAPIENTRY SwapBuffers(EGLDisplay dpy, EGLSurface surface)
EGLBoolean EGLAPIENTRY CopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target) EGLBoolean EGLAPIENTRY CopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR EVENT(
", EGLNativePixmapType target = " "(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLNativePixmapType target = "
"0x%016" PRIxPTR ")", "0x%0.8p)",
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(surface), dpy, surface, target);
reinterpret_cast<uintptr_t>(target));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -618,9 +594,8 @@ EGLBoolean EGLAPIENTRY CopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNative ...@@ -618,9 +594,8 @@ EGLBoolean EGLAPIENTRY CopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNative
EGLBoolean EGLAPIENTRY BindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer) EGLBoolean EGLAPIENTRY BindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint buffer = %d)", dpy,
", EGLint buffer = %d)", surface, buffer);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(surface), buffer);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -648,10 +623,10 @@ EGLBoolean EGLAPIENTRY SurfaceAttrib(EGLDisplay dpy, ...@@ -648,10 +623,10 @@ EGLBoolean EGLAPIENTRY SurfaceAttrib(EGLDisplay dpy,
EGLint value) EGLint value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR EVENT(
", EGLint attribute = %d, EGLint " "(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint attribute = %d, EGLint "
"value = %d)", "value = %d)",
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(surface), attribute, value); dpy, surface, attribute, value);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -669,9 +644,8 @@ EGLBoolean EGLAPIENTRY SurfaceAttrib(EGLDisplay dpy, ...@@ -669,9 +644,8 @@ EGLBoolean EGLAPIENTRY SurfaceAttrib(EGLDisplay dpy,
EGLBoolean EGLAPIENTRY ReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer) EGLBoolean EGLAPIENTRY ReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint buffer = %d)", dpy,
", EGLint buffer = %d)", surface, buffer);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(surface), buffer);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -696,8 +670,7 @@ EGLBoolean EGLAPIENTRY ReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLin ...@@ -696,8 +670,7 @@ EGLBoolean EGLAPIENTRY ReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLin
EGLBoolean EGLAPIENTRY SwapInterval(EGLDisplay dpy, EGLint interval) EGLBoolean EGLAPIENTRY SwapInterval(EGLDisplay dpy, EGLint interval)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLint interval = %d)", EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint interval = %d)", dpy, interval);
reinterpret_cast<uintptr_t>(dpy), interval);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -751,12 +724,10 @@ EGLSurface EGLAPIENTRY CreatePbufferFromClientBuffer(EGLDisplay dpy, ...@@ -751,12 +724,10 @@ EGLSurface EGLAPIENTRY CreatePbufferFromClientBuffer(EGLDisplay dpy,
const EGLint *attrib_list) const EGLint *attrib_list)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR EVENT(
", EGLenum buftype = 0x%X, EGLClientBuffer buffer = 0x%016" PRIxPTR "(EGLDisplay dpy = 0x%0.8p, EGLenum buftype = 0x%X, EGLClientBuffer buffer = 0x%0.8p, "
", " "EGLConfig config = 0x%0.8p, const EGLint *attrib_list = 0x%0.8p)",
"EGLConfig config = 0x%016" PRIxPTR ", const EGLint *attrib_list = 0x%016" PRIxPTR ")", dpy, buftype, buffer, config, attrib_list);
reinterpret_cast<uintptr_t>(dpy), buftype, reinterpret_cast<uintptr_t>(buffer),
reinterpret_cast<uintptr_t>(config), reinterpret_cast<uintptr_t>(attrib_list));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -827,9 +798,8 @@ EGLContext EGLAPIENTRY GetCurrentContext(void) ...@@ -827,9 +798,8 @@ EGLContext EGLAPIENTRY GetCurrentContext(void)
EGLSync EGLAPIENTRY CreateSync(EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list) EGLSync EGLAPIENTRY CreateSync(EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR EVENT("(EGLDisplay dpy = 0x%0.8p, EGLenum type = 0x%X, const EGLint* attrib_list = 0x%0.8p)",
", EGLenum type = 0x%X, const EGLint* attrib_list = 0x%016" PRIxPTR ")", dpy, type, attrib_list);
reinterpret_cast<uintptr_t>(dpy), type, reinterpret_cast<uintptr_t>(attrib_list));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -843,8 +813,7 @@ EGLSync EGLAPIENTRY CreateSync(EGLDisplay dpy, EGLenum type, const EGLAttrib *at ...@@ -843,8 +813,7 @@ EGLSync EGLAPIENTRY CreateSync(EGLDisplay dpy, EGLenum type, const EGLAttrib *at
EGLBoolean EGLAPIENTRY DestroySync(EGLDisplay dpy, EGLSync sync) EGLBoolean EGLAPIENTRY DestroySync(EGLDisplay dpy, EGLSync sync)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSync sync = 0x%016" PRIxPTR ")", EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSync sync = 0x%0.8p)", dpy, sync);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(sync));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
UNIMPLEMENTED(); UNIMPLEMENTED();
...@@ -857,11 +826,10 @@ EGLBoolean EGLAPIENTRY DestroySync(EGLDisplay dpy, EGLSync sync) ...@@ -857,11 +826,10 @@ EGLBoolean EGLAPIENTRY DestroySync(EGLDisplay dpy, EGLSync sync)
EGLint EGLAPIENTRY ClientWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout) EGLint EGLAPIENTRY ClientWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSync sync = 0x%016" PRIxPTR EVENT(
", EGLint flags = 0x%X, EGLTime timeout = " "(EGLDisplay dpy = 0x%0.8p, EGLSync sync = 0x%0.8p, EGLint flags = 0x%X, EGLTime timeout = "
"%llu)", "%d)",
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(sync), flags, dpy, sync, flags, timeout);
static_cast<unsigned long long>(timeout));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
UNIMPLEMENTED(); UNIMPLEMENTED();
...@@ -877,11 +845,10 @@ EGLBoolean EGLAPIENTRY GetSyncAttrib(EGLDisplay dpy, ...@@ -877,11 +845,10 @@ EGLBoolean EGLAPIENTRY GetSyncAttrib(EGLDisplay dpy,
EGLAttrib *value) EGLAttrib *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSync sync = 0x%016" PRIxPTR EVENT(
", EGLint attribute = 0x%X, EGLAttrib " "(EGLDisplay dpy = 0x%0.8p, EGLSync sync = 0x%0.8p, EGLint attribute = 0x%X, EGLAttrib "
"*value = 0x%016" PRIxPTR ")", "*value = 0x%0.8p)",
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(sync), attribute, dpy, sync, attribute, value);
reinterpret_cast<uintptr_t>(value));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
UNIMPLEMENTED(); UNIMPLEMENTED();
...@@ -898,12 +865,10 @@ EGLImage EGLAPIENTRY CreateImage(EGLDisplay dpy, ...@@ -898,12 +865,10 @@ EGLImage EGLAPIENTRY CreateImage(EGLDisplay dpy,
const EGLAttrib *attrib_list) const EGLAttrib *attrib_list)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLContext ctx = 0x%016" PRIxPTR EVENT(
", EGLenum target = 0x%X, " "(EGLDisplay dpy = 0x%0.8p, EGLContext ctx = 0x%0.8p, EGLenum target = 0x%X, "
"EGLClientBuffer buffer = 0x%016" PRIxPTR "EGLClientBuffer buffer = 0x%0.8p, const EGLAttrib *attrib_list = 0x%0.8p)",
", const EGLAttrib *attrib_list = 0x%016" PRIxPTR ")", dpy, ctx, target, buffer, attrib_list);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(ctx), target,
reinterpret_cast<uintptr_t>(buffer), reinterpret_cast<uintptr_t>(attrib_list));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -916,8 +881,7 @@ EGLImage EGLAPIENTRY CreateImage(EGLDisplay dpy, ...@@ -916,8 +881,7 @@ EGLImage EGLAPIENTRY CreateImage(EGLDisplay dpy,
EGLBoolean EGLAPIENTRY DestroyImage(EGLDisplay dpy, EGLImage image) EGLBoolean EGLAPIENTRY DestroyImage(EGLDisplay dpy, EGLImage image)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLImage image = 0x%016" PRIxPTR ")", EVENT("(EGLDisplay dpy = 0x%0.8p, EGLImage image = 0x%0.8p)", dpy, image);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(image));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
Image *eglImage = static_cast<Image *>(image); Image *eglImage = static_cast<Image *>(image);
...@@ -933,11 +897,10 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplay(EGLenum platform, ...@@ -933,11 +897,10 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplay(EGLenum platform,
const EGLAttrib *attrib_list) const EGLAttrib *attrib_list)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLenum platform = %d, void* native_display = 0x%016" PRIxPTR EVENT(
", const EGLint* attrib_list = " "(EGLenum platform = %d, void* native_display = 0x%0.8p, const EGLint* attrib_list = "
"0x%016" PRIxPTR ")", "0x%0.8p)",
platform, reinterpret_cast<uintptr_t>(native_display), platform, native_display, attrib_list);
reinterpret_cast<uintptr_t>(attrib_list));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
ANGLE_EGL_TRY_RETURN(thread, ValidateGetPlatformDisplay(platform, native_display, attrib_list), ANGLE_EGL_TRY_RETURN(thread, ValidateGetPlatformDisplay(platform, native_display, attrib_list),
...@@ -967,12 +930,10 @@ EGLSurface EGLAPIENTRY CreatePlatformWindowSurface(EGLDisplay dpy, ...@@ -967,12 +930,10 @@ EGLSurface EGLAPIENTRY CreatePlatformWindowSurface(EGLDisplay dpy,
const EGLAttrib *attrib_list) const EGLAttrib *attrib_list)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR EVENT(
", void* native_window = 0x%016" PRIxPTR "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, void* native_window = 0x%0.8p, "
", " "const EGLint* attrib_list = 0x%0.8p)",
"const EGLint* attrib_list = 0x%016" PRIxPTR ")", dpy, config, native_window, attrib_list);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(config),
reinterpret_cast<uintptr_t>(native_window), reinterpret_cast<uintptr_t>(attrib_list));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -988,12 +949,10 @@ EGLSurface EGLAPIENTRY CreatePlatformPixmapSurface(EGLDisplay dpy, ...@@ -988,12 +949,10 @@ EGLSurface EGLAPIENTRY CreatePlatformPixmapSurface(EGLDisplay dpy,
const EGLAttrib *attrib_list) const EGLAttrib *attrib_list)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR EVENT(
", void* native_pixmap = 0x%016" PRIxPTR "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, void* native_pixmap = 0x%0.8p, "
", " "const EGLint* attrib_list = 0x%0.8p)",
"const EGLint* attrib_list = 0x%016" PRIxPTR ")", dpy, config, native_pixmap, attrib_list);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(config),
reinterpret_cast<uintptr_t>(native_pixmap), reinterpret_cast<uintptr_t>(attrib_list));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -1006,9 +965,8 @@ EGLSurface EGLAPIENTRY CreatePlatformPixmapSurface(EGLDisplay dpy, ...@@ -1006,9 +965,8 @@ EGLSurface EGLAPIENTRY CreatePlatformPixmapSurface(EGLDisplay dpy,
EGLBoolean EGLAPIENTRY WaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags) EGLBoolean EGLAPIENTRY WaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy =0x%016" PRIxPTR "p, EGLSync sync = 0x%016" PRIxPTR EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSync sync = 0x%0.8p, EGLint flags = 0x%X)", dpy, sync,
", EGLint flags = 0x%X)", flags);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(sync), flags);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
......
src/libGLESv2/entry_points_egl_ext.cpp
...@@ -29,11 +29,10 @@ EGLBoolean EGLAPIENTRY QuerySurfacePointerANGLE(EGLDisplay dpy, ...@@ -29,11 +29,10 @@ EGLBoolean EGLAPIENTRY QuerySurfacePointerANGLE(EGLDisplay dpy,
void **value) void **value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR EVENT(
", EGLint attribute = %d, void " "(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint attribute = %d, void "
"**value = 0x%016" PRIxPTR ")", "**value = 0x%0.8p)",
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(surface), attribute, dpy, surface, attribute, value);
reinterpret_cast<uintptr_t>(value));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -102,11 +101,10 @@ EGLBoolean EGLAPIENTRY ...@@ -102,11 +101,10 @@ EGLBoolean EGLAPIENTRY
PostSubBufferNV(EGLDisplay dpy, EGLSurface surface, EGLint x, EGLint y, EGLint width, EGLint height) PostSubBufferNV(EGLDisplay dpy, EGLSurface surface, EGLint x, EGLint y, EGLint width, EGLint height)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR EVENT(
", EGLint x = %d, EGLint y = %d, " "(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint x = %d, EGLint y = %d, "
"EGLint width = %d, EGLint height = %d)", "EGLint width = %d, EGLint height = %d)",
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(surface), x, y, width, dpy, surface, x, y, width, height);
height);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
Surface *eglSurface = static_cast<Surface *>(surface); Surface *eglSurface = static_cast<Surface *>(surface);
...@@ -166,11 +164,10 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplayEXT(EGLenum platform, ...@@ -166,11 +164,10 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplayEXT(EGLenum platform,
const EGLint *attrib_list) const EGLint *attrib_list)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLenum platform = %d, void* native_display = 0x%016" PRIxPTR EVENT(
", const EGLint* attrib_list = " "(EGLenum platform = %d, void* native_display = 0x%0.8p, const EGLint* attrib_list = "
"0x%016" PRIxPTR ")", "0x%0.8p)",
platform, reinterpret_cast<uintptr_t>(native_display), platform, native_display, attrib_list);
reinterpret_cast<uintptr_t>(attrib_list));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Error err = ValidateGetPlatformDisplayEXT(platform, native_display, attrib_list); Error err = ValidateGetPlatformDisplayEXT(platform, native_display, attrib_list);
...@@ -204,12 +201,10 @@ EGLSurface EGLAPIENTRY CreatePlatformWindowSurfaceEXT(EGLDisplay dpy, ...@@ -204,12 +201,10 @@ EGLSurface EGLAPIENTRY CreatePlatformWindowSurfaceEXT(EGLDisplay dpy,
const EGLint *attrib_list) const EGLint *attrib_list)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR EVENT(
", void *native_window = 0x%016" PRIxPTR "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, void *native_window = 0x%0.8p, "
", " "const EGLint *attrib_list = 0x%0.8p)",
"const EGLint *attrib_list = 0x%016" PRIxPTR ")", dpy, config, native_window, attrib_list);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(config),
reinterpret_cast<uintptr_t>(native_window), reinterpret_cast<uintptr_t>(attrib_list));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -232,12 +227,10 @@ EGLSurface EGLAPIENTRY CreatePlatformPixmapSurfaceEXT(EGLDisplay dpy, ...@@ -232,12 +227,10 @@ EGLSurface EGLAPIENTRY CreatePlatformPixmapSurfaceEXT(EGLDisplay dpy,
const EGLint *attrib_list) const EGLint *attrib_list)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR EVENT(
", void *native_pixmap = 0x%016" PRIxPTR "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, void *native_pixmap = 0x%0.8p, "
", " "const EGLint *attrib_list = 0x%0.8p)",
"const EGLint *attrib_list = 0x%016" PRIxPTR ")", dpy, config, native_pixmap, attrib_list);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(config),
reinterpret_cast<uintptr_t>(native_pixmap), reinterpret_cast<uintptr_t>(attrib_list));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -258,9 +251,8 @@ EGLSurface EGLAPIENTRY CreatePlatformPixmapSurfaceEXT(EGLDisplay dpy, ...@@ -258,9 +251,8 @@ EGLSurface EGLAPIENTRY CreatePlatformPixmapSurfaceEXT(EGLDisplay dpy,
EGLBoolean EGLAPIENTRY QueryDeviceAttribEXT(EGLDeviceEXT device, EGLint attribute, EGLAttrib *value) EGLBoolean EGLAPIENTRY QueryDeviceAttribEXT(EGLDeviceEXT device, EGLint attribute, EGLAttrib *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDeviceEXT device = 0x%016" PRIxPTR EVENT("(EGLDeviceEXT device = 0x%0.8p, EGLint attribute = %d, EGLAttrib *value = 0x%0.8p)",
", EGLint attribute = %d, EGLAttrib *value = 0x%016" PRIxPTR ")", device, attribute, value);
reinterpret_cast<uintptr_t>(device), attribute, reinterpret_cast<uintptr_t>(value));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Device *dev = static_cast<Device *>(device); Device *dev = static_cast<Device *>(device);
...@@ -317,8 +309,7 @@ EGLBoolean EGLAPIENTRY QueryDeviceAttribEXT(EGLDeviceEXT device, EGLint attribut ...@@ -317,8 +309,7 @@ EGLBoolean EGLAPIENTRY QueryDeviceAttribEXT(EGLDeviceEXT device, EGLint attribut
const char *EGLAPIENTRY QueryDeviceStringEXT(EGLDeviceEXT device, EGLint name) const char *EGLAPIENTRY QueryDeviceStringEXT(EGLDeviceEXT device, EGLint name)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDeviceEXT device = 0x%016" PRIxPTR ", EGLint name = %d)", EVENT("(EGLDeviceEXT device = 0x%0.8p, EGLint name = %d)", device, name);
reinterpret_cast<uintptr_t>(device), name);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Device *dev = static_cast<Device *>(device); Device *dev = static_cast<Device *>(device);
...@@ -350,9 +341,8 @@ const char *EGLAPIENTRY QueryDeviceStringEXT(EGLDeviceEXT device, EGLint name) ...@@ -350,9 +341,8 @@ const char *EGLAPIENTRY QueryDeviceStringEXT(EGLDeviceEXT device, EGLint name)
EGLBoolean EGLAPIENTRY QueryDisplayAttribEXT(EGLDisplay dpy, EGLint attribute, EGLAttrib *value) EGLBoolean EGLAPIENTRY QueryDisplayAttribEXT(EGLDisplay dpy, EGLint attribute, EGLAttrib *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint attribute = %d, EGLAttrib *value = 0x%0.8p)", dpy,
", EGLint attribute = %d, EGLAttrib *value = 0x%016" PRIxPTR ")", attribute, value);
reinterpret_cast<uintptr_t>(dpy), attribute, reinterpret_cast<uintptr_t>(value));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -395,12 +385,10 @@ ANGLE_EXPORT EGLImageKHR EGLAPIENTRY CreateImageKHR(EGLDisplay dpy, ...@@ -395,12 +385,10 @@ ANGLE_EXPORT EGLImageKHR EGLAPIENTRY CreateImageKHR(EGLDisplay dpy,
const EGLint *attrib_list) const EGLint *attrib_list)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLContext ctx = 0x%016" PRIxPTR EVENT(
", EGLenum target = 0x%X, " "(EGLDisplay dpy = 0x%0.8p, EGLContext ctx = 0x%0.8p, EGLenum target = 0x%X, "
"EGLClientBuffer buffer = 0x%016" PRIxPTR "EGLClientBuffer buffer = 0x%0.8p, const EGLAttrib *attrib_list = 0x%0.8p)",
", const EGLAttrib *attrib_list = 0x%016" PRIxPTR ")", dpy, ctx, target, buffer, attrib_list);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(ctx), target,
reinterpret_cast<uintptr_t>(buffer), reinterpret_cast<uintptr_t>(attrib_list));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -429,8 +417,7 @@ ANGLE_EXPORT EGLImageKHR EGLAPIENTRY CreateImageKHR(EGLDisplay dpy, ...@@ -429,8 +417,7 @@ ANGLE_EXPORT EGLImageKHR EGLAPIENTRY CreateImageKHR(EGLDisplay dpy,
ANGLE_EXPORT EGLBoolean EGLAPIENTRY DestroyImageKHR(EGLDisplay dpy, EGLImageKHR image) ANGLE_EXPORT EGLBoolean EGLAPIENTRY DestroyImageKHR(EGLDisplay dpy, EGLImageKHR image)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLImage image = 0x%016" PRIxPTR ")", EVENT("(EGLDisplay dpy = 0x%0.8p, EGLImage image = 0x%0.8p)", dpy, image);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(image));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -454,11 +441,10 @@ ANGLE_EXPORT EGLDeviceEXT EGLAPIENTRY CreateDeviceANGLE(EGLint device_type, ...@@ -454,11 +441,10 @@ ANGLE_EXPORT EGLDeviceEXT EGLAPIENTRY CreateDeviceANGLE(EGLint device_type,
const EGLAttrib *attrib_list) const EGLAttrib *attrib_list)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLint device_type = %d, void* native_device = 0x%016" PRIxPTR EVENT(
", const EGLAttrib* attrib_list = " "(EGLint device_type = %d, void* native_device = 0x%0.8p, const EGLAttrib* attrib_list = "
"0x%016" PRIxPTR ")", "0x%0.8p)",
device_type, reinterpret_cast<uintptr_t>(native_device), device_type, native_device, attrib_list);
reinterpret_cast<uintptr_t>(attrib_list));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Error error = ValidateCreateDeviceANGLE(device_type, native_device, attrib_list); Error error = ValidateCreateDeviceANGLE(device_type, native_device, attrib_list);
...@@ -484,7 +470,7 @@ ANGLE_EXPORT EGLDeviceEXT EGLAPIENTRY CreateDeviceANGLE(EGLint device_type, ...@@ -484,7 +470,7 @@ ANGLE_EXPORT EGLDeviceEXT EGLAPIENTRY CreateDeviceANGLE(EGLint device_type,
ANGLE_EXPORT EGLBoolean EGLAPIENTRY ReleaseDeviceANGLE(EGLDeviceEXT device) ANGLE_EXPORT EGLBoolean EGLAPIENTRY ReleaseDeviceANGLE(EGLDeviceEXT device)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDeviceEXT device = 0x%016" PRIxPTR ")", reinterpret_cast<uintptr_t>(device)); EVENT("(EGLDeviceEXT device = 0x%0.8p)", device);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Device *dev = static_cast<Device *>(device); Device *dev = static_cast<Device *>(device);
...@@ -506,8 +492,7 @@ ANGLE_EXPORT EGLBoolean EGLAPIENTRY ReleaseDeviceANGLE(EGLDeviceEXT device) ...@@ -506,8 +492,7 @@ ANGLE_EXPORT EGLBoolean EGLAPIENTRY ReleaseDeviceANGLE(EGLDeviceEXT device)
EGLStreamKHR EGLAPIENTRY CreateStreamKHR(EGLDisplay dpy, const EGLint *attrib_list) EGLStreamKHR EGLAPIENTRY CreateStreamKHR(EGLDisplay dpy, const EGLint *attrib_list)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", const EGLAttrib* attrib_list = 0x%016" PRIxPTR ")", EVENT("(EGLDisplay dpy = 0x%0.8p, const EGLAttrib* attrib_list = 0x%0.8p)", dpy, attrib_list);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(attrib_list));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -535,8 +520,7 @@ EGLStreamKHR EGLAPIENTRY CreateStreamKHR(EGLDisplay dpy, const EGLint *attrib_li ...@@ -535,8 +520,7 @@ EGLStreamKHR EGLAPIENTRY CreateStreamKHR(EGLDisplay dpy, const EGLint *attrib_li
EGLBoolean EGLAPIENTRY DestroyStreamKHR(EGLDisplay dpy, EGLStreamKHR stream) EGLBoolean EGLAPIENTRY DestroyStreamKHR(EGLDisplay dpy, EGLStreamKHR stream)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR = 0x%016" PRIxPTR ")", EVENT("(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR = 0x%0.8p)", dpy, stream);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(stream));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -562,10 +546,10 @@ EGLBoolean EGLAPIENTRY StreamAttribKHR(EGLDisplay dpy, ...@@ -562,10 +546,10 @@ EGLBoolean EGLAPIENTRY StreamAttribKHR(EGLDisplay dpy,
EGLint value) EGLint value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR stream = 0x%016" PRIxPTR EVENT(
", EGLenum attribute = 0x%X, " "(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, EGLenum attribute = 0x%X, "
"EGLint value = 0x%X)", "EGLint value = 0x%X)",
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(stream), attribute, value); dpy, stream, attribute, value);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -601,11 +585,10 @@ EGLBoolean EGLAPIENTRY QueryStreamKHR(EGLDisplay dpy, ...@@ -601,11 +585,10 @@ EGLBoolean EGLAPIENTRY QueryStreamKHR(EGLDisplay dpy,
EGLint *value) EGLint *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR stream = 0x%016" PRIxPTR EVENT(
", EGLenum attribute = 0x%X, " "(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, EGLenum attribute = 0x%X, "
"EGLint value = 0x%016" PRIxPTR ")", "EGLint value = 0x%0.8p)",
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(stream), attribute, dpy, stream, attribute, value);
reinterpret_cast<uintptr_t>(value));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -644,11 +627,10 @@ EGLBoolean EGLAPIENTRY QueryStreamu64KHR(EGLDisplay dpy, ...@@ -644,11 +627,10 @@ EGLBoolean EGLAPIENTRY QueryStreamu64KHR(EGLDisplay dpy,
EGLuint64KHR *value) EGLuint64KHR *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR stream = 0x%016" PRIxPTR EVENT(
", EGLenum attribute = 0x%X, " "(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, EGLenum attribute = 0x%X, "
"EGLuint64KHR value = 0x%016" PRIxPTR ")", "EGLuint64KHR value = 0x%0.8p)",
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(stream), attribute, dpy, stream, attribute, value);
reinterpret_cast<uintptr_t>(value));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -681,8 +663,7 @@ EGLBoolean EGLAPIENTRY QueryStreamu64KHR(EGLDisplay dpy, ...@@ -681,8 +663,7 @@ EGLBoolean EGLAPIENTRY QueryStreamu64KHR(EGLDisplay dpy,
EGLBoolean EGLAPIENTRY StreamConsumerGLTextureExternalKHR(EGLDisplay dpy, EGLStreamKHR stream) EGLBoolean EGLAPIENTRY StreamConsumerGLTextureExternalKHR(EGLDisplay dpy, EGLStreamKHR stream)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR = 0x%016" PRIxPTR ")", EVENT("(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR = 0x%0.8p)", dpy, stream);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(stream));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -712,8 +693,7 @@ EGLBoolean EGLAPIENTRY StreamConsumerGLTextureExternalKHR(EGLDisplay dpy, EGLStr ...@@ -712,8 +693,7 @@ EGLBoolean EGLAPIENTRY StreamConsumerGLTextureExternalKHR(EGLDisplay dpy, EGLStr
EGLBoolean EGLAPIENTRY StreamConsumerAcquireKHR(EGLDisplay dpy, EGLStreamKHR stream) EGLBoolean EGLAPIENTRY StreamConsumerAcquireKHR(EGLDisplay dpy, EGLStreamKHR stream)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR = 0x%016" PRIxPTR ")", EVENT("(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR = 0x%0.8p)", dpy, stream);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(stream));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -743,8 +723,7 @@ EGLBoolean EGLAPIENTRY StreamConsumerAcquireKHR(EGLDisplay dpy, EGLStreamKHR str ...@@ -743,8 +723,7 @@ EGLBoolean EGLAPIENTRY StreamConsumerAcquireKHR(EGLDisplay dpy, EGLStreamKHR str
EGLBoolean EGLAPIENTRY StreamConsumerReleaseKHR(EGLDisplay dpy, EGLStreamKHR stream) EGLBoolean EGLAPIENTRY StreamConsumerReleaseKHR(EGLDisplay dpy, EGLStreamKHR stream)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR = 0x%016" PRIxPTR ")", EVENT("(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR = 0x%0.8p)", dpy, stream);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(stream));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -776,10 +755,9 @@ EGLBoolean EGLAPIENTRY StreamConsumerGLTextureExternalAttribsNV(EGLDisplay dpy, ...@@ -776,10 +755,9 @@ EGLBoolean EGLAPIENTRY StreamConsumerGLTextureExternalAttribsNV(EGLDisplay dpy,
const EGLAttrib *attrib_list) const EGLAttrib *attrib_list)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR stream = 0x%016" PRIxPTR EVENT(
", EGLAttrib attrib_list = 0x%016" PRIxPTR "", "(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, EGLAttrib attrib_list = 0x%0.8p",
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(stream), dpy, stream, attrib_list);
reinterpret_cast<uintptr_t>(attrib_list));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -813,10 +791,9 @@ EGLBoolean EGLAPIENTRY CreateStreamProducerD3DTextureANGLE(EGLDisplay dpy, ...@@ -813,10 +791,9 @@ EGLBoolean EGLAPIENTRY CreateStreamProducerD3DTextureANGLE(EGLDisplay dpy,
const EGLAttrib *attrib_list) const EGLAttrib *attrib_list)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR stream = 0x%016" PRIxPTR EVENT(
", EGLAttrib attrib_list = 0x%016" PRIxPTR "", "(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, EGLAttrib attrib_list = 0x%0.8p",
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(stream), dpy, stream, attrib_list);
reinterpret_cast<uintptr_t>(attrib_list));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -849,12 +826,10 @@ EGLBoolean EGLAPIENTRY StreamPostD3DTextureANGLE(EGLDisplay dpy, ...@@ -849,12 +826,10 @@ EGLBoolean EGLAPIENTRY StreamPostD3DTextureANGLE(EGLDisplay dpy,
const EGLAttrib *attrib_list) const EGLAttrib *attrib_list)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR stream = 0x%016" PRIxPTR EVENT(
", void* texture = 0x%016" PRIxPTR "(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, void* texture = 0x%0.8p, "
", " "EGLAttrib attrib_list = 0x%0.8p",
"EGLAttrib attrib_list = 0x%016" PRIxPTR "", dpy, stream, texture, attrib_list);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(stream),
reinterpret_cast<uintptr_t>(texture), reinterpret_cast<uintptr_t>(attrib_list));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -888,13 +863,10 @@ EGLBoolean EGLAPIENTRY GetSyncValuesCHROMIUM(EGLDisplay dpy, ...@@ -888,13 +863,10 @@ EGLBoolean EGLAPIENTRY GetSyncValuesCHROMIUM(EGLDisplay dpy,
EGLuint64KHR *sbc) EGLuint64KHR *sbc)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR EVENT(
", EGLuint64KHR* ust = 0x%016" PRIxPTR "(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLuint64KHR* ust = 0x%0.8p, "
", " "EGLuint64KHR* msc = 0x%0.8p, EGLuint64KHR* sbc = 0x%0.8p",
"EGLuint64KHR* msc = 0x%016" PRIxPTR ", EGLuint64KHR* sbc = 0x%016" PRIxPTR "", dpy, surface, ust, msc, sbc);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(surface),
reinterpret_cast<uintptr_t>(ust), reinterpret_cast<uintptr_t>(msc),
reinterpret_cast<uintptr_t>(sbc));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -926,12 +898,10 @@ EGLBoolean EGLAPIENTRY SwapBuffersWithDamageKHR(EGLDisplay dpy, ...@@ -926,12 +898,10 @@ EGLBoolean EGLAPIENTRY SwapBuffersWithDamageKHR(EGLDisplay dpy,
EGLint n_rects) EGLint n_rects)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR EVENT(
", EGLint *rects = 0x%016" PRIxPTR "(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint *rects = 0x%0.8p, EGLint "
", EGLint "
"n_rects = %d)", "n_rects = %d)",
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(surface), dpy, surface, rects, n_rects);
reinterpret_cast<uintptr_t>(rects), n_rects);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -962,10 +932,8 @@ EGLBoolean EGLAPIENTRY PresentationTimeANDROID(EGLDisplay dpy, ...@@ -962,10 +932,8 @@ EGLBoolean EGLAPIENTRY PresentationTimeANDROID(EGLDisplay dpy,
EGLnsecsANDROID time) EGLnsecsANDROID time)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLnsecsANDROID time = %d)",
", EGLnsecsANDROID time = %llu)", dpy, surface, time);
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(surface),
static_cast<unsigned long long>(time));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -985,11 +953,10 @@ ANGLE_EXPORT void EGLAPIENTRY SetBlobCacheFuncsANDROID(EGLDisplay dpy, ...@@ -985,11 +953,10 @@ ANGLE_EXPORT void EGLAPIENTRY SetBlobCacheFuncsANDROID(EGLDisplay dpy,
EGLSetBlobFuncANDROID set, EGLSetBlobFuncANDROID set,
EGLGetBlobFuncANDROID get) EGLGetBlobFuncANDROID get)
{ {
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSetBlobFuncANDROID set = 0x%016" PRIxPTR EVENT(
", EGLGetBlobFuncANDROID get " "(EGLDisplay dpy = 0x%0.8p, EGLSetBlobFuncANDROID set = 0x%0.8p, EGLGetBlobFuncANDROID get "
"= 0x%016" PRIxPTR ")", "= 0x%0.8p)",
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(set), dpy, set, get);
reinterpret_cast<uintptr_t>(get));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
...@@ -1004,8 +971,7 @@ ANGLE_EXPORT void EGLAPIENTRY SetBlobCacheFuncsANDROID(EGLDisplay dpy, ...@@ -1004,8 +971,7 @@ ANGLE_EXPORT void EGLAPIENTRY SetBlobCacheFuncsANDROID(EGLDisplay dpy,
EGLint EGLAPIENTRY ProgramCacheGetAttribANGLE(EGLDisplay dpy, EGLenum attrib) EGLint EGLAPIENTRY ProgramCacheGetAttribANGLE(EGLDisplay dpy, EGLenum attrib)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLenum attrib = 0x%X)", EVENT("(EGLDisplay dpy = 0x%0.8p, EGLenum attrib = 0x%X)", dpy, attrib);
reinterpret_cast<uintptr_t>(dpy), attrib);
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
...@@ -1025,12 +991,10 @@ void EGLAPIENTRY ProgramCacheQueryANGLE(EGLDisplay dpy, ...@@ -1025,12 +991,10 @@ void EGLAPIENTRY ProgramCacheQueryANGLE(EGLDisplay dpy,
EGLint *binarysize) EGLint *binarysize)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLint index = %d, void *key = 0x%016" PRIxPTR EVENT(
", EGLint *keysize = " "(EGLDisplay dpy = 0x%0.8p, EGLint index = %d, void *key = 0x%0.8p, EGLint *keysize = "
"0x%016" PRIxPTR ", void *binary = 0x%016" PRIxPTR ", EGLint *size = 0x%016" PRIxPTR ")", "0x%0.8p, void *binary = 0x%0.8p, EGLint *size = 0x%0.8p)",
reinterpret_cast<uintptr_t>(dpy), index, reinterpret_cast<uintptr_t>(key), dpy, index, key, keysize, binary, binarysize);
reinterpret_cast<uintptr_t>(keysize), reinterpret_cast<uintptr_t>(binary),
reinterpret_cast<uintptr_t>(binarysize));
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
...@@ -1052,11 +1016,10 @@ void EGLAPIENTRY ProgramCachePopulateANGLE(EGLDisplay dpy, ...@@ -1052,11 +1016,10 @@ void EGLAPIENTRY ProgramCachePopulateANGLE(EGLDisplay dpy,
EGLint binarysize) EGLint binarysize)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", void *key = 0x%016" PRIxPTR EVENT(
", EGLint keysize = %d, void *binary = " "(EGLDisplay dpy = 0x%0.8p, void *key = 0x%0.8p, EGLint keysize = %d, void *binary = "
"0x%016" PRIxPTR ", EGLint size = %d)", "0x%0.8p, EGLint *size = 0x%0.8p)",
reinterpret_cast<uintptr_t>(dpy), reinterpret_cast<uintptr_t>(key), keysize, dpy, key, keysize, binary, binarysize);
reinterpret_cast<uintptr_t>(binary), binarysize);
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
...@@ -1074,8 +1037,7 @@ void EGLAPIENTRY ProgramCachePopulateANGLE(EGLDisplay dpy, ...@@ -1074,8 +1037,7 @@ void EGLAPIENTRY ProgramCachePopulateANGLE(EGLDisplay dpy,
EGLint EGLAPIENTRY ProgramCacheResizeANGLE(EGLDisplay dpy, EGLint limit, EGLenum mode) EGLint EGLAPIENTRY ProgramCacheResizeANGLE(EGLDisplay dpy, EGLint limit, EGLenum mode)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLint limit = %d, EGLenum mode = 0x%X)", EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint limit = %d, EGLenum mode = 0x%X)", dpy, limit, mode);
reinterpret_cast<uintptr_t>(dpy), limit, mode);
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
...@@ -1090,9 +1052,8 @@ EGLint EGLAPIENTRY ProgramCacheResizeANGLE(EGLDisplay dpy, EGLint limit, EGLenum ...@@ -1090,9 +1052,8 @@ EGLint EGLAPIENTRY ProgramCacheResizeANGLE(EGLDisplay dpy, EGLint limit, EGLenum
EGLint EGLAPIENTRY DebugMessageControlKHR(EGLDEBUGPROCKHR callback, const EGLAttrib *attrib_list) EGLint EGLAPIENTRY DebugMessageControlKHR(EGLDEBUGPROCKHR callback, const EGLAttrib *attrib_list)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDEBUGPROCKHR callback = 0x%016" PRIxPTR ", EGLAttrib attrib_list = 0x%016" PRIxPTR EVENT("(EGLDEBUGPROCKHR callback = 0x%0.8p, EGLAttrib attrib_list = 0x%0.8p)", callback,
")", attrib_list);
reinterpret_cast<uintptr_t>(callback), reinterpret_cast<uintptr_t>(attrib_list));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
...@@ -1115,8 +1076,7 @@ EGLint EGLAPIENTRY DebugMessageControlKHR(EGLDEBUGPROCKHR callback, const EGLAtt ...@@ -1115,8 +1076,7 @@ EGLint EGLAPIENTRY DebugMessageControlKHR(EGLDEBUGPROCKHR callback, const EGLAtt
EGLBoolean EGLAPIENTRY QueryDebugKHR(EGLint attribute, EGLAttrib *value) EGLBoolean EGLAPIENTRY QueryDebugKHR(EGLint attribute, EGLAttrib *value)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLint attribute = 0x%X, EGLAttrib* value = 0x%016" PRIxPTR ")", attribute, EVENT("(EGLint attribute = 0x%X, EGLAttrib* value = 0x%0.8p)", attribute, value);
reinterpret_cast<uintptr_t>(value));
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
...@@ -1155,12 +1115,10 @@ EGLint EGLAPIENTRY LabelObjectKHR(EGLDisplay dpy, ...@@ -1155,12 +1115,10 @@ EGLint EGLAPIENTRY LabelObjectKHR(EGLDisplay dpy,
EGLLabelKHR label) EGLLabelKHR label)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR EVENT(
"f, EGLenum objectType = 0x%X, EGLObjectKHR object = 0x%016" PRIxPTR "(EGLDisplay dpy = 0x%0.8pf, EGLenum objectType = 0x%X, EGLObjectKHR object = 0x%0.8p, "
", " "EGLLabelKHR label = 0x%0.8p)",
"EGLLabelKHR label = 0x%016" PRIxPTR ")", dpy, objectType, object, label);
reinterpret_cast<uintptr_t>(dpy), objectType, reinterpret_cast<uintptr_t>(object),
reinterpret_cast<uintptr_t>(label));
Display *display = static_cast<Display *>(dpy); Display *display = static_cast<Display *>(dpy);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
......
src/libGLESv2/entry_points_gles_1_0_autogen.cpp
...@@ -107,8 +107,7 @@ void GL_APIENTRY ClientActiveTexture(GLenum texture) ...@@ -107,8 +107,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum p = 0x%X, const GLfloat *eqn = 0x%016" PRIxPTR ")", p, EVENT("(GLenum p = 0x%X, const GLfloat *eqn = 0x%0.8p)", p, eqn);
reinterpret_cast<uintptr_t>(eqn));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -125,8 +124,7 @@ void GL_APIENTRY ClipPlanef(GLenum p, const GLfloat *eqn) ...@@ -125,8 +124,7 @@ 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(); 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%0.8p)", plane, equation);
reinterpret_cast<uintptr_t>(equation));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -198,9 +196,8 @@ void GL_APIENTRY ColorPointer(GLint size, GLenum type, GLsizei stride, const voi ...@@ -198,9 +196,8 @@ void GL_APIENTRY ColorPointer(GLint size, GLenum type, GLsizei stride, const voi
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
"0x%016" PRIxPTR ")", size, type, stride, pointer);
size, type, stride, reinterpret_cast<uintptr_t>(pointer));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -287,8 +284,7 @@ void GL_APIENTRY Fogf(GLenum pname, GLfloat param) ...@@ -287,8 +284,7 @@ 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(); 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%0.8p)", pname, params);
reinterpret_cast<uintptr_t>(params));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -322,8 +318,7 @@ void GL_APIENTRY Fogx(GLenum pname, GLfixed param) ...@@ -322,8 +318,7 @@ 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(); 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%0.8p)", pname, param);
reinterpret_cast<uintptr_t>(param));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -380,8 +375,7 @@ void GL_APIENTRY Frustumx(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, ...@@ -380,8 +375,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum plane = 0x%X, GLfloat *equation = 0x%016" PRIxPTR ")", plane, EVENT("(GLenum plane = 0x%X, GLfloat *equation = 0x%0.8p)", plane, equation);
reinterpret_cast<uintptr_t>(equation));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -398,8 +392,7 @@ void GL_APIENTRY GetClipPlanef(GLenum plane, GLfloat *equation) ...@@ -398,8 +392,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum plane = 0x%X, GLfixed *equation = 0x%016" PRIxPTR ")", plane, EVENT("(GLenum plane = 0x%X, GLfixed *equation = 0x%0.8p)", plane, equation);
reinterpret_cast<uintptr_t>(equation));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -416,8 +409,7 @@ void GL_APIENTRY GetClipPlanex(GLenum plane, GLfixed *equation) ...@@ -416,8 +409,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")", pname, EVENT("(GLenum pname = 0x%X, GLfixed *params = 0x%0.8p)", pname, params);
reinterpret_cast<uintptr_t>(params));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -434,8 +426,8 @@ void GL_APIENTRY GetFixedv(GLenum pname, GLfixed *params) ...@@ -434,8 +426,8 @@ 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(); 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%0.8p)", light, pname,
pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -453,8 +445,8 @@ void GL_APIENTRY GetLightfv(GLenum light, GLenum pname, GLfloat *params) ...@@ -453,8 +445,8 @@ 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(); 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%0.8p)", light, pname,
pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -472,8 +464,8 @@ void GL_APIENTRY GetLightxv(GLenum light, GLenum pname, GLfixed *params) ...@@ -472,8 +464,8 @@ 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(); 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%0.8p)", face, pname,
pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -491,8 +483,8 @@ void GL_APIENTRY GetMaterialfv(GLenum face, GLenum pname, GLfloat *params) ...@@ -491,8 +483,8 @@ 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(); 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%0.8p)", face, pname,
pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -510,8 +502,7 @@ void GL_APIENTRY GetMaterialxv(GLenum face, GLenum pname, GLfixed *params) ...@@ -510,8 +502,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, void **params = 0x%016" PRIxPTR ")", pname, EVENT("(GLenum pname = 0x%X, void **params = 0x%0.8p)", pname, params);
reinterpret_cast<uintptr_t>(params));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -528,8 +519,8 @@ void GL_APIENTRY GetPointerv(GLenum pname, void **params) ...@@ -528,8 +519,8 @@ 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(); 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%0.8p)", target, pname,
target, pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -549,8 +540,8 @@ void GL_APIENTRY GetTexEnvfv(GLenum target, GLenum pname, GLfloat *params) ...@@ -549,8 +540,8 @@ 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(); 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%0.8p)", target, pname,
pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -570,8 +561,8 @@ void GL_APIENTRY GetTexEnviv(GLenum target, GLenum pname, GLint *params) ...@@ -570,8 +561,8 @@ 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(); 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%0.8p)", target, pname,
target, pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -591,8 +582,8 @@ void GL_APIENTRY GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params) ...@@ -591,8 +582,8 @@ 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(); 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%0.8p)", target, pname,
target, pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -628,8 +619,7 @@ void GL_APIENTRY LightModelf(GLenum pname, GLfloat param) ...@@ -628,8 +619,7 @@ 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(); 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%0.8p)", pname, params);
reinterpret_cast<uintptr_t>(params));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -663,8 +653,7 @@ void GL_APIENTRY LightModelx(GLenum pname, GLfixed param) ...@@ -663,8 +653,7 @@ 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(); 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%0.8p)", pname, param);
reinterpret_cast<uintptr_t>(param));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -699,8 +688,8 @@ void GL_APIENTRY Lightf(GLenum light, GLenum pname, GLfloat param) ...@@ -699,8 +688,8 @@ 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(); 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%0.8p)", light,
light, pname, reinterpret_cast<uintptr_t>(params)); pname, params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -736,8 +725,8 @@ void GL_APIENTRY Lightx(GLenum light, GLenum pname, GLfixed param) ...@@ -736,8 +725,8 @@ 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(); 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%0.8p)", light,
light, pname, reinterpret_cast<uintptr_t>(params)); pname, params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -789,7 +778,7 @@ void GL_APIENTRY LoadIdentity() ...@@ -789,7 +778,7 @@ void GL_APIENTRY LoadIdentity()
void GL_APIENTRY LoadMatrixf(const GLfloat *m) void GL_APIENTRY LoadMatrixf(const GLfloat *m)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(const GLfloat *m = 0x%016" PRIxPTR ")", reinterpret_cast<uintptr_t>(m)); EVENT("(const GLfloat *m = 0x%0.8p)", m);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -806,7 +795,7 @@ void GL_APIENTRY LoadMatrixf(const GLfloat *m) ...@@ -806,7 +795,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(const GLfixed *m = 0x%016" PRIxPTR ")", reinterpret_cast<uintptr_t>(m)); EVENT("(const GLfixed *m = 0x%0.8p)", m);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -859,8 +848,8 @@ void GL_APIENTRY Materialf(GLenum face, GLenum pname, GLfloat param) ...@@ -859,8 +848,8 @@ 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(); 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%0.8p)", face, pname,
face, pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -896,8 +885,8 @@ void GL_APIENTRY Materialx(GLenum face, GLenum pname, GLfixed param) ...@@ -896,8 +885,8 @@ 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(); 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%0.8p)", face, pname,
face, pname, reinterpret_cast<uintptr_t>(param)); param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -933,7 +922,7 @@ void GL_APIENTRY MatrixMode(GLenum mode) ...@@ -933,7 +922,7 @@ void GL_APIENTRY MatrixMode(GLenum mode)
void GL_APIENTRY MultMatrixf(const GLfloat *m) void GL_APIENTRY MultMatrixf(const GLfloat *m)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(const GLfloat *m = 0x%016" PRIxPTR ")", reinterpret_cast<uintptr_t>(m)); EVENT("(const GLfloat *m = 0x%0.8p)", m);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -950,7 +939,7 @@ void GL_APIENTRY MultMatrixf(const GLfloat *m) ...@@ -950,7 +939,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(const GLfixed *m = 0x%016" PRIxPTR ")", reinterpret_cast<uintptr_t>(m)); EVENT("(const GLfixed *m = 0x%0.8p)", m);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1039,8 +1028,8 @@ void GL_APIENTRY Normal3x(GLfixed nx, GLfixed ny, GLfixed nz) ...@@ -1039,8 +1028,8 @@ 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(); 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%0.8p)", type, stride,
type, stride, reinterpret_cast<uintptr_t>(pointer)); pointer);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1115,8 +1104,7 @@ void GL_APIENTRY PointParameterf(GLenum pname, GLfloat param) ...@@ -1115,8 +1104,7 @@ 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(); 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%0.8p)", pname, params);
reinterpret_cast<uintptr_t>(params));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1152,8 +1140,7 @@ void GL_APIENTRY PointParameterx(GLenum pname, GLfixed param) ...@@ -1152,8 +1140,7 @@ 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(); 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%0.8p)", pname, params);
reinterpret_cast<uintptr_t>(params));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1361,9 +1348,8 @@ void GL_APIENTRY TexCoordPointer(GLint size, GLenum type, GLsizei stride, const ...@@ -1361,9 +1348,8 @@ void GL_APIENTRY TexCoordPointer(GLint size, GLenum type, GLsizei stride, const
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
"0x%016" PRIxPTR ")", size, type, stride, pointer);
size, type, stride, reinterpret_cast<uintptr_t>(pointer));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1400,8 +1386,8 @@ void GL_APIENTRY TexEnvf(GLenum target, GLenum pname, GLfloat param) ...@@ -1400,8 +1386,8 @@ 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(); 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%0.8p)", target,
target, pname, reinterpret_cast<uintptr_t>(params)); pname, params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1440,8 +1426,8 @@ void GL_APIENTRY TexEnvi(GLenum target, GLenum pname, GLint param) ...@@ -1440,8 +1426,8 @@ 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(); 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%0.8p)", target,
target, pname, reinterpret_cast<uintptr_t>(params)); pname, params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1481,8 +1467,8 @@ void GL_APIENTRY TexEnvx(GLenum target, GLenum pname, GLfixed param) ...@@ -1481,8 +1467,8 @@ 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(); 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%0.8p)", target,
target, pname, reinterpret_cast<uintptr_t>(params)); pname, params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1521,8 +1507,8 @@ void GL_APIENTRY TexParameterx(GLenum target, GLenum pname, GLfixed param) ...@@ -1521,8 +1507,8 @@ 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(); 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%0.8p)", target,
target, pname, reinterpret_cast<uintptr_t>(params)); pname, params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1576,9 +1562,8 @@ void GL_APIENTRY VertexPointer(GLint size, GLenum type, GLsizei stride, const vo ...@@ -1576,9 +1562,8 @@ void GL_APIENTRY VertexPointer(GLint size, GLenum type, GLsizei stride, const vo
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
"0x%016" PRIxPTR ")", size, type, stride, pointer);
size, type, stride, reinterpret_cast<uintptr_t>(pointer));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
......
src/libGLESv2/entry_points_gles_2_0_autogen.cpp
...@@ -53,8 +53,8 @@ void GL_APIENTRY AttachShader(GLuint program, GLuint shader) ...@@ -53,8 +53,8 @@ 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(); 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%0.8p)", program, index,
program, index, reinterpret_cast<uintptr_t>(name)); name);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -235,9 +235,10 @@ void GL_APIENTRY BlendFuncSeparate(GLenum sfactorRGB, ...@@ -235,9 +235,10 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLsizeiptr size = %llu, const void *data = 0x%016" PRIxPTR EVENT(
", GLenum usage = 0x%X)", "(GLenum target = 0x%X, GLsizeiptr size = %d, const void *data = 0x%0.8p, GLenum usage = "
target, static_cast<unsigned long long>(size), reinterpret_cast<uintptr_t>(data), usage); "0x%X)",
target, size, data, usage);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -258,10 +259,9 @@ void GL_APIENTRY BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, ...@@ -258,10 +259,9 @@ void GL_APIENTRY BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size,
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); 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 = %d, GLsizeiptr size = %d, const void *data = "
"0x%016" PRIxPTR ")", "0x%0.8p)",
target, static_cast<unsigned long long>(offset), static_cast<unsigned long long>(size), target, offset, size, data);
reinterpret_cast<uintptr_t>(data));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -413,9 +413,8 @@ void GL_APIENTRY CompressedTexImage2D(GLenum target, ...@@ -413,9 +413,8 @@ void GL_APIENTRY CompressedTexImage2D(GLenum target,
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 = "
"0x%016" PRIxPTR ")", "0x%0.8p)",
target, level, internalformat, width, height, border, imageSize, target, level, internalformat, width, height, border, imageSize, data);
reinterpret_cast<uintptr_t>(data));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -448,9 +447,8 @@ void GL_APIENTRY CompressedTexSubImage2D(GLenum target, ...@@ -448,9 +447,8 @@ void GL_APIENTRY CompressedTexSubImage2D(GLenum target,
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 "
"*data = 0x%016" PRIxPTR ")", "*data = 0x%0.8p)",
target, level, xoffset, yoffset, width, height, format, imageSize, target, level, xoffset, yoffset, width, height, format, imageSize, data);
reinterpret_cast<uintptr_t>(data));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -592,8 +590,7 @@ void GL_APIENTRY CullFace(GLenum mode) ...@@ -592,8 +590,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *buffers = 0x%016" PRIxPTR ")", n, EVENT("(GLsizei n = %d, const GLuint *buffers = 0x%0.8p)", n, buffers);
reinterpret_cast<uintptr_t>(buffers));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -610,8 +607,7 @@ void GL_APIENTRY DeleteBuffers(GLsizei n, const GLuint *buffers) ...@@ -610,8 +607,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *framebuffers = 0x%016" PRIxPTR ")", n, EVENT("(GLsizei n = %d, const GLuint *framebuffers = 0x%0.8p)", n, framebuffers);
reinterpret_cast<uintptr_t>(framebuffers));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -645,8 +641,7 @@ void GL_APIENTRY DeleteProgram(GLuint program) ...@@ -645,8 +641,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *renderbuffers = 0x%016" PRIxPTR ")", n, EVENT("(GLsizei n = %d, const GLuint *renderbuffers = 0x%0.8p)", n, renderbuffers);
reinterpret_cast<uintptr_t>(renderbuffers));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -680,8 +675,7 @@ void GL_APIENTRY DeleteShader(GLuint shader) ...@@ -680,8 +675,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *textures = 0x%016" PRIxPTR ")", n, EVENT("(GLsizei n = %d, const GLuint *textures = 0x%0.8p)", n, textures);
reinterpret_cast<uintptr_t>(textures));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -820,8 +814,8 @@ void GL_APIENTRY DrawElements(GLenum mode, GLsizei count, GLenum type, const voi ...@@ -820,8 +814,8 @@ void GL_APIENTRY DrawElements(GLenum mode, GLsizei count, GLenum type, const voi
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
mode, count, type, reinterpret_cast<uintptr_t>(indices)); mode, count, type, indices);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -979,8 +973,7 @@ void GL_APIENTRY FrontFace(GLenum mode) ...@@ -979,8 +973,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *buffers = 0x%016" PRIxPTR ")", n, EVENT("(GLsizei n = %d, GLuint *buffers = 0x%0.8p)", n, buffers);
reinterpret_cast<uintptr_t>(buffers));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -997,8 +990,7 @@ void GL_APIENTRY GenBuffers(GLsizei n, GLuint *buffers) ...@@ -997,8 +990,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *framebuffers = 0x%016" PRIxPTR ")", n, EVENT("(GLsizei n = %d, GLuint *framebuffers = 0x%0.8p)", n, framebuffers);
reinterpret_cast<uintptr_t>(framebuffers));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1015,8 +1007,7 @@ void GL_APIENTRY GenFramebuffers(GLsizei n, GLuint *framebuffers) ...@@ -1015,8 +1007,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *renderbuffers = 0x%016" PRIxPTR ")", n, EVENT("(GLsizei n = %d, GLuint *renderbuffers = 0x%0.8p)", n, renderbuffers);
reinterpret_cast<uintptr_t>(renderbuffers));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1033,8 +1024,7 @@ void GL_APIENTRY GenRenderbuffers(GLsizei n, GLuint *renderbuffers) ...@@ -1033,8 +1024,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *textures = 0x%016" PRIxPTR ")", n, EVENT("(GLsizei n = %d, GLuint *textures = 0x%0.8p)", n, textures);
reinterpret_cast<uintptr_t>(textures));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1076,12 +1066,9 @@ void GL_APIENTRY GetActiveAttrib(GLuint program, ...@@ -1076,12 +1066,9 @@ void GL_APIENTRY GetActiveAttrib(GLuint program,
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p, "
"0x%016" PRIxPTR ", GLint *size = 0x%016" PRIxPTR ", GLenum *type = 0x%016" PRIxPTR "GLint *size = 0x%0.8p, GLenum *type = 0x%0.8p, GLchar *name = 0x%0.8p)",
", GLchar *name = 0x%016" PRIxPTR ")", program, index, bufSize, length, size, type, name);
program, index, bufSize, reinterpret_cast<uintptr_t>(length),
reinterpret_cast<uintptr_t>(size), reinterpret_cast<uintptr_t>(type),
reinterpret_cast<uintptr_t>(name));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1107,12 +1094,9 @@ void GL_APIENTRY GetActiveUniform(GLuint program, ...@@ -1107,12 +1094,9 @@ void GL_APIENTRY GetActiveUniform(GLuint program,
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p, "
"0x%016" PRIxPTR ", GLint *size = 0x%016" PRIxPTR ", GLenum *type = 0x%016" PRIxPTR "GLint *size = 0x%0.8p, GLenum *type = 0x%0.8p, GLchar *name = 0x%0.8p)",
", GLchar *name = 0x%016" PRIxPTR ")", program, index, bufSize, length, size, type, name);
program, index, bufSize, reinterpret_cast<uintptr_t>(length),
reinterpret_cast<uintptr_t>(size), reinterpret_cast<uintptr_t>(type),
reinterpret_cast<uintptr_t>(name));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1134,10 +1118,10 @@ void GL_APIENTRY GetAttachedShaders(GLuint program, ...@@ -1134,10 +1118,10 @@ void GL_APIENTRY GetAttachedShaders(GLuint program,
GLuint *shaders) GLuint *shaders)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLsizei maxCount = %d, GLsizei *count = 0x%016" PRIxPTR EVENT(
", GLuint *shaders = 0x%016" PRIxPTR ")", "(GLuint program = %u, GLsizei maxCount = %d, GLsizei *count = 0x%0.8p, GLuint *shaders = "
program, maxCount, reinterpret_cast<uintptr_t>(count), "0x%0.8p)",
reinterpret_cast<uintptr_t>(shaders)); program, maxCount, count, shaders);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1155,8 +1139,7 @@ void GL_APIENTRY GetAttachedShaders(GLuint program, ...@@ -1155,8 +1139,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, const GLchar *name = 0x%016" PRIxPTR ")", program, EVENT("(GLuint program = %u, const GLchar *name = 0x%0.8p)", program, name);
reinterpret_cast<uintptr_t>(name));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1175,8 +1158,7 @@ GLint GL_APIENTRY GetAttribLocation(GLuint program, const GLchar *name) ...@@ -1175,8 +1158,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLboolean *data = 0x%016" PRIxPTR ")", pname, EVENT("(GLenum pname = 0x%X, GLboolean *data = 0x%0.8p)", pname, data);
reinterpret_cast<uintptr_t>(data));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1193,8 +1175,8 @@ void GL_APIENTRY GetBooleanv(GLenum pname, GLboolean *data) ...@@ -1193,8 +1175,8 @@ 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(); 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%0.8p)", target, pname,
pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1232,8 +1214,7 @@ GLenum GL_APIENTRY GetError() ...@@ -1232,8 +1214,7 @@ GLenum GL_APIENTRY GetError()
void GL_APIENTRY GetFloatv(GLenum pname, GLfloat *data) void GL_APIENTRY GetFloatv(GLenum pname, GLfloat *data)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLfloat *data = 0x%016" PRIxPTR ")", pname, EVENT("(GLenum pname = 0x%X, GLfloat *data = 0x%0.8p)", pname, data);
reinterpret_cast<uintptr_t>(data));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1255,8 +1236,8 @@ void GL_APIENTRY GetFramebufferAttachmentParameteriv(GLenum target, ...@@ -1255,8 +1236,8 @@ void GL_APIENTRY GetFramebufferAttachmentParameteriv(GLenum target,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
target, attachment, pname, reinterpret_cast<uintptr_t>(params)); target, attachment, pname, params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1275,8 +1256,7 @@ void GL_APIENTRY GetFramebufferAttachmentParameteriv(GLenum target, ...@@ -1275,8 +1256,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLint *data = 0x%016" PRIxPTR ")", pname, EVENT("(GLenum pname = 0x%X, GLint *data = 0x%0.8p)", pname, data);
reinterpret_cast<uintptr_t>(data));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1296,10 +1276,10 @@ void GL_APIENTRY GetProgramInfoLog(GLuint program, ...@@ -1296,10 +1276,10 @@ void GL_APIENTRY GetProgramInfoLog(GLuint program,
GLchar *infoLog) GLchar *infoLog)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR EVENT(
", GLchar *infoLog = 0x%016" PRIxPTR ")", "(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *infoLog = "
program, bufSize, reinterpret_cast<uintptr_t>(length), "0x%0.8p)",
reinterpret_cast<uintptr_t>(infoLog)); program, bufSize, length, infoLog);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1317,8 +1297,8 @@ void GL_APIENTRY GetProgramInfoLog(GLuint program, ...@@ -1317,8 +1297,8 @@ 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(); 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%0.8p)", program, pname,
pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1335,8 +1315,8 @@ void GL_APIENTRY GetProgramiv(GLuint program, GLenum pname, GLint *params) ...@@ -1335,8 +1315,8 @@ 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(); 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%0.8p)", target, pname,
pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1354,10 +1334,10 @@ void GL_APIENTRY GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint * ...@@ -1354,10 +1334,10 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR EVENT(
", GLchar *infoLog = 0x%016" PRIxPTR ")", "(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *infoLog = "
shader, bufSize, reinterpret_cast<uintptr_t>(length), "0x%0.8p)",
reinterpret_cast<uintptr_t>(infoLog)); shader, bufSize, length, infoLog);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1378,10 +1358,10 @@ void GL_APIENTRY GetShaderPrecisionFormat(GLenum shadertype, ...@@ -1378,10 +1358,10 @@ void GL_APIENTRY GetShaderPrecisionFormat(GLenum shadertype,
GLint *precision) GLint *precision)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum shadertype = 0x%X, GLenum precisiontype = 0x%X, GLint *range = 0x%016" PRIxPTR EVENT(
", GLint *precision = 0x%016" PRIxPTR ")", "(GLenum shadertype = 0x%X, GLenum precisiontype = 0x%X, GLint *range = 0x%0.8p, GLint "
shadertype, precisiontype, reinterpret_cast<uintptr_t>(range), "*precision = 0x%0.8p)",
reinterpret_cast<uintptr_t>(precision)); shadertype, precisiontype, range, precision);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1400,10 +1380,10 @@ void GL_APIENTRY GetShaderPrecisionFormat(GLenum shadertype, ...@@ -1400,10 +1380,10 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR EVENT(
", GLchar *source = 0x%016" PRIxPTR ")", "(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *source = "
shader, bufSize, reinterpret_cast<uintptr_t>(length), "0x%0.8p)",
reinterpret_cast<uintptr_t>(source)); shader, bufSize, length, source);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1421,8 +1401,8 @@ void GL_APIENTRY GetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length ...@@ -1421,8 +1401,8 @@ 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(); 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%0.8p)", shader, pname,
pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1458,8 +1438,8 @@ const GLubyte *GL_APIENTRY GetString(GLenum name) ...@@ -1458,8 +1438,8 @@ 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(); 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%0.8p)", target, pname,
target, pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1478,8 +1458,8 @@ void GL_APIENTRY GetTexParameterfv(GLenum target, GLenum pname, GLfloat *params) ...@@ -1478,8 +1458,8 @@ 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(); 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%0.8p)", target, pname,
pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1498,8 +1478,7 @@ void GL_APIENTRY GetTexParameteriv(GLenum target, GLenum pname, GLint *params) ...@@ -1498,8 +1478,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, const GLchar *name = 0x%016" PRIxPTR ")", program, EVENT("(GLuint program = %u, const GLchar *name = 0x%0.8p)", program, name);
reinterpret_cast<uintptr_t>(name));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1518,8 +1497,8 @@ GLint GL_APIENTRY GetUniformLocation(GLuint program, const GLchar *name) ...@@ -1518,8 +1497,8 @@ 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(); 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%0.8p)", program,
program, location, reinterpret_cast<uintptr_t>(params)); location, params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1536,8 +1515,8 @@ void GL_APIENTRY GetUniformfv(GLuint program, GLint location, GLfloat *params) ...@@ -1536,8 +1515,8 @@ 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(); 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%0.8p)", program, location,
location, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1554,8 +1533,8 @@ void GL_APIENTRY GetUniformiv(GLuint program, GLint location, GLint *params) ...@@ -1554,8 +1533,8 @@ 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(); 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%0.8p)", index, pname,
pname, reinterpret_cast<uintptr_t>(pointer)); pointer);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1573,8 +1552,8 @@ void GL_APIENTRY GetVertexAttribPointerv(GLuint index, GLenum pname, void **poin ...@@ -1573,8 +1552,8 @@ 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(); 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%0.8p)", index, pname,
pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1591,8 +1570,8 @@ void GL_APIENTRY GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params) ...@@ -1591,8 +1570,8 @@ 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(); 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%0.8p)", index, pname,
pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1835,8 +1814,8 @@ void GL_APIENTRY ReadPixels(GLint x, ...@@ -1835,8 +1814,8 @@ void GL_APIENTRY ReadPixels(GLint x,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
x, y, width, height, format, type, reinterpret_cast<uintptr_t>(pixels)); x, y, width, height, format, type, pixels);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1935,11 +1914,10 @@ void GL_APIENTRY ShaderBinary(GLsizei count, ...@@ -1935,11 +1914,10 @@ void GL_APIENTRY ShaderBinary(GLsizei count,
GLsizei length) GLsizei length)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei count = %d, const GLuint *shaders = 0x%016" PRIxPTR EVENT(
", GLenum binaryformat = 0x%X, const void *binary = 0x%016" PRIxPTR "(GLsizei count = %d, const GLuint *shaders = 0x%0.8p, GLenum binaryformat = 0x%X, const "
", GLsizei length = %d)", "void *binary = 0x%0.8p, GLsizei length = %d)",
count, reinterpret_cast<uintptr_t>(shaders), binaryformat, count, shaders, binaryformat, binary, length);
reinterpret_cast<uintptr_t>(binary), length);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1961,9 +1939,10 @@ void GL_APIENTRY ShaderSource(GLuint shader, ...@@ -1961,9 +1939,10 @@ void GL_APIENTRY ShaderSource(GLuint shader,
const GLint *length) const GLint *length)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint shader = %u, GLsizei count = %d, const GLchar *const*string = 0x%016" PRIxPTR EVENT(
", const GLint *length = 0x%016" PRIxPTR ")", "(GLuint shader = %u, GLsizei count = %d, const GLchar *const*string = 0x%0.8p, const "
shader, count, reinterpret_cast<uintptr_t>(string), reinterpret_cast<uintptr_t>(length)); "GLint *length = 0x%0.8p)",
shader, count, string, length);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2098,9 +2077,8 @@ void GL_APIENTRY TexImage2D(GLenum target, ...@@ -2098,9 +2077,8 @@ void GL_APIENTRY TexImage2D(GLenum target,
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 "
"void *pixels = 0x%016" PRIxPTR ")", "void *pixels = 0x%0.8p)",
target, level, internalformat, width, height, border, format, type, target, level, internalformat, width, height, border, format, type, pixels);
reinterpret_cast<uintptr_t>(pixels));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2140,8 +2118,8 @@ void GL_APIENTRY TexParameterf(GLenum target, GLenum pname, GLfloat param) ...@@ -2140,8 +2118,8 @@ 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(); 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%0.8p)", target,
target, pname, reinterpret_cast<uintptr_t>(params)); pname, params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2178,8 +2156,8 @@ void GL_APIENTRY TexParameteri(GLenum target, GLenum pname, GLint param) ...@@ -2178,8 +2156,8 @@ 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(); 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%0.8p)", target,
target, pname, reinterpret_cast<uintptr_t>(params)); pname, params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2209,9 +2187,8 @@ void GL_APIENTRY TexSubImage2D(GLenum target, ...@@ -2209,9 +2187,8 @@ void GL_APIENTRY TexSubImage2D(GLenum target,
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 "
"*pixels = 0x%016" PRIxPTR ")", "*pixels = 0x%0.8p)",
target, level, xoffset, yoffset, width, height, format, type, target, level, xoffset, yoffset, width, height, format, type, pixels);
reinterpret_cast<uintptr_t>(pixels));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2250,8 +2227,8 @@ void GL_APIENTRY Uniform1f(GLint location, GLfloat v0) ...@@ -2250,8 +2227,8 @@ 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(); 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%0.8p)", location,
location, count, reinterpret_cast<uintptr_t>(value)); count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2285,8 +2262,8 @@ void GL_APIENTRY Uniform1i(GLint location, GLint v0) ...@@ -2285,8 +2262,8 @@ 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(); 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%0.8p)", location,
location, count, reinterpret_cast<uintptr_t>(value)); count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2320,8 +2297,8 @@ void GL_APIENTRY Uniform2f(GLint location, GLfloat v0, GLfloat v1) ...@@ -2320,8 +2297,8 @@ 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(); 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%0.8p)", location,
location, count, reinterpret_cast<uintptr_t>(value)); count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2355,8 +2332,8 @@ void GL_APIENTRY Uniform2i(GLint location, GLint v0, GLint v1) ...@@ -2355,8 +2332,8 @@ 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(); 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%0.8p)", location,
location, count, reinterpret_cast<uintptr_t>(value)); count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2391,8 +2368,8 @@ void GL_APIENTRY Uniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2) ...@@ -2391,8 +2368,8 @@ 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(); 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%0.8p)", location,
location, count, reinterpret_cast<uintptr_t>(value)); count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2427,8 +2404,8 @@ void GL_APIENTRY Uniform3i(GLint location, GLint v0, GLint v1, GLint v2) ...@@ -2427,8 +2404,8 @@ 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(); 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%0.8p)", location,
location, count, reinterpret_cast<uintptr_t>(value)); count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2464,8 +2441,8 @@ void GL_APIENTRY Uniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, G ...@@ -2464,8 +2441,8 @@ 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(); 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%0.8p)", location,
location, count, reinterpret_cast<uintptr_t>(value)); count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2500,8 +2477,8 @@ void GL_APIENTRY Uniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v ...@@ -2500,8 +2477,8 @@ 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(); 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%0.8p)", location,
location, count, reinterpret_cast<uintptr_t>(value)); count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2523,8 +2500,8 @@ void GL_APIENTRY UniformMatrix2fv(GLint location, ...@@ -2523,8 +2500,8 @@ void GL_APIENTRY UniformMatrix2fv(GLint location,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
location, count, transpose, reinterpret_cast<uintptr_t>(value)); location, count, transpose, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2547,8 +2524,8 @@ void GL_APIENTRY UniformMatrix3fv(GLint location, ...@@ -2547,8 +2524,8 @@ void GL_APIENTRY UniformMatrix3fv(GLint location,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
location, count, transpose, reinterpret_cast<uintptr_t>(value)); location, count, transpose, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2571,8 +2548,8 @@ void GL_APIENTRY UniformMatrix4fv(GLint location, ...@@ -2571,8 +2548,8 @@ void GL_APIENTRY UniformMatrix4fv(GLint location,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
location, count, transpose, reinterpret_cast<uintptr_t>(value)); location, count, transpose, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2641,8 +2618,7 @@ void GL_APIENTRY VertexAttrib1f(GLuint index, GLfloat x) ...@@ -2641,8 +2618,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v);
reinterpret_cast<uintptr_t>(v));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2676,8 +2652,7 @@ void GL_APIENTRY VertexAttrib2f(GLuint index, GLfloat x, GLfloat y) ...@@ -2676,8 +2652,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v);
reinterpret_cast<uintptr_t>(v));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2711,8 +2686,7 @@ void GL_APIENTRY VertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z) ...@@ -2711,8 +2686,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v);
reinterpret_cast<uintptr_t>(v));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2747,8 +2721,7 @@ void GL_APIENTRY VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, G ...@@ -2747,8 +2721,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v);
reinterpret_cast<uintptr_t>(v));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2772,8 +2745,8 @@ void GL_APIENTRY VertexAttribPointer(GLuint index, ...@@ -2772,8 +2745,8 @@ void GL_APIENTRY VertexAttribPointer(GLuint index,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
index, size, type, normalized, stride, reinterpret_cast<uintptr_t>(pointer)); index, size, type, normalized, stride, pointer);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
......
src/libGLESv2/entry_points_gles_3_0_autogen.cpp
...@@ -77,10 +77,9 @@ BindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLs ...@@ -77,10 +77,9 @@ BindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLs
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); 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 = %d, "
"GLsizeiptr size = %llu)", "GLsizeiptr size = %d)",
target, index, buffer, static_cast<unsigned long long>(offset), target, index, buffer, offset, size);
static_cast<unsigned long long>(size));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -204,8 +203,8 @@ void GL_APIENTRY ClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, G ...@@ -204,8 +203,8 @@ 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(); 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%0.8p)", buffer,
buffer, drawbuffer, reinterpret_cast<uintptr_t>(value)); drawbuffer, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -222,8 +221,8 @@ void GL_APIENTRY ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *v ...@@ -222,8 +221,8 @@ 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(); 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%0.8p)", buffer,
buffer, drawbuffer, reinterpret_cast<uintptr_t>(value)); drawbuffer, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -240,8 +239,8 @@ void GL_APIENTRY ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *val ...@@ -240,8 +239,8 @@ 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(); 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%0.8p)", buffer,
buffer, drawbuffer, reinterpret_cast<uintptr_t>(value)); drawbuffer, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -258,8 +257,8 @@ void GL_APIENTRY ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *v ...@@ -258,8 +257,8 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsync sync = 0x%016" PRIxPTR ", GLbitfield flags = 0x%X, GLuint64 timeout = %llu)", EVENT("(GLsync sync = 0x%0.8p, GLbitfield flags = 0x%X, GLuint64 timeout = %llu)", sync, flags,
reinterpret_cast<uintptr_t>(sync), flags, static_cast<unsigned long long>(timeout)); timeout);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -289,9 +288,8 @@ void GL_APIENTRY CompressedTexImage3D(GLenum target, ...@@ -289,9 +288,8 @@ void GL_APIENTRY CompressedTexImage3D(GLenum target,
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, "
"const void *data = 0x%016" PRIxPTR ")", "const void *data = 0x%0.8p)",
target, level, internalformat, width, height, depth, border, imageSize, target, level, internalformat, width, height, depth, border, imageSize, data);
reinterpret_cast<uintptr_t>(data));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -326,9 +324,8 @@ void GL_APIENTRY CompressedTexSubImage3D(GLenum target, ...@@ -326,9 +324,8 @@ void GL_APIENTRY CompressedTexSubImage3D(GLenum target,
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 "
"= 0x%X, GLsizei imageSize = %d, const void *data = 0x%016" PRIxPTR ")", "= 0x%X, GLsizei imageSize = %d, const void *data = 0x%0.8p)",
target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
reinterpret_cast<uintptr_t>(data));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -356,10 +353,9 @@ void GL_APIENTRY CopyBufferSubData(GLenum readTarget, ...@@ -356,10 +353,9 @@ void GL_APIENTRY CopyBufferSubData(GLenum readTarget,
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); 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 = %d, GLintptr "
"GLintptr writeOffset = %llu, GLsizeiptr size = %llu)", "writeOffset = %d, GLsizeiptr size = %d)",
readTarget, writeTarget, static_cast<unsigned long long>(readOffset), readTarget, writeTarget, readOffset, writeOffset, size);
static_cast<unsigned long long>(writeOffset), static_cast<unsigned long long>(size));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -415,8 +411,7 @@ void GL_APIENTRY CopyTexSubImage3D(GLenum target, ...@@ -415,8 +411,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *ids = 0x%016" PRIxPTR ")", n, EVENT("(GLsizei n = %d, const GLuint *ids = 0x%0.8p)", n, ids);
reinterpret_cast<uintptr_t>(ids));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -433,8 +428,7 @@ void GL_APIENTRY DeleteQueries(GLsizei n, const GLuint *ids) ...@@ -433,8 +428,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei count = %d, const GLuint *samplers = 0x%016" PRIxPTR ")", count, EVENT("(GLsizei count = %d, const GLuint *samplers = 0x%0.8p)", count, samplers);
reinterpret_cast<uintptr_t>(samplers));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -451,7 +445,7 @@ void GL_APIENTRY DeleteSamplers(GLsizei count, const GLuint *samplers) ...@@ -451,7 +445,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsync sync = 0x%016" PRIxPTR ")", reinterpret_cast<uintptr_t>(sync)); EVENT("(GLsync sync = 0x%0.8p)", sync);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -468,8 +462,7 @@ void GL_APIENTRY DeleteSync(GLsync sync) ...@@ -468,8 +462,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *ids = 0x%016" PRIxPTR ")", n, EVENT("(GLsizei n = %d, const GLuint *ids = 0x%0.8p)", n, ids);
reinterpret_cast<uintptr_t>(ids));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -486,8 +479,7 @@ void GL_APIENTRY DeleteTransformFeedbacks(GLsizei n, const GLuint *ids) ...@@ -486,8 +479,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *arrays = 0x%016" PRIxPTR ")", n, EVENT("(GLsizei n = %d, const GLuint *arrays = 0x%0.8p)", n, arrays);
reinterpret_cast<uintptr_t>(arrays));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -525,8 +517,7 @@ void GL_APIENTRY DrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GL ...@@ -525,8 +517,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLenum *bufs = 0x%016" PRIxPTR ")", n, EVENT("(GLsizei n = %d, const GLenum *bufs = 0x%0.8p)", n, bufs);
reinterpret_cast<uintptr_t>(bufs));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -549,8 +540,8 @@ void GL_APIENTRY DrawElementsInstanced(GLenum mode, ...@@ -549,8 +540,8 @@ void GL_APIENTRY DrawElementsInstanced(GLenum mode,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p, GLsizei instancecount = %d)",
mode, count, type, reinterpret_cast<uintptr_t>(indices), instancecount); mode, count, type, indices, instancecount);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -577,8 +568,8 @@ void GL_APIENTRY DrawRangeElements(GLenum mode, ...@@ -577,8 +568,8 @@ void GL_APIENTRY DrawRangeElements(GLenum mode,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
mode, start, end, count, type, reinterpret_cast<uintptr_t>(indices)); mode, start, end, count, type, indices);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -652,8 +643,8 @@ GLsync GL_APIENTRY FenceSync(GLenum condition, GLbitfield flags) ...@@ -652,8 +643,8 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr length = %llu)", target, EVENT("(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr length = %d)", target, offset,
static_cast<unsigned long long>(offset), static_cast<unsigned long long>(length)); length);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -695,7 +686,7 @@ FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint ...@@ -695,7 +686,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *ids = 0x%016" PRIxPTR ")", n, reinterpret_cast<uintptr_t>(ids)); EVENT("(GLsizei n = %d, GLuint *ids = 0x%0.8p)", n, ids);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -712,8 +703,7 @@ void GL_APIENTRY GenQueries(GLsizei n, GLuint *ids) ...@@ -712,8 +703,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei count = %d, GLuint *samplers = 0x%016" PRIxPTR ")", count, EVENT("(GLsizei count = %d, GLuint *samplers = 0x%0.8p)", count, samplers);
reinterpret_cast<uintptr_t>(samplers));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -730,7 +720,7 @@ void GL_APIENTRY GenSamplers(GLsizei count, GLuint *samplers) ...@@ -730,7 +720,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *ids = 0x%016" PRIxPTR ")", n, reinterpret_cast<uintptr_t>(ids)); EVENT("(GLsizei n = %d, GLuint *ids = 0x%0.8p)", n, ids);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -747,8 +737,7 @@ void GL_APIENTRY GenTransformFeedbacks(GLsizei n, GLuint *ids) ...@@ -747,8 +737,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *arrays = 0x%016" PRIxPTR ")", n, EVENT("(GLsizei n = %d, GLuint *arrays = 0x%0.8p)", n, arrays);
reinterpret_cast<uintptr_t>(arrays));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -771,9 +760,8 @@ void GL_APIENTRY GetActiveUniformBlockName(GLuint program, ...@@ -771,9 +760,8 @@ void GL_APIENTRY GetActiveUniformBlockName(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p, GLchar *uniformBlockName = 0x%0.8p)",
program, uniformBlockIndex, bufSize, reinterpret_cast<uintptr_t>(length), program, uniformBlockIndex, bufSize, length, uniformBlockName);
reinterpret_cast<uintptr_t>(uniformBlockName));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -799,8 +787,8 @@ void GL_APIENTRY GetActiveUniformBlockiv(GLuint program, ...@@ -799,8 +787,8 @@ void GL_APIENTRY GetActiveUniformBlockiv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, uniformBlockIndex, pname, reinterpret_cast<uintptr_t>(params)); program, uniformBlockIndex, pname, params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -824,10 +812,9 @@ void GL_APIENTRY GetActiveUniformsiv(GLuint program, ...@@ -824,10 +812,9 @@ void GL_APIENTRY GetActiveUniformsiv(GLuint program,
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p, "
"0x%016" PRIxPTR ", GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", "GLenum pname = 0x%X, GLint *params = 0x%0.8p)",
program, uniformCount, reinterpret_cast<uintptr_t>(uniformIndices), pname, program, uniformCount, uniformIndices, pname, params);
reinterpret_cast<uintptr_t>(params));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -846,8 +833,8 @@ void GL_APIENTRY GetActiveUniformsiv(GLuint program, ...@@ -846,8 +833,8 @@ 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(); 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%0.8p)", target, pname,
target, pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -866,8 +853,8 @@ void GL_APIENTRY GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *pa ...@@ -866,8 +853,8 @@ 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(); 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%0.8p)", target, pname,
pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -886,8 +873,7 @@ void GL_APIENTRY GetBufferPointerv(GLenum target, GLenum pname, void **params) ...@@ -886,8 +873,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, const GLchar *name = 0x%016" PRIxPTR ")", program, EVENT("(GLuint program = %u, const GLchar *name = 0x%0.8p)", program, name);
reinterpret_cast<uintptr_t>(name));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -906,8 +892,8 @@ GLint GL_APIENTRY GetFragDataLocation(GLuint program, const GLchar *name) ...@@ -906,8 +892,8 @@ 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(); 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%0.8p)", target, index,
index, reinterpret_cast<uintptr_t>(data)); data);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -924,8 +910,7 @@ void GL_APIENTRY GetInteger64i_v(GLenum target, GLuint index, GLint64 *data) ...@@ -924,8 +910,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLint64 *data = 0x%016" PRIxPTR ")", pname, EVENT("(GLenum pname = 0x%X, GLint64 *data = 0x%0.8p)", pname, data);
reinterpret_cast<uintptr_t>(data));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -942,8 +927,7 @@ void GL_APIENTRY GetInteger64v(GLenum pname, GLint64 *data) ...@@ -942,8 +927,7 @@ 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(); 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%0.8p)", target, index, data);
index, reinterpret_cast<uintptr_t>(data));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -966,8 +950,8 @@ void GL_APIENTRY GetInternalformativ(GLenum target, ...@@ -966,8 +950,8 @@ void GL_APIENTRY GetInternalformativ(GLenum target,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
target, internalformat, pname, bufSize, reinterpret_cast<uintptr_t>(params)); target, internalformat, pname, bufSize, params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -990,10 +974,10 @@ void GL_APIENTRY GetProgramBinary(GLuint program, ...@@ -990,10 +974,10 @@ void GL_APIENTRY GetProgramBinary(GLuint program,
void *binary) void *binary)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR EVENT(
", GLenum *binaryFormat = 0x%016" PRIxPTR ", void *binary = 0x%016" PRIxPTR ")", "(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLenum "
program, bufSize, reinterpret_cast<uintptr_t>(length), "*binaryFormat = 0x%0.8p, void *binary = 0x%0.8p)",
reinterpret_cast<uintptr_t>(binaryFormat), reinterpret_cast<uintptr_t>(binary)); program, bufSize, length, binaryFormat, binary);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1012,8 +996,7 @@ void GL_APIENTRY GetProgramBinary(GLuint program, ...@@ -1012,8 +996,7 @@ 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(); 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%0.8p)", id, pname, params);
reinterpret_cast<uintptr_t>(params));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1030,8 +1013,8 @@ void GL_APIENTRY GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params) ...@@ -1030,8 +1013,8 @@ 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(); 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%0.8p)", target, pname,
pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1049,8 +1032,8 @@ void GL_APIENTRY GetQueryiv(GLenum target, GLenum pname, GLint *params) ...@@ -1049,8 +1032,8 @@ 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(); 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%0.8p)", sampler, pname,
sampler, pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1068,8 +1051,8 @@ void GL_APIENTRY GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *pa ...@@ -1068,8 +1051,8 @@ 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(); 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%0.8p)", sampler, pname,
pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1107,11 +1090,10 @@ void GL_APIENTRY ...@@ -1107,11 +1090,10 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsync sync = 0x%016" PRIxPTR EVENT(
", GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR "(GLsync sync = 0x%0.8p, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei *length = "
", GLint *values = 0x%016" PRIxPTR ")", "0x%0.8p, GLint *values = 0x%0.8p)",
reinterpret_cast<uintptr_t>(sync), pname, bufSize, reinterpret_cast<uintptr_t>(length), sync, pname, bufSize, length, values);
reinterpret_cast<uintptr_t>(values));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1136,12 +1118,9 @@ void GL_APIENTRY GetTransformFeedbackVarying(GLuint program, ...@@ -1136,12 +1118,9 @@ void GL_APIENTRY GetTransformFeedbackVarying(GLuint program,
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p, "
"0x%016" PRIxPTR ", GLsizei *size = 0x%016" PRIxPTR ", GLenum *type = 0x%016" PRIxPTR "GLsizei *size = 0x%0.8p, GLenum *type = 0x%0.8p, GLchar *name = 0x%0.8p)",
", GLchar *name = 0x%016" PRIxPTR ")", program, index, bufSize, length, size, type, name);
program, index, bufSize, reinterpret_cast<uintptr_t>(length),
reinterpret_cast<uintptr_t>(size), reinterpret_cast<uintptr_t>(type),
reinterpret_cast<uintptr_t>(name));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1161,8 +1140,8 @@ void GL_APIENTRY GetTransformFeedbackVarying(GLuint program, ...@@ -1161,8 +1140,8 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, const GLchar *uniformBlockName = 0x%016" PRIxPTR ")", program, EVENT("(GLuint program = %u, const GLchar *uniformBlockName = 0x%0.8p)", program,
reinterpret_cast<uintptr_t>(uniformBlockName)); uniformBlockName);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1187,9 +1166,8 @@ void GL_APIENTRY GetUniformIndices(GLuint program, ...@@ -1187,9 +1166,8 @@ void GL_APIENTRY GetUniformIndices(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p, GLuint *uniformIndices = 0x%0.8p)",
program, uniformCount, reinterpret_cast<uintptr_t>(uniformNames), program, uniformCount, uniformNames, uniformIndices);
reinterpret_cast<uintptr_t>(uniformIndices));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1208,8 +1186,8 @@ void GL_APIENTRY GetUniformIndices(GLuint program, ...@@ -1208,8 +1186,8 @@ 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(); 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%0.8p)", program, location,
location, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1226,8 +1204,8 @@ void GL_APIENTRY GetUniformuiv(GLuint program, GLint location, GLuint *params) ...@@ -1226,8 +1204,8 @@ 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(); 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%0.8p)", index, pname,
pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1244,8 +1222,8 @@ void GL_APIENTRY GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params) ...@@ -1244,8 +1222,8 @@ 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(); 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%0.8p)", index, pname,
pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1265,9 +1243,8 @@ void GL_APIENTRY InvalidateFramebuffer(GLenum target, ...@@ -1265,9 +1243,8 @@ void GL_APIENTRY InvalidateFramebuffer(GLenum target,
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
"0x%016" PRIxPTR ")", target, numAttachments, attachments);
target, numAttachments, reinterpret_cast<uintptr_t>(attachments));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1293,9 +1270,9 @@ void GL_APIENTRY InvalidateSubFramebuffer(GLenum target, ...@@ -1293,9 +1270,9 @@ void GL_APIENTRY InvalidateSubFramebuffer(GLenum target,
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p, "
"0x%016" PRIxPTR ", GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", "GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",
target, numAttachments, reinterpret_cast<uintptr_t>(attachments), x, y, width, height); target, numAttachments, attachments, x, y, width, height);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1354,7 +1331,7 @@ GLboolean GL_APIENTRY IsSampler(GLuint sampler) ...@@ -1354,7 +1331,7 @@ GLboolean GL_APIENTRY IsSampler(GLuint sampler)
GLboolean GL_APIENTRY IsSync(GLsync sync) GLboolean GL_APIENTRY IsSync(GLsync sync)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsync sync = 0x%016" PRIxPTR ")", reinterpret_cast<uintptr_t>(sync)); EVENT("(GLsync sync = 0x%0.8p)", sync);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1415,10 +1392,9 @@ void *GL_APIENTRY MapBufferRange(GLenum target, ...@@ -1415,10 +1392,9 @@ void *GL_APIENTRY MapBufferRange(GLenum target,
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT(
"(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr length = %llu, GLbitfield " "(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr length = %d, GLbitfield access = "
"access = 0x%X)", "0x%X)",
target, static_cast<unsigned long long>(offset), static_cast<unsigned long long>(length), target, offset, length, access);
access);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1459,9 +1435,10 @@ void GL_APIENTRY ProgramBinary(GLuint program, ...@@ -1459,9 +1435,10 @@ void GL_APIENTRY ProgramBinary(GLuint program,
GLsizei length) GLsizei length)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLenum binaryFormat = 0x%X, const void *binary = 0x%016" PRIxPTR EVENT(
", GLsizei length = %d)", "(GLuint program = %u, GLenum binaryFormat = 0x%X, const void *binary = 0x%0.8p, GLsizei "
program, binaryFormat, reinterpret_cast<uintptr_t>(binary), length); "length = %d)",
program, binaryFormat, binary, length);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1574,8 +1551,8 @@ void GL_APIENTRY SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param) ...@@ -1574,8 +1551,8 @@ 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(); 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%0.8p)", sampler,
sampler, pname, reinterpret_cast<uintptr_t>(param)); pname, param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1609,8 +1586,8 @@ void GL_APIENTRY SamplerParameteri(GLuint sampler, GLenum pname, GLint param) ...@@ -1609,8 +1586,8 @@ 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(); 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%0.8p)", sampler,
sampler, pname, reinterpret_cast<uintptr_t>(param)); pname, param);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1639,9 +1616,8 @@ void GL_APIENTRY TexImage3D(GLenum target, ...@@ -1639,9 +1616,8 @@ void GL_APIENTRY TexImage3D(GLenum target,
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 "
"type = 0x%X, const void *pixels = 0x%016" PRIxPTR ")", "type = 0x%X, const void *pixels = 0x%0.8p)",
target, level, internalformat, width, height, depth, border, format, type, target, level, internalformat, width, height, depth, border, format, type, pixels);
reinterpret_cast<uintptr_t>(pixels));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1728,9 +1704,8 @@ void GL_APIENTRY TexSubImage3D(GLenum target, ...@@ -1728,9 +1704,8 @@ void GL_APIENTRY TexSubImage3D(GLenum target,
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 "
"= 0x%X, GLenum type = 0x%X, const void *pixels = 0x%016" PRIxPTR ")", "= 0x%X, GLenum type = 0x%X, const void *pixels = 0x%0.8p)",
target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
reinterpret_cast<uintptr_t>(pixels));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1756,9 +1731,10 @@ void GL_APIENTRY TransformFeedbackVaryings(GLuint program, ...@@ -1756,9 +1731,10 @@ void GL_APIENTRY TransformFeedbackVaryings(GLuint program,
GLenum bufferMode) GLenum bufferMode)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLsizei count = %d, const GLchar *const*varyings = 0x%016" PRIxPTR EVENT(
", GLenum bufferMode = 0x%X)", "(GLuint program = %u, GLsizei count = %d, const GLchar *const*varyings = 0x%0.8p, GLenum "
program, count, reinterpret_cast<uintptr_t>(varyings), bufferMode); "bufferMode = 0x%X)",
program, count, varyings, bufferMode);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1794,8 +1770,8 @@ void GL_APIENTRY Uniform1ui(GLint location, GLuint v0) ...@@ -1794,8 +1770,8 @@ 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(); 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%0.8p)", location,
location, count, reinterpret_cast<uintptr_t>(value)); count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1829,8 +1805,8 @@ void GL_APIENTRY Uniform2ui(GLint location, GLuint v0, GLuint v1) ...@@ -1829,8 +1805,8 @@ 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(); 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%0.8p)", location,
location, count, reinterpret_cast<uintptr_t>(value)); count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1865,8 +1841,8 @@ void GL_APIENTRY Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2) ...@@ -1865,8 +1841,8 @@ 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(); 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%0.8p)", location,
location, count, reinterpret_cast<uintptr_t>(value)); count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1901,8 +1877,8 @@ void GL_APIENTRY Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLu ...@@ -1901,8 +1877,8 @@ 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(); 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%0.8p)", location,
location, count, reinterpret_cast<uintptr_t>(value)); count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1946,8 +1922,8 @@ void GL_APIENTRY UniformMatrix2x3fv(GLint location, ...@@ -1946,8 +1922,8 @@ void GL_APIENTRY UniformMatrix2x3fv(GLint location,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
location, count, transpose, reinterpret_cast<uintptr_t>(value)); location, count, transpose, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1970,8 +1946,8 @@ void GL_APIENTRY UniformMatrix2x4fv(GLint location, ...@@ -1970,8 +1946,8 @@ void GL_APIENTRY UniformMatrix2x4fv(GLint location,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
location, count, transpose, reinterpret_cast<uintptr_t>(value)); location, count, transpose, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1994,8 +1970,8 @@ void GL_APIENTRY UniformMatrix3x2fv(GLint location, ...@@ -1994,8 +1970,8 @@ void GL_APIENTRY UniformMatrix3x2fv(GLint location,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
location, count, transpose, reinterpret_cast<uintptr_t>(value)); location, count, transpose, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2018,8 +1994,8 @@ void GL_APIENTRY UniformMatrix3x4fv(GLint location, ...@@ -2018,8 +1994,8 @@ void GL_APIENTRY UniformMatrix3x4fv(GLint location,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
location, count, transpose, reinterpret_cast<uintptr_t>(value)); location, count, transpose, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2042,8 +2018,8 @@ void GL_APIENTRY UniformMatrix4x2fv(GLint location, ...@@ -2042,8 +2018,8 @@ void GL_APIENTRY UniformMatrix4x2fv(GLint location,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
location, count, transpose, reinterpret_cast<uintptr_t>(value)); location, count, transpose, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2066,8 +2042,8 @@ void GL_APIENTRY UniformMatrix4x3fv(GLint location, ...@@ -2066,8 +2042,8 @@ void GL_APIENTRY UniformMatrix4x3fv(GLint location,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
location, count, transpose, reinterpret_cast<uintptr_t>(value)); location, count, transpose, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2140,8 +2116,7 @@ void GL_APIENTRY VertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint ...@@ -2140,8 +2116,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, const GLint *v = 0x%016" PRIxPTR ")", index, EVENT("(GLuint index = %u, const GLint *v = 0x%0.8p)", index, v);
reinterpret_cast<uintptr_t>(v));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2176,8 +2151,7 @@ void GL_APIENTRY VertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GL ...@@ -2176,8 +2151,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, const GLuint *v = 0x%016" PRIxPTR ")", index, EVENT("(GLuint index = %u, const GLuint *v = 0x%0.8p)", index, v);
reinterpret_cast<uintptr_t>(v));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2197,8 +2171,8 @@ VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, cons ...@@ -2197,8 +2171,8 @@ VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, cons
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
index, size, type, stride, reinterpret_cast<uintptr_t>(pointer)); index, size, type, stride, pointer);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -2216,8 +2190,8 @@ VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, cons ...@@ -2216,8 +2190,8 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsync sync = 0x%016" PRIxPTR ", GLbitfield flags = 0x%X, GLuint64 timeout = %llu)", EVENT("(GLsync sync = 0x%0.8p, GLbitfield flags = 0x%X, GLuint64 timeout = %llu)", sync, flags,
reinterpret_cast<uintptr_t>(sync), flags, static_cast<unsigned long long>(timeout)); timeout);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
......
src/libGLESv2/entry_points_gles_3_1_autogen.cpp
...@@ -85,9 +85,8 @@ void GL_APIENTRY BindVertexBuffer(GLuint bindingindex, ...@@ -85,9 +85,8 @@ void GL_APIENTRY BindVertexBuffer(GLuint bindingindex,
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); 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 = %d, GLsizei stride = %d)",
"%d)", bindingindex, buffer, offset, stride);
bindingindex, buffer, static_cast<unsigned long long>(offset), stride);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -105,9 +104,8 @@ void GL_APIENTRY BindVertexBuffer(GLuint bindingindex, ...@@ -105,9 +104,8 @@ 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(); 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%0.8p)", type,
")", count, strings);
type, count, reinterpret_cast<uintptr_t>(strings));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -128,8 +126,7 @@ GLuint GL_APIENTRY CreateShaderProgramv(GLenum type, GLsizei count, const GLchar ...@@ -128,8 +126,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *pipelines = 0x%016" PRIxPTR ")", n, EVENT("(GLsizei n = %d, const GLuint *pipelines = 0x%0.8p)", n, pipelines);
reinterpret_cast<uintptr_t>(pipelines));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -166,7 +163,7 @@ void GL_APIENTRY DispatchCompute(GLuint num_groups_x, GLuint num_groups_y, GLuin ...@@ -166,7 +163,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLintptr indirect = %llu)", static_cast<unsigned long long>(indirect)); EVENT("(GLintptr indirect = %d)", indirect);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -183,8 +180,7 @@ void GL_APIENTRY DispatchComputeIndirect(GLintptr indirect) ...@@ -183,8 +180,7 @@ 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(); 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%0.8p)", mode, indirect);
reinterpret_cast<uintptr_t>(indirect));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -202,8 +198,8 @@ void GL_APIENTRY DrawArraysIndirect(GLenum mode, const void *indirect) ...@@ -202,8 +198,8 @@ 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(); 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%0.8p)", mode, type,
mode, type, reinterpret_cast<uintptr_t>(indirect)); indirect);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -240,8 +236,7 @@ void GL_APIENTRY FramebufferParameteri(GLenum target, GLenum pname, GLint param) ...@@ -240,8 +236,7 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *pipelines = 0x%016" PRIxPTR ")", n, EVENT("(GLsizei n = %d, GLuint *pipelines = 0x%0.8p)", n, pipelines);
reinterpret_cast<uintptr_t>(pipelines));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -258,8 +253,8 @@ void GL_APIENTRY GenProgramPipelines(GLsizei n, GLuint *pipelines) ...@@ -258,8 +253,8 @@ 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(); 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%0.8p)", target, index,
index, reinterpret_cast<uintptr_t>(data)); data);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -276,8 +271,8 @@ void GL_APIENTRY GetBooleani_v(GLenum target, GLuint index, GLboolean *data) ...@@ -276,8 +271,8 @@ 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(); 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%0.8p)", target, pname,
pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -295,8 +290,7 @@ void GL_APIENTRY GetFramebufferParameteriv(GLenum target, GLenum pname, GLint *p ...@@ -295,8 +290,7 @@ 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(); 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%0.8p)", pname, index, val);
index, reinterpret_cast<uintptr_t>(val));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -318,8 +312,8 @@ void GL_APIENTRY GetProgramInterfaceiv(GLuint program, ...@@ -318,8 +312,8 @@ void GL_APIENTRY GetProgramInterfaceiv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, programInterface, pname, reinterpret_cast<uintptr_t>(params)); program, programInterface, pname, params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -341,10 +335,10 @@ void GL_APIENTRY GetProgramPipelineInfoLog(GLuint pipeline, ...@@ -341,10 +335,10 @@ void GL_APIENTRY GetProgramPipelineInfoLog(GLuint pipeline,
GLchar *infoLog) GLchar *infoLog)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint pipeline = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR EVENT(
", GLchar *infoLog = 0x%016" PRIxPTR ")", "(GLuint pipeline = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *infoLog = "
pipeline, bufSize, reinterpret_cast<uintptr_t>(length), "0x%0.8p)",
reinterpret_cast<uintptr_t>(infoLog)); pipeline, bufSize, length, infoLog);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -363,8 +357,8 @@ void GL_APIENTRY GetProgramPipelineInfoLog(GLuint pipeline, ...@@ -363,8 +357,8 @@ 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(); 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%0.8p)", pipeline, pname,
pipeline, pname, reinterpret_cast<uintptr_t>(params)); params);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -384,10 +378,8 @@ GLuint GL_APIENTRY GetProgramResourceIndex(GLuint program, ...@@ -384,10 +378,8 @@ GLuint GL_APIENTRY GetProgramResourceIndex(GLuint program,
const GLchar *name) const GLchar *name)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT("(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%0.8p)",
"(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%016" PRIxPTR program, programInterface, name);
")",
program, programInterface, reinterpret_cast<uintptr_t>(name));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -409,10 +401,8 @@ GLint GL_APIENTRY GetProgramResourceLocation(GLuint program, ...@@ -409,10 +401,8 @@ GLint GL_APIENTRY GetProgramResourceLocation(GLuint program,
const GLchar *name) const GLchar *name)
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT("(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%0.8p)",
"(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%016" PRIxPTR program, programInterface, name);
")",
program, programInterface, reinterpret_cast<uintptr_t>(name));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -440,9 +430,8 @@ void GL_APIENTRY GetProgramResourceName(GLuint program, ...@@ -440,9 +430,8 @@ void GL_APIENTRY GetProgramResourceName(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p, GLchar *name = 0x%0.8p)",
program, programInterface, index, bufSize, reinterpret_cast<uintptr_t>(length), program, programInterface, index, bufSize, length, name);
reinterpret_cast<uintptr_t>(name));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -472,11 +461,9 @@ void GL_APIENTRY GetProgramResourceiv(GLuint program, ...@@ -472,11 +461,9 @@ void GL_APIENTRY GetProgramResourceiv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p, GLsizei bufSize = %d, GLsizei *length = "
", GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR "0x%0.8p, GLint *params = 0x%0.8p)",
", GLint *params = 0x%016" PRIxPTR ")", program, programInterface, index, propCount, props, bufSize, length, params);
program, programInterface, index, propCount, reinterpret_cast<uintptr_t>(props), bufSize,
reinterpret_cast<uintptr_t>(length), reinterpret_cast<uintptr_t>(params));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -498,9 +485,8 @@ void GL_APIENTRY GetTexLevelParameterfv(GLenum target, GLint level, GLenum pname ...@@ -498,9 +485,8 @@ void GL_APIENTRY GetTexLevelParameterfv(GLenum target, GLint level, GLenum pname
{ {
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
"0x%016" PRIxPTR ")", target, level, pname, params);
target, level, pname, reinterpret_cast<uintptr_t>(params));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -520,10 +506,8 @@ void GL_APIENTRY GetTexLevelParameterfv(GLenum target, GLint level, GLenum pname ...@@ -520,10 +506,8 @@ 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(); ANGLE_SCOPED_GLOBAL_LOCK();
EVENT( EVENT("(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLint *params = 0x%0.8p)",
"(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLint *params = " target, level, pname, params);
"0x%016" PRIxPTR ")",
target, level, pname, reinterpret_cast<uintptr_t>(params));
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -618,8 +602,8 @@ void GL_APIENTRY ProgramUniform1fv(GLuint program, ...@@ -618,8 +602,8 @@ void GL_APIENTRY ProgramUniform1fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, reinterpret_cast<uintptr_t>(value)); program, location, count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -659,8 +643,8 @@ void GL_APIENTRY ProgramUniform1iv(GLuint program, ...@@ -659,8 +643,8 @@ void GL_APIENTRY ProgramUniform1iv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, reinterpret_cast<uintptr_t>(value)); program, location, count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -700,8 +684,8 @@ void GL_APIENTRY ProgramUniform1uiv(GLuint program, ...@@ -700,8 +684,8 @@ void GL_APIENTRY ProgramUniform1uiv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, reinterpret_cast<uintptr_t>(value)); program, location, count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -743,8 +727,8 @@ void GL_APIENTRY ProgramUniform2fv(GLuint program, ...@@ -743,8 +727,8 @@ void GL_APIENTRY ProgramUniform2fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, reinterpret_cast<uintptr_t>(value)); program, location, count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -786,8 +770,8 @@ void GL_APIENTRY ProgramUniform2iv(GLuint program, ...@@ -786,8 +770,8 @@ void GL_APIENTRY ProgramUniform2iv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, reinterpret_cast<uintptr_t>(value)); program, location, count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -829,8 +813,8 @@ void GL_APIENTRY ProgramUniform2uiv(GLuint program, ...@@ -829,8 +813,8 @@ void GL_APIENTRY ProgramUniform2uiv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, reinterpret_cast<uintptr_t>(value)); program, location, count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -875,8 +859,8 @@ void GL_APIENTRY ProgramUniform3fv(GLuint program, ...@@ -875,8 +859,8 @@ void GL_APIENTRY ProgramUniform3fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, reinterpret_cast<uintptr_t>(value)); program, location, count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -918,8 +902,8 @@ void GL_APIENTRY ProgramUniform3iv(GLuint program, ...@@ -918,8 +902,8 @@ void GL_APIENTRY ProgramUniform3iv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, reinterpret_cast<uintptr_t>(value)); program, location, count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -963,8 +947,8 @@ void GL_APIENTRY ProgramUniform3uiv(GLuint program, ...@@ -963,8 +947,8 @@ void GL_APIENTRY ProgramUniform3uiv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, reinterpret_cast<uintptr_t>(value)); program, location, count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1009,8 +993,8 @@ void GL_APIENTRY ProgramUniform4fv(GLuint program, ...@@ -1009,8 +993,8 @@ void GL_APIENTRY ProgramUniform4fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, reinterpret_cast<uintptr_t>(value)); program, location, count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1055,8 +1039,8 @@ void GL_APIENTRY ProgramUniform4iv(GLuint program, ...@@ -1055,8 +1039,8 @@ void GL_APIENTRY ProgramUniform4iv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, reinterpret_cast<uintptr_t>(value)); program, location, count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1101,8 +1085,8 @@ void GL_APIENTRY ProgramUniform4uiv(GLuint program, ...@@ -1101,8 +1085,8 @@ void GL_APIENTRY ProgramUniform4uiv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, reinterpret_cast<uintptr_t>(value)); program, location, count, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1126,8 +1110,8 @@ void GL_APIENTRY ProgramUniformMatrix2fv(GLuint program, ...@@ -1126,8 +1110,8 @@ void GL_APIENTRY ProgramUniformMatrix2fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, transpose, reinterpret_cast<uintptr_t>(value)); program, location, count, transpose, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1152,8 +1136,8 @@ void GL_APIENTRY ProgramUniformMatrix2x3fv(GLuint program, ...@@ -1152,8 +1136,8 @@ void GL_APIENTRY ProgramUniformMatrix2x3fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, transpose, reinterpret_cast<uintptr_t>(value)); program, location, count, transpose, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1178,8 +1162,8 @@ void GL_APIENTRY ProgramUniformMatrix2x4fv(GLuint program, ...@@ -1178,8 +1162,8 @@ void GL_APIENTRY ProgramUniformMatrix2x4fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, transpose, reinterpret_cast<uintptr_t>(value)); program, location, count, transpose, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1204,8 +1188,8 @@ void GL_APIENTRY ProgramUniformMatrix3fv(GLuint program, ...@@ -1204,8 +1188,8 @@ void GL_APIENTRY ProgramUniformMatrix3fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, transpose, reinterpret_cast<uintptr_t>(value)); program, location, count, transpose, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1230,8 +1214,8 @@ void GL_APIENTRY ProgramUniformMatrix3x2fv(GLuint program, ...@@ -1230,8 +1214,8 @@ void GL_APIENTRY ProgramUniformMatrix3x2fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, transpose, reinterpret_cast<uintptr_t>(value)); program, location, count, transpose, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1256,8 +1240,8 @@ void GL_APIENTRY ProgramUniformMatrix3x4fv(GLuint program, ...@@ -1256,8 +1240,8 @@ void GL_APIENTRY ProgramUniformMatrix3x4fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, transpose, reinterpret_cast<uintptr_t>(value)); program, location, count, transpose, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1282,8 +1266,8 @@ void GL_APIENTRY ProgramUniformMatrix4fv(GLuint program, ...@@ -1282,8 +1266,8 @@ void GL_APIENTRY ProgramUniformMatrix4fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, transpose, reinterpret_cast<uintptr_t>(value)); program, location, count, transpose, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1308,8 +1292,8 @@ void GL_APIENTRY ProgramUniformMatrix4x2fv(GLuint program, ...@@ -1308,8 +1292,8 @@ void GL_APIENTRY ProgramUniformMatrix4x2fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, transpose, reinterpret_cast<uintptr_t>(value)); program, location, count, transpose, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
...@@ -1334,8 +1318,8 @@ void GL_APIENTRY ProgramUniformMatrix4x3fv(GLuint program, ...@@ -1334,8 +1318,8 @@ void GL_APIENTRY ProgramUniformMatrix4x3fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK(); 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%0.8p)",
program, location, count, transpose, reinterpret_cast<uintptr_t>(value)); program, location, count, transpose, value);
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
......
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/tests/gles_conformance_tests/gles_conformance_tests.cpp
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#include <sstream> #include <sstream>
#include <stdarg.h> #include <stdarg.h>
ANGLE_FORMAT_PRINTF(1, 2)
static std::vector<char> FormatArg(const char* fmt, ...) static std::vector<char> FormatArg(const char* fmt, ...)
{ {
va_list vararg; va_list vararg;
......
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