Add Context* to EVENT() & DebugAnnotator::beginEvent()

scripts/code_generation_hashes/GL_EGL_entry_points.json

@@ -6,7 +6,7 @@
   "scripts/entry_point_packed_gl_enums.json":
     "2d46a38023361f8e95af71042626667c",
   "scripts/generate_entry_points.py":
-    "97af17f666be77934b2d54d3b66746f7",
+    "16da95ef4313d62c580112c65660d82e",
   "scripts/gl.xml":
     "e74a595068cbdd6064300be1e71b7cc9",
   "scripts/gl_angle_ext.xml":
@@ -150,79 +150,79 @@
   "src/libANGLE/validationGL4_autogen.h":
     "cbe3f917024a93a3adcbd2806f3e951f",
   "src/libGL/entry_points_gl_1_0_autogen.cpp":
-    "e984e675dab9624214609fc86f1330a8",
+    "f23f3b0c50511fd2157da3db17a9aff4",
   "src/libGL/entry_points_gl_1_0_autogen.h":
     "4ff00afc21780bc6c138b5431a2d067c",
   "src/libGL/entry_points_gl_1_1_autogen.cpp":
-    "253205804905c1e5bf6422c1df606079",
+    "fdba6bafa021aa0574827adb360684f3",
   "src/libGL/entry_points_gl_1_1_autogen.h":
     "570a839bb336d8f5f83d3b50fe49411a",
   "src/libGL/entry_points_gl_1_2_autogen.cpp":
-    "0ca1ad8d1a3a48c8053b4081bdf5f5e4",
+    "e89a87545b9fb2cc398a20cc27047945",
   "src/libGL/entry_points_gl_1_2_autogen.h":
     "3f52187f299fe96672384e1646f4a1cb",
   "src/libGL/entry_points_gl_1_3_autogen.cpp":
-    "5bce9f7bb2639a7de57e925a028039ef",
+    "e3ead2456cc9ec15f1b3d103294690cb",
   "src/libGL/entry_points_gl_1_3_autogen.h":
     "5ea36d869b82a824d5f290625c4ea052",
   "src/libGL/entry_points_gl_1_4_autogen.cpp":
-    "e799387d084ae718fe0762d48c1a40b9",
+    "e92444a3923333859259015956faf98a",
   "src/libGL/entry_points_gl_1_4_autogen.h":
     "2c5d31ca248507a024e4724c74283ec4",
   "src/libGL/entry_points_gl_1_5_autogen.cpp":
-    "aaddbde89c780194ac4754f7a1177c84",
+    "aa54e56cba33b02f59c5957cd9c24261",
   "src/libGL/entry_points_gl_1_5_autogen.h":
     "978457aa9a40e427846b6dea24608903",
   "src/libGL/entry_points_gl_2_0_autogen.cpp":
-    "68fbf332b51401391978bc4bb3ece654",
+    "afcfb2d402124bddd31326ac196bed71",
   "src/libGL/entry_points_gl_2_0_autogen.h":
     "41b0cd064167fac84bcdb1896a275b1b",
   "src/libGL/entry_points_gl_2_1_autogen.cpp":
-    "4e31b9d8a88dc69a9f1f07b0adb98965",
+    "bde895812b7339665671447fd73d52e0",
   "src/libGL/entry_points_gl_2_1_autogen.h":
     "1da48dec560ea5ff8cadf4d0b6bfde1c",
   "src/libGL/entry_points_gl_3_0_autogen.cpp":
-    "6decc6494c9acdfb63d5379b0bb7e767",
+    "3fbd9e5daff828faddd68dbe451444f6",
   "src/libGL/entry_points_gl_3_0_autogen.h":
     "0fad8005f23815beb8ee9b3797c00b83",
   "src/libGL/entry_points_gl_3_1_autogen.cpp":
-    "84675c4c273fb0b7ba59b433507b50ef",
+    "aa2a5a02d780733e1e447563bef95553",
   "src/libGL/entry_points_gl_3_1_autogen.h":
     "a68ff6c69f0ce95d9730e22bb4c63366",
   "src/libGL/entry_points_gl_3_2_autogen.cpp":
-    "d7cddaca9a2c6e051a4dec76b03611f2",
+    "ab1b0676394018164400b32f5dacda9b",
   "src/libGL/entry_points_gl_3_2_autogen.h":
     "f162c4e93a64ab2e43048a0937f7c46f",
   "src/libGL/entry_points_gl_3_3_autogen.cpp":
-    "30f8dfd5b902d203abab84c5795e4e4b",
+    "03c57cc42c9acce54245dadaae48733c",
   "src/libGL/entry_points_gl_3_3_autogen.h":
     "51c0e4f074c85447f5d910c63b9ea61c",
   "src/libGL/entry_points_gl_4_0_autogen.cpp":
-    "4e4c098104082451d2b1c450d48bca72",
+    "e16628740f0a06219f3ae3e37287de06",
   "src/libGL/entry_points_gl_4_0_autogen.h":
     "35d611138951cebc29db99c9bf3a9e5f",
   "src/libGL/entry_points_gl_4_1_autogen.cpp":
-    "af2ffeafdee8535470bc8fb4ee9e62fd",
+    "7c72e40d3fa6ff6db894d5f6d48b43d2",
   "src/libGL/entry_points_gl_4_1_autogen.h":
     "beec6659a3a77695dad66df90717c6ba",
   "src/libGL/entry_points_gl_4_2_autogen.cpp":
-    "048be315948850676439b43fbc215d80",
+    "6ef3dad75ba220f2fd2a612214ed6ac9",
   "src/libGL/entry_points_gl_4_2_autogen.h":
     "a2cb2a48cceaf6131f96bf8ec556aa55",
   "src/libGL/entry_points_gl_4_3_autogen.cpp":
-    "38e576aefe518d0fd80c73836798234f",
+    "4f47179fde663d5033693b1fae13f306",
   "src/libGL/entry_points_gl_4_3_autogen.h":
     "abfa431742a2b643db21220944e10ab0",
   "src/libGL/entry_points_gl_4_4_autogen.cpp":
-    "69d079ef40f34737be2da2573a668091",
+    "0659139235221d4fe6879834e69ea7cb",
   "src/libGL/entry_points_gl_4_4_autogen.h":
     "cdf1651f00d26db547b153afc09acc1c",
   "src/libGL/entry_points_gl_4_5_autogen.cpp":
-    "506e903d618ca6039eafe639a0d358f4",
+    "85ce4ad4ae18fc20cfa0d367e88c34f0",
   "src/libGL/entry_points_gl_4_5_autogen.h":
     "9f5de9513c06b82aca60856860f7b716",
   "src/libGL/entry_points_gl_4_6_autogen.cpp":
-    "a007b9c5e0b5c445adf64e9f00ab7092",
+    "09c3ccac53be47eeaaa5882af07c27ed",
   "src/libGL/entry_points_gl_4_6_autogen.h":
     "ee3150d4a8d267271a02e38e8feb923a",
   "src/libGL/libGL_autogen.cpp":
@@ -230,27 +230,27 @@
   "src/libGL/libGL_autogen.def":
     "2789d87b05eea9f53d52e2aff499b785",
   "src/libGLESv2/entry_points_gles_1_0_autogen.cpp":
-    "9047ef2452a45c86c4a92b568f6877c3",
+    "22887bfd29d481e34514bf02cfdf8841",
   "src/libGLESv2/entry_points_gles_1_0_autogen.h":
     "899dcff9383465380f94fbdfe5bcf0a0",
   "src/libGLESv2/entry_points_gles_2_0_autogen.cpp":
-    "5a54d106e1196795ab9bb22d24f32dc4",
+    "9fc4466d31b35a37b436328107f87d92",
   "src/libGLESv2/entry_points_gles_2_0_autogen.h":
     "26387e27cbddf5e34d6cd9f850cb8b64",
   "src/libGLESv2/entry_points_gles_3_0_autogen.cpp":
