Skip to content

A
angle
Commit a390ebd9 by Shahbaz Youssefi Committed by Commit Bot
Options

Add compiler printf attribute to relevant functions

Relands 27a472c6 with reinterpret_cast changed to C-style cast to support types that are pointers on some platforms and integers on others. 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", (uintptr_t)x); printf("|%016" PRIxPTR "|\n", (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: Idf9f705c3d00f69e41e7603453016276a2e13a64 Reviewed-on: https://chromium-review.googlesource.com/c/1300913Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
parent ad8fe588
Showing with 707 additions and 588 deletions
scripts/generate_entry_points.py
......@@ -298,6 +298,34 @@ def just_the_name_packed(param, reserved_set):
else:
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 "(uintptr_t)" + name_only
if type_only in reinterpret_cast_to_dict:
return "(" + 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 = {
"GLbitfield": "0x%X",
"GLboolean": "%u",
......@@ -306,22 +334,22 @@ format_dict = {
"GLfixed": "0x%X",
"GLfloat": "%f",
"GLint": "%d",
"GLintptr": "%d",
"GLintptr": "%llu",
"GLshort": "%d",
"GLsizei": "%d",
"GLsizeiptr": "%d",
"GLsync": "0x%0.8p",
"GLsizeiptr": "%llu",
"GLsync": "0x%016\" PRIxPTR \"",
"GLubyte": "%d",
"GLuint": "%u",
"GLuint64": "%llu",
"GLDEBUGPROC": "0x%0.8p",
"GLDEBUGPROCKHR": "0x%0.8p",
"GLeglImageOES": "0x%0.8p",
"GLDEBUGPROC": "0x%016\" PRIxPTR \"",
"GLDEBUGPROCKHR": "0x%016\" PRIxPTR \"",
"GLeglImageOES": "0x%016\" PRIxPTR \"",
}
def param_format_string(param):
if "*" in param:
return param + " = 0x%0.8p"
return param + " = 0x%016\" PRIxPTR \""
else:
type_only = just_the_type(param)
if type_only not in format_dict:
......@@ -358,7 +386,7 @@ def format_entry_point_def(cmd_name, proto, params, is_explicit_context):
packed_gl_enum_conversions += ["\n " + internal_type + " " + internal_name +" = FromGLenum<" +
internal_type + ">(" + name + ");"]
pass_params = [just_the_name(param) for param in params]
pass_params = [param_print_argument(param) for param in params]
format_params = [param_format_string(param) for param in params]
return_type = proto[:-len(cmd_name)]
default_return = default_return_value(cmd_name, return_type.strip())
......
src/common/angleutils.h
......@@ -297,6 +297,16 @@ std::string ToString(const T &value)
#define ANGLE_NOINLINE
#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
#define ANGLE_STRINGIFY(x) #x
#endif
......
src/common/debug.h
......@@ -31,7 +31,8 @@ namespace gl
class ScopedPerfEventHelper : angle::NonCopyable
{
public:
ScopedPerfEventHelper(const char* format, ...);
ANGLE_FORMAT_PRINTF(2, 3)
ScopedPerfEventHelper(const char *format, ...);
~ScopedPerfEventHelper();
};
......
src/gpu_info_util/SystemInfo_android.cpp
......@@ -97,6 +97,7 @@ class VulkanLibrary final : NonCopyable
VkInstance mInstance = VK_NULL_HANDLE;
};
ANGLE_FORMAT_PRINTF(1, 2)
std::string FormatString(const char *fmt, ...)
{
va_list vararg;
......
src/libANGLE/angletypes.h
......@@ -17,6 +17,7 @@
#include "libANGLE/Error.h"
#include "libANGLE/RefCountObject.h"
#include <inttypes.h>
#include <stdint.h>
#include <bitset>
......
src/libGLESv2/entry_points_egl.cpp
......@@ -67,7 +67,7 @@ EGLint EGLAPIENTRY GetError(void)
EGLDisplay EGLAPIENTRY GetDisplay(EGLNativeDisplayType display_id)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLNativeDisplayType display_id = 0x%0.8p)", display_id);
EVENT("(EGLNativeDisplayType display_id = 0x%016" PRIxPTR ")", (uintptr_t)display_id);
return Display::GetDisplayFromNativeDisplay(display_id, AttributeMap());
}
......@@ -75,8 +75,9 @@ EGLDisplay EGLAPIENTRY GetDisplay(EGLNativeDisplayType display_id)
EGLBoolean EGLAPIENTRY Initialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint *major = 0x%0.8p, EGLint *minor = 0x%0.8p)", dpy,
major, minor);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLint *major = 0x%016" PRIxPTR
", EGLint *minor = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)major, (uintptr_t)minor);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -98,7 +99,7 @@ EGLBoolean EGLAPIENTRY Initialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
EGLBoolean EGLAPIENTRY Terminate(EGLDisplay dpy)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p)", dpy);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ")", (uintptr_t)dpy);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -120,7 +121,7 @@ EGLBoolean EGLAPIENTRY Terminate(EGLDisplay dpy)
const char *EGLAPIENTRY QueryString(EGLDisplay dpy, EGLint name)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint name = %d)", dpy, name);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLint name = %d)", (uintptr_t)dpy, name);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -168,10 +169,10 @@ EGLBoolean EGLAPIENTRY GetConfigs(EGLDisplay dpy,
EGLint *num_config)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLConfig *configs = 0x%0.8p, "
"EGLint config_size = %d, EGLint *num_config = 0x%0.8p)",
dpy, configs, config_size, num_config);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig *configs = 0x%016" PRIxPTR
", "
"EGLint config_size = %d, EGLint *num_config = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)configs, config_size, (uintptr_t)num_config);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -192,10 +193,12 @@ EGLBoolean EGLAPIENTRY ChooseConfig(EGLDisplay dpy,
EGLint *num_config)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, const EGLint *attrib_list = 0x%0.8p, "
"EGLConfig *configs = 0x%0.8p, EGLint config_size = %d, EGLint *num_config = 0x%0.8p)",
dpy, attrib_list, configs, config_size, num_config);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", const EGLint *attrib_list = 0x%016" PRIxPTR
", "
"EGLConfig *configs = 0x%016" PRIxPTR
", EGLint config_size = %d, EGLint *num_config = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)attrib_list, (uintptr_t)configs, config_size,
(uintptr_t)num_config);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -216,10 +219,10 @@ EGLBoolean EGLAPIENTRY GetConfigAttrib(EGLDisplay dpy,
EGLint *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLint attribute = %d, EGLint "
"*value = 0x%0.8p)",
dpy, config, attribute, value);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR
", EGLint attribute = %d, EGLint "
"*value = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)config, attribute, (uintptr_t)value);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -240,10 +243,11 @@ EGLSurface EGLAPIENTRY CreateWindowSurface(EGLDisplay dpy,
const EGLint *attrib_list)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLNativeWindowType win = 0x%0.8p, "
"const EGLint *attrib_list = 0x%0.8p)",
dpy, config, win, attrib_list);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR
", EGLNativeWindowType win = 0x%016" PRIxPTR
", "
"const EGLint *attrib_list = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)config, (uintptr_t)win, (uintptr_t)attrib_list);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -267,10 +271,10 @@ EGLSurface EGLAPIENTRY CreatePbufferSurface(EGLDisplay dpy,
const EGLint *attrib_list)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, const EGLint *attrib_list = "
"0x%0.8p)",
dpy, config, attrib_list);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR
", const EGLint *attrib_list = "
"0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)config, (uintptr_t)attrib_list);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -293,11 +297,12 @@ EGLSurface EGLAPIENTRY CreatePixmapSurface(EGLDisplay dpy,
const EGLint *attrib_list)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLNativePixmapType pixmap = "
"0x%0.8p, "
"const EGLint *attrib_list = 0x%0.8p)",
dpy, config, pixmap, attrib_list);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR
", EGLNativePixmapType pixmap = "
"0x%016" PRIxPTR
", "
"const EGLint *attrib_list = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)config, (uintptr_t)pixmap, (uintptr_t)attrib_list);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -315,7 +320,8 @@ EGLSurface EGLAPIENTRY CreatePixmapSurface(EGLDisplay dpy,
EGLBoolean EGLAPIENTRY DestroySurface(EGLDisplay dpy, EGLSurface surface)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p)", dpy, surface);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)surface);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -337,10 +343,10 @@ EGLBoolean EGLAPIENTRY QuerySurface(EGLDisplay dpy,
EGLint *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint attribute = %d, EGLint "
"*value = 0x%0.8p)",
dpy, surface, attribute, value);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
", EGLint attribute = %d, EGLint "
"*value = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)surface, attribute, (uintptr_t)value);
Thread *thread = GetCurrentThread();
const Display *display = static_cast<const Display *>(dpy);
......@@ -361,11 +367,12 @@ EGLContext EGLAPIENTRY CreateContext(EGLDisplay dpy,
const EGLint *attrib_list)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLContext share_context = "
"0x%0.8p, "
"const EGLint *attrib_list = 0x%0.8p)",
dpy, config, share_context, attrib_list);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR
", EGLContext share_context = "
"0x%016" PRIxPTR
", "
"const EGLint *attrib_list = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)config, (uintptr_t)share_context, (uintptr_t)attrib_list);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -389,7 +396,8 @@ EGLContext EGLAPIENTRY CreateContext(EGLDisplay dpy,
EGLBoolean EGLAPIENTRY DestroyContext(EGLDisplay dpy, EGLContext ctx)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLContext ctx = 0x%0.8p)", dpy, ctx);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLContext ctx = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)ctx);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -415,10 +423,11 @@ EGLBoolean EGLAPIENTRY DestroyContext(EGLDisplay dpy, EGLContext ctx)
EGLBoolean EGLAPIENTRY MakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLSurface draw = 0x%0.8p, EGLSurface read = 0x%0.8p, "
"EGLContext ctx = 0x%0.8p)",
dpy, draw, read, ctx);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface draw = 0x%016" PRIxPTR
", EGLSurface read = 0x%016" PRIxPTR
", "
"EGLContext ctx = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)draw, (uintptr_t)read, (uintptr_t)ctx);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -494,10 +503,10 @@ EGLDisplay EGLAPIENTRY GetCurrentDisplay(void)
EGLBoolean EGLAPIENTRY QueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLContext ctx = 0x%0.8p, EGLint attribute = %d, EGLint *value "
"= 0x%0.8p)",
dpy, ctx, attribute, value);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLContext ctx = 0x%016" PRIxPTR
", EGLint attribute = %d, EGLint *value "
"= 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)ctx, attribute, (uintptr_t)value);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -553,7 +562,8 @@ EGLBoolean EGLAPIENTRY WaitNative(EGLint engine)
EGLBoolean EGLAPIENTRY SwapBuffers(EGLDisplay dpy, EGLSurface surface)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p)", dpy, surface);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)surface);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -572,10 +582,10 @@ EGLBoolean EGLAPIENTRY SwapBuffers(EGLDisplay dpy, EGLSurface surface)
EGLBoolean EGLAPIENTRY CopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLNativePixmapType target = "
"0x%0.8p)",
dpy, surface, target);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
", EGLNativePixmapType target = "
"0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)surface, (uintptr_t)target);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -594,8 +604,9 @@ EGLBoolean EGLAPIENTRY CopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNative
EGLBoolean EGLAPIENTRY BindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint buffer = %d)", dpy,
surface, buffer);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
", EGLint buffer = %d)",
(uintptr_t)dpy, (uintptr_t)surface, buffer);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -623,10 +634,10 @@ EGLBoolean EGLAPIENTRY SurfaceAttrib(EGLDisplay dpy,
EGLint value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint attribute = %d, EGLint "
"value = %d)",
dpy, surface, attribute, value);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
", EGLint attribute = %d, EGLint "
"value = %d)",
(uintptr_t)dpy, (uintptr_t)surface, attribute, value);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -644,8 +655,9 @@ EGLBoolean EGLAPIENTRY SurfaceAttrib(EGLDisplay dpy,
EGLBoolean EGLAPIENTRY ReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint buffer = %d)", dpy,
surface, buffer);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
", EGLint buffer = %d)",
(uintptr_t)dpy, (uintptr_t)surface, buffer);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -670,7 +682,7 @@ EGLBoolean EGLAPIENTRY ReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLin
EGLBoolean EGLAPIENTRY SwapInterval(EGLDisplay dpy, EGLint interval)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint interval = %d)", dpy, interval);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLint interval = %d)", (uintptr_t)dpy, interval);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -724,10 +736,11 @@ EGLSurface EGLAPIENTRY CreatePbufferFromClientBuffer(EGLDisplay dpy,
const EGLint *attrib_list)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLenum buftype = 0x%X, EGLClientBuffer buffer = 0x%0.8p, "
"EGLConfig config = 0x%0.8p, const EGLint *attrib_list = 0x%0.8p)",
dpy, buftype, buffer, config, attrib_list);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR
", EGLenum buftype = 0x%X, EGLClientBuffer buffer = 0x%016" PRIxPTR
", "
"EGLConfig config = 0x%016" PRIxPTR ", const EGLint *attrib_list = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, buftype, (uintptr_t)buffer, (uintptr_t)config, (uintptr_t)attrib_list);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -798,8 +811,9 @@ EGLContext EGLAPIENTRY GetCurrentContext(void)
EGLSync EGLAPIENTRY CreateSync(EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLenum type = 0x%X, const EGLint* attrib_list = 0x%0.8p)",
dpy, type, attrib_list);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR
", EGLenum type = 0x%X, const EGLint* attrib_list = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, type, (uintptr_t)attrib_list);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -813,7 +827,8 @@ EGLSync EGLAPIENTRY CreateSync(EGLDisplay dpy, EGLenum type, const EGLAttrib *at
EGLBoolean EGLAPIENTRY DestroySync(EGLDisplay dpy, EGLSync sync)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSync sync = 0x%0.8p)", dpy, sync);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSync sync = 0x%016" PRIxPTR ")", (uintptr_t)dpy,
(uintptr_t)sync);
Thread *thread = GetCurrentThread();
UNIMPLEMENTED();
......@@ -826,10 +841,10 @@ EGLBoolean EGLAPIENTRY DestroySync(EGLDisplay dpy, EGLSync sync)
EGLint EGLAPIENTRY ClientWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLSync sync = 0x%0.8p, EGLint flags = 0x%X, EGLTime timeout = "
"%d)",
dpy, sync, flags, timeout);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSync sync = 0x%016" PRIxPTR
", EGLint flags = 0x%X, EGLTime timeout = "
"%llu)",
(uintptr_t)dpy, (uintptr_t)sync, flags, static_cast<unsigned long long>(timeout));
Thread *thread = GetCurrentThread();
UNIMPLEMENTED();
......@@ -845,10 +860,10 @@ EGLBoolean EGLAPIENTRY GetSyncAttrib(EGLDisplay dpy,
EGLAttrib *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLSync sync = 0x%0.8p, EGLint attribute = 0x%X, EGLAttrib "
"*value = 0x%0.8p)",
dpy, sync, attribute, value);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSync sync = 0x%016" PRIxPTR
", EGLint attribute = 0x%X, EGLAttrib "
"*value = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)sync, attribute, (uintptr_t)value);
Thread *thread = GetCurrentThread();
UNIMPLEMENTED();
......@@ -865,10 +880,11 @@ EGLImage EGLAPIENTRY CreateImage(EGLDisplay dpy,
const EGLAttrib *attrib_list)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLContext ctx = 0x%0.8p, EGLenum target = 0x%X, "
"EGLClientBuffer buffer = 0x%0.8p, const EGLAttrib *attrib_list = 0x%0.8p)",
dpy, ctx, target, buffer, attrib_list);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLContext ctx = 0x%016" PRIxPTR
", EGLenum target = 0x%X, "
"EGLClientBuffer buffer = 0x%016" PRIxPTR
", const EGLAttrib *attrib_list = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)ctx, target, (uintptr_t)buffer, (uintptr_t)attrib_list);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -881,7 +897,8 @@ EGLImage EGLAPIENTRY CreateImage(EGLDisplay dpy,
EGLBoolean EGLAPIENTRY DestroyImage(EGLDisplay dpy, EGLImage image)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLImage image = 0x%0.8p)", dpy, image);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLImage image = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)image);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
Image *eglImage = static_cast<Image *>(image);
......@@ -897,10 +914,10 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplay(EGLenum platform,
const EGLAttrib *attrib_list)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLenum platform = %d, void* native_display = 0x%0.8p, const EGLint* attrib_list = "
"0x%0.8p)",
platform, native_display, attrib_list);
EVENT("(EGLenum platform = %d, void* native_display = 0x%016" PRIxPTR
", const EGLint* attrib_list = "
"0x%016" PRIxPTR ")",
platform, (uintptr_t)native_display, (uintptr_t)attrib_list);
Thread *thread = GetCurrentThread();
ANGLE_EGL_TRY_RETURN(thread, ValidateGetPlatformDisplay(platform, native_display, attrib_list),
......@@ -930,10 +947,11 @@ EGLSurface EGLAPIENTRY CreatePlatformWindowSurface(EGLDisplay dpy,
const EGLAttrib *attrib_list)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, void* native_window = 0x%0.8p, "
"const EGLint* attrib_list = 0x%0.8p)",
dpy, config, native_window, attrib_list);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR
", void* native_window = 0x%016" PRIxPTR
", "
"const EGLint* attrib_list = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)config, (uintptr_t)native_window, (uintptr_t)attrib_list);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -949,10 +967,11 @@ EGLSurface EGLAPIENTRY CreatePlatformPixmapSurface(EGLDisplay dpy,
const EGLAttrib *attrib_list)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, void* native_pixmap = 0x%0.8p, "
"const EGLint* attrib_list = 0x%0.8p)",
dpy, config, native_pixmap, attrib_list);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR
", void* native_pixmap = 0x%016" PRIxPTR
", "
"const EGLint* attrib_list = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)config, (uintptr_t)native_pixmap, (uintptr_t)attrib_list);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -965,8 +984,9 @@ EGLSurface EGLAPIENTRY CreatePlatformPixmapSurface(EGLDisplay dpy,
EGLBoolean EGLAPIENTRY WaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSync sync = 0x%0.8p, EGLint flags = 0x%X)", dpy, sync,
flags);
EVENT("(EGLDisplay dpy =0x%016" PRIxPTR "p, EGLSync sync = 0x%016" PRIxPTR
", EGLint flags = 0x%X)",
(uintptr_t)dpy, (uintptr_t)sync, flags);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......
src/libGLESv2/entry_points_egl_ext.cpp
......@@ -29,10 +29,10 @@ EGLBoolean EGLAPIENTRY QuerySurfacePointerANGLE(EGLDisplay dpy,
void **value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint attribute = %d, void "
"**value = 0x%0.8p)",
dpy, surface, attribute, value);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
", EGLint attribute = %d, void "
"**value = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)surface, attribute, (uintptr_t)value);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -101,10 +101,10 @@ EGLBoolean EGLAPIENTRY
PostSubBufferNV(EGLDisplay dpy, EGLSurface surface, EGLint x, EGLint y, EGLint width, EGLint height)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint x = %d, EGLint y = %d, "
"EGLint width = %d, EGLint height = %d)",
dpy, surface, x, y, width, height);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
", EGLint x = %d, EGLint y = %d, "
"EGLint width = %d, EGLint height = %d)",
(uintptr_t)dpy, (uintptr_t)surface, x, y, width, height);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
Surface *eglSurface = static_cast<Surface *>(surface);
......@@ -164,10 +164,10 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplayEXT(EGLenum platform,
const EGLint *attrib_list)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLenum platform = %d, void* native_display = 0x%0.8p, const EGLint* attrib_list = "
"0x%0.8p)",
platform, native_display, attrib_list);
EVENT("(EGLenum platform = %d, void* native_display = 0x%016" PRIxPTR
", const EGLint* attrib_list = "
"0x%016" PRIxPTR ")",
platform, (uintptr_t)native_display, (uintptr_t)attrib_list);
Thread *thread = GetCurrentThread();
Error err = ValidateGetPlatformDisplayEXT(platform, native_display, attrib_list);
......@@ -201,10 +201,11 @@ EGLSurface EGLAPIENTRY CreatePlatformWindowSurfaceEXT(EGLDisplay dpy,
const EGLint *attrib_list)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, void *native_window = 0x%0.8p, "
"const EGLint *attrib_list = 0x%0.8p)",
dpy, config, native_window, attrib_list);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR
", void *native_window = 0x%016" PRIxPTR
", "
"const EGLint *attrib_list = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)config, (uintptr_t)native_window, (uintptr_t)attrib_list);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -227,10 +228,11 @@ EGLSurface EGLAPIENTRY CreatePlatformPixmapSurfaceEXT(EGLDisplay dpy,
const EGLint *attrib_list)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, void *native_pixmap = 0x%0.8p, "
"const EGLint *attrib_list = 0x%0.8p)",
dpy, config, native_pixmap, attrib_list);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR
", void *native_pixmap = 0x%016" PRIxPTR
", "
"const EGLint *attrib_list = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)config, (uintptr_t)native_pixmap, (uintptr_t)attrib_list);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -251,8 +253,9 @@ EGLSurface EGLAPIENTRY CreatePlatformPixmapSurfaceEXT(EGLDisplay dpy,
EGLBoolean EGLAPIENTRY QueryDeviceAttribEXT(EGLDeviceEXT device, EGLint attribute, EGLAttrib *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDeviceEXT device = 0x%0.8p, EGLint attribute = %d, EGLAttrib *value = 0x%0.8p)",
device, attribute, value);
EVENT("(EGLDeviceEXT device = 0x%016" PRIxPTR
", EGLint attribute = %d, EGLAttrib *value = 0x%016" PRIxPTR ")",
(uintptr_t)device, attribute, (uintptr_t)value);
Thread *thread = GetCurrentThread();
Device *dev = static_cast<Device *>(device);
......@@ -309,7 +312,7 @@ EGLBoolean EGLAPIENTRY QueryDeviceAttribEXT(EGLDeviceEXT device, EGLint attribut
const char *EGLAPIENTRY QueryDeviceStringEXT(EGLDeviceEXT device, EGLint name)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDeviceEXT device = 0x%0.8p, EGLint name = %d)", device, name);
EVENT("(EGLDeviceEXT device = 0x%016" PRIxPTR ", EGLint name = %d)", (uintptr_t)device, name);
Thread *thread = GetCurrentThread();
Device *dev = static_cast<Device *>(device);
......@@ -341,8 +344,9 @@ const char *EGLAPIENTRY QueryDeviceStringEXT(EGLDeviceEXT device, EGLint name)
EGLBoolean EGLAPIENTRY QueryDisplayAttribEXT(EGLDisplay dpy, EGLint attribute, EGLAttrib *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint attribute = %d, EGLAttrib *value = 0x%0.8p)", dpy,
attribute, value);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR
", EGLint attribute = %d, EGLAttrib *value = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, attribute, (uintptr_t)value);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -385,10 +389,11 @@ ANGLE_EXPORT EGLImageKHR EGLAPIENTRY CreateImageKHR(EGLDisplay dpy,
const EGLint *attrib_list)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLContext ctx = 0x%0.8p, EGLenum target = 0x%X, "
"EGLClientBuffer buffer = 0x%0.8p, const EGLAttrib *attrib_list = 0x%0.8p)",
dpy, ctx, target, buffer, attrib_list);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLContext ctx = 0x%016" PRIxPTR
", EGLenum target = 0x%X, "
"EGLClientBuffer buffer = 0x%016" PRIxPTR
", const EGLAttrib *attrib_list = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)ctx, target, (uintptr_t)buffer, (uintptr_t)attrib_list);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -417,7 +422,8 @@ ANGLE_EXPORT EGLImageKHR EGLAPIENTRY CreateImageKHR(EGLDisplay dpy,
ANGLE_EXPORT EGLBoolean EGLAPIENTRY DestroyImageKHR(EGLDisplay dpy, EGLImageKHR image)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLImage image = 0x%0.8p)", dpy, image);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLImage image = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)image);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -441,10 +447,10 @@ ANGLE_EXPORT EGLDeviceEXT EGLAPIENTRY CreateDeviceANGLE(EGLint device_type,
const EGLAttrib *attrib_list)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLint device_type = %d, void* native_device = 0x%0.8p, const EGLAttrib* attrib_list = "
"0x%0.8p)",
device_type, native_device, attrib_list);
EVENT("(EGLint device_type = %d, void* native_device = 0x%016" PRIxPTR
", const EGLAttrib* attrib_list = "
"0x%016" PRIxPTR ")",
device_type, (uintptr_t)native_device, (uintptr_t)attrib_list);
Thread *thread = GetCurrentThread();
Error error = ValidateCreateDeviceANGLE(device_type, native_device, attrib_list);
......@@ -470,7 +476,7 @@ ANGLE_EXPORT EGLDeviceEXT EGLAPIENTRY CreateDeviceANGLE(EGLint device_type,
ANGLE_EXPORT EGLBoolean EGLAPIENTRY ReleaseDeviceANGLE(EGLDeviceEXT device)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDeviceEXT device = 0x%0.8p)", device);
EVENT("(EGLDeviceEXT device = 0x%016" PRIxPTR ")", (uintptr_t)device);
Thread *thread = GetCurrentThread();
Device *dev = static_cast<Device *>(device);
......@@ -492,7 +498,8 @@ ANGLE_EXPORT EGLBoolean EGLAPIENTRY ReleaseDeviceANGLE(EGLDeviceEXT device)
EGLStreamKHR EGLAPIENTRY CreateStreamKHR(EGLDisplay dpy, const EGLint *attrib_list)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, const EGLAttrib* attrib_list = 0x%0.8p)", dpy, attrib_list);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", const EGLAttrib* attrib_list = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)attrib_list);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -520,7 +527,8 @@ EGLStreamKHR EGLAPIENTRY CreateStreamKHR(EGLDisplay dpy, const EGLint *attrib_li
EGLBoolean EGLAPIENTRY DestroyStreamKHR(EGLDisplay dpy, EGLStreamKHR stream)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR = 0x%0.8p)", dpy, stream);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR = 0x%016" PRIxPTR ")", (uintptr_t)dpy,
(uintptr_t)stream);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -546,10 +554,10 @@ EGLBoolean EGLAPIENTRY StreamAttribKHR(EGLDisplay dpy,
EGLint value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, EGLenum attribute = 0x%X, "
"EGLint value = 0x%X)",
dpy, stream, attribute, value);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR stream = 0x%016" PRIxPTR
", EGLenum attribute = 0x%X, "
"EGLint value = 0x%X)",
(uintptr_t)dpy, (uintptr_t)stream, attribute, value);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -585,10 +593,10 @@ EGLBoolean EGLAPIENTRY QueryStreamKHR(EGLDisplay dpy,
EGLint *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, EGLenum attribute = 0x%X, "
"EGLint value = 0x%0.8p)",
dpy, stream, attribute, value);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR stream = 0x%016" PRIxPTR
", EGLenum attribute = 0x%X, "
"EGLint value = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)stream, attribute, (uintptr_t)value);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -627,10 +635,10 @@ EGLBoolean EGLAPIENTRY QueryStreamu64KHR(EGLDisplay dpy,
EGLuint64KHR *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, EGLenum attribute = 0x%X, "
"EGLuint64KHR value = 0x%0.8p)",
dpy, stream, attribute, value);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR stream = 0x%016" PRIxPTR
", EGLenum attribute = 0x%X, "
"EGLuint64KHR value = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)stream, attribute, (uintptr_t)value);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -663,7 +671,8 @@ EGLBoolean EGLAPIENTRY QueryStreamu64KHR(EGLDisplay dpy,
EGLBoolean EGLAPIENTRY StreamConsumerGLTextureExternalKHR(EGLDisplay dpy, EGLStreamKHR stream)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR = 0x%0.8p)", dpy, stream);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR = 0x%016" PRIxPTR ")", (uintptr_t)dpy,
(uintptr_t)stream);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -693,7 +702,8 @@ EGLBoolean EGLAPIENTRY StreamConsumerGLTextureExternalKHR(EGLDisplay dpy, EGLStr
EGLBoolean EGLAPIENTRY StreamConsumerAcquireKHR(EGLDisplay dpy, EGLStreamKHR stream)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR = 0x%0.8p)", dpy, stream);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR = 0x%016" PRIxPTR ")", (uintptr_t)dpy,
(uintptr_t)stream);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -723,7 +733,8 @@ EGLBoolean EGLAPIENTRY StreamConsumerAcquireKHR(EGLDisplay dpy, EGLStreamKHR str
EGLBoolean EGLAPIENTRY StreamConsumerReleaseKHR(EGLDisplay dpy, EGLStreamKHR stream)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR = 0x%0.8p)", dpy, stream);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR = 0x%016" PRIxPTR ")", (uintptr_t)dpy,
(uintptr_t)stream);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -755,9 +766,9 @@ EGLBoolean EGLAPIENTRY StreamConsumerGLTextureExternalAttribsNV(EGLDisplay dpy,
const EGLAttrib *attrib_list)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, EGLAttrib attrib_list = 0x%0.8p",
dpy, stream, attrib_list);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR stream = 0x%016" PRIxPTR
", EGLAttrib attrib_list = 0x%016" PRIxPTR "",
(uintptr_t)dpy, (uintptr_t)stream, (uintptr_t)attrib_list);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -791,9 +802,9 @@ EGLBoolean EGLAPIENTRY CreateStreamProducerD3DTextureANGLE(EGLDisplay dpy,
const EGLAttrib *attrib_list)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, EGLAttrib attrib_list = 0x%0.8p",
dpy, stream, attrib_list);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR stream = 0x%016" PRIxPTR
", EGLAttrib attrib_list = 0x%016" PRIxPTR "",
(uintptr_t)dpy, (uintptr_t)stream, (uintptr_t)attrib_list);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -826,10 +837,11 @@ EGLBoolean EGLAPIENTRY StreamPostD3DTextureANGLE(EGLDisplay dpy,
const EGLAttrib *attrib_list)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, void* texture = 0x%0.8p, "
"EGLAttrib attrib_list = 0x%0.8p",
dpy, stream, texture, attrib_list);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR stream = 0x%016" PRIxPTR
", void* texture = 0x%016" PRIxPTR
", "
"EGLAttrib attrib_list = 0x%016" PRIxPTR "",
(uintptr_t)dpy, (uintptr_t)stream, (uintptr_t)texture, (uintptr_t)attrib_list);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -863,10 +875,11 @@ EGLBoolean EGLAPIENTRY GetSyncValuesCHROMIUM(EGLDisplay dpy,
EGLuint64KHR *sbc)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLuint64KHR* ust = 0x%0.8p, "
"EGLuint64KHR* msc = 0x%0.8p, EGLuint64KHR* sbc = 0x%0.8p",
dpy, surface, ust, msc, sbc);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
", EGLuint64KHR* ust = 0x%016" PRIxPTR
", "
"EGLuint64KHR* msc = 0x%016" PRIxPTR ", EGLuint64KHR* sbc = 0x%016" PRIxPTR "",
(uintptr_t)dpy, (uintptr_t)surface, (uintptr_t)ust, (uintptr_t)msc, (uintptr_t)sbc);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -898,10 +911,11 @@ EGLBoolean EGLAPIENTRY SwapBuffersWithDamageKHR(EGLDisplay dpy,
EGLint n_rects)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint *rects = 0x%0.8p, EGLint "
"n_rects = %d)",
dpy, surface, rects, n_rects);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
", EGLint *rects = 0x%016" PRIxPTR
", EGLint "
"n_rects = %d)",
(uintptr_t)dpy, (uintptr_t)surface, (uintptr_t)rects, n_rects);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -932,8 +946,9 @@ EGLBoolean EGLAPIENTRY PresentationTimeANDROID(EGLDisplay dpy,
EGLnsecsANDROID time)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLnsecsANDROID time = %d)",
dpy, surface, time);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
", EGLnsecsANDROID time = %llu)",
(uintptr_t)dpy, (uintptr_t)surface, static_cast<unsigned long long>(time));
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -953,10 +968,10 @@ ANGLE_EXPORT void EGLAPIENTRY SetBlobCacheFuncsANDROID(EGLDisplay dpy,
EGLSetBlobFuncANDROID set,
EGLGetBlobFuncANDROID get)
{
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLSetBlobFuncANDROID set = 0x%0.8p, EGLGetBlobFuncANDROID get "
"= 0x%0.8p)",
dpy, set, get);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSetBlobFuncANDROID set = 0x%016" PRIxPTR
", EGLGetBlobFuncANDROID get "
"= 0x%016" PRIxPTR ")",
(uintptr_t)dpy, (uintptr_t)set, (uintptr_t)get);
Thread *thread = GetCurrentThread();
Display *display = static_cast<Display *>(dpy);
......@@ -971,7 +986,7 @@ ANGLE_EXPORT void EGLAPIENTRY SetBlobCacheFuncsANDROID(EGLDisplay dpy,
EGLint EGLAPIENTRY ProgramCacheGetAttribANGLE(EGLDisplay dpy, EGLenum attrib)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLenum attrib = 0x%X)", dpy, attrib);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLenum attrib = 0x%X)", (uintptr_t)dpy, attrib);
Display *display = static_cast<Display *>(dpy);
Thread *thread = GetCurrentThread();
......@@ -991,10 +1006,11 @@ void EGLAPIENTRY ProgramCacheQueryANGLE(EGLDisplay dpy,
EGLint *binarysize)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLint index = %d, void *key = 0x%0.8p, EGLint *keysize = "
"0x%0.8p, void *binary = 0x%0.8p, EGLint *size = 0x%0.8p)",
dpy, index, key, keysize, binary, binarysize);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLint index = %d, void *key = 0x%016" PRIxPTR
", EGLint *keysize = "
"0x%016" PRIxPTR ", void *binary = 0x%016" PRIxPTR ", EGLint *size = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, index, (uintptr_t)key, (uintptr_t)keysize, (uintptr_t)binary,
(uintptr_t)binarysize);
Display *display = static_cast<Display *>(dpy);
Thread *thread = GetCurrentThread();
......@@ -1016,10 +1032,10 @@ void EGLAPIENTRY ProgramCachePopulateANGLE(EGLDisplay dpy,
EGLint binarysize)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8p, void *key = 0x%0.8p, EGLint keysize = %d, void *binary = "
"0x%0.8p, EGLint *size = 0x%0.8p)",
dpy, key, keysize, binary, binarysize);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", void *key = 0x%016" PRIxPTR
", EGLint keysize = %d, void *binary = "
"0x%016" PRIxPTR ", EGLint size = %d)",
(uintptr_t)dpy, (uintptr_t)key, keysize, (uintptr_t)binary, binarysize);
Display *display = static_cast<Display *>(dpy);
Thread *thread = GetCurrentThread();
......@@ -1037,7 +1053,8 @@ void EGLAPIENTRY ProgramCachePopulateANGLE(EGLDisplay dpy,
EGLint EGLAPIENTRY ProgramCacheResizeANGLE(EGLDisplay dpy, EGLint limit, EGLenum mode)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint limit = %d, EGLenum mode = 0x%X)", dpy, limit, mode);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLint limit = %d, EGLenum mode = 0x%X)",
(uintptr_t)dpy, limit, mode);
Display *display = static_cast<Display *>(dpy);
Thread *thread = GetCurrentThread();
......@@ -1052,8 +1069,9 @@ EGLint EGLAPIENTRY ProgramCacheResizeANGLE(EGLDisplay dpy, EGLint limit, EGLenum
EGLint EGLAPIENTRY DebugMessageControlKHR(EGLDEBUGPROCKHR callback, const EGLAttrib *attrib_list)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLDEBUGPROCKHR callback = 0x%0.8p, EGLAttrib attrib_list = 0x%0.8p)", callback,
attrib_list);
EVENT("(EGLDEBUGPROCKHR callback = 0x%016" PRIxPTR ", EGLAttrib attrib_list = 0x%016" PRIxPTR
")",
(uintptr_t)callback, (uintptr_t)attrib_list);
Thread *thread = GetCurrentThread();
......@@ -1076,7 +1094,8 @@ EGLint EGLAPIENTRY DebugMessageControlKHR(EGLDEBUGPROCKHR callback, const EGLAtt
EGLBoolean EGLAPIENTRY QueryDebugKHR(EGLint attribute, EGLAttrib *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(EGLint attribute = 0x%X, EGLAttrib* value = 0x%0.8p)", attribute, value);
EVENT("(EGLint attribute = 0x%X, EGLAttrib* value = 0x%016" PRIxPTR ")", attribute,
(uintptr_t)value);
Thread *thread = GetCurrentThread();
......@@ -1115,10 +1134,11 @@ EGLint EGLAPIENTRY LabelObjectKHR(EGLDisplay dpy,
EGLLabelKHR label)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(EGLDisplay dpy = 0x%0.8pf, EGLenum objectType = 0x%X, EGLObjectKHR object = 0x%0.8p, "
"EGLLabelKHR label = 0x%0.8p)",
dpy, objectType, object, label);
EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR
"f, EGLenum objectType = 0x%X, EGLObjectKHR object = 0x%016" PRIxPTR
", "
"EGLLabelKHR label = 0x%016" PRIxPTR ")",
(uintptr_t)dpy, objectType, (uintptr_t)object, (uintptr_t)label);
Display *display = static_cast<Display *>(dpy);
Thread *thread = GetCurrentThread();
......
src/libGLESv2/entry_points_gles_1_0_autogen.cpp
......@@ -107,7 +107,7 @@ void GL_APIENTRY ClientActiveTexture(GLenum texture)
void GL_APIENTRY ClipPlanef(GLenum p, const GLfloat *eqn)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum p = 0x%X, const GLfloat *eqn = 0x%0.8p)", p, eqn);
EVENT("(GLenum p = 0x%X, const GLfloat *eqn = 0x%016" PRIxPTR ")", p, (uintptr_t)eqn);
Context *context = GetValidGlobalContext();
if (context)
......@@ -124,7 +124,8 @@ void GL_APIENTRY ClipPlanef(GLenum p, const GLfloat *eqn)
void GL_APIENTRY ClipPlanex(GLenum plane, const GLfixed *equation)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum plane = 0x%X, const GLfixed *equation = 0x%0.8p)", plane, equation);
EVENT("(GLenum plane = 0x%X, const GLfixed *equation = 0x%016" PRIxPTR ")", plane,
(uintptr_t)equation);
Context *context = GetValidGlobalContext();
if (context)
......@@ -196,8 +197,9 @@ void GL_APIENTRY ColorPointer(GLint size, GLenum type, GLsizei stride, const voi
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%0.8p)",
size, type, stride, pointer);
"(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = "
"0x%016" PRIxPTR ")",
size, type, stride, (uintptr_t)pointer);
Context *context = GetValidGlobalContext();
if (context)
......@@ -284,7 +286,8 @@ void GL_APIENTRY Fogf(GLenum pname, GLfloat param)
void GL_APIENTRY Fogfv(GLenum pname, const GLfloat *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", pname, params);
EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")", pname,
(uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -318,7 +321,8 @@ void GL_APIENTRY Fogx(GLenum pname, GLfixed param)
void GL_APIENTRY Fogxv(GLenum pname, const GLfixed *param)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, const GLfixed *param = 0x%0.8p)", pname, param);
EVENT("(GLenum pname = 0x%X, const GLfixed *param = 0x%016" PRIxPTR ")", pname,
(uintptr_t)param);
Context *context = GetValidGlobalContext();
if (context)
......@@ -375,7 +379,8 @@ void GL_APIENTRY Frustumx(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n,
void GL_APIENTRY GetClipPlanef(GLenum plane, GLfloat *equation)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum plane = 0x%X, GLfloat *equation = 0x%0.8p)", plane, equation);
EVENT("(GLenum plane = 0x%X, GLfloat *equation = 0x%016" PRIxPTR ")", plane,
(uintptr_t)equation);
Context *context = GetValidGlobalContext();
if (context)
......@@ -392,7 +397,8 @@ void GL_APIENTRY GetClipPlanef(GLenum plane, GLfloat *equation)
void GL_APIENTRY GetClipPlanex(GLenum plane, GLfixed *equation)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum plane = 0x%X, GLfixed *equation = 0x%0.8p)", plane, equation);
EVENT("(GLenum plane = 0x%X, GLfixed *equation = 0x%016" PRIxPTR ")", plane,
(uintptr_t)equation);
Context *context = GetValidGlobalContext();
if (context)
......@@ -409,7 +415,7 @@ void GL_APIENTRY GetClipPlanex(GLenum plane, GLfixed *equation)
void GL_APIENTRY GetFixedv(GLenum pname, GLfixed *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLfixed *params = 0x%0.8p)", pname, params);
EVENT("(GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")", pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -426,8 +432,8 @@ void GL_APIENTRY GetFixedv(GLenum pname, GLfixed *params)
void GL_APIENTRY GetLightfv(GLenum light, GLenum pname, GLfloat *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", light, pname,
params);
EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")", light,
pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -445,8 +451,8 @@ void GL_APIENTRY GetLightfv(GLenum light, GLenum pname, GLfloat *params)
void GL_APIENTRY GetLightxv(GLenum light, GLenum pname, GLfixed *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%0.8p)", light, pname,
params);
EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")", light,
pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -464,8 +470,8 @@ void GL_APIENTRY GetLightxv(GLenum light, GLenum pname, GLfixed *params)
void GL_APIENTRY GetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", face, pname,
params);
EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")", face,
pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -483,8 +489,8 @@ void GL_APIENTRY GetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
void GL_APIENTRY GetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%0.8p)", face, pname,
params);
EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")", face,
pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -502,7 +508,7 @@ void GL_APIENTRY GetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
void GL_APIENTRY GetPointerv(GLenum pname, void **params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, void **params = 0x%0.8p)", pname, params);
EVENT("(GLenum pname = 0x%X, void **params = 0x%016" PRIxPTR ")", pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -519,8 +525,8 @@ void GL_APIENTRY GetPointerv(GLenum pname, void **params)
void GL_APIENTRY GetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", target, pname,
params);
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -540,8 +546,8 @@ void GL_APIENTRY GetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
void GL_APIENTRY GetTexEnviv(GLenum target, GLenum pname, GLint *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname,
params);
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -561,8 +567,8 @@ void GL_APIENTRY GetTexEnviv(GLenum target, GLenum pname, GLint *params)
void GL_APIENTRY GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%0.8p)", target, pname,
params);
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -582,8 +588,8 @@ void GL_APIENTRY GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params)
void GL_APIENTRY GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%0.8p)", target, pname,
params);
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -619,7 +625,8 @@ void GL_APIENTRY LightModelf(GLenum pname, GLfloat param)
void GL_APIENTRY LightModelfv(GLenum pname, const GLfloat *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", pname, params);
EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")", pname,
(uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -653,7 +660,8 @@ void GL_APIENTRY LightModelx(GLenum pname, GLfixed param)
void GL_APIENTRY LightModelxv(GLenum pname, const GLfixed *param)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, const GLfixed *param = 0x%0.8p)", pname, param);
EVENT("(GLenum pname = 0x%X, const GLfixed *param = 0x%016" PRIxPTR ")", pname,
(uintptr_t)param);
Context *context = GetValidGlobalContext();
if (context)
......@@ -688,8 +696,8 @@ void GL_APIENTRY Lightf(GLenum light, GLenum pname, GLfloat param)
void GL_APIENTRY Lightfv(GLenum light, GLenum pname, const GLfloat *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", light,
pname, params);
EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")",
light, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -725,8 +733,8 @@ void GL_APIENTRY Lightx(GLenum light, GLenum pname, GLfixed param)
void GL_APIENTRY Lightxv(GLenum light, GLenum pname, const GLfixed *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%0.8p)", light,
pname, params);
EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%016" PRIxPTR ")",
light, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -778,7 +786,7 @@ void GL_APIENTRY LoadIdentity()
void GL_APIENTRY LoadMatrixf(const GLfloat *m)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(const GLfloat *m = 0x%0.8p)", m);
EVENT("(const GLfloat *m = 0x%016" PRIxPTR ")", (uintptr_t)m);
Context *context = GetValidGlobalContext();
if (context)
......@@ -795,7 +803,7 @@ void GL_APIENTRY LoadMatrixf(const GLfloat *m)
void GL_APIENTRY LoadMatrixx(const GLfixed *m)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(const GLfixed *m = 0x%0.8p)", m);
EVENT("(const GLfixed *m = 0x%016" PRIxPTR ")", (uintptr_t)m);
Context *context = GetValidGlobalContext();
if (context)
......@@ -848,8 +856,8 @@ void GL_APIENTRY Materialf(GLenum face, GLenum pname, GLfloat param)
void GL_APIENTRY Materialfv(GLenum face, GLenum pname, const GLfloat *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", face, pname,
params);
EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")",
face, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -885,8 +893,8 @@ void GL_APIENTRY Materialx(GLenum face, GLenum pname, GLfixed param)
void GL_APIENTRY Materialxv(GLenum face, GLenum pname, const GLfixed *param)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, const GLfixed *param = 0x%0.8p)", face, pname,
param);
EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, const GLfixed *param = 0x%016" PRIxPTR ")",
face, pname, (uintptr_t)param);
Context *context = GetValidGlobalContext();
if (context)
......@@ -922,7 +930,7 @@ void GL_APIENTRY MatrixMode(GLenum mode)
void GL_APIENTRY MultMatrixf(const GLfloat *m)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(const GLfloat *m = 0x%0.8p)", m);
EVENT("(const GLfloat *m = 0x%016" PRIxPTR ")", (uintptr_t)m);
Context *context = GetValidGlobalContext();
if (context)
......@@ -939,7 +947,7 @@ void GL_APIENTRY MultMatrixf(const GLfloat *m)
void GL_APIENTRY MultMatrixx(const GLfixed *m)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(const GLfixed *m = 0x%0.8p)", m);
EVENT("(const GLfixed *m = 0x%016" PRIxPTR ")", (uintptr_t)m);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1028,8 +1036,8 @@ void GL_APIENTRY Normal3x(GLfixed nx, GLfixed ny, GLfixed nz)
void GL_APIENTRY NormalPointer(GLenum type, GLsizei stride, const void *pointer)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%0.8p)", type, stride,
pointer);
EVENT("(GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%016" PRIxPTR ")",
type, stride, (uintptr_t)pointer);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1104,7 +1112,8 @@ void GL_APIENTRY PointParameterf(GLenum pname, GLfloat param)
void GL_APIENTRY PointParameterfv(GLenum pname, const GLfloat *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", pname, params);
EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")", pname,
(uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1140,7 +1149,8 @@ void GL_APIENTRY PointParameterx(GLenum pname, GLfixed param)
void GL_APIENTRY PointParameterxv(GLenum pname, const GLfixed *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, const GLfixed *params = 0x%0.8p)", pname, params);
EVENT("(GLenum pname = 0x%X, const GLfixed *params = 0x%016" PRIxPTR ")", pname,
(uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1348,8 +1358,9 @@ void GL_APIENTRY TexCoordPointer(GLint size, GLenum type, GLsizei stride, const
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%0.8p)",
size, type, stride, pointer);
"(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = "
"0x%016" PRIxPTR ")",
size, type, stride, (uintptr_t)pointer);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1386,8 +1397,8 @@ void GL_APIENTRY TexEnvf(GLenum target, GLenum pname, GLfloat param)
void GL_APIENTRY TexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", target,
pname, params);
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1426,8 +1437,8 @@ void GL_APIENTRY TexEnvi(GLenum target, GLenum pname, GLint param)
void GL_APIENTRY TexEnviv(GLenum target, GLenum pname, const GLint *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%0.8p)", target,
pname, params);
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1467,8 +1478,8 @@ void GL_APIENTRY TexEnvx(GLenum target, GLenum pname, GLfixed param)
void GL_APIENTRY TexEnvxv(GLenum target, GLenum pname, const GLfixed *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%0.8p)", target,
pname, params);
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1507,8 +1518,8 @@ void GL_APIENTRY TexParameterx(GLenum target, GLenum pname, GLfixed param)
void GL_APIENTRY TexParameterxv(GLenum target, GLenum pname, const GLfixed *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%0.8p)", target,
pname, params);
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1562,8 +1573,9 @@ void GL_APIENTRY VertexPointer(GLint size, GLenum type, GLsizei stride, const vo
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%0.8p)",
size, type, stride, pointer);
"(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = "
"0x%016" PRIxPTR ")",
size, type, stride, (uintptr_t)pointer);
Context *context = GetValidGlobalContext();
if (context)
......
src/libGLESv2/entry_points_gles_2_0_autogen.cpp
......@@ -53,8 +53,8 @@ void GL_APIENTRY AttachShader(GLuint program, GLuint shader)
void GL_APIENTRY BindAttribLocation(GLuint program, GLuint index, const GLchar *name)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLuint index = %u, const GLchar *name = 0x%0.8p)", program, index,
name);
EVENT("(GLuint program = %u, GLuint index = %u, const GLchar *name = 0x%016" PRIxPTR ")",
program, index, (uintptr_t)name);
Context *context = GetValidGlobalContext();
if (context)
......@@ -235,10 +235,9 @@ void GL_APIENTRY BlendFuncSeparate(GLenum sfactorRGB,
void GL_APIENTRY BufferData(GLenum target, GLsizeiptr size, const void *data, GLenum usage)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLenum target = 0x%X, GLsizeiptr size = %d, const void *data = 0x%0.8p, GLenum usage = "
"0x%X)",
target, size, data, usage);
EVENT("(GLenum target = 0x%X, GLsizeiptr size = %llu, const void *data = 0x%016" PRIxPTR
", GLenum usage = 0x%X)",
target, static_cast<unsigned long long>(size), (uintptr_t)data, usage);
Context *context = GetValidGlobalContext();
if (context)
......@@ -259,9 +258,10 @@ void GL_APIENTRY BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size,
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr size = %d, const void *data = "
"0x%0.8p)",
target, offset, size, data);
"(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr size = %llu, const void *data = "
"0x%016" PRIxPTR ")",
target, static_cast<unsigned long long>(offset), static_cast<unsigned long long>(size),
(uintptr_t)data);
Context *context = GetValidGlobalContext();
if (context)
......@@ -413,8 +413,8 @@ void GL_APIENTRY CompressedTexImage2D(GLenum target,
EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = "
"%d, GLsizei height = %d, GLint border = %d, GLsizei imageSize = %d, const void *data = "
"0x%0.8p)",
target, level, internalformat, width, height, border, imageSize, data);
"0x%016" PRIxPTR ")",
target, level, internalformat, width, height, border, imageSize, (uintptr_t)data);
Context *context = GetValidGlobalContext();
if (context)
......@@ -447,8 +447,8 @@ void GL_APIENTRY CompressedTexSubImage2D(GLenum target,
EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLsizei "
"width = %d, GLsizei height = %d, GLenum format = 0x%X, GLsizei imageSize = %d, const void "
"*data = 0x%0.8p)",
target, level, xoffset, yoffset, width, height, format, imageSize, data);
"*data = 0x%016" PRIxPTR ")",
target, level, xoffset, yoffset, width, height, format, imageSize, (uintptr_t)data);
Context *context = GetValidGlobalContext();
if (context)
......@@ -590,7 +590,7 @@ void GL_APIENTRY CullFace(GLenum mode)
void GL_APIENTRY DeleteBuffers(GLsizei n, const GLuint *buffers)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *buffers = 0x%0.8p)", n, buffers);
EVENT("(GLsizei n = %d, const GLuint *buffers = 0x%016" PRIxPTR ")", n, (uintptr_t)buffers);
Context *context = GetValidGlobalContext();
if (context)
......@@ -607,7 +607,8 @@ void GL_APIENTRY DeleteBuffers(GLsizei n, const GLuint *buffers)
void GL_APIENTRY DeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *framebuffers = 0x%0.8p)", n, framebuffers);
EVENT("(GLsizei n = %d, const GLuint *framebuffers = 0x%016" PRIxPTR ")", n,
(uintptr_t)framebuffers);
Context *context = GetValidGlobalContext();
if (context)
......@@ -641,7 +642,8 @@ void GL_APIENTRY DeleteProgram(GLuint program)
void GL_APIENTRY DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *renderbuffers = 0x%0.8p)", n, renderbuffers);
EVENT("(GLsizei n = %d, const GLuint *renderbuffers = 0x%016" PRIxPTR ")", n,
(uintptr_t)renderbuffers);
Context *context = GetValidGlobalContext();
if (context)
......@@ -675,7 +677,7 @@ void GL_APIENTRY DeleteShader(GLuint shader)
void GL_APIENTRY DeleteTextures(GLsizei n, const GLuint *textures)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *textures = 0x%0.8p)", n, textures);
EVENT("(GLsizei n = %d, const GLuint *textures = 0x%016" PRIxPTR ")", n, (uintptr_t)textures);
Context *context = GetValidGlobalContext();
if (context)
......@@ -814,8 +816,8 @@ void GL_APIENTRY DrawElements(GLenum mode, GLsizei count, GLenum type, const voi
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = "
"0x%0.8p)",
mode, count, type, indices);
"0x%016" PRIxPTR ")",
mode, count, type, (uintptr_t)indices);
Context *context = GetValidGlobalContext();
if (context)
......@@ -973,7 +975,7 @@ void GL_APIENTRY FrontFace(GLenum mode)
void GL_APIENTRY GenBuffers(GLsizei n, GLuint *buffers)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *buffers = 0x%0.8p)", n, buffers);
EVENT("(GLsizei n = %d, GLuint *buffers = 0x%016" PRIxPTR ")", n, (uintptr_t)buffers);
Context *context = GetValidGlobalContext();
if (context)
......@@ -990,7 +992,7 @@ void GL_APIENTRY GenBuffers(GLsizei n, GLuint *buffers)
void GL_APIENTRY GenFramebuffers(GLsizei n, GLuint *framebuffers)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *framebuffers = 0x%0.8p)", n, framebuffers);
EVENT("(GLsizei n = %d, GLuint *framebuffers = 0x%016" PRIxPTR ")", n, (uintptr_t)framebuffers);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1007,7 +1009,8 @@ void GL_APIENTRY GenFramebuffers(GLsizei n, GLuint *framebuffers)
void GL_APIENTRY GenRenderbuffers(GLsizei n, GLuint *renderbuffers)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *renderbuffers = 0x%0.8p)", n, renderbuffers);
EVENT("(GLsizei n = %d, GLuint *renderbuffers = 0x%016" PRIxPTR ")", n,
(uintptr_t)renderbuffers);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1024,7 +1027,7 @@ void GL_APIENTRY GenRenderbuffers(GLsizei n, GLuint *renderbuffers)
void GL_APIENTRY GenTextures(GLsizei n, GLuint *textures)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *textures = 0x%0.8p)", n, textures);
EVENT("(GLsizei n = %d, GLuint *textures = 0x%016" PRIxPTR ")", n, (uintptr_t)textures);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1066,9 +1069,11 @@ void GL_APIENTRY GetActiveAttrib(GLuint program,
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, "
"GLint *size = 0x%0.8p, GLenum *type = 0x%0.8p, GLchar *name = 0x%0.8p)",
program, index, bufSize, length, size, type, name);
"(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = "
"0x%016" PRIxPTR ", GLint *size = 0x%016" PRIxPTR ", GLenum *type = 0x%016" PRIxPTR
", GLchar *name = 0x%016" PRIxPTR ")",
program, index, bufSize, (uintptr_t)length, (uintptr_t)size, (uintptr_t)type,
(uintptr_t)name);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1094,9 +1099,11 @@ void GL_APIENTRY GetActiveUniform(GLuint program,
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, "
"GLint *size = 0x%0.8p, GLenum *type = 0x%0.8p, GLchar *name = 0x%0.8p)",
program, index, bufSize, length, size, type, name);
"(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = "
"0x%016" PRIxPTR ", GLint *size = 0x%016" PRIxPTR ", GLenum *type = 0x%016" PRIxPTR
", GLchar *name = 0x%016" PRIxPTR ")",
program, index, bufSize, (uintptr_t)length, (uintptr_t)size, (uintptr_t)type,
(uintptr_t)name);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1118,10 +1125,9 @@ void GL_APIENTRY GetAttachedShaders(GLuint program,
GLuint *shaders)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLsizei maxCount = %d, GLsizei *count = 0x%0.8p, GLuint *shaders = "
"0x%0.8p)",
program, maxCount, count, shaders);
EVENT("(GLuint program = %u, GLsizei maxCount = %d, GLsizei *count = 0x%016" PRIxPTR
", GLuint *shaders = 0x%016" PRIxPTR ")",
program, maxCount, (uintptr_t)count, (uintptr_t)shaders);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1139,7 +1145,8 @@ void GL_APIENTRY GetAttachedShaders(GLuint program,
GLint GL_APIENTRY GetAttribLocation(GLuint program, const GLchar *name)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, const GLchar *name = 0x%0.8p)", program, name);
EVENT("(GLuint program = %u, const GLchar *name = 0x%016" PRIxPTR ")", program,
(uintptr_t)name);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1158,7 +1165,7 @@ GLint GL_APIENTRY GetAttribLocation(GLuint program, const GLchar *name)
void GL_APIENTRY GetBooleanv(GLenum pname, GLboolean *data)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLboolean *data = 0x%0.8p)", pname, data);
EVENT("(GLenum pname = 0x%X, GLboolean *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1175,8 +1182,8 @@ void GL_APIENTRY GetBooleanv(GLenum pname, GLboolean *data)
void GL_APIENTRY GetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname,
params);
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1214,7 +1221,7 @@ GLenum GL_APIENTRY GetError()
void GL_APIENTRY GetFloatv(GLenum pname, GLfloat *data)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLfloat *data = 0x%0.8p)", pname, data);
EVENT("(GLenum pname = 0x%X, GLfloat *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1236,8 +1243,8 @@ void GL_APIENTRY GetFramebufferAttachmentParameteriv(GLenum target,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLint *params = "
"0x%0.8p)",
target, attachment, pname, params);
"0x%016" PRIxPTR ")",
target, attachment, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1256,7 +1263,7 @@ void GL_APIENTRY GetFramebufferAttachmentParameteriv(GLenum target,
void GL_APIENTRY GetIntegerv(GLenum pname, GLint *data)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLint *data = 0x%0.8p)", pname, data);
EVENT("(GLenum pname = 0x%X, GLint *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1276,10 +1283,9 @@ void GL_APIENTRY GetProgramInfoLog(GLuint program,
GLchar *infoLog)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *infoLog = "
"0x%0.8p)",
program, bufSize, length, infoLog);
EVENT("(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
", GLchar *infoLog = 0x%016" PRIxPTR ")",
program, bufSize, (uintptr_t)length, (uintptr_t)infoLog);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1297,8 +1303,8 @@ void GL_APIENTRY GetProgramInfoLog(GLuint program,
void GL_APIENTRY GetProgramiv(GLuint program, GLenum pname, GLint *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", program, pname,
params);
EVENT("(GLuint program = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", program,
pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1315,8 +1321,8 @@ void GL_APIENTRY GetProgramiv(GLuint program, GLenum pname, GLint *params)
void GL_APIENTRY GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname,
params);
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1334,10 +1340,9 @@ void GL_APIENTRY GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *
void GL_APIENTRY GetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *infoLog = "
"0x%0.8p)",
shader, bufSize, length, infoLog);
EVENT("(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
", GLchar *infoLog = 0x%016" PRIxPTR ")",
shader, bufSize, (uintptr_t)length, (uintptr_t)infoLog);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1358,10 +1363,9 @@ void GL_APIENTRY GetShaderPrecisionFormat(GLenum shadertype,
GLint *precision)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLenum shadertype = 0x%X, GLenum precisiontype = 0x%X, GLint *range = 0x%0.8p, GLint "
"*precision = 0x%0.8p)",
shadertype, precisiontype, range, precision);
EVENT("(GLenum shadertype = 0x%X, GLenum precisiontype = 0x%X, GLint *range = 0x%016" PRIxPTR
", GLint *precision = 0x%016" PRIxPTR ")",
shadertype, precisiontype, (uintptr_t)range, (uintptr_t)precision);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1380,10 +1384,9 @@ void GL_APIENTRY GetShaderPrecisionFormat(GLenum shadertype,
void GL_APIENTRY GetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *source = "
"0x%0.8p)",
shader, bufSize, length, source);
EVENT("(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
", GLchar *source = 0x%016" PRIxPTR ")",
shader, bufSize, (uintptr_t)length, (uintptr_t)source);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1401,8 +1404,8 @@ void GL_APIENTRY GetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length
void GL_APIENTRY GetShaderiv(GLuint shader, GLenum pname, GLint *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint shader = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", shader, pname,
params);
EVENT("(GLuint shader = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", shader,
pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1438,8 +1441,8 @@ const GLubyte *GL_APIENTRY GetString(GLenum name)
void GL_APIENTRY GetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", target, pname,
params);
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1458,8 +1461,8 @@ void GL_APIENTRY GetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
void GL_APIENTRY GetTexParameteriv(GLenum target, GLenum pname, GLint *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname,
params);
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1478,7 +1481,8 @@ void GL_APIENTRY GetTexParameteriv(GLenum target, GLenum pname, GLint *params)
GLint GL_APIENTRY GetUniformLocation(GLuint program, const GLchar *name)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, const GLchar *name = 0x%0.8p)", program, name);
EVENT("(GLuint program = %u, const GLchar *name = 0x%016" PRIxPTR ")", program,
(uintptr_t)name);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1497,8 +1501,8 @@ GLint GL_APIENTRY GetUniformLocation(GLuint program, const GLchar *name)
void GL_APIENTRY GetUniformfv(GLuint program, GLint location, GLfloat *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLint location = %d, GLfloat *params = 0x%0.8p)", program,
location, params);
EVENT("(GLuint program = %u, GLint location = %d, GLfloat *params = 0x%016" PRIxPTR ")",
program, location, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1515,8 +1519,8 @@ void GL_APIENTRY GetUniformfv(GLuint program, GLint location, GLfloat *params)
void GL_APIENTRY GetUniformiv(GLuint program, GLint location, GLint *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLint location = %d, GLint *params = 0x%0.8p)", program, location,
params);
EVENT("(GLuint program = %u, GLint location = %d, GLint *params = 0x%016" PRIxPTR ")", program,
location, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1533,8 +1537,8 @@ void GL_APIENTRY GetUniformiv(GLuint program, GLint location, GLint *params)
void GL_APIENTRY GetVertexAttribPointerv(GLuint index, GLenum pname, void **pointer)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, GLenum pname = 0x%X, void **pointer = 0x%0.8p)", index, pname,
pointer);
EVENT("(GLuint index = %u, GLenum pname = 0x%X, void **pointer = 0x%016" PRIxPTR ")", index,
pname, (uintptr_t)pointer);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1552,8 +1556,8 @@ void GL_APIENTRY GetVertexAttribPointerv(GLuint index, GLenum pname, void **poin
void GL_APIENTRY GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", index, pname,
params);
EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")", index,
pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1570,8 +1574,8 @@ void GL_APIENTRY GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
void GL_APIENTRY GetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", index, pname,
params);
EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", index,
pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1814,8 +1818,8 @@ void GL_APIENTRY ReadPixels(GLint x,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = "
"0x%X, GLenum type = 0x%X, void *pixels = 0x%0.8p)",
x, y, width, height, format, type, pixels);
"0x%X, GLenum type = 0x%X, void *pixels = 0x%016" PRIxPTR ")",
x, y, width, height, format, type, (uintptr_t)pixels);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1914,10 +1918,10 @@ void GL_APIENTRY ShaderBinary(GLsizei count,
GLsizei length)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLsizei count = %d, const GLuint *shaders = 0x%0.8p, GLenum binaryformat = 0x%X, const "
"void *binary = 0x%0.8p, GLsizei length = %d)",
count, shaders, binaryformat, binary, length);
EVENT("(GLsizei count = %d, const GLuint *shaders = 0x%016" PRIxPTR
", GLenum binaryformat = 0x%X, const void *binary = 0x%016" PRIxPTR
", GLsizei length = %d)",
count, (uintptr_t)shaders, binaryformat, (uintptr_t)binary, length);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1939,10 +1943,9 @@ void GL_APIENTRY ShaderSource(GLuint shader,
const GLint *length)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint shader = %u, GLsizei count = %d, const GLchar *const*string = 0x%0.8p, const "
"GLint *length = 0x%0.8p)",
shader, count, string, length);
EVENT("(GLuint shader = %u, GLsizei count = %d, const GLchar *const*string = 0x%016" PRIxPTR
", const GLint *length = 0x%016" PRIxPTR ")",
shader, count, (uintptr_t)string, (uintptr_t)length);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2077,8 +2080,8 @@ void GL_APIENTRY TexImage2D(GLenum target,
EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, "
"GLsizei height = %d, GLint border = %d, GLenum format = 0x%X, GLenum type = 0x%X, const "
"void *pixels = 0x%0.8p)",
target, level, internalformat, width, height, border, format, type, pixels);
"void *pixels = 0x%016" PRIxPTR ")",
target, level, internalformat, width, height, border, format, type, (uintptr_t)pixels);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2118,8 +2121,8 @@ void GL_APIENTRY TexParameterf(GLenum target, GLenum pname, GLfloat param)
void GL_APIENTRY TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", target,
pname, params);
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2156,8 +2159,8 @@ void GL_APIENTRY TexParameteri(GLenum target, GLenum pname, GLint param)
void GL_APIENTRY TexParameteriv(GLenum target, GLenum pname, const GLint *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%0.8p)", target,
pname, params);
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2187,8 +2190,8 @@ void GL_APIENTRY TexSubImage2D(GLenum target,
EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLsizei "
"width = %d, GLsizei height = %d, GLenum format = 0x%X, GLenum type = 0x%X, const void "
"*pixels = 0x%0.8p)",
target, level, xoffset, yoffset, width, height, format, type, pixels);
"*pixels = 0x%016" PRIxPTR ")",
target, level, xoffset, yoffset, width, height, format, type, (uintptr_t)pixels);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2227,8 +2230,8 @@ void GL_APIENTRY Uniform1f(GLint location, GLfloat v0)
void GL_APIENTRY Uniform1fv(GLint location, GLsizei count, const GLfloat *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%0.8p)", location,
count, value);
EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2262,8 +2265,8 @@ void GL_APIENTRY Uniform1i(GLint location, GLint v0)
void GL_APIENTRY Uniform1iv(GLint location, GLsizei count, const GLint *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%0.8p)", location,
count, value);
EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2297,8 +2300,8 @@ void GL_APIENTRY Uniform2f(GLint location, GLfloat v0, GLfloat v1)
void GL_APIENTRY Uniform2fv(GLint location, GLsizei count, const GLfloat *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%0.8p)", location,
count, value);
EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2332,8 +2335,8 @@ void GL_APIENTRY Uniform2i(GLint location, GLint v0, GLint v1)
void GL_APIENTRY Uniform2iv(GLint location, GLsizei count, const GLint *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%0.8p)", location,
count, value);
EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2368,8 +2371,8 @@ void GL_APIENTRY Uniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
void GL_APIENTRY Uniform3fv(GLint location, GLsizei count, const GLfloat *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%0.8p)", location,
count, value);
EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2404,8 +2407,8 @@ void GL_APIENTRY Uniform3i(GLint location, GLint v0, GLint v1, GLint v2)
void GL_APIENTRY Uniform3iv(GLint location, GLsizei count, const GLint *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%0.8p)", location,
count, value);
EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2441,8 +2444,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)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%0.8p)", location,
count, value);
EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2477,8 +2480,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)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%0.8p)", location,
count, value);
EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2500,8 +2503,8 @@ void GL_APIENTRY UniformMatrix2fv(GLint location,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
"= 0x%0.8p)",
location, count, transpose, value);
"= 0x%016" PRIxPTR ")",
location, count, transpose, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2524,8 +2527,8 @@ void GL_APIENTRY UniformMatrix3fv(GLint location,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
"= 0x%0.8p)",
location, count, transpose, value);
"= 0x%016" PRIxPTR ")",
location, count, transpose, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2548,8 +2551,8 @@ void GL_APIENTRY UniformMatrix4fv(GLint location,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
"= 0x%0.8p)",
location, count, transpose, value);
"= 0x%016" PRIxPTR ")",
location, count, transpose, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2618,7 +2621,7 @@ void GL_APIENTRY VertexAttrib1f(GLuint index, GLfloat x)
void GL_APIENTRY VertexAttrib1fv(GLuint index, const GLfloat *v)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v);
EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2652,7 +2655,7 @@ void GL_APIENTRY VertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
void GL_APIENTRY VertexAttrib2fv(GLuint index, const GLfloat *v)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v);
EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2686,7 +2689,7 @@ void GL_APIENTRY VertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
void GL_APIENTRY VertexAttrib3fv(GLuint index, const GLfloat *v)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v);
EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2721,7 +2724,7 @@ void GL_APIENTRY VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, G
void GL_APIENTRY VertexAttrib4fv(GLuint index, const GLfloat *v)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v);
EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2745,8 +2748,8 @@ void GL_APIENTRY VertexAttribPointer(GLuint index,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint index = %u, GLint size = %d, GLenum type = 0x%X, GLboolean normalized = %u, "
"GLsizei stride = %d, const void *pointer = 0x%0.8p)",
index, size, type, normalized, stride, pointer);
"GLsizei stride = %d, const void *pointer = 0x%016" PRIxPTR ")",
index, size, type, normalized, stride, (uintptr_t)pointer);
Context *context = GetValidGlobalContext();
if (context)
......
src/libGLESv2/entry_points_gles_3_0_autogen.cpp
......@@ -77,9 +77,10 @@ BindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLs
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLenum target = 0x%X, GLuint index = %u, GLuint buffer = %u, GLintptr offset = %d, "
"GLsizeiptr size = %d)",
target, index, buffer, offset, size);
"(GLenum target = 0x%X, GLuint index = %u, GLuint buffer = %u, GLintptr offset = %llu, "
"GLsizeiptr size = %llu)",
target, index, buffer, static_cast<unsigned long long>(offset),
static_cast<unsigned long long>(size));
Context *context = GetValidGlobalContext();
if (context)
......@@ -203,8 +204,8 @@ void GL_APIENTRY ClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, G
void GL_APIENTRY ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLfloat *value = 0x%0.8p)", buffer,
drawbuffer, value);
EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLfloat *value = 0x%016" PRIxPTR ")",
buffer, drawbuffer, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -221,8 +222,8 @@ void GL_APIENTRY ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *v
void GL_APIENTRY ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLint *value = 0x%0.8p)", buffer,
drawbuffer, value);
EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLint *value = 0x%016" PRIxPTR ")",
buffer, drawbuffer, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -239,8 +240,8 @@ void GL_APIENTRY ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *val
void GL_APIENTRY ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLuint *value = 0x%0.8p)", buffer,
drawbuffer, value);
EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLuint *value = 0x%016" PRIxPTR ")",
buffer, drawbuffer, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -257,8 +258,8 @@ void GL_APIENTRY ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *v
GLenum GL_APIENTRY ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsync sync = 0x%0.8p, GLbitfield flags = 0x%X, GLuint64 timeout = %llu)", sync, flags,
timeout);
EVENT("(GLsync sync = 0x%016" PRIxPTR ", GLbitfield flags = 0x%X, GLuint64 timeout = %llu)",
(uintptr_t)sync, flags, static_cast<unsigned long long>(timeout));
Context *context = GetValidGlobalContext();
if (context)
......@@ -288,8 +289,8 @@ void GL_APIENTRY CompressedTexImage3D(GLenum target,
EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = "
"%d, GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLsizei imageSize = %d, "
"const void *data = 0x%0.8p)",
target, level, internalformat, width, height, depth, border, imageSize, data);
"const void *data = 0x%016" PRIxPTR ")",
target, level, internalformat, width, height, depth, border, imageSize, (uintptr_t)data);
Context *context = GetValidGlobalContext();
if (context)
......@@ -324,8 +325,9 @@ void GL_APIENTRY CompressedTexSubImage3D(GLenum target,
EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint "
"zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format "
"= 0x%X, GLsizei imageSize = %d, const void *data = 0x%0.8p)",
target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
"= 0x%X, GLsizei imageSize = %d, const void *data = 0x%016" PRIxPTR ")",
target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize,
(uintptr_t)data);
Context *context = GetValidGlobalContext();
if (context)
......@@ -353,9 +355,10 @@ void GL_APIENTRY CopyBufferSubData(GLenum readTarget,
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLenum readTarget = 0x%X, GLenum writeTarget = 0x%X, GLintptr readOffset = %d, GLintptr "
"writeOffset = %d, GLsizeiptr size = %d)",
readTarget, writeTarget, readOffset, writeOffset, size);
"(GLenum readTarget = 0x%X, GLenum writeTarget = 0x%X, GLintptr readOffset = %llu, "
"GLintptr writeOffset = %llu, GLsizeiptr size = %llu)",
readTarget, writeTarget, static_cast<unsigned long long>(readOffset),
static_cast<unsigned long long>(writeOffset), static_cast<unsigned long long>(size));
Context *context = GetValidGlobalContext();
if (context)
......@@ -411,7 +414,7 @@ void GL_APIENTRY CopyTexSubImage3D(GLenum target,
void GL_APIENTRY DeleteQueries(GLsizei n, const GLuint *ids)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *ids = 0x%0.8p)", n, ids);
EVENT("(GLsizei n = %d, const GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids);
Context *context = GetValidGlobalContext();
if (context)
......@@ -428,7 +431,8 @@ void GL_APIENTRY DeleteQueries(GLsizei n, const GLuint *ids)
void GL_APIENTRY DeleteSamplers(GLsizei count, const GLuint *samplers)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei count = %d, const GLuint *samplers = 0x%0.8p)", count, samplers);
EVENT("(GLsizei count = %d, const GLuint *samplers = 0x%016" PRIxPTR ")", count,
(uintptr_t)samplers);
Context *context = GetValidGlobalContext();
if (context)
......@@ -445,7 +449,7 @@ void GL_APIENTRY DeleteSamplers(GLsizei count, const GLuint *samplers)
void GL_APIENTRY DeleteSync(GLsync sync)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsync sync = 0x%0.8p)", sync);
EVENT("(GLsync sync = 0x%016" PRIxPTR ")", (uintptr_t)sync);
Context *context = GetValidGlobalContext();
if (context)
......@@ -462,7 +466,7 @@ void GL_APIENTRY DeleteSync(GLsync sync)
void GL_APIENTRY DeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *ids = 0x%0.8p)", n, ids);
EVENT("(GLsizei n = %d, const GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids);
Context *context = GetValidGlobalContext();
if (context)
......@@ -479,7 +483,7 @@ void GL_APIENTRY DeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
void GL_APIENTRY DeleteVertexArrays(GLsizei n, const GLuint *arrays)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *arrays = 0x%0.8p)", n, arrays);
EVENT("(GLsizei n = %d, const GLuint *arrays = 0x%016" PRIxPTR ")", n, (uintptr_t)arrays);
Context *context = GetValidGlobalContext();
if (context)
......@@ -517,7 +521,7 @@ void GL_APIENTRY DrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GL
void GL_APIENTRY DrawBuffers(GLsizei n, const GLenum *bufs)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLenum *bufs = 0x%0.8p)", n, bufs);
EVENT("(GLsizei n = %d, const GLenum *bufs = 0x%016" PRIxPTR ")", n, (uintptr_t)bufs);
Context *context = GetValidGlobalContext();
if (context)
......@@ -540,8 +544,8 @@ void GL_APIENTRY DrawElementsInstanced(GLenum mode,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = "
"0x%0.8p, GLsizei instancecount = %d)",
mode, count, type, indices, instancecount);
"0x%016" PRIxPTR ", GLsizei instancecount = %d)",
mode, count, type, (uintptr_t)indices, instancecount);
Context *context = GetValidGlobalContext();
if (context)
......@@ -568,8 +572,8 @@ void GL_APIENTRY DrawRangeElements(GLenum mode,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLenum mode = 0x%X, GLuint start = %u, GLuint end = %u, GLsizei count = %d, GLenum type "
"= 0x%X, const void *indices = 0x%0.8p)",
mode, start, end, count, type, indices);
"= 0x%X, const void *indices = 0x%016" PRIxPTR ")",
mode, start, end, count, type, (uintptr_t)indices);
Context *context = GetValidGlobalContext();
if (context)
......@@ -643,8 +647,8 @@ GLsync GL_APIENTRY FenceSync(GLenum condition, GLbitfield flags)
void GL_APIENTRY FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr length = %d)", target, offset,
length);
EVENT("(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr length = %llu)", target,
static_cast<unsigned long long>(offset), static_cast<unsigned long long>(length));
Context *context = GetValidGlobalContext();
if (context)
......@@ -686,7 +690,7 @@ FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint
void GL_APIENTRY GenQueries(GLsizei n, GLuint *ids)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *ids = 0x%0.8p)", n, ids);
EVENT("(GLsizei n = %d, GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids);
Context *context = GetValidGlobalContext();
if (context)
......@@ -703,7 +707,7 @@ void GL_APIENTRY GenQueries(GLsizei n, GLuint *ids)
void GL_APIENTRY GenSamplers(GLsizei count, GLuint *samplers)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei count = %d, GLuint *samplers = 0x%0.8p)", count, samplers);
EVENT("(GLsizei count = %d, GLuint *samplers = 0x%016" PRIxPTR ")", count, (uintptr_t)samplers);
Context *context = GetValidGlobalContext();
if (context)
......@@ -720,7 +724,7 @@ void GL_APIENTRY GenSamplers(GLsizei count, GLuint *samplers)
void GL_APIENTRY GenTransformFeedbacks(GLsizei n, GLuint *ids)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *ids = 0x%0.8p)", n, ids);
EVENT("(GLsizei n = %d, GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids);
Context *context = GetValidGlobalContext();
if (context)
......@@ -737,7 +741,7 @@ void GL_APIENTRY GenTransformFeedbacks(GLsizei n, GLuint *ids)
void GL_APIENTRY GenVertexArrays(GLsizei n, GLuint *arrays)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *arrays = 0x%0.8p)", n, arrays);
EVENT("(GLsizei n = %d, GLuint *arrays = 0x%016" PRIxPTR ")", n, (uintptr_t)arrays);
Context *context = GetValidGlobalContext();
if (context)
......@@ -760,8 +764,8 @@ void GL_APIENTRY GetActiveUniformBlockName(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLuint uniformBlockIndex = %u, GLsizei bufSize = %d, GLsizei "
"*length = 0x%0.8p, GLchar *uniformBlockName = 0x%0.8p)",
program, uniformBlockIndex, bufSize, length, uniformBlockName);
"*length = 0x%016" PRIxPTR ", GLchar *uniformBlockName = 0x%016" PRIxPTR ")",
program, uniformBlockIndex, bufSize, (uintptr_t)length, (uintptr_t)uniformBlockName);
Context *context = GetValidGlobalContext();
if (context)
......@@ -787,8 +791,8 @@ void GL_APIENTRY GetActiveUniformBlockiv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLuint uniformBlockIndex = %u, GLenum pname = 0x%X, GLint *params = "
"0x%0.8p)",
program, uniformBlockIndex, pname, params);
"0x%016" PRIxPTR ")",
program, uniformBlockIndex, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -812,9 +816,9 @@ void GL_APIENTRY GetActiveUniformsiv(GLuint program,
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLsizei uniformCount = %d, const GLuint *uniformIndices = 0x%0.8p, "
"GLenum pname = 0x%X, GLint *params = 0x%0.8p)",
program, uniformCount, uniformIndices, pname, params);
"(GLuint program = %u, GLsizei uniformCount = %d, const GLuint *uniformIndices = "
"0x%016" PRIxPTR ", GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")",
program, uniformCount, (uintptr_t)uniformIndices, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -833,8 +837,8 @@ void GL_APIENTRY GetActiveUniformsiv(GLuint program,
void GL_APIENTRY GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint64 *params = 0x%0.8p)", target, pname,
params);
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint64 *params = 0x%016" PRIxPTR ")",
target, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -853,8 +857,8 @@ void GL_APIENTRY GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *pa
void GL_APIENTRY GetBufferPointerv(GLenum target, GLenum pname, void **params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, void **params = 0x%0.8p)", target, pname,
params);
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, void **params = 0x%016" PRIxPTR ")", target,
pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -873,7 +877,8 @@ void GL_APIENTRY GetBufferPointerv(GLenum target, GLenum pname, void **params)
GLint GL_APIENTRY GetFragDataLocation(GLuint program, const GLchar *name)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, const GLchar *name = 0x%0.8p)", program, name);
EVENT("(GLuint program = %u, const GLchar *name = 0x%016" PRIxPTR ")", program,
(uintptr_t)name);
Context *context = GetValidGlobalContext();
if (context)
......@@ -892,8 +897,8 @@ GLint GL_APIENTRY GetFragDataLocation(GLuint program, const GLchar *name)
void GL_APIENTRY GetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLuint index = %u, GLint64 *data = 0x%0.8p)", target, index,
data);
EVENT("(GLenum target = 0x%X, GLuint index = %u, GLint64 *data = 0x%016" PRIxPTR ")", target,
index, (uintptr_t)data);
Context *context = GetValidGlobalContext();
if (context)
......@@ -910,7 +915,7 @@ void GL_APIENTRY GetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
void GL_APIENTRY GetInteger64v(GLenum pname, GLint64 *data)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLint64 *data = 0x%0.8p)", pname, data);
EVENT("(GLenum pname = 0x%X, GLint64 *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data);
Context *context = GetValidGlobalContext();
if (context)
......@@ -927,7 +932,8 @@ void GL_APIENTRY GetInteger64v(GLenum pname, GLint64 *data)
void GL_APIENTRY GetIntegeri_v(GLenum target, GLuint index, GLint *data)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLuint index = %u, GLint *data = 0x%0.8p)", target, index, data);
EVENT("(GLenum target = 0x%X, GLuint index = %u, GLint *data = 0x%016" PRIxPTR ")", target,
index, (uintptr_t)data);
Context *context = GetValidGlobalContext();
if (context)
......@@ -950,8 +956,8 @@ void GL_APIENTRY GetInternalformativ(GLenum target,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLenum pname = 0x%X, GLsizei bufSize "
"= %d, GLint *params = 0x%0.8p)",
target, internalformat, pname, bufSize, params);
"= %d, GLint *params = 0x%016" PRIxPTR ")",
target, internalformat, pname, bufSize, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -974,10 +980,9 @@ void GL_APIENTRY GetProgramBinary(GLuint program,
void *binary)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLenum "
"*binaryFormat = 0x%0.8p, void *binary = 0x%0.8p)",
program, bufSize, length, binaryFormat, binary);
EVENT("(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
", GLenum *binaryFormat = 0x%016" PRIxPTR ", void *binary = 0x%016" PRIxPTR ")",
program, bufSize, (uintptr_t)length, (uintptr_t)binaryFormat, (uintptr_t)binary);
Context *context = GetValidGlobalContext();
if (context)
......@@ -996,7 +1001,8 @@ void GL_APIENTRY GetProgramBinary(GLuint program,
void GL_APIENTRY GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLuint *params = 0x%0.8p)", id, pname, params);
EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLuint *params = 0x%016" PRIxPTR ")", id, pname,
(uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1013,8 +1019,8 @@ void GL_APIENTRY GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
void GL_APIENTRY GetQueryiv(GLenum target, GLenum pname, GLint *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname,
params);
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1032,8 +1038,8 @@ void GL_APIENTRY GetQueryiv(GLenum target, GLenum pname, GLint *params)
void GL_APIENTRY GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", sampler, pname,
params);
EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")",
sampler, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1051,8 +1057,8 @@ void GL_APIENTRY GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *pa
void GL_APIENTRY GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", sampler, pname,
params);
EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", sampler,
pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1090,10 +1096,10 @@ void GL_APIENTRY
GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLsync sync = 0x%0.8p, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei *length = "
"0x%0.8p, GLint *values = 0x%0.8p)",
sync, pname, bufSize, length, values);
EVENT("(GLsync sync = 0x%016" PRIxPTR
", GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
", GLint *values = 0x%016" PRIxPTR ")",
(uintptr_t)sync, pname, bufSize, (uintptr_t)length, (uintptr_t)values);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1118,9 +1124,11 @@ void GL_APIENTRY GetTransformFeedbackVarying(GLuint program,
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, "
"GLsizei *size = 0x%0.8p, GLenum *type = 0x%0.8p, GLchar *name = 0x%0.8p)",
program, index, bufSize, length, size, type, name);
"(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = "
"0x%016" PRIxPTR ", GLsizei *size = 0x%016" PRIxPTR ", GLenum *type = 0x%016" PRIxPTR
", GLchar *name = 0x%016" PRIxPTR ")",
program, index, bufSize, (uintptr_t)length, (uintptr_t)size, (uintptr_t)type,
(uintptr_t)name);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1140,8 +1148,8 @@ void GL_APIENTRY GetTransformFeedbackVarying(GLuint program,
GLuint GL_APIENTRY GetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, const GLchar *uniformBlockName = 0x%0.8p)", program,
uniformBlockName);
EVENT("(GLuint program = %u, const GLchar *uniformBlockName = 0x%016" PRIxPTR ")", program,
(uintptr_t)uniformBlockName);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1166,8 +1174,8 @@ void GL_APIENTRY GetUniformIndices(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLsizei uniformCount = %d, const GLchar *const*uniformNames = "
"0x%0.8p, GLuint *uniformIndices = 0x%0.8p)",
program, uniformCount, uniformNames, uniformIndices);
"0x%016" PRIxPTR ", GLuint *uniformIndices = 0x%016" PRIxPTR ")",
program, uniformCount, (uintptr_t)uniformNames, (uintptr_t)uniformIndices);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1186,8 +1194,8 @@ void GL_APIENTRY GetUniformIndices(GLuint program,
void GL_APIENTRY GetUniformuiv(GLuint program, GLint location, GLuint *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLint location = %d, GLuint *params = 0x%0.8p)", program, location,
params);
EVENT("(GLuint program = %u, GLint location = %d, GLuint *params = 0x%016" PRIxPTR ")", program,
location, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1204,8 +1212,8 @@ void GL_APIENTRY GetUniformuiv(GLuint program, GLint location, GLuint *params)
void GL_APIENTRY GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", index, pname,
params);
EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", index,
pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1222,8 +1230,8 @@ void GL_APIENTRY GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
void GL_APIENTRY GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLuint *params = 0x%0.8p)", index, pname,
params);
EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLuint *params = 0x%016" PRIxPTR ")", index,
pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1243,8 +1251,9 @@ void GL_APIENTRY InvalidateFramebuffer(GLenum target,
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = 0x%0.8p)",
target, numAttachments, attachments);
"(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = "
"0x%016" PRIxPTR ")",
target, numAttachments, (uintptr_t)attachments);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1270,9 +1279,9 @@ void GL_APIENTRY InvalidateSubFramebuffer(GLenum target,
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = 0x%0.8p, "
"GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",
target, numAttachments, attachments, x, y, width, height);
"(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = "
"0x%016" PRIxPTR ", GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",
target, numAttachments, (uintptr_t)attachments, x, y, width, height);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1331,7 +1340,7 @@ GLboolean GL_APIENTRY IsSampler(GLuint sampler)
GLboolean GL_APIENTRY IsSync(GLsync sync)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsync sync = 0x%0.8p)", sync);
EVENT("(GLsync sync = 0x%016" PRIxPTR ")", (uintptr_t)sync);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1392,9 +1401,10 @@ void *GL_APIENTRY MapBufferRange(GLenum target,
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr length = %d, GLbitfield access = "
"0x%X)",
target, offset, length, access);
"(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr length = %llu, GLbitfield "
"access = 0x%X)",
target, static_cast<unsigned long long>(offset), static_cast<unsigned long long>(length),
access);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1435,10 +1445,9 @@ void GL_APIENTRY ProgramBinary(GLuint program,
GLsizei length)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLenum binaryFormat = 0x%X, const void *binary = 0x%0.8p, GLsizei "
"length = %d)",
program, binaryFormat, binary, length);
EVENT("(GLuint program = %u, GLenum binaryFormat = 0x%X, const void *binary = 0x%016" PRIxPTR
", GLsizei length = %d)",
program, binaryFormat, (uintptr_t)binary, length);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1551,8 +1560,8 @@ void GL_APIENTRY SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
void GL_APIENTRY SamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLfloat *param = 0x%0.8p)", sampler,
pname, param);
EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLfloat *param = 0x%016" PRIxPTR ")",
sampler, pname, (uintptr_t)param);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1586,8 +1595,8 @@ void GL_APIENTRY SamplerParameteri(GLuint sampler, GLenum pname, GLint param)
void GL_APIENTRY SamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLint *param = 0x%0.8p)", sampler,
pname, param);
EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLint *param = 0x%016" PRIxPTR ")",
sampler, pname, (uintptr_t)param);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1616,8 +1625,9 @@ void GL_APIENTRY TexImage3D(GLenum target,
EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, "
"GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLenum format = 0x%X, GLenum "
"type = 0x%X, const void *pixels = 0x%0.8p)",
target, level, internalformat, width, height, depth, border, format, type, pixels);
"type = 0x%X, const void *pixels = 0x%016" PRIxPTR ")",
target, level, internalformat, width, height, depth, border, format, type,
(uintptr_t)pixels);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1704,8 +1714,9 @@ void GL_APIENTRY TexSubImage3D(GLenum target,
EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint "
"zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format "
"= 0x%X, GLenum type = 0x%X, const void *pixels = 0x%0.8p)",
target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
"= 0x%X, GLenum type = 0x%X, const void *pixels = 0x%016" PRIxPTR ")",
target, level, xoffset, yoffset, zoffset, width, height, depth, format, type,
(uintptr_t)pixels);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1731,10 +1742,9 @@ void GL_APIENTRY TransformFeedbackVaryings(GLuint program,
GLenum bufferMode)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLsizei count = %d, const GLchar *const*varyings = 0x%0.8p, GLenum "
"bufferMode = 0x%X)",
program, count, varyings, bufferMode);
EVENT("(GLuint program = %u, GLsizei count = %d, const GLchar *const*varyings = 0x%016" PRIxPTR
", GLenum bufferMode = 0x%X)",
program, count, (uintptr_t)varyings, bufferMode);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1770,8 +1780,8 @@ void GL_APIENTRY Uniform1ui(GLint location, GLuint v0)
void GL_APIENTRY Uniform1uiv(GLint location, GLsizei count, const GLuint *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%0.8p)", location,
count, value);
EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1805,8 +1815,8 @@ void GL_APIENTRY Uniform2ui(GLint location, GLuint v0, GLuint v1)
void GL_APIENTRY Uniform2uiv(GLint location, GLsizei count, const GLuint *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%0.8p)", location,
count, value);
EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1841,8 +1851,8 @@ void GL_APIENTRY Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
void GL_APIENTRY Uniform3uiv(GLint location, GLsizei count, const GLuint *value)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%0.8p)", location,
count, value);
EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1877,8 +1887,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)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%0.8p)", location,
count, value);
EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%016" PRIxPTR ")",
location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1922,8 +1932,8 @@ void GL_APIENTRY UniformMatrix2x3fv(GLint location,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
"= 0x%0.8p)",
location, count, transpose, value);
"= 0x%016" PRIxPTR ")",
location, count, transpose, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1946,8 +1956,8 @@ void GL_APIENTRY UniformMatrix2x4fv(GLint location,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
"= 0x%0.8p)",
location, count, transpose, value);
"= 0x%016" PRIxPTR ")",
location, count, transpose, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1970,8 +1980,8 @@ void GL_APIENTRY UniformMatrix3x2fv(GLint location,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
"= 0x%0.8p)",
location, count, transpose, value);
"= 0x%016" PRIxPTR ")",
location, count, transpose, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1994,8 +2004,8 @@ void GL_APIENTRY UniformMatrix3x4fv(GLint location,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
"= 0x%0.8p)",
location, count, transpose, value);
"= 0x%016" PRIxPTR ")",
location, count, transpose, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2018,8 +2028,8 @@ void GL_APIENTRY UniformMatrix4x2fv(GLint location,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
"= 0x%0.8p)",
location, count, transpose, value);
"= 0x%016" PRIxPTR ")",
location, count, transpose, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2042,8 +2052,8 @@ void GL_APIENTRY UniformMatrix4x3fv(GLint location,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
"= 0x%0.8p)",
location, count, transpose, value);
"= 0x%016" PRIxPTR ")",
location, count, transpose, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2116,7 +2126,7 @@ void GL_APIENTRY VertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint
void GL_APIENTRY VertexAttribI4iv(GLuint index, const GLint *v)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, const GLint *v = 0x%0.8p)", index, v);
EVENT("(GLuint index = %u, const GLint *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2151,7 +2161,7 @@ void GL_APIENTRY VertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GL
void GL_APIENTRY VertexAttribI4uiv(GLuint index, const GLuint *v)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint index = %u, const GLuint *v = 0x%0.8p)", index, v);
EVENT("(GLuint index = %u, const GLuint *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2171,8 +2181,8 @@ VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, cons
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint index = %u, GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void "
"*pointer = 0x%0.8p)",
index, size, type, stride, pointer);
"*pointer = 0x%016" PRIxPTR ")",
index, size, type, stride, (uintptr_t)pointer);
Context *context = GetValidGlobalContext();
if (context)
......@@ -2190,8 +2200,8 @@ VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, cons
void GL_APIENTRY WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsync sync = 0x%0.8p, GLbitfield flags = 0x%X, GLuint64 timeout = %llu)", sync, flags,
timeout);
EVENT("(GLsync sync = 0x%016" PRIxPTR ", GLbitfield flags = 0x%X, GLuint64 timeout = %llu)",
(uintptr_t)sync, flags, static_cast<unsigned long long>(timeout));
Context *context = GetValidGlobalContext();
if (context)
......
src/libGLESv2/entry_points_gles_3_1_autogen.cpp
......@@ -85,8 +85,9 @@ void GL_APIENTRY BindVertexBuffer(GLuint bindingindex,
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint bindingindex = %u, GLuint buffer = %u, GLintptr offset = %d, GLsizei stride = %d)",
bindingindex, buffer, offset, stride);
"(GLuint bindingindex = %u, GLuint buffer = %u, GLintptr offset = %llu, GLsizei stride = "
"%d)",
bindingindex, buffer, static_cast<unsigned long long>(offset), stride);
Context *context = GetValidGlobalContext();
if (context)
......@@ -104,8 +105,9 @@ void GL_APIENTRY BindVertexBuffer(GLuint bindingindex,
GLuint GL_APIENTRY CreateShaderProgramv(GLenum type, GLsizei count, const GLchar *const *strings)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum type = 0x%X, GLsizei count = %d, const GLchar *const*strings = 0x%0.8p)", type,
count, strings);
EVENT("(GLenum type = 0x%X, GLsizei count = %d, const GLchar *const*strings = 0x%016" PRIxPTR
")",
type, count, (uintptr_t)strings);
Context *context = GetValidGlobalContext();
if (context)
......@@ -126,7 +128,7 @@ GLuint GL_APIENTRY CreateShaderProgramv(GLenum type, GLsizei count, const GLchar
void GL_APIENTRY DeleteProgramPipelines(GLsizei n, const GLuint *pipelines)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, const GLuint *pipelines = 0x%0.8p)", n, pipelines);
EVENT("(GLsizei n = %d, const GLuint *pipelines = 0x%016" PRIxPTR ")", n, (uintptr_t)pipelines);
Context *context = GetValidGlobalContext();
if (context)
......@@ -163,7 +165,7 @@ void GL_APIENTRY DispatchCompute(GLuint num_groups_x, GLuint num_groups_y, GLuin
void GL_APIENTRY DispatchComputeIndirect(GLintptr indirect)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLintptr indirect = %d)", indirect);
EVENT("(GLintptr indirect = %llu)", static_cast<unsigned long long>(indirect));
Context *context = GetValidGlobalContext();
if (context)
......@@ -180,7 +182,8 @@ void GL_APIENTRY DispatchComputeIndirect(GLintptr indirect)
void GL_APIENTRY DrawArraysIndirect(GLenum mode, const void *indirect)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum mode = 0x%X, const void *indirect = 0x%0.8p)", mode, indirect);
EVENT("(GLenum mode = 0x%X, const void *indirect = 0x%016" PRIxPTR ")", mode,
(uintptr_t)indirect);
Context *context = GetValidGlobalContext();
if (context)
......@@ -198,8 +201,8 @@ void GL_APIENTRY DrawArraysIndirect(GLenum mode, const void *indirect)
void GL_APIENTRY DrawElementsIndirect(GLenum mode, GLenum type, const void *indirect)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum mode = 0x%X, GLenum type = 0x%X, const void *indirect = 0x%0.8p)", mode, type,
indirect);
EVENT("(GLenum mode = 0x%X, GLenum type = 0x%X, const void *indirect = 0x%016" PRIxPTR ")",
mode, type, (uintptr_t)indirect);
Context *context = GetValidGlobalContext();
if (context)
......@@ -236,7 +239,7 @@ void GL_APIENTRY FramebufferParameteri(GLenum target, GLenum pname, GLint param)
void GL_APIENTRY GenProgramPipelines(GLsizei n, GLuint *pipelines)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLsizei n = %d, GLuint *pipelines = 0x%0.8p)", n, pipelines);
EVENT("(GLsizei n = %d, GLuint *pipelines = 0x%016" PRIxPTR ")", n, (uintptr_t)pipelines);
Context *context = GetValidGlobalContext();
if (context)
......@@ -253,8 +256,8 @@ void GL_APIENTRY GenProgramPipelines(GLsizei n, GLuint *pipelines)
void GL_APIENTRY GetBooleani_v(GLenum target, GLuint index, GLboolean *data)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLuint index = %u, GLboolean *data = 0x%0.8p)", target, index,
data);
EVENT("(GLenum target = 0x%X, GLuint index = %u, GLboolean *data = 0x%016" PRIxPTR ")", target,
index, (uintptr_t)data);
Context *context = GetValidGlobalContext();
if (context)
......@@ -271,8 +274,8 @@ void GL_APIENTRY GetBooleani_v(GLenum target, GLuint index, GLboolean *data)
void GL_APIENTRY GetFramebufferParameteriv(GLenum target, GLenum pname, GLint *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname,
params);
EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -290,7 +293,8 @@ void GL_APIENTRY GetFramebufferParameteriv(GLenum target, GLenum pname, GLint *p
void GL_APIENTRY GetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum pname = 0x%X, GLuint index = %u, GLfloat *val = 0x%0.8p)", pname, index, val);
EVENT("(GLenum pname = 0x%X, GLuint index = %u, GLfloat *val = 0x%016" PRIxPTR ")", pname,
index, (uintptr_t)val);
Context *context = GetValidGlobalContext();
if (context)
......@@ -312,8 +316,8 @@ void GL_APIENTRY GetProgramInterfaceiv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLenum programInterface = 0x%X, GLenum pname = 0x%X, GLint *params "
"= 0x%0.8p)",
program, programInterface, pname, params);
"= 0x%016" PRIxPTR ")",
program, programInterface, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -335,10 +339,9 @@ void GL_APIENTRY GetProgramPipelineInfoLog(GLuint pipeline,
GLchar *infoLog)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint pipeline = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *infoLog = "
"0x%0.8p)",
pipeline, bufSize, length, infoLog);
EVENT("(GLuint pipeline = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
", GLchar *infoLog = 0x%016" PRIxPTR ")",
pipeline, bufSize, (uintptr_t)length, (uintptr_t)infoLog);
Context *context = GetValidGlobalContext();
if (context)
......@@ -357,8 +360,8 @@ void GL_APIENTRY GetProgramPipelineInfoLog(GLuint pipeline,
void GL_APIENTRY GetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint pipeline = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", pipeline, pname,
params);
EVENT("(GLuint pipeline = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")",
pipeline, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -378,8 +381,10 @@ GLuint GL_APIENTRY GetProgramResourceIndex(GLuint program,
const GLchar *name)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%0.8p)",
program, programInterface, name);
EVENT(
"(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%016" PRIxPTR
")",
program, programInterface, (uintptr_t)name);
Context *context = GetValidGlobalContext();
if (context)
......@@ -401,8 +406,10 @@ GLint GL_APIENTRY GetProgramResourceLocation(GLuint program,
const GLchar *name)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%0.8p)",
program, programInterface, name);
EVENT(
"(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%016" PRIxPTR
")",
program, programInterface, (uintptr_t)name);
Context *context = GetValidGlobalContext();
if (context)
......@@ -430,8 +437,8 @@ void GL_APIENTRY GetProgramResourceName(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLenum programInterface = 0x%X, GLuint index = %u, GLsizei bufSize "
"= %d, GLsizei *length = 0x%0.8p, GLchar *name = 0x%0.8p)",
program, programInterface, index, bufSize, length, name);
"= %d, GLsizei *length = 0x%016" PRIxPTR ", GLchar *name = 0x%016" PRIxPTR ")",
program, programInterface, index, bufSize, (uintptr_t)length, (uintptr_t)name);
Context *context = GetValidGlobalContext();
if (context)
......@@ -461,9 +468,11 @@ void GL_APIENTRY GetProgramResourceiv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLenum programInterface = 0x%X, GLuint index = %u, GLsizei "
"propCount = %d, const GLenum *props = 0x%0.8p, GLsizei bufSize = %d, GLsizei *length = "
"0x%0.8p, GLint *params = 0x%0.8p)",
program, programInterface, index, propCount, props, bufSize, length, params);
"propCount = %d, const GLenum *props = 0x%016" PRIxPTR
", GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
", GLint *params = 0x%016" PRIxPTR ")",
program, programInterface, index, propCount, (uintptr_t)props, bufSize, (uintptr_t)length,
(uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -485,8 +494,9 @@ void GL_APIENTRY GetTexLevelParameterfv(GLenum target, GLint level, GLenum pname
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)",
target, level, pname, params);
"(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLfloat *params = "
"0x%016" PRIxPTR ")",
target, level, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -506,8 +516,10 @@ void GL_APIENTRY GetTexLevelParameterfv(GLenum target, GLint level, GLenum pname
void GL_APIENTRY GetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
{
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT("(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLint *params = 0x%0.8p)",
target, level, pname, params);
EVENT(
"(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLint *params = "
"0x%016" PRIxPTR ")",
target, level, pname, (uintptr_t)params);
Context *context = GetValidGlobalContext();
if (context)
......@@ -602,8 +614,8 @@ void GL_APIENTRY ProgramUniform1fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = "
"0x%0.8p)",
program, location, count, value);
"0x%016" PRIxPTR ")",
program, location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -643,8 +655,8 @@ void GL_APIENTRY ProgramUniform1iv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = "
"0x%0.8p)",
program, location, count, value);
"0x%016" PRIxPTR ")",
program, location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -684,8 +696,8 @@ void GL_APIENTRY ProgramUniform1uiv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = "
"0x%0.8p)",
program, location, count, value);
"0x%016" PRIxPTR ")",
program, location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -727,8 +739,8 @@ void GL_APIENTRY ProgramUniform2fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = "
"0x%0.8p)",
program, location, count, value);
"0x%016" PRIxPTR ")",
program, location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -770,8 +782,8 @@ void GL_APIENTRY ProgramUniform2iv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = "
"0x%0.8p)",
program, location, count, value);
"0x%016" PRIxPTR ")",
program, location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -813,8 +825,8 @@ void GL_APIENTRY ProgramUniform2uiv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = "
"0x%0.8p)",
program, location, count, value);
"0x%016" PRIxPTR ")",
program, location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -859,8 +871,8 @@ void GL_APIENTRY ProgramUniform3fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = "
"0x%0.8p)",
program, location, count, value);
"0x%016" PRIxPTR ")",
program, location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -902,8 +914,8 @@ void GL_APIENTRY ProgramUniform3iv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = "
"0x%0.8p)",
program, location, count, value);
"0x%016" PRIxPTR ")",
program, location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -947,8 +959,8 @@ void GL_APIENTRY ProgramUniform3uiv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = "
"0x%0.8p)",
program, location, count, value);
"0x%016" PRIxPTR ")",
program, location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -993,8 +1005,8 @@ void GL_APIENTRY ProgramUniform4fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = "
"0x%0.8p)",
program, location, count, value);
"0x%016" PRIxPTR ")",
program, location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1039,8 +1051,8 @@ void GL_APIENTRY ProgramUniform4iv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = "
"0x%0.8p)",
program, location, count, value);
"0x%016" PRIxPTR ")",
program, location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1085,8 +1097,8 @@ void GL_APIENTRY ProgramUniform4uiv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = "
"0x%0.8p)",
program, location, count, value);
"0x%016" PRIxPTR ")",
program, location, count, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1110,8 +1122,8 @@ void GL_APIENTRY ProgramUniformMatrix2fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
"const GLfloat *value = 0x%0.8p)",
program, location, count, transpose, value);
"const GLfloat *value = 0x%016" PRIxPTR ")",
program, location, count, transpose, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1136,8 +1148,8 @@ void GL_APIENTRY ProgramUniformMatrix2x3fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
"const GLfloat *value = 0x%0.8p)",
program, location, count, transpose, value);
"const GLfloat *value = 0x%016" PRIxPTR ")",
program, location, count, transpose, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1162,8 +1174,8 @@ void GL_APIENTRY ProgramUniformMatrix2x4fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
"const GLfloat *value = 0x%0.8p)",
program, location, count, transpose, value);
"const GLfloat *value = 0x%016" PRIxPTR ")",
program, location, count, transpose, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1188,8 +1200,8 @@ void GL_APIENTRY ProgramUniformMatrix3fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
"const GLfloat *value = 0x%0.8p)",
program, location, count, transpose, value);
"const GLfloat *value = 0x%016" PRIxPTR ")",
program, location, count, transpose, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1214,8 +1226,8 @@ void GL_APIENTRY ProgramUniformMatrix3x2fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
"const GLfloat *value = 0x%0.8p)",
program, location, count, transpose, value);
"const GLfloat *value = 0x%016" PRIxPTR ")",
program, location, count, transpose, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1240,8 +1252,8 @@ void GL_APIENTRY ProgramUniformMatrix3x4fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
"const GLfloat *value = 0x%0.8p)",
program, location, count, transpose, value);
"const GLfloat *value = 0x%016" PRIxPTR ")",
program, location, count, transpose, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1266,8 +1278,8 @@ void GL_APIENTRY ProgramUniformMatrix4fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
"const GLfloat *value = 0x%0.8p)",
program, location, count, transpose, value);
"const GLfloat *value = 0x%016" PRIxPTR ")",
program, location, count, transpose, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1292,8 +1304,8 @@ void GL_APIENTRY ProgramUniformMatrix4x2fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
"const GLfloat *value = 0x%0.8p)",
program, location, count, transpose, value);
"const GLfloat *value = 0x%016" PRIxPTR ")",
program, location, count, transpose, (uintptr_t)value);
Context *context = GetValidGlobalContext();
if (context)
......@@ -1318,8 +1330,8 @@ void GL_APIENTRY ProgramUniformMatrix4x3fv(GLuint program,
ANGLE_SCOPED_GLOBAL_LOCK();
EVENT(
"(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
"const GLfloat *value = 0x%0.8p)",
program, location, count, transpose, value);
"const GLfloat *value = 0x%016" PRIxPTR ")",
program, location, count, transpose, (uintptr_t)value);
Context *context = GetValidGlobalContext();
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,6 +7,7 @@
#include <sstream>
#include <stdarg.h>
ANGLE_FORMAT_PRINTF(1, 2)
static std::vector<char> FormatArg(const char* fmt, ...)
{
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