Skip to content

A
angle
Commit f074d61a by Ian Elliott Committed by Commit Bot
Options

Plumb EntryPoint & Context to DebugAnnotator/EVENT()

This makes it easier to plumb debug labels to a future DebugAnnotatorVk class. Bug: b/162068318 Bug: b/169243237 Change-Id: I01e3779569c27c91252dc2874f6deaec526afd6f Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2451516 Commit-Queue: Ian Elliott <ianelliott@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 86ca5d2b
Showing with 210 additions and 161 deletions
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":
"16da95ef4313d62c580112c65660d82e",
"c79b44b36428f8e9f374d7f5c139b94c",
"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":
"f23f3b0c50511fd2157da3db17a9aff4",
"64d8ddabb486784b129c7bacd334d9cf",
"src/libGL/entry_points_gl_1_0_autogen.h":
"4ff00afc21780bc6c138b5431a2d067c",
"src/libGL/entry_points_gl_1_1_autogen.cpp":
"fdba6bafa021aa0574827adb360684f3",
"f1e6508c5c1b2acbcfab7f0330c94634",
"src/libGL/entry_points_gl_1_1_autogen.h":
"570a839bb336d8f5f83d3b50fe49411a",
"src/libGL/entry_points_gl_1_2_autogen.cpp":
"e89a87545b9fb2cc398a20cc27047945",
"6025bdaa2cf677b087e1c42e7de54e1b",
"src/libGL/entry_points_gl_1_2_autogen.h":
"3f52187f299fe96672384e1646f4a1cb",
"src/libGL/entry_points_gl_1_3_autogen.cpp":
"e3ead2456cc9ec15f1b3d103294690cb",
"bdff6b60cf7434a915437457bef9374b",
"src/libGL/entry_points_gl_1_3_autogen.h":
"5ea36d869b82a824d5f290625c4ea052",
"src/libGL/entry_points_gl_1_4_autogen.cpp":
"e92444a3923333859259015956faf98a",
"415a3184b8aa4575cdbf9ec9be5743cd",
"src/libGL/entry_points_gl_1_4_autogen.h":
"2c5d31ca248507a024e4724c74283ec4",
"src/libGL/entry_points_gl_1_5_autogen.cpp":
"aa54e56cba33b02f59c5957cd9c24261",
"4e513e6efb7e9d9a167e93e022c4456a",
"src/libGL/entry_points_gl_1_5_autogen.h":
"978457aa9a40e427846b6dea24608903",
"src/libGL/entry_points_gl_2_0_autogen.cpp":
"afcfb2d402124bddd31326ac196bed71",
"bbacfb76118d448f937a14eeba8b611d",
"src/libGL/entry_points_gl_2_0_autogen.h":
"41b0cd064167fac84bcdb1896a275b1b",
"src/libGL/entry_points_gl_2_1_autogen.cpp":
"bde895812b7339665671447fd73d52e0",
"78ab9a5ffa9dd197aa58549d6c4ef5cf",
"src/libGL/entry_points_gl_2_1_autogen.h":
"1da48dec560ea5ff8cadf4d0b6bfde1c",
"src/libGL/entry_points_gl_3_0_autogen.cpp":
"3fbd9e5daff828faddd68dbe451444f6",
"73a6ae63badd8bde401f07a473ccd866",
"src/libGL/entry_points_gl_3_0_autogen.h":
"0fad8005f23815beb8ee9b3797c00b83",
"src/libGL/entry_points_gl_3_1_autogen.cpp":
"aa2a5a02d780733e1e447563bef95553",
"2585e834b0a28e4b128d76fb3bb1cb55",
"src/libGL/entry_points_gl_3_1_autogen.h":
"a68ff6c69f0ce95d9730e22bb4c63366",
"src/libGL/entry_points_gl_3_2_autogen.cpp":
"ab1b0676394018164400b32f5dacda9b",
"1a591608d3f02ceb3d38d19ad15896b1",
"src/libGL/entry_points_gl_3_2_autogen.h":
"f162c4e93a64ab2e43048a0937f7c46f",
"src/libGL/entry_points_gl_3_3_autogen.cpp":
"03c57cc42c9acce54245dadaae48733c",
"22be82cb4d29a312b013e20e82189209",
"src/libGL/entry_points_gl_3_3_autogen.h":
"51c0e4f074c85447f5d910c63b9ea61c",
"src/libGL/entry_points_gl_4_0_autogen.cpp":
"e16628740f0a06219f3ae3e37287de06",
"78176f7c4f239fad54b3a425120b92a7",
"src/libGL/entry_points_gl_4_0_autogen.h":
"35d611138951cebc29db99c9bf3a9e5f",
"src/libGL/entry_points_gl_4_1_autogen.cpp":
"7c72e40d3fa6ff6db894d5f6d48b43d2",
"fcdbc6bb9727178de28c3da68628fdca",
"src/libGL/entry_points_gl_4_1_autogen.h":
"beec6659a3a77695dad66df90717c6ba",
"src/libGL/entry_points_gl_4_2_autogen.cpp":
"6ef3dad75ba220f2fd2a612214ed6ac9",
"e5c45aea2e026e9cd3aa9d8979ca814d",
"src/libGL/entry_points_gl_4_2_autogen.h":
"a2cb2a48cceaf6131f96bf8ec556aa55",
"src/libGL/entry_points_gl_4_3_autogen.cpp":
"4f47179fde663d5033693b1fae13f306",
"f9a57e1da6ad5b6b07712c275e2f660d",
"src/libGL/entry_points_gl_4_3_autogen.h":
"abfa431742a2b643db21220944e10ab0",
"src/libGL/entry_points_gl_4_4_autogen.cpp":
"0659139235221d4fe6879834e69ea7cb",
"7ae753fdab08c6fb62c39bcfcae2a34f",
"src/libGL/entry_points_gl_4_4_autogen.h":
"cdf1651f00d26db547b153afc09acc1c",
"src/libGL/entry_points_gl_4_5_autogen.cpp":
"85ce4ad4ae18fc20cfa0d367e88c34f0",
"1ff3a18c3041b98b349dbf6c96e7e54a",
"src/libGL/entry_points_gl_4_5_autogen.h":
"9f5de9513c06b82aca60856860f7b716",
"src/libGL/entry_points_gl_4_6_autogen.cpp":
"09c3ccac53be47eeaaa5882af07c27ed",
"f2cff601f7137ba02b6ec123b6526c01",
"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":
"22887bfd29d481e34514bf02cfdf8841",
"d84936cf946b26dadf75dc249476e01f",
"src/libGLESv2/entry_points_gles_1_0_autogen.h":
"899dcff9383465380f94fbdfe5bcf0a0",
"src/libGLESv2/entry_points_gles_2_0_autogen.cpp":
"9fc4466d31b35a37b436328107f87d92",
"d2e51c453945bf9dfbcda99d03ee979c",
"src/libGLESv2/entry_points_gles_2_0_autogen.h":
"26387e27cbddf5e34d6cd9f850cb8b64",
"src/libGLESv2/entry_points_gles_3_0_autogen.cpp":
"1d095828b01116f9992a7bfa95283ba7",
"e31ce38421c965a387d25b41febc5b8e",
"src/libGLESv2/entry_points_gles_3_0_autogen.h":
"0d246024379fbf55b87204db5d6a37e3",
"src/libGLESv2/entry_points_gles_3_1_autogen.cpp":
"0ba581778fce9d7e1a54231fc494b9d5",
"b503cfdd892ed38dbcf0ef6963221472",
"src/libGLESv2/entry_points_gles_3_1_autogen.h":
"69bae5c94ed4665836a8464b6c353f9a",
"src/libGLESv2/entry_points_gles_3_2_autogen.cpp":
"a6898b35e7bd1dc60b3e1e1b97c4388d",
"6697586a8a7a3a0ecda4edb71fe59969",
"src/libGLESv2/entry_points_gles_3_2_autogen.h":
"5798aa0a73af1d4ba5dfe99b6217a247",
"src/libGLESv2/entry_points_gles_ext_autogen.cpp":
"f305a1ba1ca268ac647a77f38b994455",
"a650c0fb59e907d6a8e77cb5fe37cc5a",
"src/libGLESv2/entry_points_gles_ext_autogen.h":
"879ce9d1859bb776a032678f877a259e",
"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(context, "gl{name}", "context = %d{comma_if_needed}{format_params}", CID(context){comma_if_needed}{pass_params});
{event_comment}EVENT(context, gl::EntryPoint::{name}, "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(context, "gl{name}", "context = %d{comma_if_needed}{format_params}", CID(context){comma_if_needed}{pass_params});
{event_comment}EVENT(context, gl::EntryPoint::{name}, "gl{name}", "context = %d{comma_if_needed}{format_params}", CID(context){comma_if_needed}{pass_params});
{return_type} returnValue;
if (context)
......@@ -469,6 +469,7 @@ template_sources_includes = """#include "libGLESv2/entry_points_{header_version}
#include "libANGLE/gl_enum_utils.h"
#include "libANGLE/validation{validation_header_version}.h"
#include "libANGLE/entry_points_utils.h"
#include "libANGLE/entry_points_enum_autogen.h"
#include "libGLESv2/global_state.h"
"""
......
src/common/debug.cpp
......@@ -119,8 +119,11 @@ std::mutex &GetDebugMutex()
return *g_debugMutex;
}
ScopedPerfEventHelper::ScopedPerfEventHelper(gl::Context *context, const char *format, ...)
: mFunctionName(nullptr)
ScopedPerfEventHelper::ScopedPerfEventHelper(gl::Context *context,
gl::EntryPoint entryPoint,
const char *format,
...)
: mContext(context), mEntryPoint(entryPoint), mFunctionName(nullptr)
{
bool dbgTrace = DebugAnnotationsActive();
#if !defined(ANGLE_ENABLE_DEBUG_TRACE)
......@@ -140,7 +143,7 @@ ScopedPerfEventHelper::ScopedPerfEventHelper(gl::Context *context, const char *f
va_end(vararg);
if (dbgTrace)
{
g_debugAnnotator->beginEvent(context, mFunctionName, buffer.data());
g_debugAnnotator->beginEvent(context, entryPoint, mFunctionName, buffer.data());
}
}
......@@ -148,7 +151,7 @@ ScopedPerfEventHelper::~ScopedPerfEventHelper()
{
if (DebugAnnotationsActive())
{
g_debugAnnotator->endEvent(mFunctionName);
g_debugAnnotator->endEvent(mContext, mFunctionName, mEntryPoint);
}
}
......
src/common/debug.h
......@@ -29,16 +29,19 @@
namespace gl
{
class Context;
enum class EntryPoint;
// Pairs a D3D begin event with an end event.
class ScopedPerfEventHelper : angle::NonCopyable
{
public:
ANGLE_FORMAT_PRINTF(3, 4)
ScopedPerfEventHelper(gl::Context *context, const char *format, ...);
ANGLE_FORMAT_PRINTF(4, 5)
ScopedPerfEventHelper(gl::Context *context, gl::EntryPoint entryPoint, const char *format, ...);
~ScopedPerfEventHelper();
private:
gl::Context *mContext;
const gl::EntryPoint mEntryPoint;
const char *mFunctionName;
};
......@@ -89,9 +92,12 @@ class DebugAnnotator : angle::NonCopyable
DebugAnnotator() {}
virtual ~DebugAnnotator() {}
virtual void beginEvent(gl::Context *context,
gl::EntryPoint entryPoint,
const char *eventName,
const char *eventMessage) = 0;
virtual void endEvent(const char *eventName) = 0;
virtual void endEvent(gl::Context *context,
const char *eventName,
gl::EntryPoint entryPoint) = 0;
virtual void setMarker(const char *markerName) = 0;
virtual bool getStatus() = 0;
// Log Message Handler that gets passed every log message,
......@@ -248,13 +254,13 @@ 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(context, function, message, ...) \
gl::ScopedPerfEventHelper scopedPerfEventHelper##__LINE__(context, "%s(" message ")", \
function, __VA_ARGS__)
# define EVENT(context, entryPoint, function, message, ...) \
gl::ScopedPerfEventHelper scopedPerfEventHelper##__LINE__( \
context, entryPoint, "%s(" message ")", function, __VA_ARGS__)
# else
# define EVENT(context, function, message, ...) \
gl::ScopedPerfEventHelper scopedPerfEventHelper(context, "%s(" message ")", function, \
##__VA_ARGS__)
# define EVENT(context, entryPoint, function, message, ...) \
gl::ScopedPerfEventHelper scopedPerfEventHelper( \
context, entryPoint, "%s(" message ")", function, ##__VA_ARGS__)
# endif // _MSC_VER
#else
# define EVENT(message, ...) (void(0))
......
src/libANGLE/LoggingAnnotator.cpp
......@@ -19,13 +19,16 @@ bool LoggingAnnotator::getStatus()
}
void LoggingAnnotator::beginEvent(gl::Context *context,
gl::EntryPoint entryPoint,
const char *eventName,
const char *eventMessage)
{
ANGLE_TRACE_EVENT_BEGIN0("gpu.angle", eventName);
}
void LoggingAnnotator::endEvent(const char *eventName)
void LoggingAnnotator::endEvent(gl::Context *context,
const char *eventName,
gl::EntryPoint entryPoint)
{
ANGLE_TRACE_EVENT_END0("gpu.angle", eventName);
}
......
src/libANGLE/LoggingAnnotator.h
......@@ -24,8 +24,11 @@ class LoggingAnnotator : public gl::DebugAnnotator
public:
LoggingAnnotator() {}
~LoggingAnnotator() override {}
void beginEvent(gl::Context *context, const char *eventName, const char *eventMessage) override;
void endEvent(const char *eventName) override;
void beginEvent(gl::Context *context,
gl::EntryPoint entryPoint,
const char *eventName,
const char *eventMessage) override;
void endEvent(gl::Context *context, const char *eventName, gl::EntryPoint entryPoint) override;
void setMarker(const char *markerName) override;
bool getStatus() override;
void logMessage(const gl::LogMessage &msg) const override;
......
src/libANGLE/entry_points_utils.h
......@@ -95,7 +95,8 @@ constexpr ANGLE_INLINE ReturnType GetDefaultReturnValue()
# define ANGLE_CAPTURE(...)
#endif // ANGLE_CAPTURE_ENABLED
#define FUNC_EVENT(format, ...) EVENT(nullptr, __FUNCTION__, format, __VA_ARGS__)
#define FUNC_EVENT(format, ...) \
EVENT(nullptr, gl::EntryPoint::Begin, __FUNCTION__, format, __VA_ARGS__)
inline int CID(const Context *context)
{
......
src/libANGLE/renderer/d3d/d3d11/Context11.cpp
......@@ -13,6 +13,7 @@
#include "libANGLE/Context.h"
#include "libANGLE/Context.inl.h"
#include "libANGLE/MemoryProgramCache.h"
#include "libANGLE/entry_points_enum_autogen.h"
#include "libANGLE/renderer/OverlayImpl.h"
#include "libANGLE/renderer/d3d/CompilerD3D.h"
#include "libANGLE/renderer/d3d/RenderbufferD3D.h"
......@@ -740,7 +741,7 @@ angle::Result Context11::insertEventMarker(GLsizei length, const char *marker)
angle::Result Context11::pushGroupMarker(GLsizei length, const char *marker)
{
mRenderer->getAnnotator()->beginEvent(nullptr, marker, marker);
mRenderer->getAnnotator()->beginEvent(nullptr, gl::EntryPoint::Begin, marker, marker);
mMarkerStack.push(std::string(marker));
return angle::Result::Continue;
}
......@@ -752,7 +753,7 @@ angle::Result Context11::popGroupMarker()
{
marker = mMarkerStack.top().c_str();
mMarkerStack.pop();
mRenderer->getAnnotator()->endEvent(marker);
mRenderer->getAnnotator()->endEvent(nullptr, marker, gl::EntryPoint::Begin);
}
return angle::Result::Continue;
}
......
src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp
......@@ -20,10 +20,11 @@ DebugAnnotator11::DebugAnnotator11() {}
DebugAnnotator11::~DebugAnnotator11() {}
void DebugAnnotator11::beginEvent(gl::Context *context,
gl::EntryPoint entryPoint,
const char *eventName,
const char *eventMessage)
{
angle::LoggingAnnotator::beginEvent(context, eventName, eventMessage);
angle::LoggingAnnotator::beginEvent(context, entryPoint, eventName, eventMessage);
if (loggingEnabledForThisThread())
{
std::mbstate_t state = std::mbstate_t();
......@@ -32,9 +33,11 @@ void DebugAnnotator11::beginEvent(gl::Context *context,
}
}
void DebugAnnotator11::endEvent(const char *eventName)
void DebugAnnotator11::endEvent(gl::Context *context,
const char *eventName,
gl::EntryPoint entryPoint)
{
angle::LoggingAnnotator::endEvent(eventName);
angle::LoggingAnnotator::endEvent(context, eventName, entryPoint);
if (loggingEnabledForThisThread())
{
mUserDefinedAnnotation->EndEvent();
......
src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.h
......@@ -23,8 +23,11 @@ class DebugAnnotator11 : public angle::LoggingAnnotator
~DebugAnnotator11() override;
void initialize(ID3D11DeviceContext *context);
void release();
void beginEvent(gl::Context *context, const char *eventName, const char *eventMessage) override;
void endEvent(const char *eventName) override;
void beginEvent(gl::Context *context,
gl::EntryPoint entryPoint,
const char *eventName,
const char *eventMessage) override;
void endEvent(gl::Context *context, const char *eventName, gl::EntryPoint entryPoint) override;
void setMarker(const char *markerName) override;
bool getStatus() override;
......
src/libANGLE/renderer/d3d/d3d9/Context9.cpp
......@@ -10,6 +10,7 @@
#include "libANGLE/renderer/d3d/d3d9/Context9.h"
#include "common/string_utils.h"
#include "libANGLE/entry_points_enum_autogen.h"
#include "libANGLE/renderer/OverlayImpl.h"
#include "libANGLE/renderer/d3d/CompilerD3D.h"
#include "libANGLE/renderer/d3d/ProgramD3D.h"
......@@ -375,7 +376,7 @@ angle::Result Context9::insertEventMarker(GLsizei length, const char *marker)
angle::Result Context9::pushGroupMarker(GLsizei length, const char *marker)
{
mRenderer->getAnnotator()->beginEvent(nullptr, marker, marker);
mRenderer->getAnnotator()->beginEvent(nullptr, gl::EntryPoint::Begin, marker, marker);
mMarkerStack.push(std::string(marker));
return angle::Result::Continue;
}
......@@ -387,7 +388,7 @@ angle::Result Context9::popGroupMarker()
{
marker = mMarkerStack.top().c_str();
mMarkerStack.pop();
mRenderer->getAnnotator()->endEvent(marker);
mRenderer->getAnnotator()->endEvent(nullptr, marker, gl::EntryPoint::Begin);
}
return angle::Result::Continue;
}
......
src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp
......@@ -14,18 +14,21 @@ namespace rx
{
void DebugAnnotator9::beginEvent(gl::Context *context,
gl::EntryPoint entryPoint,
const char *eventName,
const char *eventMessage)
{
angle::LoggingAnnotator::beginEvent(context, eventName, eventMessage);
angle::LoggingAnnotator::beginEvent(context, entryPoint, eventName, eventMessage);
std::mbstate_t state = std::mbstate_t();
std::mbsrtowcs(mWCharMessage, &eventMessage, kMaxMessageLength, &state);
D3DPERF_BeginEvent(0, mWCharMessage);
}
void DebugAnnotator9::endEvent(const char *eventName)
void DebugAnnotator9::endEvent(gl::Context *context,
const char *eventName,
gl::EntryPoint entryPoint)
{
angle::LoggingAnnotator::endEvent(eventName);
angle::LoggingAnnotator::endEvent(context, eventName, entryPoint);
D3DPERF_EndEvent();
}
......
src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.h
......@@ -18,8 +18,11 @@ class DebugAnnotator9 : public angle::LoggingAnnotator
{
public:
DebugAnnotator9() {}
void beginEvent(gl::Context *context, const char *eventName, const char *eventMessage) override;
void endEvent(const char *eventName) override;
void beginEvent(gl::Context *context,
gl::EntryPoint entryPoint,
const char *eventName,
const char *eventMessage) override;
void endEvent(gl::Context *context, const char *eventName, gl::EntryPoint entryPoint) override;
void setMarker(const char *markerName) override;
bool getStatus() override;
......
src/libGL/entry_points_gl_1_0_autogen.cpp
This source diff could not be displayed because it is too large. You can view the blob instead.
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(context, "glCopyTexSubImage3D",
EVENT(context, gl::EntryPoint::CopyTexSubImage3D, "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(context, "glDrawRangeElements",
EVENT(context, gl::EntryPoint::DrawRangeElements, "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(context, "glTexImage3D",
EVENT(context, gl::EntryPoint::TexImage3D, "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(context, "glTexSubImage3D",
EVENT(context, gl::EntryPoint::TexSubImage3D, "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_2_1_autogen.cpp
......@@ -33,7 +33,7 @@ void GL_APIENTRY UniformMatrix2x3fv(GLint location,
const GLfloat *value)
{
Context *context = GetValidGlobalContext();
EVENT(context, "glUniformMatrix2x3fv",
EVENT(context, gl::EntryPoint::UniformMatrix2x3fv, "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(context, "glUniformMatrix2x4fv",
EVENT(context, gl::EntryPoint::UniformMatrix2x4fv, "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(context, "glUniformMatrix3x2fv",
EVENT(context, gl::EntryPoint::UniformMatrix3x2fv, "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(context, "glUniformMatrix3x4fv",
EVENT(context, gl::EntryPoint::UniformMatrix3x4fv, "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(context, "glUniformMatrix4x2fv",
EVENT(context, gl::EntryPoint::UniformMatrix4x2fv, "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(context, "glUniformMatrix4x3fv",
EVENT(context, gl::EntryPoint::UniformMatrix4x3fv, "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(context, "glCopyBufferSubData",
EVENT(context, gl::EntryPoint::CopyBufferSubData, "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(context, "glDrawArraysInstanced",
EVENT(context, gl::EntryPoint::DrawArraysInstanced, "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(context, "glDrawElementsInstanced",
EVENT(context, gl::EntryPoint::DrawElementsInstanced, "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(context, "glGetActiveUniformBlockName",
EVENT(context, gl::EntryPoint::GetActiveUniformBlockName, "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(context, "glGetActiveUniformBlockiv",
EVENT(context, gl::EntryPoint::GetActiveUniformBlockiv, "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(context, "glGetActiveUniformName",
EVENT(context, gl::EntryPoint::GetActiveUniformName, "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(context, "glGetActiveUniformsiv",
EVENT(context, gl::EntryPoint::GetActiveUniformsiv, "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(context, "glGetUniformBlockIndex",
EVENT(context, gl::EntryPoint::GetUniformBlockIndex, "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(context, "glGetUniformIndices",
EVENT(context, gl::EntryPoint::GetUniformIndices, "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,8 +296,8 @@ void GL_APIENTRY GetUniformIndices(GLuint program,
void GL_APIENTRY PrimitiveRestartIndex(GLuint index)
{
Context *context = GetValidGlobalContext();
EVENT(context, "glPrimitiveRestartIndex", "context = %d, GLuint index = %u", CID(context),
index);
EVENT(context, gl::EntryPoint::PrimitiveRestartIndex, "glPrimitiveRestartIndex",
"context = %d, GLuint index = %u", CID(context), index);
if (context)
{
......@@ -315,7 +315,7 @@ void GL_APIENTRY PrimitiveRestartIndex(GLuint index)
void GL_APIENTRY TexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
{
Context *context = GetValidGlobalContext();
EVENT(context, "glTexBuffer",
EVENT(context, gl::EntryPoint::TexBuffer, "glTexBuffer",
"context = %d, GLenum target = %s, GLenum internalformat = %s, GLuint buffer = %u",
CID(context), GLenumToString(GLenumGroup::TextureTarget, target),
GLenumToString(GLenumGroup::InternalFormat, internalformat), buffer);
......@@ -340,7 +340,7 @@ void GL_APIENTRY UniformBlockBinding(GLuint program,
GLuint uniformBlockBinding)
{
Context *context = GetValidGlobalContext();
EVENT(context, "glUniformBlockBinding",
EVENT(context, gl::EntryPoint::UniformBlockBinding, "glUniformBlockBinding",
"context = %d, GLuint program = %u, GLuint uniformBlockIndex = %u, GLuint "
"uniformBlockBinding = %u",
CID(context), program, uniformBlockIndex, uniformBlockBinding);
......
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(context, "glBindImageTexture",
EVENT(context, gl::EntryPoint::BindImageTexture, "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,8 @@ void GL_APIENTRY DrawArraysInstancedBaseInstance(GLenum mode,
GLuint baseinstance)
{
Context *context = GetValidGlobalContext();
EVENT(context, "glDrawArraysInstancedBaseInstance",
EVENT(context, gl::EntryPoint::DrawArraysInstancedBaseInstance,
"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 +98,8 @@ void GL_APIENTRY DrawElementsInstancedBaseInstance(GLenum mode,
GLuint baseinstance)
{
Context *context = GetValidGlobalContext();
EVENT(context, "glDrawElementsInstancedBaseInstance",
EVENT(context, gl::EntryPoint::DrawElementsInstancedBaseInstance,
"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 +131,8 @@ void GL_APIENTRY DrawElementsInstancedBaseVertexBaseInstance(GLenum mode,
GLuint baseinstance)
{
Context *context = GetValidGlobalContext();
EVENT(context, "glDrawElementsInstancedBaseVertexBaseInstance",
EVENT(context, gl::EntryPoint::DrawElementsInstancedBaseVertexBaseInstance,
"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 +162,8 @@ void GL_APIENTRY DrawElementsInstancedBaseVertexBaseInstance(GLenum mode,
void GL_APIENTRY DrawTransformFeedbackInstanced(GLenum mode, GLuint id, GLsizei instancecount)
{
Context *context = GetValidGlobalContext();
EVENT(context, "glDrawTransformFeedbackInstanced",
EVENT(context, gl::EntryPoint::DrawTransformFeedbackInstanced,
"glDrawTransformFeedbackInstanced",
"context = %d, GLenum mode = %s, GLuint id = %u, GLsizei instancecount = %d",
CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), id, instancecount);
......@@ -185,7 +189,8 @@ void GL_APIENTRY DrawTransformFeedbackStreamInstanced(GLenum mode,
GLsizei instancecount)
{
Context *context = GetValidGlobalContext();
EVENT(context, "glDrawTransformFeedbackStreamInstanced",
EVENT(context, gl::EntryPoint::DrawTransformFeedbackStreamInstanced,
"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 +218,8 @@ void GL_APIENTRY GetActiveAtomicCounterBufferiv(GLuint program,
GLint *params)
{
Context *context = GetValidGlobalContext();
EVENT(context, "glGetActiveAtomicCounterBufferiv",
EVENT(context, gl::EntryPoint::GetActiveAtomicCounterBufferiv,
"glGetActiveAtomicCounterBufferiv",
"context = %d, GLuint program = %u, GLuint bufferIndex = %u, GLenum pname = %s, GLint "
"*params = 0x%016" PRIxPTR "",
CID(context), program, bufferIndex,
......@@ -242,7 +248,7 @@ void GL_APIENTRY GetInternalformativ(GLenum target,
GLint *params)
{
Context *context = GetValidGlobalContext();
EVENT(context, "glGetInternalformativ",
EVENT(context, gl::EntryPoint::GetInternalformativ, "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 +273,8 @@ void GL_APIENTRY GetInternalformativ(GLenum target,
void GL_APIENTRY MemoryBarrier(GLbitfield barriers)
{
Context *context = GetValidGlobalContext();
EVENT(context, "glMemoryBarrier", "context = %d, GLbitfield barriers = %s", CID(context),
EVENT(context, gl::EntryPoint::MemoryBarrier, "glMemoryBarrier",
"context = %d, GLbitfield barriers = %s", CID(context),
GLbitfieldToString(GLenumGroup::MemoryBarrierMask, barriers).c_str());
if (context)
......@@ -285,7 +292,7 @@ void GL_APIENTRY MemoryBarrier(GLbitfield barriers)
void GL_APIENTRY TexStorage1D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width)
{
Context *context = GetValidGlobalContext();
EVENT(context, "glTexStorage1D",
EVENT(context, gl::EntryPoint::TexStorage1D, "glTexStorage1D",
"context = %d, GLenum target = %s, GLsizei levels = %d, GLenum internalformat = %s, "
"GLsizei width = %d",
CID(context), GLenumToString(GLenumGroup::TextureTarget, target), levels,
......@@ -308,7 +315,7 @@ void GL_APIENTRY
TexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
{
Context *context = GetValidGlobalContext();
EVENT(context, "glTexStorage2D",
EVENT(context, gl::EntryPoint::TexStorage2D, "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 +345,7 @@ void GL_APIENTRY TexStorage3D(GLenum target,
GLsizei depth)
{
Context *context = GetValidGlobalContext();
EVENT(context, "glTexStorage3D",
EVENT(context, gl::EntryPoint::TexStorage3D, "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(context, "glBindBuffersBase",
EVENT(context, gl::EntryPoint::BindBuffersBase, "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(context, "glBindBuffersRange",
EVENT(context, gl::EntryPoint::BindBuffersRange, "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(context, "glBindImageTextures",
EVENT(context, gl::EntryPoint::BindImageTextures, "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(context, "glBindSamplers",
EVENT(context, gl::EntryPoint::BindSamplers, "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(context, "glBindTextures",
EVENT(context, gl::EntryPoint::BindTextures, "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(context, "glBindVertexBuffers",
EVENT(context, gl::EntryPoint::BindVertexBuffers, "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(context, "glBufferStorage",
EVENT(context, gl::EntryPoint::BufferStorage, "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(context, "glClearTexImage",
EVENT(context, gl::EntryPoint::ClearTexImage, "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(context, "glClearTexSubImage",
EVENT(context, gl::EntryPoint::ClearTexSubImage, "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(context, "glMultiDrawArraysIndirectCount",
EVENT(context, gl::EntryPoint::MultiDrawArraysIndirectCount, "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,8 @@ void GL_APIENTRY MultiDrawElementsIndirectCount(GLenum mode,
GLsizei stride)
{
Context *context = GetValidGlobalContext();
EVENT(context, "glMultiDrawElementsIndirectCount",
EVENT(context, gl::EntryPoint::MultiDrawElementsIndirectCount,
"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 +90,7 @@ void GL_APIENTRY MultiDrawElementsIndirectCount(GLenum mode,
void GL_APIENTRY PolygonOffsetClamp(GLfloat factor, GLfloat units, GLfloat clamp)
{
Context *context = GetValidGlobalContext();
EVENT(context, "glPolygonOffsetClamp",
EVENT(context, gl::EntryPoint::PolygonOffsetClamp, "glPolygonOffsetClamp",
"context = %d, GLfloat factor = %f, GLfloat units = %f, GLfloat clamp = %f", CID(context),
factor, units, clamp);
......@@ -113,7 +114,7 @@ void GL_APIENTRY SpecializeShader(GLuint shader,
const GLuint *pConstantValue)
{
Context *context = GetValidGlobalContext();
EVENT(context, "glSpecializeShader",
EVENT(context, gl::EntryPoint::SpecializeShader, "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(nullptr, __FUNCTION__, "");
EVENT(nullptr, gl::EntryPoint::Begin, __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(nullptr, __FUNCTION__, "");
EVENT(nullptr, gl::EntryPoint::Begin, __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(nullptr, __FUNCTION__, "");
EVENT(nullptr, gl::EntryPoint::Begin, __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(nullptr, __FUNCTION__, "");
EVENT(nullptr, gl::EntryPoint::Begin, __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(nullptr, __FUNCTION__, "");
EVENT(nullptr, gl::EntryPoint::Begin, __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(nullptr, __FUNCTION__, "");
EVENT(nullptr, gl::EntryPoint::Begin, __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(nullptr, __FUNCTION__, "");
EVENT(nullptr, gl::EntryPoint::Begin, __FUNCTION__, "");
Thread *thread = egl::GetCurrentThread();
gl::Context *context = thread->getContext();
......
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.
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