-    "bce7650df5a83ae9c6b080b1a4a9164b",
+    "1d095828b01116f9992a7bfa95283ba7",
   "src/libGLESv2/entry_points_gles_3_0_autogen.h":
     "0d246024379fbf55b87204db5d6a37e3",
   "src/libGLESv2/entry_points_gles_3_1_autogen.cpp":
-    "f449340852be3a389f52fb10ddd29d94",
+    "0ba581778fce9d7e1a54231fc494b9d5",
   "src/libGLESv2/entry_points_gles_3_1_autogen.h":
     "69bae5c94ed4665836a8464b6c353f9a",
   "src/libGLESv2/entry_points_gles_3_2_autogen.cpp":
-    "d091d689219c1bbd547c68be8f8801c1",
+    "a6898b35e7bd1dc60b3e1e1b97c4388d",
   "src/libGLESv2/entry_points_gles_3_2_autogen.h":
     "5798aa0a73af1d4ba5dfe99b6217a247",
   "src/libGLESv2/entry_points_gles_ext_autogen.cpp":
-    "2574c1bc13e7df94a07b2efb98fe9645",
+    "d474603d5950bbfc42dae4a1d91c9c2b",
   "src/libGLESv2/entry_points_gles_ext_autogen.h":
     "6d115fefeb5f3ceb605d7525d8b55be2",
   "src/libGLESv2/libGLESv2_autogen.cpp":

scripts/generate_entry_points.py

@@ -157,7 +157,7 @@ template_entry_point_decl = """ANGLE_EXPORT {return_type}GL_APIENTRY {name}{expl
 template_entry_point_no_return = """void GL_APIENTRY {name}{explicit_context_suffix}({explicit_context_param}{explicit_context_comma}{params})
 {{
     Context *context = {context_getter};
-    {event_comment}EVENT("gl{name}", "context = %d{comma_if_needed}{format_params}", CID(context){comma_if_needed}{pass_params});
+    {event_comment}EVENT(context, "gl{name}", "context = %d{comma_if_needed}{format_params}", CID(context){comma_if_needed}{pass_params});
 
     if (context)
     {{{assert_explicit_context}{packed_gl_enum_conversions}
@@ -175,7 +175,7 @@ template_entry_point_no_return = """void GL_APIENTRY {name}{explicit_context_suf
 template_entry_point_with_return = """{return_type}GL_APIENTRY {name}{explicit_context_suffix}({explicit_context_param}{explicit_context_comma}{params})
 {{
     Context *context = {context_getter};
-    {event_comment}EVENT("gl{name}", "context = %d{comma_if_needed}{format_params}", CID(context){comma_if_needed}{pass_params});
+    {event_comment}EVENT(context, "gl{name}", "context = %d{comma_if_needed}{format_params}", CID(context){comma_if_needed}{pass_params});
 
     {return_type} returnValue;
     if (context)

src/common/debug.cpp

@@ -119,7 +119,8 @@ std::mutex &GetDebugMutex()
     return *g_debugMutex;
 }
 
-ScopedPerfEventHelper::ScopedPerfEventHelper(const char *format, ...) : mFunctionName(nullptr)
+ScopedPerfEventHelper::ScopedPerfEventHelper(gl::Context *context, const char *format, ...)
+    : mFunctionName(nullptr)
 {
     bool dbgTrace = DebugAnnotationsActive();
 #if !defined(ANGLE_ENABLE_DEBUG_TRACE)
@@ -139,7 +140,7 @@ ScopedPerfEventHelper::ScopedPerfEventHelper(const char *format, ...) : mFunctio
     va_end(vararg);
     if (dbgTrace)
     {
-        g_debugAnnotator->beginEvent(mFunctionName, buffer.data());
+        g_debugAnnotator->beginEvent(context, mFunctionName, buffer.data());
     }
 }
 

src/common/debug.h

@@ -28,13 +28,14 @@
 
 namespace gl
 {
+class Context;
 
 // Pairs a D3D begin event with an end event.
 class ScopedPerfEventHelper : angle::NonCopyable
 {
   public:
-    ANGLE_FORMAT_PRINTF(2, 3)
-    ScopedPerfEventHelper(const char *format, ...);
+    ANGLE_FORMAT_PRINTF(3, 4)
+    ScopedPerfEventHelper(gl::Context *context, const char *format, ...);
     ~ScopedPerfEventHelper();
 
   private:
@@ -87,10 +88,12 @@ class DebugAnnotator : angle::NonCopyable
   public:
     DebugAnnotator() {}
     virtual ~DebugAnnotator() {}
-    virtual void beginEvent(const char *eventName, const char *eventMessage) = 0;
-    virtual void endEvent(const char *eventName)                             = 0;
-    virtual void setMarker(const char *markerName)                           = 0;
-    virtual bool getStatus()                                                 = 0;
+    virtual void beginEvent(gl::Context *context,
+                            const char *eventName,
+                            const char *eventMessage) = 0;
+    virtual void endEvent(const char *eventName)      = 0;
+    virtual void setMarker(const char *markerName)    = 0;
+    virtual bool getStatus()                          = 0;
     // Log Message Handler that gets passed every log message,
     // when debug annotations are initialized,
     // replacing default handling by LogMessage.
@@ -245,12 +248,12 @@ std::ostream &FmtHex(std::ostream &os, T value)
 // A macro to log a performance event around a scope.
 #if defined(ANGLE_TRACE_ENABLED)
 #    if defined(_MSC_VER)
-#        define EVENT(function, message, ...)                                                      \
-            gl::ScopedPerfEventHelper scopedPerfEventHelper##__LINE__("%s(" message ")", function, \
-                                                                      __VA_ARGS__)
+#        define EVENT(context, function, message, ...)                                            \
+            gl::ScopedPerfEventHelper scopedPerfEventHelper##__LINE__(context, "%s(" message ")", \
+                                                                      function, __VA_ARGS__)
 #    else
-#        define EVENT(function, message, ...)                                            \
-            gl::ScopedPerfEventHelper scopedPerfEventHelper("%s(" message ")", function, \
+#        define EVENT(context, function, message, ...)                                            \
+            gl::ScopedPerfEventHelper scopedPerfEventHelper(context, "%s(" message ")", function, \
                                                             ##__VA_ARGS__)
 #    endif  // _MSC_VER
 #else

src/libANGLE/LoggingAnnotator.cpp

@@ -18,7 +18,9 @@ bool LoggingAnnotator::getStatus()
     return false;
 }
 
-void LoggingAnnotator::beginEvent(const char *eventName, const char *eventMessage)
+void LoggingAnnotator::beginEvent(gl::Context *context,
+                                  const char *eventName,
+                                  const char *eventMessage)
 {
     ANGLE_TRACE_EVENT_BEGIN0("gpu.angle", eventName);
 }

src/libANGLE/LoggingAnnotator.h

@@ -11,6 +11,11 @@
 
 #include "common/debug.h"
 
+namespace gl
+{
+class Context;
+}  // namespace gl
+
 namespace angle
 {
 
@@ -19,7 +24,7 @@ class LoggingAnnotator : public gl::DebugAnnotator
   public:
     LoggingAnnotator() {}
     ~LoggingAnnotator() override {}
-    void beginEvent(const char *eventName, const char *eventMessage) override;
+    void beginEvent(gl::Context *context, const char *eventName, const char *eventMessage) override;
     void endEvent(const char *eventName) override;
     void setMarker(const char *markerName) override;
     bool getStatus() override;

src/libANGLE/entry_points_utils.h

@@ -95,7 +95,7 @@ constexpr ANGLE_INLINE ReturnType GetDefaultReturnValue()
 #    define ANGLE_CAPTURE(...)
 #endif  // ANGLE_CAPTURE_ENABLED
 
-#define FUNC_EVENT(format, ...) EVENT(__FUNCTION__, format, __VA_ARGS__)
+#define FUNC_EVENT(format, ...) EVENT(nullptr, __FUNCTION__, format, __VA_ARGS__)
 
 inline int CID(const Context *context)
 {

src/libANGLE/renderer/d3d/d3d11/Context11.cpp

@@ -740,7 +740,7 @@ angle::Result Context11::insertEventMarker(GLsizei length, const char *marker)
 
 angle::Result Context11::pushGroupMarker(GLsizei length, const char *marker)
 {
-    mRenderer->getAnnotator()->beginEvent(marker, marker);
+    mRenderer->getAnnotator()->beginEvent(nullptr, marker, marker);
     mMarkerStack.push(std::string(marker));
     return angle::Result::Continue;
 }

src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp

@@ -19,9 +19,11 @@ DebugAnnotator11::DebugAnnotator11() {}
 
 DebugAnnotator11::~DebugAnnotator11() {}
 
-void DebugAnnotator11::beginEvent(const char *eventName, const char *eventMessage)
+void DebugAnnotator11::beginEvent(gl::Context *context,
+                                  const char *eventName,
+                                  const char *eventMessage)
 {
-    angle::LoggingAnnotator::beginEvent(eventName, eventMessage);
+    angle::LoggingAnnotator::beginEvent(context, eventName, eventMessage);
     if (loggingEnabledForThisThread())
     {
         std::mbstate_t state = std::mbstate_t();

src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.h

@@ -23,7 +23,7 @@ class DebugAnnotator11 : public angle::LoggingAnnotator
     ~DebugAnnotator11() override;
     void initialize(ID3D11DeviceContext *context);
     void release();
-    void beginEvent(const char *eventName, const char *eventMessage) override;
+    void beginEvent(gl::Context *context, const char *eventName, const char *eventMessage) override;
     void endEvent(const char *eventName) override;
     void setMarker(const char *markerName) override;
     bool getStatus() override;

src/libANGLE/renderer/d3d/d3d9/Context9.cpp

@@ -375,7 +375,7 @@ angle::Result Context9::insertEventMarker(GLsizei length, const char *marker)
 
 angle::Result Context9::pushGroupMarker(GLsizei length, const char *marker)
 {
-    mRenderer->getAnnotator()->beginEvent(marker, marker);
+    mRenderer->getAnnotator()->beginEvent(nullptr, marker, marker);
     mMarkerStack.push(std::string(marker));
     return angle::Result::Continue;
 }

src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp

@@ -13,9 +13,11 @@
 namespace rx
 {
 
-void DebugAnnotator9::beginEvent(const char *eventName, const char *eventMessage)
+void DebugAnnotator9::beginEvent(gl::Context *context,
+                                 const char *eventName,
+                                 const char *eventMessage)
 {
-    angle::LoggingAnnotator::beginEvent(eventName, eventMessage);
+    angle::LoggingAnnotator::beginEvent(context, eventName, eventMessage);
     std::mbstate_t state = std::mbstate_t();
     std::mbsrtowcs(mWCharMessage, &eventMessage, kMaxMessageLength, &state);
     D3DPERF_BeginEvent(0, mWCharMessage);

src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.h

@@ -18,7 +18,7 @@ class DebugAnnotator9 : public angle::LoggingAnnotator
 {
   public:
     DebugAnnotator9() {}
-    void beginEvent(const char *eventName, const char *eventMessage) override;
+    void beginEvent(gl::Context *context, const char *eventName, const char *eventMessage) override;
     void endEvent(const char *eventName) override;
     void setMarker(const char *markerName) override;
     bool getStatus() override;

src/libGL/entry_points_gl_1_2_autogen.cpp

@@ -38,7 +38,7 @@ void GL_APIENTRY CopyTexSubImage3D(GLenum target,
                                    GLsizei height)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glCopyTexSubImage3D",
+    EVENT(context, "glCopyTexSubImage3D",
           "context = %d, GLenum target = %s, GLint level = %d, GLint xoffset = %d, GLint yoffset = "
           "%d, GLint zoffset = %d, GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height "
           "= %d",
@@ -70,7 +70,7 @@ void GL_APIENTRY DrawRangeElements(GLenum mode,
                                    const void *indices)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glDrawRangeElements",
+    EVENT(context, "glDrawRangeElements",
           "context = %d, GLenum mode = %s, GLuint start = %u, GLuint end = %u, GLsizei count = %d, "
           "GLenum type = %s, const void *indices = 0x%016" PRIxPTR "",
           CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), start, end, count,
@@ -105,7 +105,7 @@ void GL_APIENTRY TexImage3D(GLenum target,
                             const void *pixels)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glTexImage3D",
+    EVENT(context, "glTexImage3D",
           "context = %d, GLenum target = %s, GLint level = %d, GLint internalformat = %d, GLsizei "
           "width = %d, GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLenum format = "
           "%s, GLenum type = %s, const void *pixels = 0x%016" PRIxPTR "",
@@ -143,7 +143,7 @@ void GL_APIENTRY TexSubImage3D(GLenum target,
                                const void *pixels)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glTexSubImage3D",
+    EVENT(context, "glTexSubImage3D",
           "context = %d, GLenum target = %s, GLint level = %d, GLint xoffset = %d, GLint yoffset = "
           "%d, GLint zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, "
           "GLenum format = %s, GLenum type = %s, const void *pixels = 0x%016" PRIxPTR "",

src/libGL/entry_points_gl_1_5_autogen.cpp

@@ -30,7 +30,7 @@ namespace gl
 void GL_APIENTRY BeginQuery(GLenum target, GLuint id)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glBeginQuery", "context = %d, GLenum target = %s, GLuint id = %u", CID(context),
+    EVENT(context, "glBeginQuery", "context = %d, GLenum target = %s, GLuint id = %u", CID(context),
           GLenumToString(GLenumGroup::QueryTarget, target), id);
 
     if (context)
@@ -51,8 +51,8 @@ void GL_APIENTRY BeginQuery(GLenum target, GLuint id)
 void GL_APIENTRY BindBuffer(GLenum target, GLuint buffer)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glBindBuffer", "context = %d, GLenum target = %s, GLuint buffer = %u", CID(context),
-          GLenumToString(GLenumGroup::BufferTargetARB, target), buffer);
+    EVENT(context, "glBindBuffer", "context = %d, GLenum target = %s, GLuint buffer = %u",
+          CID(context), GLenumToString(GLenumGroup::BufferTargetARB, target), buffer);
 
     if (context)
     {
@@ -72,7 +72,7 @@ void GL_APIENTRY BindBuffer(GLenum target, GLuint buffer)
 void GL_APIENTRY BufferData(GLenum target, GLsizeiptr size, const void *data, GLenum usage)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glBufferData",
+    EVENT(context, "glBufferData",
           "context = %d, GLenum target = %s, GLsizeiptr size = %llu, const void *data = "
           "0x%016" PRIxPTR ", GLenum usage = %s",
           CID(context), GLenumToString(GLenumGroup::BufferTargetARB, target),
@@ -97,7 +97,7 @@ void GL_APIENTRY BufferData(GLenum target, GLsizeiptr size, const void *data, GL
 void GL_APIENTRY BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const void *data)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glBufferSubData",
+    EVENT(context, "glBufferSubData",
           "context = %d, GLenum target = %s, GLintptr offset = %llu, GLsizeiptr size = %llu, const "
           "void *data = 0x%016" PRIxPTR "",
           CID(context), GLenumToString(GLenumGroup::BufferTargetARB, target),
@@ -121,7 +121,7 @@ void GL_APIENTRY BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size,
 void GL_APIENTRY DeleteBuffers(GLsizei n, const GLuint *buffers)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glDeleteBuffers",
+    EVENT(context, "glDeleteBuffers",
           "context = %d, GLsizei n = %d, const GLuint *buffers = 0x%016" PRIxPTR "", CID(context),
           n, (uintptr_t)buffers);
 
@@ -142,8 +142,9 @@ void GL_APIENTRY DeleteBuffers(GLsizei n, const GLuint *buffers)
 void GL_APIENTRY DeleteQueries(GLsizei n, const GLuint *ids)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glDeleteQueries", "context = %d, GLsizei n = %d, const GLuint *ids = 0x%016" PRIxPTR "",
-          CID(context), n, (uintptr_t)ids);
+    EVENT(context, "glDeleteQueries",
+          "context = %d, GLsizei n = %d, const GLuint *ids = 0x%016" PRIxPTR "", CID(context), n,
+          (uintptr_t)ids);
 
     if (context)
     {
@@ -162,7 +163,7 @@ void GL_APIENTRY DeleteQueries(GLsizei n, const GLuint *ids)
 void GL_APIENTRY EndQuery(GLenum target)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glEndQuery", "context = %d, GLenum target = %s", CID(context),
+    EVENT(context, "glEndQuery", "context = %d, GLenum target = %s", CID(context),
           GLenumToString(GLenumGroup::QueryTarget, target));
 
     if (context)
@@ -181,8 +182,9 @@ void GL_APIENTRY EndQuery(GLenum target)
 void GL_APIENTRY GenBuffers(GLsizei n, GLuint *buffers)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glGenBuffers", "context = %d, GLsizei n = %d, GLuint *buffers = 0x%016" PRIxPTR "",
-          CID(context), n, (uintptr_t)buffers);
+    EVENT(context, "glGenBuffers",
+          "context = %d, GLsizei n = %d, GLuint *buffers = 0x%016" PRIxPTR "", CID(context), n,
+          (uintptr_t)buffers);
 
     if (context)
     {
@@ -201,7 +203,7 @@ void GL_APIENTRY GenBuffers(GLsizei n, GLuint *buffers)
 void GL_APIENTRY GenQueries(GLsizei n, GLuint *ids)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glGenQueries", "context = %d, GLsizei n = %d, GLuint *ids = 0x%016" PRIxPTR "",
+    EVENT(context, "glGenQueries", "context = %d, GLsizei n = %d, GLuint *ids = 0x%016" PRIxPTR "",
           CID(context), n, (uintptr_t)ids);
 
     if (context)
@@ -220,7 +222,7 @@ void GL_APIENTRY GenQueries(GLsizei n, GLuint *ids)
 void GL_APIENTRY GetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glGetBufferParameteriv",
+    EVENT(context, "glGetBufferParameteriv",
           "context = %d, GLenum target = %s, GLenum pname = %s, GLint *params = 0x%016" PRIxPTR "",
           CID(context), GLenumToString(GLenumGroup::BufferTargetARB, target),
           GLenumToString(GLenumGroup::DefaultGroup, pname), (uintptr_t)params);
@@ -242,7 +244,7 @@ void GL_APIENTRY GetBufferParameteriv(GLenum target, GLenum pname, GLint *params
 void GL_APIENTRY GetBufferPointerv(GLenum target, GLenum pname, void **params)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glGetBufferPointerv",
+    EVENT(context, "glGetBufferPointerv",
           "context = %d, GLenum target = %s, GLenum pname = %s, void **params = 0x%016" PRIxPTR "",
           CID(context), GLenumToString(GLenumGroup::BufferTargetARB, target),
           GLenumToString(GLenumGroup::DefaultGroup, pname), (uintptr_t)params);
@@ -264,7 +266,7 @@ void GL_APIENTRY GetBufferPointerv(GLenum target, GLenum pname, void **params)
 void GL_APIENTRY GetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, void *data)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glGetBufferSubData",
+    EVENT(context, "glGetBufferSubData",
           "context = %d, GLenum target = %s, GLintptr offset = %llu, GLsizeiptr size = %llu, void "
           "*data = 0x%016" PRIxPTR "",
           CID(context), GLenumToString(GLenumGroup::BufferTargetARB, target),
@@ -287,7 +289,7 @@ void GL_APIENTRY GetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr siz
 void GL_APIENTRY GetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
     Context *context = GetGlobalContext();
-    EVENT("glGetQueryObjectiv",
+    EVENT(context, "glGetQueryObjectiv",
           "context = %d, GLuint id = %u, GLenum pname = %s, GLint *params = 0x%016" PRIxPTR "",
           CID(context), id, GLenumToString(GLenumGroup::QueryObjectParameterName, pname),
           (uintptr_t)params);
@@ -309,7 +311,7 @@ void GL_APIENTRY GetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 void GL_APIENTRY GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glGetQueryObjectuiv",
+    EVENT(context, "glGetQueryObjectuiv",
           "context = %d, GLuint id = %u, GLenum pname = %s, GLuint *params = 0x%016" PRIxPTR "",
           CID(context), id, GLenumToString(GLenumGroup::QueryObjectParameterName, pname),
           (uintptr_t)params);
@@ -331,7 +333,7 @@ void GL_APIENTRY GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 void GL_APIENTRY GetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glGetQueryiv",
+    EVENT(context, "glGetQueryiv",
           "context = %d, GLenum target = %s, GLenum pname = %s, GLint *params = 0x%016" PRIxPTR "",
           CID(context), GLenumToString(GLenumGroup::QueryTarget, target),
           GLenumToString(GLenumGroup::QueryParameterName, pname), (uintptr_t)params);
@@ -353,7 +355,7 @@ void GL_APIENTRY GetQueryiv(GLenum target, GLenum pname, GLint *params)
 GLboolean GL_APIENTRY IsBuffer(GLuint buffer)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glIsBuffer", "context = %d, GLuint buffer = %u", CID(context), buffer);
+    EVENT(context, "glIsBuffer", "context = %d, GLuint buffer = %u", CID(context), buffer);
 
     GLboolean returnValue;
     if (context)
@@ -381,7 +383,7 @@ GLboolean GL_APIENTRY IsBuffer(GLuint buffer)
 GLboolean GL_APIENTRY IsQuery(GLuint id)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glIsQuery", "context = %d, GLuint id = %u", CID(context), id);
+    EVENT(context, "glIsQuery", "context = %d, GLuint id = %u", CID(context), id);
 
     GLboolean returnValue;
     if (context)
@@ -409,8 +411,8 @@ GLboolean GL_APIENTRY IsQuery(GLuint id)
 void *GL_APIENTRY MapBuffer(GLenum target, GLenum access)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glMapBuffer", "context = %d, GLenum target = %s, GLenum access = %s", CID(context),
-          GLenumToString(GLenumGroup::BufferTargetARB, target),
+    EVENT(context, "glMapBuffer", "context = %d, GLenum target = %s, GLenum access = %s",
+          CID(context), GLenumToString(GLenumGroup::BufferTargetARB, target),
           GLenumToString(GLenumGroup::BufferAccessARB, access));
 
     void *returnValue;
@@ -440,7 +442,7 @@ void *GL_APIENTRY MapBuffer(GLenum target, GLenum access)
 GLboolean GL_APIENTRY UnmapBuffer(GLenum target)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glUnmapBuffer", "context = %d, GLenum target = %s", CID(context),
+    EVENT(context, "glUnmapBuffer", "context = %d, GLenum target = %s", CID(context),
           GLenumToString(GLenumGroup::BufferTargetARB, target));
 
     GLboolean returnValue;

src/libGL/entry_points_gl_2_1_autogen.cpp

@@ -33,7 +33,7 @@ void GL_APIENTRY UniformMatrix2x3fv(GLint location,
                                     const GLfloat *value)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glUniformMatrix2x3fv",
+    EVENT(context, "glUniformMatrix2x3fv",
           "context = %d, GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const "
           "GLfloat *value = 0x%016" PRIxPTR "",
           CID(context), location, count, GLbooleanToString(transpose), (uintptr_t)value);
@@ -60,7 +60,7 @@ void GL_APIENTRY UniformMatrix2x4fv(GLint location,
                                     const GLfloat *value)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glUniformMatrix2x4fv",
+    EVENT(context, "glUniformMatrix2x4fv",
           "context = %d, GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const "
           "GLfloat *value = 0x%016" PRIxPTR "",
           CID(context), location, count, GLbooleanToString(transpose), (uintptr_t)value);
@@ -87,7 +87,7 @@ void GL_APIENTRY UniformMatrix3x2fv(GLint location,
                                     const GLfloat *value)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glUniformMatrix3x2fv",
+    EVENT(context, "glUniformMatrix3x2fv",
           "context = %d, GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const "
           "GLfloat *value = 0x%016" PRIxPTR "",
           CID(context), location, count, GLbooleanToString(transpose), (uintptr_t)value);
@@ -114,7 +114,7 @@ void GL_APIENTRY UniformMatrix3x4fv(GLint location,
                                     const GLfloat *value)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glUniformMatrix3x4fv",
+    EVENT(context, "glUniformMatrix3x4fv",
           "context = %d, GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const "
           "GLfloat *value = 0x%016" PRIxPTR "",
           CID(context), location, count, GLbooleanToString(transpose), (uintptr_t)value);
@@ -141,7 +141,7 @@ void GL_APIENTRY UniformMatrix4x2fv(GLint location,
                                     const GLfloat *value)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glUniformMatrix4x2fv",
+    EVENT(context, "glUniformMatrix4x2fv",
           "context = %d, GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const "
           "GLfloat *value = 0x%016" PRIxPTR "",
           CID(context), location, count, GLbooleanToString(transpose), (uintptr_t)value);
@@ -168,7 +168,7 @@ void GL_APIENTRY UniformMatrix4x3fv(GLint location,
                                     const GLfloat *value)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glUniformMatrix4x3fv",
+    EVENT(context, "glUniformMatrix4x3fv",
           "context = %d, GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const "
           "GLfloat *value = 0x%016" PRIxPTR "",
           CID(context), location, count, GLbooleanToString(transpose), (uintptr_t)value);

src/libGL/entry_points_gl_3_1_autogen.cpp

@@ -34,7 +34,7 @@ void GL_APIENTRY CopyBufferSubData(GLenum readTarget,
                                    GLsizeiptr size)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glCopyBufferSubData",
+    EVENT(context, "glCopyBufferSubData",
           "context = %d, GLenum readTarget = %s, GLenum writeTarget = %s, GLintptr readOffset = "
           "%llu, GLintptr writeOffset = %llu, GLsizeiptr size = %llu",
           CID(context), GLenumToString(GLenumGroup::CopyBufferSubDataTarget, readTarget),
@@ -63,7 +63,7 @@ void GL_APIENTRY CopyBufferSubData(GLenum readTarget,
 void GL_APIENTRY DrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glDrawArraysInstanced",
+    EVENT(context, "glDrawArraysInstanced",
           "context = %d, GLenum mode = %s, GLint first = %d, GLsizei count = %d, GLsizei "
           "instancecount = %d",
           CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), first, count,
@@ -92,7 +92,7 @@ void GL_APIENTRY DrawElementsInstanced(GLenum mode,
                                        GLsizei instancecount)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glDrawElementsInstanced",
+    EVENT(context, "glDrawElementsInstanced",
           "context = %d, GLenum mode = %s, GLsizei count = %d, GLenum type = %s, const void "
           "*indices = 0x%016" PRIxPTR ", GLsizei instancecount = %d",
           CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), count,
@@ -122,7 +122,7 @@ void GL_APIENTRY GetActiveUniformBlockName(GLuint program,
                                            GLchar *uniformBlockName)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glGetActiveUniformBlockName",
+    EVENT(context, "glGetActiveUniformBlockName",
           "context = %d, GLuint program = %u, GLuint uniformBlockIndex = %u, GLsizei bufSize = %d, "
           "GLsizei *length = 0x%016" PRIxPTR ", GLchar *uniformBlockName = 0x%016" PRIxPTR "",
           CID(context), program, uniformBlockIndex, bufSize, (uintptr_t)length,
@@ -152,7 +152,7 @@ void GL_APIENTRY GetActiveUniformBlockiv(GLuint program,
                                          GLint *params)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glGetActiveUniformBlockiv",
+    EVENT(context, "glGetActiveUniformBlockiv",
           "context = %d, GLuint program = %u, GLuint uniformBlockIndex = %u, GLenum pname = %s, "
           "GLint *params = 0x%016" PRIxPTR "",
           CID(context), program, uniformBlockIndex,
@@ -181,7 +181,7 @@ void GL_APIENTRY GetActiveUniformName(GLuint program,
                                       GLchar *uniformName)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glGetActiveUniformName",
+    EVENT(context, "glGetActiveUniformName",
           "context = %d, GLuint program = %u, GLuint uniformIndex = %u, GLsizei bufSize = %d, "
           "GLsizei *length = 0x%016" PRIxPTR ", GLchar *uniformName = 0x%016" PRIxPTR "",
           CID(context), program, uniformIndex, bufSize, (uintptr_t)length, (uintptr_t)uniformName);
@@ -210,7 +210,7 @@ void GL_APIENTRY GetActiveUniformsiv(GLuint program,
                                      GLint *params)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glGetActiveUniformsiv",
+    EVENT(context, "glGetActiveUniformsiv",
           "context = %d, GLuint program = %u, GLsizei uniformCount = %d, const GLuint "
           "*uniformIndices = 0x%016" PRIxPTR ", GLenum pname = %s, GLint *params = 0x%016" PRIxPTR
           "",
@@ -237,7 +237,7 @@ void GL_APIENTRY GetActiveUniformsiv(GLuint program,
 GLuint GL_APIENTRY GetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glGetUniformBlockIndex",
+    EVENT(context, "glGetUniformBlockIndex",
           "context = %d, GLuint program = %u, const GLchar *uniformBlockName = 0x%016" PRIxPTR "",
           CID(context), program, (uintptr_t)uniformBlockName);
 
@@ -272,7 +272,7 @@ void GL_APIENTRY GetUniformIndices(GLuint program,
                                    GLuint *uniformIndices)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glGetUniformIndices",
+    EVENT(context, "glGetUniformIndices",
           "context = %d, GLuint program = %u, GLsizei uniformCount = %d, const GLchar "
           "*const*uniformNames = 0x%016" PRIxPTR ", GLuint *uniformIndices = 0x%016" PRIxPTR "",
           CID(context), program, uniformCount, (uintptr_t)uniformNames, (uintptr_t)uniformIndices);
@@ -296,7 +296,8 @@ void GL_APIENTRY GetUniformIndices(GLuint program,
 void GL_APIENTRY PrimitiveRestartIndex(GLuint index)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glPrimitiveRestartIndex", "context = %d, GLuint index = %u", CID(context), index);
+    EVENT(context, "glPrimitiveRestartIndex", "context = %d, GLuint index = %u", CID(context),
+          index);
 
     if (context)
     {
@@ -314,7 +315,7 @@ void GL_APIENTRY PrimitiveRestartIndex(GLuint index)
 void GL_APIENTRY TexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glTexBuffer",
+    EVENT(context, "glTexBuffer",
           "context = %d, GLenum target = %s, GLenum internalformat = %s, GLuint buffer = %u",
           CID(context), GLenumToString(GLenumGroup::TextureTarget, target),
           GLenumToString(GLenumGroup::InternalFormat, internalformat), buffer);
@@ -339,7 +340,7 @@ void GL_APIENTRY UniformBlockBinding(GLuint program,
                                      GLuint uniformBlockBinding)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glUniformBlockBinding",
+    EVENT(context, "glUniformBlockBinding",
           "context = %d, GLuint program = %u, GLuint uniformBlockIndex = %u, GLuint "
           "uniformBlockBinding = %u",
           CID(context), program, uniformBlockIndex, uniformBlockBinding);

src/libGL/entry_points_gl_3_2_autogen.cpp

@@ -30,7 +30,7 @@ namespace gl
 GLenum GL_APIENTRY ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glClientWaitSync",
+    EVENT(context, "glClientWaitSync",
           "context = %d, GLsync sync = 0x%016" PRIxPTR
           ", GLbitfield flags = %s, GLuint64 timeout = %llu",
           CID(context), (uintptr_t)sync,
@@ -63,7 +63,7 @@ GLenum GL_APIENTRY ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeou
 void GL_APIENTRY DeleteSync(GLsync sync)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glDeleteSync", "context = %d, GLsync sync = 0x%016" PRIxPTR "", CID(context),
+    EVENT(context, "glDeleteSync", "context = %d, GLsync sync = 0x%016" PRIxPTR "", CID(context),
           (uintptr_t)sync);
 
     if (context)
@@ -85,7 +85,7 @@ void GL_APIENTRY DrawElementsBaseVertex(GLenum mode,
                                         GLint basevertex)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glDrawElementsBaseVertex",
+    EVENT(context, "glDrawElementsBaseVertex",
           "context = %d, GLenum mode = %s, GLsizei count = %d, GLenum type = %s, const void "
           "*indices = 0x%016" PRIxPTR ", GLint basevertex = %d",
           CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), count,
@@ -116,7 +116,7 @@ void GL_APIENTRY DrawElementsInstancedBaseVertex(GLenum mode,
                                                  GLint basevertex)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glDrawElementsInstancedBaseVertex",
+    EVENT(context, "glDrawElementsInstancedBaseVertex",
           "context = %d, GLenum mode = %s, GLsizei count = %d, GLenum type = %s, const void "
           "*indices = 0x%016" PRIxPTR ", GLsizei instancecount = %d, GLint basevertex = %d",
           CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), count,
@@ -150,7 +150,7 @@ void GL_APIENTRY DrawRangeElementsBaseVertex(GLenum mode,
                                              GLint basevertex)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glDrawRangeElementsBaseVertex",
+    EVENT(context, "glDrawRangeElementsBaseVertex",
           "context = %d, GLenum mode = %s, GLuint start = %u, GLuint end = %u, GLsizei count = %d, "
           "GLenum type = %s, const void *indices = 0x%016" PRIxPTR ", GLint basevertex = %d",
           CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), start, end, count,
@@ -177,8 +177,8 @@ void GL_APIENTRY DrawRangeElementsBaseVertex(GLenum mode,
 GLsync GL_APIENTRY FenceSync(GLenum condition, GLbitfield flags)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glFenceSync", "context = %d, GLenum condition = %s, GLbitfield flags = %s", CID(context),
-          GLenumToString(GLenumGroup::SyncCondition, condition),
+    EVENT(context, "glFenceSync", "context = %d, GLenum condition = %s, GLbitfield flags = %s",
+          CID(context), GLenumToString(GLenumGroup::SyncCondition, condition),
           GLbitfieldToString(GLenumGroup::DefaultGroup, flags).c_str());
 
     GLsync returnValue;
@@ -207,7 +207,7 @@ GLsync GL_APIENTRY FenceSync(GLenum condition, GLbitfield flags)
 void GL_APIENTRY FramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glFramebufferTexture",
+    EVENT(context, "glFramebufferTexture",
           "context = %d, GLenum target = %s, GLenum attachment = %s, GLuint texture = %u, GLint "
           "level = %d",
           CID(context), GLenumToString(GLenumGroup::FramebufferTarget, target),
@@ -232,7 +232,7 @@ void GL_APIENTRY FramebufferTexture(GLenum target, GLenum attachment, GLuint tex
 void GL_APIENTRY GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glGetBufferParameteri64v",
+    EVENT(context, "glGetBufferParameteri64v",
           "context = %d, GLenum target = %s, GLenum pname = %s, GLint64 *params = 0x%016" PRIxPTR
           "",
           CID(context), GLenumToString(GLenumGroup::BufferTargetARB, target),
@@ -255,7 +255,7 @@ void GL_APIENTRY GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *pa
 void GL_APIENTRY GetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glGetInteger64i_v",
+    EVENT(context, "glGetInteger64i_v",
           "context = %d, GLenum target = %s, GLuint index = %u, GLint64 *data = 0x%016" PRIxPTR "",
           CID(context), GLenumToString(GLenumGroup::TypeEnum, target), index, (uintptr_t)data);
 
@@ -275,8 +275,9 @@ void GL_APIENTRY GetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
 void GL_APIENTRY GetInteger64v(GLenum pname, GLint64 *data)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glGetInteger64v", "context = %d, GLenum pname = %s, GLint64 *data = 0x%016" PRIxPTR "",
-          CID(context), GLenumToString(GLenumGroup::GetPName, pname), (uintptr_t)data);
+    EVENT(context, "glGetInteger64v",
+          "context = %d, GLenum pname = %s, GLint64 *data = 0x%016" PRIxPTR "", CID(context),
+          GLenumToString(GLenumGroup::GetPName, pname), (uintptr_t)data);
 
     if (context)
     {
@@ -294,7 +295,7 @@ void GL_APIENTRY GetInteger64v(GLenum pname, GLint64 *data)
 void GL_APIENTRY GetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glGetMultisamplefv",
+    EVENT(context, "glGetMultisamplefv",
           "context = %d, GLenum pname = %s, GLuint index = %u, GLfloat *val = 0x%016" PRIxPTR "",
           CID(context), GLenumToString(GLenumGroup::DefaultGroup, pname), index, (uintptr_t)val);
 
@@ -315,7 +316,7 @@ void GL_APIENTRY
 GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
 {
     Context *context = GetGlobalContext();
-    EVENT("glGetSynciv",
+    EVENT(context, "glGetSynciv",
           "context = %d, GLsync sync = 0x%016" PRIxPTR
           ", GLenum pname = %s, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
           ", GLint *values = 0x%016" PRIxPTR "",
@@ -338,7 +339,7 @@ GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *va
 GLboolean GL_APIENTRY IsSync(GLsync sync)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glIsSync", "context = %d, GLsync sync = 0x%016" PRIxPTR "", CID(context),
+    EVENT(context, "glIsSync", "context = %d, GLsync sync = 0x%016" PRIxPTR "", CID(context),
           (uintptr_t)sync);
 
     GLboolean returnValue;
@@ -371,7 +372,7 @@ void GL_APIENTRY MultiDrawElementsBaseVertex(GLenum mode,
                                              const GLint *basevertex)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glMultiDrawElementsBaseVertex",
+    EVENT(context, "glMultiDrawElementsBaseVertex",
           "context = %d, GLenum mode = %s, const GLsizei *count = 0x%016" PRIxPTR
           ", GLenum type = %s, const void *const*indices = 0x%016" PRIxPTR
           ", GLsizei drawcount = %d, const GLint *basevertex = 0x%016" PRIxPTR "",
@@ -400,7 +401,7 @@ void GL_APIENTRY MultiDrawElementsBaseVertex(GLenum mode,
 void GL_APIENTRY ProvokingVertex(GLenum mode)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glProvokingVertex", "context = %d, GLenum mode = %s", CID(context),
+    EVENT(context, "glProvokingVertex", "context = %d, GLenum mode = %s", CID(context),
           GLenumToString(GLenumGroup::VertexProvokingMode, mode));
 
     if (context)
@@ -420,7 +421,7 @@ void GL_APIENTRY ProvokingVertex(GLenum mode)
 void GL_APIENTRY SampleMaski(GLuint maskNumber, GLbitfield mask)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glSampleMaski", "context = %d, GLuint maskNumber = %u, GLbitfield mask = %s",
+    EVENT(context, "glSampleMaski", "context = %d, GLuint maskNumber = %u, GLbitfield mask = %s",
           CID(context), maskNumber, GLbitfieldToString(GLenumGroup::DefaultGroup, mask).c_str());
 
     if (context)
@@ -444,7 +445,7 @@ void GL_APIENTRY TexImage2DMultisample(GLenum target,
                                        GLboolean fixedsamplelocations)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glTexImage2DMultisample",
+    EVENT(context, "glTexImage2DMultisample",
           "context = %d, GLenum target = %s, GLsizei samples = %d, GLenum internalformat = %s, "
           "GLsizei width = %d, GLsizei height = %d, GLboolean fixedsamplelocations = %s",
           CID(context), GLenumToString(GLenumGroup::TextureTarget, target), samples,
@@ -476,7 +477,7 @@ void GL_APIENTRY TexImage3DMultisample(GLenum target,
                                        GLboolean fixedsamplelocations)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glTexImage3DMultisample",
+    EVENT(context, "glTexImage3DMultisample",
           "context = %d, GLenum target = %s, GLsizei samples = %d, GLenum internalformat = %s, "
           "GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLboolean "
           "fixedsamplelocations = %s",
@@ -504,7 +505,7 @@ void GL_APIENTRY TexImage3DMultisample(GLenum target,
 void GL_APIENTRY WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glWaitSync",
+    EVENT(context, "glWaitSync",
           "context = %d, GLsync sync = 0x%016" PRIxPTR
           ", GLbitfield flags = %s, GLuint64 timeout = %llu",
           CID(context), (uintptr_t)sync,

src/libGL/entry_points_gl_4_2_autogen.cpp

@@ -36,7 +36,7 @@ void GL_APIENTRY BindImageTexture(GLuint unit,
                                   GLenum format)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glBindImageTexture",
+    EVENT(context, "glBindImageTexture",
           "context = %d, GLuint unit = %u, GLuint texture = %u, GLint level = %d, GLboolean "
           "layered = %s, GLint layer = %d, GLenum access = %s, GLenum format = %s",
           CID(context), unit, texture, level, GLbooleanToString(layered), layer,
@@ -66,7 +66,7 @@ void GL_APIENTRY DrawArraysInstancedBaseInstance(GLenum mode,
                                                  GLuint baseinstance)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glDrawArraysInstancedBaseInstance",
+    EVENT(context, "glDrawArraysInstancedBaseInstance",
           "context = %d, GLenum mode = %s, GLint first = %d, GLsizei count = %d, GLsizei "
           "instancecount = %d, GLuint baseinstance = %u",
           CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), first, count,
@@ -97,7 +97,7 @@ void GL_APIENTRY DrawElementsInstancedBaseInstance(GLenum mode,
                                                    GLuint baseinstance)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glDrawElementsInstancedBaseInstance",
+    EVENT(context, "glDrawElementsInstancedBaseInstance",
           "context = %d, GLenum mode = %s, GLsizei count = %d, GLenum type = %s, const void "
           "*indices = 0x%016" PRIxPTR ", GLsizei instancecount = %d, GLuint baseinstance = %u",
           CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), count,
@@ -129,7 +129,7 @@ void GL_APIENTRY DrawElementsInstancedBaseVertexBaseInstance(GLenum mode,
                                                              GLuint baseinstance)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glDrawElementsInstancedBaseVertexBaseInstance",
+    EVENT(context, "glDrawElementsInstancedBaseVertexBaseInstance",
           "context = %d, GLenum mode = %s, GLsizei count = %d, GLenum type = %s, const void "
           "*indices = 0x%016" PRIxPTR
           ", GLsizei instancecount = %d, GLint basevertex = %d, GLuint baseinstance = %u",
@@ -159,7 +159,7 @@ void GL_APIENTRY DrawElementsInstancedBaseVertexBaseInstance(GLenum mode,
 void GL_APIENTRY DrawTransformFeedbackInstanced(GLenum mode, GLuint id, GLsizei instancecount)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glDrawTransformFeedbackInstanced",
+    EVENT(context, "glDrawTransformFeedbackInstanced",
           "context = %d, GLenum mode = %s, GLuint id = %u, GLsizei instancecount = %d",
           CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), id, instancecount);
 
@@ -185,7 +185,7 @@ void GL_APIENTRY DrawTransformFeedbackStreamInstanced(GLenum mode,
                                                       GLsizei instancecount)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glDrawTransformFeedbackStreamInstanced",
+    EVENT(context, "glDrawTransformFeedbackStreamInstanced",
           "context = %d, GLenum mode = %s, GLuint id = %u, GLuint stream = %u, GLsizei "
           "instancecount = %d",
           CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), id, stream,
@@ -213,7 +213,7 @@ void GL_APIENTRY GetActiveAtomicCounterBufferiv(GLuint program,
                                                 GLint *params)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glGetActiveAtomicCounterBufferiv",
+    EVENT(context, "glGetActiveAtomicCounterBufferiv",
           "context = %d, GLuint program = %u, GLuint bufferIndex = %u, GLenum pname = %s, GLint "
           "*params = 0x%016" PRIxPTR "",
           CID(context), program, bufferIndex,
@@ -242,7 +242,7 @@ void GL_APIENTRY GetInternalformativ(GLenum target,
                                      GLint *params)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glGetInternalformativ",
+    EVENT(context, "glGetInternalformativ",
           "context = %d, GLenum target = %s, GLenum internalformat = %s, GLenum pname = %s, "
           "GLsizei bufSize = %d, GLint *params = 0x%016" PRIxPTR "",
           CID(context), GLenumToString(GLenumGroup::TextureTarget, target),
@@ -267,7 +267,7 @@ void GL_APIENTRY GetInternalformativ(GLenum target,
 void GL_APIENTRY MemoryBarrier(GLbitfield barriers)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glMemoryBarrier", "context = %d, GLbitfield barriers = %s", CID(context),
+    EVENT(context, "glMemoryBarrier", "context = %d, GLbitfield barriers = %s", CID(context),
           GLbitfieldToString(GLenumGroup::MemoryBarrierMask, barriers).c_str());
 
     if (context)
@@ -285,7 +285,7 @@ void GL_APIENTRY MemoryBarrier(GLbitfield barriers)
 void GL_APIENTRY TexStorage1D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glTexStorage1D",
+    EVENT(context, "glTexStorage1D",
           "context = %d, GLenum target = %s, GLsizei levels = %d, GLenum internalformat = %s, "
           "GLsizei width = %d",
           CID(context), GLenumToString(GLenumGroup::TextureTarget, target), levels,
@@ -308,7 +308,7 @@ void GL_APIENTRY
 TexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glTexStorage2D",
+    EVENT(context, "glTexStorage2D",
           "context = %d, GLenum target = %s, GLsizei levels = %d, GLenum internalformat = %s, "
           "GLsizei width = %d, GLsizei height = %d",
           CID(context), GLenumToString(GLenumGroup::TextureTarget, target), levels,
@@ -338,7 +338,7 @@ void GL_APIENTRY TexStorage3D(GLenum target,
                               GLsizei depth)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glTexStorage3D",
+    EVENT(context, "glTexStorage3D",
           "context = %d, GLenum target = %s, GLsizei levels = %d, GLenum internalformat = %s, "
           "GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d",
           CID(context), GLenumToString(GLenumGroup::TextureTarget, target), levels,

src/libGL/entry_points_gl_4_4_autogen.cpp

@@ -30,7 +30,7 @@ namespace gl
 void GL_APIENTRY BindBuffersBase(GLenum target, GLuint first, GLsizei count, const GLuint *buffers)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glBindBuffersBase",
+    EVENT(context, "glBindBuffersBase",
           "context = %d, GLenum target = %s, GLuint first = %u, GLsizei count = %d, const GLuint "
           "*buffers = 0x%016" PRIxPTR "",
           CID(context), GLenumToString(GLenumGroup::BufferTargetARB, target), first, count,
@@ -58,7 +58,7 @@ void GL_APIENTRY BindBuffersRange(GLenum target,
                                   const GLsizeiptr *sizes)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glBindBuffersRange",
+    EVENT(context, "glBindBuffersRange",
           "context = %d, GLenum target = %s, GLuint first = %u, GLsizei count = %d, const GLuint "
           "*buffers = 0x%016" PRIxPTR ", const GLintptr *offsets = 0x%016" PRIxPTR
           ", const GLsizeiptr *sizes = 0x%016" PRIxPTR "",
@@ -84,7 +84,7 @@ void GL_APIENTRY BindBuffersRange(GLenum target,
 void GL_APIENTRY BindImageTextures(GLuint first, GLsizei count, const GLuint *textures)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glBindImageTextures",
+    EVENT(context, "glBindImageTextures",
           "context = %d, GLuint first = %u, GLsizei count = %d, const GLuint *textures = "
           "0x%016" PRIxPTR "",
           CID(context), first, count, (uintptr_t)textures);
@@ -105,7 +105,7 @@ void GL_APIENTRY BindImageTextures(GLuint first, GLsizei count, const GLuint *te
 void GL_APIENTRY BindSamplers(GLuint first, GLsizei count, const GLuint *samplers)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glBindSamplers",
+    EVENT(context, "glBindSamplers",
           "context = %d, GLuint first = %u, GLsizei count = %d, const GLuint *samplers = "
           "0x%016" PRIxPTR "",
           CID(context), first, count, (uintptr_t)samplers);
@@ -126,7 +126,7 @@ void GL_APIENTRY BindSamplers(GLuint first, GLsizei count, const GLuint *sampler
 void GL_APIENTRY BindTextures(GLuint first, GLsizei count, const GLuint *textures)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glBindTextures",
+    EVENT(context, "glBindTextures",
           "context = %d, GLuint first = %u, GLsizei count = %d, const GLuint *textures = "
           "0x%016" PRIxPTR "",
           CID(context), first, count, (uintptr_t)textures);
@@ -151,7 +151,7 @@ void GL_APIENTRY BindVertexBuffers(GLuint first,
                                    const GLsizei *strides)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glBindVertexBuffers",
+    EVENT(context, "glBindVertexBuffers",
           "context = %d, GLuint first = %u, GLsizei count = %d, const GLuint *buffers = "
           "0x%016" PRIxPTR ", const GLintptr *offsets = 0x%016" PRIxPTR
           ", const GLsizei *strides = 0x%016" PRIxPTR "",
@@ -176,7 +176,7 @@ void GL_APIENTRY BindVertexBuffers(GLuint first,
 void GL_APIENTRY BufferStorage(GLenum target, GLsizeiptr size, const void *data, GLbitfield flags)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glBufferStorage",
+    EVENT(context, "glBufferStorage",
           "context = %d, GLenum target = %s, GLsizeiptr size = %llu, const void *data = "
           "0x%016" PRIxPTR ", GLbitfield flags = %s",
           CID(context), GLenumToString(GLenumGroup::BufferStorageTarget, target),
@@ -201,7 +201,7 @@ void GL_APIENTRY
 ClearTexImage(GLuint texture, GLint level, GLenum format, GLenum type, const void *data)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glClearTexImage",
+    EVENT(context, "glClearTexImage",
           "context = %d, GLuint texture = %u, GLint level = %d, GLenum format = %s, GLenum type = "
           "%s, const void *data = 0x%016" PRIxPTR "",
           CID(context), texture, level, GLenumToString(GLenumGroup::PixelFormat, format),
@@ -236,7 +236,7 @@ void GL_APIENTRY ClearTexSubImage(GLuint texture,
                                   const void *data)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glClearTexSubImage",
+    EVENT(context, "glClearTexSubImage",
           "context = %d, GLuint texture = %u, GLint level = %d, GLint xoffset = %d, GLint yoffset "
           "= %d, GLint zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, "
           "GLenum format = %s, GLenum type = %s, const void *data = 0x%016" PRIxPTR "",

src/libGL/entry_points_gl_4_6_autogen.cpp

@@ -34,7 +34,7 @@ void GL_APIENTRY MultiDrawArraysIndirectCount(GLenum mode,
                                               GLsizei stride)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glMultiDrawArraysIndirectCount",
+    EVENT(context, "glMultiDrawArraysIndirectCount",
           "context = %d, GLenum mode = %s, const void *indirect = 0x%016" PRIxPTR
           ", GLintptr drawcount = %llu, GLsizei maxdrawcount = %d, GLsizei stride = %d",
           CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), (uintptr_t)indirect,
@@ -63,7 +63,7 @@ void GL_APIENTRY MultiDrawElementsIndirectCount(GLenum mode,
                                                 GLsizei stride)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glMultiDrawElementsIndirectCount",
+    EVENT(context, "glMultiDrawElementsIndirectCount",
           "context = %d, GLenum mode = %s, GLenum type = %s, const void *indirect = 0x%016" PRIxPTR
           ", GLintptr drawcount = %llu, GLsizei maxdrawcount = %d, GLsizei stride = %d",
           CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode),
@@ -89,7 +89,7 @@ void GL_APIENTRY MultiDrawElementsIndirectCount(GLenum mode,
 void GL_APIENTRY PolygonOffsetClamp(GLfloat factor, GLfloat units, GLfloat clamp)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glPolygonOffsetClamp",
+    EVENT(context, "glPolygonOffsetClamp",
           "context = %d, GLfloat factor = %f, GLfloat units = %f, GLfloat clamp = %f", CID(context),
           factor, units, clamp);
 
@@ -113,7 +113,7 @@ void GL_APIENTRY SpecializeShader(GLuint shader,
                                   const GLuint *pConstantValue)
 {
     Context *context = GetValidGlobalContext();
-    EVENT("glSpecializeShader",
+    EVENT(context, "glSpecializeShader",
           "context = %d, GLuint shader = %u, const GLchar *pEntryPoint = 0x%016" PRIxPTR
           ", GLuint numSpecializationConstants = %u, const GLuint *pConstantIndex = 0x%016" PRIxPTR
           ", const GLuint *pConstantValue = 0x%016" PRIxPTR "",

src/libGLESv2/entry_points_egl.cpp

@@ -56,7 +56,7 @@ extern "C" {
 EGLint EGLAPIENTRY EGL_GetError(void)
 {
     ANGLE_SCOPED_GLOBAL_LOCK();
-    EVENT(__FUNCTION__, "");
+    EVENT(nullptr, __FUNCTION__, "");
     Thread *thread = egl::GetCurrentThread();
 
     EGLint error = thread->getError();
@@ -491,7 +491,7 @@ EGLSurface EGLAPIENTRY EGL_GetCurrentSurface(EGLint readdraw)
 EGLDisplay EGLAPIENTRY EGL_GetCurrentDisplay(void)
 {
     ANGLE_SCOPED_GLOBAL_LOCK();
-    EVENT(__FUNCTION__, "");
+    EVENT(nullptr, __FUNCTION__, "");
     Thread *thread = egl::GetCurrentThread();
 
     thread->setSuccess();
@@ -530,7 +530,7 @@ EGLBoolean EGLAPIENTRY EGL_QueryContext(EGLDisplay dpy,
 EGLBoolean EGLAPIENTRY EGL_WaitGL(void)
 {
     ANGLE_SCOPED_GLOBAL_LOCK();
-    EVENT(__FUNCTION__, "");
+    EVENT(nullptr, __FUNCTION__, "");
     Thread *thread = egl::GetCurrentThread();
 
     egl::Display *display = thread->getDisplay();
@@ -730,7 +730,7 @@ EGLBoolean EGLAPIENTRY EGL_BindAPI(EGLenum api)
 EGLenum EGLAPIENTRY EGL_QueryAPI(void)
 {
     ANGLE_SCOPED_GLOBAL_LOCK();
-    EVENT(__FUNCTION__, "");
+    EVENT(nullptr, __FUNCTION__, "");
     Thread *thread = egl::GetCurrentThread();
 
     EGLenum API = thread->getAPI();
@@ -776,7 +776,7 @@ EGLSurface EGLAPIENTRY EGL_CreatePbufferFromClientBuffer(EGLDisplay dpy,
 EGLBoolean EGLAPIENTRY EGL_ReleaseThread(void)
 {
     ANGLE_SCOPED_GLOBAL_LOCK();
-    EVENT(__FUNCTION__, "");
+    EVENT(nullptr, __FUNCTION__, "");
     Thread *thread = egl::GetCurrentThread();
 
     Surface *previousDraw         = thread->getCurrentDrawSurface();
@@ -805,7 +805,7 @@ EGLBoolean EGLAPIENTRY EGL_ReleaseThread(void)
 EGLBoolean EGLAPIENTRY EGL_WaitClient(void)
 {
     ANGLE_SCOPED_GLOBAL_LOCK();
-    EVENT(__FUNCTION__, "");
+    EVENT(nullptr, __FUNCTION__, "");
     Thread *thread = egl::GetCurrentThread();
 
     egl::Display *display = thread->getDisplay();
@@ -825,7 +825,7 @@ EGLBoolean EGLAPIENTRY EGL_WaitClient(void)
 EGLContext EGLAPIENTRY EGL_GetCurrentContext(void)
 {
     ANGLE_SCOPED_GLOBAL_LOCK();
-    EVENT(__FUNCTION__, "");
+    EVENT(nullptr, __FUNCTION__, "");
     Thread *thread = egl::GetCurrentThread();
 
     gl::Context *context = thread->getContext();