Map D3D calls and HLSL shaders back to GLES2 calls and GLSL ES shaders in PIX.

This makes debugging and profiling using PIX a lot more convenient. The top level of events are the GLES calls with their arguments. Those can be expanded to see the D3D calls that were issued for a particular GLES call.

When PIX is attached, the shaders are saved out to temporary files and referenced from the translated HLSL shaders via #line directives. This enabled source level debugging of the original GLSL from PIX for pixel and vertex shaders. The HLSL is also saved to a temporary file so that intrinsic functions like texture2D can be stepped into.

It also avoids creating a text file in the current working directory, which has continued to be an issue.

I made the dependency on d3d9.dll static again so it can be accessed by GetModuleHandle witihin DllMain.

I added an EVENT macro that issues D3DPERF_BeginEvent and D3DPERF_EndEvent around a C++ block. I replaced TRACE with EVENT for all the entry points.

I removed the tracing of shader source since the source is visible in PIX.

The means by which the filename of the temporary shader file is passed into the shader compiler is a little clunky. I did it that way to avoid changing the function signatures and breaking folks using the translator.

I plan to make the compiler respect #pragma optimize so that optimization can be disabled for debugging purposes. For now it just disables shader optimization in debug builds of ANGLE.


Review URL: http://codereview.appspot.com/3945043

git-svn-id: https://angleproject.googlecode.com/svn/trunk@541 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index bed9211..cfc3a45 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -33,7 +33,7 @@
 
 void __stdcall glActiveTexture(GLenum texture)
 {
-    TRACE("(GLenum texture = 0x%X)", texture);
+    EVENT("(GLenum texture = 0x%X)", texture);
 
     try
     {
@@ -57,7 +57,7 @@
 
 void __stdcall glAttachShader(GLuint program, GLuint shader)
 {
-    TRACE("(GLuint program = %d, GLuint shader = %d)", program, shader);
+    EVENT("(GLuint program = %d, GLuint shader = %d)", program, shader);
 
     try
     {
@@ -106,7 +106,7 @@
 
 void __stdcall glBindAttribLocation(GLuint program, GLuint index, const GLchar* name)
 {
-    TRACE("(GLuint program = %d, GLuint index = %d, const GLchar* name = 0x%0.8p)", program, index, name);
+    EVENT("(GLuint program = %d, GLuint index = %d, const GLchar* name = 0x%0.8p)", program, index, name);
 
     try
     {
@@ -149,7 +149,7 @@
 
 void __stdcall glBindBuffer(GLenum target, GLuint buffer)
 {
-    TRACE("(GLenum target = 0x%X, GLuint buffer = %d)", target, buffer);
+    EVENT("(GLenum target = 0x%X, GLuint buffer = %d)", target, buffer);
 
     try
     {
@@ -178,7 +178,7 @@
 
 void __stdcall glBindFramebuffer(GLenum target, GLuint framebuffer)
 {
-    TRACE("(GLenum target = 0x%X, GLuint framebuffer = %d)", target, framebuffer);
+    EVENT("(GLenum target = 0x%X, GLuint framebuffer = %d)", target, framebuffer);
 
     try
     {
@@ -210,7 +210,7 @@
 
 void __stdcall glBindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
-    TRACE("(GLenum target = 0x%X, GLuint renderbuffer = %d)", target, renderbuffer);
+    EVENT("(GLenum target = 0x%X, GLuint renderbuffer = %d)", target, renderbuffer);
 
     try
     {
@@ -234,7 +234,7 @@
 
 void __stdcall glBindTexture(GLenum target, GLuint texture)
 {
-    TRACE("(GLenum target = 0x%X, GLuint texture = %d)", target, texture);
+    EVENT("(GLenum target = 0x%X, GLuint texture = %d)", target, texture);
 
     try
     {
@@ -270,7 +270,7 @@
 
 void __stdcall glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
 {
-    TRACE("(GLclampf red = %f, GLclampf green = %f, GLclampf blue = %f, GLclampf alpha = %f)",
+    EVENT("(GLclampf red = %f, GLclampf green = %f, GLclampf blue = %f, GLclampf alpha = %f)",
           red, green, blue, alpha);
 
     try
@@ -295,7 +295,7 @@
 
 void __stdcall glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    TRACE("(GLenum modeRGB = 0x%X, GLenum modeAlpha = 0x%X)", modeRGB, modeAlpha);
+    EVENT("(GLenum modeRGB = 0x%X, GLenum modeAlpha = 0x%X)", modeRGB, modeAlpha);
 
     try
     {
@@ -339,7 +339,7 @@
 
 void __stdcall glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
 {
-    TRACE("(GLenum srcRGB = 0x%X, GLenum dstRGB = 0x%X, GLenum srcAlpha = 0x%X, GLenum dstAlpha = 0x%X)",
+    EVENT("(GLenum srcRGB = 0x%X, GLenum dstRGB = 0x%X, GLenum srcAlpha = 0x%X, GLenum dstAlpha = 0x%X)",
           srcRGB, dstRGB, srcAlpha, dstAlpha);
 
     try
@@ -457,7 +457,7 @@
 
 void __stdcall glBufferData(GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage)
 {
-    TRACE("(GLenum target = 0x%X, GLsizeiptr size = %d, const GLvoid* data = 0x%0.8p, GLenum usage = %d)",
+    EVENT("(GLenum target = 0x%X, GLsizeiptr size = %d, const GLvoid* data = 0x%0.8p, GLenum usage = %d)",
           target, size, data, usage);
 
     try
@@ -511,7 +511,7 @@
 
 void __stdcall glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data)
 {
-    TRACE("(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr size = %d, const GLvoid* data = 0x%0.8p)",
+    EVENT("(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr size = %d, const GLvoid* data = 0x%0.8p)",
           target, offset, size, data);
 
     try
@@ -565,7 +565,7 @@
 
 GLenum __stdcall glCheckFramebufferStatus(GLenum target)
 {
-    TRACE("(GLenum target = 0x%X)", target);
+    EVENT("(GLenum target = 0x%X)", target);
 
     try
     {
@@ -601,7 +601,7 @@
 
 void __stdcall glClear(GLbitfield mask)
 {
-    TRACE("(GLbitfield mask = %X)", mask);
+    EVENT("(GLbitfield mask = %X)", mask);
 
     try
     {
@@ -620,7 +620,7 @@
 
 void __stdcall glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
 {
-    TRACE("(GLclampf red = %f, GLclampf green = %f, GLclampf blue = %f, GLclampf alpha = %f)",
+    EVENT("(GLclampf red = %f, GLclampf green = %f, GLclampf blue = %f, GLclampf alpha = %f)",
           red, green, blue, alpha);
 
     try
@@ -640,7 +640,7 @@
 
 void __stdcall glClearDepthf(GLclampf depth)
 {
-    TRACE("(GLclampf depth = %f)", depth);
+    EVENT("(GLclampf depth = %f)", depth);
 
     try
     {
@@ -659,7 +659,7 @@
 
 void __stdcall glClearStencil(GLint s)
 {
-    TRACE("(GLint s = %d)", s);
+    EVENT("(GLint s = %d)", s);
 
     try
     {
@@ -678,7 +678,7 @@
 
 void __stdcall glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    TRACE("(GLboolean red = %d, GLboolean green = %d, GLboolean blue = %d, GLboolean alpha = %d)",
+    EVENT("(GLboolean red = %d, GLboolean green = %d, GLboolean blue = %d, GLboolean alpha = %d)",
           red, green, blue, alpha);
 
     try
@@ -698,7 +698,7 @@
 
 void __stdcall glCompileShader(GLuint shader)
 {
-    TRACE("(GLuint shader = %d)", shader);
+    EVENT("(GLuint shader = %d)", shader);
 
     try
     {
@@ -732,7 +732,7 @@
 void __stdcall glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, 
                                       GLint border, GLsizei imageSize, const GLvoid* data)
 {
-    TRACE("(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = %d, " 
+    EVENT("(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = %d, " 
           "GLsizei height = %d, GLint border = %d, GLsizei imageSize = %d, const GLvoid* data = 0x%0.8p)",
           target, level, internalformat, width, height, border, imageSize, data);
 
@@ -856,7 +856,7 @@
 void __stdcall glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height,
                                          GLenum format, GLsizei imageSize, const GLvoid* data)
 {
-    TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "
+    EVENT("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "
           "GLsizei width = %d, GLsizei height = %d, GLenum format = 0x%X, "
           "GLsizei imageSize = %d, const GLvoid* data = 0x%0.8p)",
           target, level, xoffset, yoffset, width, height, format, imageSize, data);
@@ -976,7 +976,7 @@
 
 void __stdcall glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    TRACE("(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, "
+    EVENT("(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, "
           "GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLint border = %d)",
           target, level, internalformat, x, y, width, height, border);
 
@@ -1130,7 +1130,7 @@
 
 void __stdcall glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "
+    EVENT("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "
           "GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",
           target, level, xoffset, yoffset, x, y, width, height);
 
@@ -1253,7 +1253,7 @@
 
 GLuint __stdcall glCreateProgram(void)
 {
-    TRACE("()");
+    EVENT("()");
 
     try
     {
@@ -1274,7 +1274,7 @@
 
 GLuint __stdcall glCreateShader(GLenum type)
 {
-    TRACE("(GLenum type = 0x%X)", type);
+    EVENT("(GLenum type = 0x%X)", type);
 
     try
     {
@@ -1302,7 +1302,7 @@
 
 void __stdcall glCullFace(GLenum mode)
 {
-    TRACE("(GLenum mode = 0x%X)", mode);
+    EVENT("(GLenum mode = 0x%X)", mode);
 
     try
     {
@@ -1332,7 +1332,7 @@
 
 void __stdcall glDeleteBuffers(GLsizei n, const GLuint* buffers)
 {
-    TRACE("(GLsizei n = %d, const GLuint* buffers = 0x%0.8p)", n, buffers);
+    EVENT("(GLsizei n = %d, const GLuint* buffers = 0x%0.8p)", n, buffers);
 
     try
     {
@@ -1359,7 +1359,7 @@
 
 void __stdcall glDeleteFencesNV(GLsizei n, const GLuint* fences)
 {
-    TRACE("(GLsizei n = %d, const GLuint* fences = 0x%0.8p)", n, fences);
+    EVENT("(GLsizei n = %d, const GLuint* fences = 0x%0.8p)", n, fences);
 
     try
     {
@@ -1386,7 +1386,7 @@
 
 void __stdcall glDeleteFramebuffers(GLsizei n, const GLuint* framebuffers)
 {
-    TRACE("(GLsizei n = %d, const GLuint* framebuffers = 0x%0.8p)", n, framebuffers);
+    EVENT("(GLsizei n = %d, const GLuint* framebuffers = 0x%0.8p)", n, framebuffers);
 
     try
     {
@@ -1416,7 +1416,7 @@
 
 void __stdcall glDeleteProgram(GLuint program)
 {
-    TRACE("(GLuint program = %d)", program);
+    EVENT("(GLuint program = %d)", program);
 
     try
     {
@@ -1452,7 +1452,7 @@
 
 void __stdcall glDeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers)
 {
-    TRACE("(GLsizei n = %d, const GLuint* renderbuffers = 0x%0.8p)", n, renderbuffers);
+    EVENT("(GLsizei n = %d, const GLuint* renderbuffers = 0x%0.8p)", n, renderbuffers);
 
     try
     {
@@ -1479,7 +1479,7 @@
 
 void __stdcall glDeleteShader(GLuint shader)
 {
-    TRACE("(GLuint shader = %d)", shader);
+    EVENT("(GLuint shader = %d)", shader);
 
     try
     {
@@ -1515,7 +1515,7 @@
 
 void __stdcall glDeleteTextures(GLsizei n, const GLuint* textures)
 {
-    TRACE("(GLsizei n = %d, const GLuint* textures = 0x%0.8p)", n, textures);
+    EVENT("(GLsizei n = %d, const GLuint* textures = 0x%0.8p)", n, textures);
 
     try
     {
@@ -1545,7 +1545,7 @@
 
 void __stdcall glDepthFunc(GLenum func)
 {
-    TRACE("(GLenum func = 0x%X)", func);
+    EVENT("(GLenum func = 0x%X)", func);
 
     try
     {
@@ -1579,7 +1579,7 @@
 
 void __stdcall glDepthMask(GLboolean flag)
 {
-    TRACE("(GLboolean flag = %d)", flag);
+    EVENT("(GLboolean flag = %d)", flag);
 
     try
     {
@@ -1598,7 +1598,7 @@
 
 void __stdcall glDepthRangef(GLclampf zNear, GLclampf zFar)
 {
-    TRACE("(GLclampf zNear = %f, GLclampf zFar = %f)", zNear, zFar);
+    EVENT("(GLclampf zNear = %f, GLclampf zFar = %f)", zNear, zFar);
 
     try
     {
@@ -1617,7 +1617,7 @@
 
 void __stdcall glDetachShader(GLuint program, GLuint shader)
 {
-    TRACE("(GLuint program = %d, GLuint shader = %d)", program, shader);
+    EVENT("(GLuint program = %d, GLuint shader = %d)", program, shader);
 
     try
     {
@@ -1670,7 +1670,7 @@
 
 void __stdcall glDisable(GLenum cap)
 {
-    TRACE("(GLenum cap = 0x%X)", cap);
+    EVENT("(GLenum cap = 0x%X)", cap);
 
     try
     {
@@ -1702,7 +1702,7 @@
 
 void __stdcall glDisableVertexAttribArray(GLuint index)
 {
-    TRACE("(GLuint index = %d)", index);
+    EVENT("(GLuint index = %d)", index);
 
     try
     {
@@ -1726,7 +1726,7 @@
 
 void __stdcall glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    TRACE("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d)", mode, first, count);
+    EVENT("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d)", mode, first, count);
 
     try
     {
@@ -1750,7 +1750,7 @@
 
 void __stdcall glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid* indices)
 {
-    TRACE("(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const GLvoid* indices = 0x%0.8p)",
+    EVENT("(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const GLvoid* indices = 0x%0.8p)",
           mode, count, type, indices);
 
     try
@@ -1790,7 +1790,7 @@
 
 void __stdcall glEnable(GLenum cap)
 {
-    TRACE("(GLenum cap = 0x%X)", cap);
+    EVENT("(GLenum cap = 0x%X)", cap);
 
     try
     {
@@ -1822,7 +1822,7 @@
 
 void __stdcall glEnableVertexAttribArray(GLuint index)
 {
-    TRACE("(GLuint index = %d)", index);
+    EVENT("(GLuint index = %d)", index);
 
     try
     {
@@ -1846,7 +1846,7 @@
 
 void __stdcall glFinishFenceNV(GLuint fence)
 {
-    TRACE("(GLuint fence = %d)", fence);
+    EVENT("(GLuint fence = %d)", fence);
 
     try
     {
@@ -1872,7 +1872,7 @@
 
 void __stdcall glFinish(void)
 {
-    TRACE("()");
+    EVENT("()");
 
     try
     {
@@ -1891,7 +1891,7 @@
 
 void __stdcall glFlush(void)
 {
-    TRACE("()");
+    EVENT("()");
 
     try
     {
@@ -1910,7 +1910,7 @@
 
 void __stdcall glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    TRACE("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum renderbuffertarget = 0x%X, "
+    EVENT("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum renderbuffertarget = 0x%X, "
           "GLuint renderbuffer = %d)", target, attachment, renderbuffertarget, renderbuffer);
 
     try
@@ -1967,7 +1967,7 @@
 
 void __stdcall glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    TRACE("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, "
+    EVENT("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, "
           "GLuint texture = %d, GLint level = %d)", target, attachment, textarget, texture, level);
 
     try
@@ -2074,7 +2074,7 @@
 
 void __stdcall glFrontFace(GLenum mode)
 {
-    TRACE("(GLenum mode = 0x%X)", mode);
+    EVENT("(GLenum mode = 0x%X)", mode);
 
     try
     {
@@ -2103,7 +2103,7 @@
 
 void __stdcall glGenBuffers(GLsizei n, GLuint* buffers)
 {
-    TRACE("(GLsizei n = %d, GLuint* buffers = 0x%0.8p)", n, buffers);
+    EVENT("(GLsizei n = %d, GLuint* buffers = 0x%0.8p)", n, buffers);
 
     try
     {
@@ -2130,7 +2130,7 @@
 
 void __stdcall glGenerateMipmap(GLenum target)
 {
-    TRACE("(GLenum target = 0x%X)", target);
+    EVENT("(GLenum target = 0x%X)", target);
 
     try
     {
@@ -2170,7 +2170,7 @@
 
 void __stdcall glGenFencesNV(GLsizei n, GLuint* fences)
 {
-    TRACE("(GLsizei n = %d, GLuint* fences = 0x%0.8p)", n, fences);
+    EVENT("(GLsizei n = %d, GLuint* fences = 0x%0.8p)", n, fences);
 
     try
     {
@@ -2197,7 +2197,7 @@
 
 void __stdcall glGenFramebuffers(GLsizei n, GLuint* framebuffers)
 {
-    TRACE("(GLsizei n = %d, GLuint* framebuffers = 0x%0.8p)", n, framebuffers);
+    EVENT("(GLsizei n = %d, GLuint* framebuffers = 0x%0.8p)", n, framebuffers);
 
     try
     {
@@ -2224,7 +2224,7 @@
 
 void __stdcall glGenRenderbuffers(GLsizei n, GLuint* renderbuffers)
 {
-    TRACE("(GLsizei n = %d, GLuint* renderbuffers = 0x%0.8p)", n, renderbuffers);
+    EVENT("(GLsizei n = %d, GLuint* renderbuffers = 0x%0.8p)", n, renderbuffers);
 
     try
     {
@@ -2251,7 +2251,7 @@
 
 void __stdcall glGenTextures(GLsizei n, GLuint* textures)
 {
-    TRACE("(GLsizei n = %d, GLuint* textures =  0x%0.8p)", n, textures);
+    EVENT("(GLsizei n = %d, GLuint* textures =  0x%0.8p)", n, textures);
 
     try
     {
@@ -2278,7 +2278,7 @@
 
 void __stdcall glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    TRACE("(GLuint program = %d, GLuint index = %d, GLsizei bufsize = %d, GLsizei *length = 0x%0.8p, "
+    EVENT("(GLuint program = %d, GLuint index = %d, GLsizei bufsize = %d, GLsizei *length = 0x%0.8p, "
           "GLint *size = 0x%0.8p, GLenum *type = %0.8p, GLchar *name = %0.8p)",
           program, index, bufsize, length, size, type, name);
 
@@ -2323,7 +2323,7 @@
 
 void __stdcall glGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name)
 {
-    TRACE("(GLuint program = %d, GLuint index = %d, GLsizei bufsize = %d, "
+    EVENT("(GLuint program = %d, GLuint index = %d, GLsizei bufsize = %d, "
           "GLsizei* length = 0x%0.8p, GLint* size = 0x%0.8p, GLenum* type = 0x%0.8p, GLchar* name = 0x%0.8p)",
           program, index, bufsize, length, size, type, name);
 
@@ -2368,7 +2368,7 @@
 
 void __stdcall glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders)
 {
-    TRACE("(GLuint program = %d, GLsizei maxcount = %d, GLsizei* count = 0x%0.8p, GLuint* shaders = 0x%0.8p)",
+    EVENT("(GLuint program = %d, GLsizei maxcount = %d, GLsizei* count = 0x%0.8p, GLuint* shaders = 0x%0.8p)",
           program, maxcount, count, shaders);
 
     try
@@ -2407,7 +2407,7 @@
 
 int __stdcall glGetAttribLocation(GLuint program, const GLchar* name)
 {
-    TRACE("(GLuint program = %d, const GLchar* name = %s)", program, name);
+    EVENT("(GLuint program = %d, const GLchar* name = %s)", program, name);
 
     try
     {
@@ -2448,7 +2448,7 @@
 
 void __stdcall glGetBooleanv(GLenum pname, GLboolean* params)
 {
-    TRACE("(GLenum pname = 0x%X, GLboolean* params = 0x%0.8p)",  pname, params);
+    EVENT("(GLenum pname = 0x%X, GLboolean* params = 0x%0.8p)",  pname, params);
 
     try
     {
@@ -2511,7 +2511,7 @@
 
 void __stdcall glGetBufferParameteriv(GLenum target, GLenum pname, GLint* params)
 {
-    TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint* params = 0x%0.8p)", target, pname, params);
+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint* params = 0x%0.8p)", target, pname, params);
 
     try
     {
@@ -2558,7 +2558,7 @@
 
 GLenum __stdcall glGetError(void)
 {
-    TRACE("()");
+    EVENT("()");
 
     gl::Context *context = gl::getContext();
 
@@ -2572,7 +2572,7 @@
 
 void __stdcall glGetFenceivNV(GLuint fence, GLenum pname, GLint *params)
 {
-    TRACE("(GLuint fence = %d, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", fence, pname, params);
+    EVENT("(GLuint fence = %d, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", fence, pname, params);
 
     try
     {
@@ -2599,7 +2599,7 @@
 
 void __stdcall glGetFloatv(GLenum pname, GLfloat* params)
 {
-    TRACE("(GLenum pname = 0x%X, GLfloat* params = 0x%0.8p)", pname, params);
+    EVENT("(GLenum pname = 0x%X, GLfloat* params = 0x%0.8p)", pname, params);
 
     try
     {
@@ -2659,7 +2659,7 @@
 
 void __stdcall glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint* params)
 {
-    TRACE("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLint* params = 0x%0.8p)",
+    EVENT("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLint* params = 0x%0.8p)",
           target, attachment, pname, params);
 
     try
@@ -2778,7 +2778,7 @@
 
 void __stdcall glGetIntegerv(GLenum pname, GLint* params)
 {
-    TRACE("(GLenum pname = 0x%X, GLint* params = 0x%0.8p)", pname, params);
+    EVENT("(GLenum pname = 0x%X, GLint* params = 0x%0.8p)", pname, params);
 
     try
     {
@@ -2843,7 +2843,7 @@
 
 void __stdcall glGetProgramiv(GLuint program, GLenum pname, GLint* params)
 {
-    TRACE("(GLuint program = %d, GLenum pname = %d, GLint* params = 0x%0.8p)", program, pname, params);
+    EVENT("(GLuint program = %d, GLenum pname = %d, GLint* params = 0x%0.8p)", program, pname, params);
 
     try
     {
@@ -2900,7 +2900,7 @@
 
 void __stdcall glGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* length, GLchar* infolog)
 {
-    TRACE("(GLuint program = %d, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, GLchar* infolog = 0x%0.8p)",
+    EVENT("(GLuint program = %d, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, GLchar* infolog = 0x%0.8p)",
           program, bufsize, length, infolog);
 
     try
@@ -2932,7 +2932,7 @@
 
 void __stdcall glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params)
 {
-    TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint* params = 0x%0.8p)", target, pname, params);
+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint* params = 0x%0.8p)", target, pname, params);
 
     try
     {
@@ -3048,7 +3048,7 @@
 
 void __stdcall glGetShaderiv(GLuint shader, GLenum pname, GLint* params)
 {
-    TRACE("(GLuint shader = %d, GLenum pname = %d, GLint* params = 0x%0.8p)", shader, pname, params);
+    EVENT("(GLuint shader = %d, GLenum pname = %d, GLint* params = 0x%0.8p)", shader, pname, params);
 
     try
     {
@@ -3093,7 +3093,7 @@
 
 void __stdcall glGetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* infolog)
 {
-    TRACE("(GLuint shader = %d, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, GLchar* infolog = 0x%0.8p)",
+    EVENT("(GLuint shader = %d, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, GLchar* infolog = 0x%0.8p)",
           shader, bufsize, length, infolog);
 
     try
@@ -3125,7 +3125,7 @@
 
 void __stdcall glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision)
 {
-    TRACE("(GLenum shadertype = 0x%X, GLenum precisiontype = 0x%X, GLint* range = 0x%0.8p, GLint* precision = 0x%0.8p)",
+    EVENT("(GLenum shadertype = 0x%X, GLenum precisiontype = 0x%X, GLint* range = 0x%0.8p, GLint* precision = 0x%0.8p)",
           shadertype, precisiontype, range, precision);
 
     try
@@ -3170,7 +3170,7 @@
 
 void __stdcall glGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* source)
 {
-    TRACE("(GLuint shader = %d, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, GLchar* source = 0x%0.8p)",
+    EVENT("(GLuint shader = %d, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, GLchar* source = 0x%0.8p)",
           shader, bufsize, length, source);
 
     try
@@ -3202,7 +3202,7 @@
 
 const GLubyte* __stdcall glGetString(GLenum name)
 {
-    TRACE("(GLenum name = 0x%X)", name);
+    EVENT("(GLenum name = 0x%X)", name);
 
     try
     {
@@ -3234,7 +3234,7 @@
 
 void __stdcall glGetTexParameterfv(GLenum target, GLenum pname, GLfloat* params)
 {
-    TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat* params = 0x%0.8p)", target, pname, params);
+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat* params = 0x%0.8p)", target, pname, params);
 
     try
     {
@@ -3283,7 +3283,7 @@
 
 void __stdcall glGetTexParameteriv(GLenum target, GLenum pname, GLint* params)
 {
-    TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint* params = 0x%0.8p)", target, pname, params);
+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint* params = 0x%0.8p)", target, pname, params);
 
     try
     {
@@ -3332,7 +3332,7 @@
 
 void __stdcall glGetUniformfv(GLuint program, GLint location, GLfloat* params)
 {
-    TRACE("(GLuint program = %d, GLint location = %d, GLfloat* params = 0x%0.8p)", program, location, params);
+    EVENT("(GLuint program = %d, GLint location = %d, GLfloat* params = 0x%0.8p)", program, location, params);
 
     try
     {
@@ -3366,7 +3366,7 @@
 
 void __stdcall glGetUniformiv(GLuint program, GLint location, GLint* params)
 {
-    TRACE("(GLuint program = %d, GLint location = %d, GLint* params = 0x%0.8p)", program, location, params);
+    EVENT("(GLuint program = %d, GLint location = %d, GLint* params = 0x%0.8p)", program, location, params);
 
     try
     {
@@ -3405,7 +3405,7 @@
 
 int __stdcall glGetUniformLocation(GLuint program, const GLchar* name)
 {
-    TRACE("(GLuint program = %d, const GLchar* name = 0x%0.8p)", program, name);
+    EVENT("(GLuint program = %d, const GLchar* name = 0x%0.8p)", program, name);
 
     try
     {
@@ -3450,7 +3450,7 @@
 
 void __stdcall glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params)
 {
-    TRACE("(GLuint index = %d, GLenum pname = 0x%X, GLfloat* params = 0x%0.8p)", index, pname, params);
+    EVENT("(GLuint index = %d, GLenum pname = 0x%X, GLfloat* params = 0x%0.8p)", index, pname, params);
 
     try
     {
@@ -3503,7 +3503,7 @@
 
 void __stdcall glGetVertexAttribiv(GLuint index, GLenum pname, GLint* params)
 {
-    TRACE("(GLuint index = %d, GLenum pname = 0x%X, GLint* params = 0x%0.8p)", index, pname, params);
+    EVENT("(GLuint index = %d, GLenum pname = 0x%X, GLint* params = 0x%0.8p)", index, pname, params);
 
     try
     {
@@ -3557,7 +3557,7 @@
 
 void __stdcall glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid** pointer)
 {
-    TRACE("(GLuint index = %d, GLenum pname = 0x%X, GLvoid** pointer = 0x%0.8p)", index, pname, pointer);
+    EVENT("(GLuint index = %d, GLenum pname = 0x%X, GLvoid** pointer = 0x%0.8p)", index, pname, pointer);
 
     try
     {
@@ -3586,7 +3586,7 @@
 
 void __stdcall glHint(GLenum target, GLenum mode)
 {
-    TRACE("(GLenum target = 0x%X, GLenum mode = 0x%X)", target, mode);
+    EVENT("(GLenum target = 0x%X, GLenum mode = 0x%X)", target, mode);
 
     try
     {
@@ -3621,7 +3621,7 @@
 
 GLboolean __stdcall glIsBuffer(GLuint buffer)
 {
-    TRACE("(GLuint buffer = %d)", buffer);
+    EVENT("(GLuint buffer = %d)", buffer);
 
     try
     {
@@ -3647,7 +3647,7 @@
 
 GLboolean __stdcall glIsEnabled(GLenum cap)
 {
-    TRACE("(GLenum cap = 0x%X)", cap);
+    EVENT("(GLenum cap = 0x%X)", cap);
 
     try
     {
@@ -3681,7 +3681,7 @@
 
 GLboolean __stdcall glIsFenceNV(GLuint fence)
 {
-    TRACE("(GLuint fence = %d)", fence);
+    EVENT("(GLuint fence = %d)", fence);
 
     try
     {
@@ -3709,7 +3709,7 @@
 
 GLboolean __stdcall glIsFramebuffer(GLuint framebuffer)
 {
-    TRACE("(GLuint framebuffer = %d)", framebuffer);
+    EVENT("(GLuint framebuffer = %d)", framebuffer);
 
     try
     {
@@ -3735,7 +3735,7 @@
 
 GLboolean __stdcall glIsProgram(GLuint program)
 {
-    TRACE("(GLuint program = %d)", program);
+    EVENT("(GLuint program = %d)", program);
 
     try
     {
@@ -3761,7 +3761,7 @@
 
 GLboolean __stdcall glIsRenderbuffer(GLuint renderbuffer)
 {
-    TRACE("(GLuint renderbuffer = %d)", renderbuffer);
+    EVENT("(GLuint renderbuffer = %d)", renderbuffer);
 
     try
     {
@@ -3787,7 +3787,7 @@
 
 GLboolean __stdcall glIsShader(GLuint shader)
 {
-    TRACE("(GLuint shader = %d)", shader);
+    EVENT("(GLuint shader = %d)", shader);
 
     try
     {
@@ -3813,7 +3813,7 @@
 
 GLboolean __stdcall glIsTexture(GLuint texture)
 {
-    TRACE("(GLuint texture = %d)", texture);
+    EVENT("(GLuint texture = %d)", texture);
 
     try
     {
@@ -3839,7 +3839,7 @@
 
 void __stdcall glLineWidth(GLfloat width)
 {
-    TRACE("(GLfloat width = %f)", width);
+    EVENT("(GLfloat width = %f)", width);
 
     try
     {
@@ -3863,7 +3863,7 @@
 
 void __stdcall glLinkProgram(GLuint program)
 {
-    TRACE("(GLuint program = %d)", program);
+    EVENT("(GLuint program = %d)", program);
 
     try
     {
@@ -3896,7 +3896,7 @@
 
 void __stdcall glPixelStorei(GLenum pname, GLint param)
 {
-    TRACE("(GLenum pname = 0x%X, GLint param = %d)", pname, param);
+    EVENT("(GLenum pname = 0x%X, GLint param = %d)", pname, param);
 
     try
     {
@@ -3937,7 +3937,7 @@
 
 void __stdcall glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    TRACE("(GLfloat factor = %f, GLfloat units = %f)", factor, units);
+    EVENT("(GLfloat factor = %f, GLfloat units = %f)", factor, units);
 
     try
     {
@@ -3956,7 +3956,7 @@
 
 void __stdcall glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels)
 {
-    TRACE("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, "
+    EVENT("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, "
           "GLenum format = 0x%X, GLenum type = 0x%X, GLvoid* pixels = 0x%0.8p)",
           x, y, width, height, format, type,  pixels);
 
@@ -4017,7 +4017,7 @@
 
 void __stdcall glReleaseShaderCompiler(void)
 {
-    TRACE("()");
+    EVENT("()");
 
     try
     {
@@ -4031,7 +4031,7 @@
 
 void __stdcall glRenderbufferStorageMultisampleANGLE(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    TRACE("(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = %d)",
+    EVENT("(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = %d)",
           target, samples, internalformat, width, height);
 
     try
@@ -4107,7 +4107,7 @@
 
 void __stdcall glSampleCoverage(GLclampf value, GLboolean invert)
 {
-    TRACE("(GLclampf value = %f, GLboolean invert = %d)", value, invert);
+    EVENT("(GLclampf value = %f, GLboolean invert = %d)", value, invert);
 
     try
     {
@@ -4126,7 +4126,7 @@
 
 void __stdcall glSetFenceNV(GLuint fence, GLenum condition)
 {
-    TRACE("(GLuint fence = %d, GLenum condition = 0x%X)", fence, condition);
+    EVENT("(GLuint fence = %d, GLenum condition = 0x%X)", fence, condition);
 
     try
     {
@@ -4157,7 +4157,7 @@
 
 void __stdcall glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    TRACE("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", x, y, width, height);
+    EVENT("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", x, y, width, height);
 
     try
     {
@@ -4181,7 +4181,7 @@
 
 void __stdcall glShaderBinary(GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length)
 {
-    TRACE("(GLsizei n = %d, const GLuint* shaders = 0x%0.8p, GLenum binaryformat = 0x%X, "
+    EVENT("(GLsizei n = %d, const GLuint* shaders = 0x%0.8p, GLenum binaryformat = 0x%X, "
           "const GLvoid* binary = 0x%0.8p, GLsizei length = %d)",
           n, shaders, binaryformat, binary, length);
 
@@ -4198,7 +4198,7 @@
 
 void __stdcall glShaderSource(GLuint shader, GLsizei count, const GLchar** string, const GLint* length)
 {
-    TRACE("(GLuint shader = %d, GLsizei count = %d, const GLchar** string = 0x%0.8p, const GLint* length = 0x%0.8p)",
+    EVENT("(GLuint shader = %d, GLsizei count = %d, const GLchar** string = 0x%0.8p, const GLint* length = 0x%0.8p)",
           shader, count, string, length);
 
     try
@@ -4242,7 +4242,7 @@
 
 void __stdcall glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    TRACE("(GLenum face = 0x%X, GLenum func = 0x%X, GLint ref = %d, GLuint mask = %d)", face, func, ref, mask);
+    EVENT("(GLenum face = 0x%X, GLenum func = 0x%X, GLint ref = %d, GLuint mask = %d)", face, func, ref, mask);
 
     try
     {
@@ -4299,7 +4299,7 @@
 
 void __stdcall glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    TRACE("(GLenum face = 0x%X, GLuint mask = %d)", face, mask);
+    EVENT("(GLenum face = 0x%X, GLuint mask = %d)", face, mask);
 
     try
     {
@@ -4341,7 +4341,7 @@
 
 void __stdcall glStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)
 {
-    TRACE("(GLenum face = 0x%X, GLenum fail = 0x%X, GLenum zfail = 0x%X, GLenum zpas = 0x%Xs)",
+    EVENT("(GLenum face = 0x%X, GLenum fail = 0x%X, GLenum zfail = 0x%X, GLenum zpas = 0x%Xs)",
           face, fail, zfail, zpass);
 
     try
@@ -4424,7 +4424,7 @@
 
 GLboolean __stdcall glTestFenceNV(GLuint fence)
 {
-    TRACE("(GLuint fence = %d)", fence);
+    EVENT("(GLuint fence = %d)", fence);
 
     try
     {
@@ -4453,7 +4453,7 @@
 void __stdcall glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
                             GLint border, GLenum format, GLenum type, const GLvoid* pixels)
 {
-    TRACE("(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, GLsizei height = %d, "
+    EVENT("(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, GLsizei height = %d, "
           "GLint border = %d, GLenum format = 0x%X, GLenum type = 0x%X, const GLvoid* pixels =  0x%0.8p)",
           target, level, internalformat, width, height, border, format, type, pixels);
 
@@ -4660,7 +4660,7 @@
 
 void __stdcall glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %d)", target, pname, param);
+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %d)", target, pname, param);
 
     try
     {
@@ -4727,7 +4727,7 @@
 void __stdcall glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height,
                                GLenum format, GLenum type, const GLvoid* pixels)
 {
-    TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "
+    EVENT("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "
           "GLsizei width = %d, GLsizei height = %d, GLenum format = 0x%X, GLenum type = 0x%X, "
           "const GLvoid* pixels = 0x%0.8p)",
            target, level, xoffset, yoffset, width, height, format, type, pixels);
@@ -4844,7 +4844,7 @@
 
 void __stdcall glUniform1fv(GLint location, GLsizei count, const GLfloat* v)
 {
-    TRACE("(GLint location = %d, GLsizei count = %d, const GLfloat* v = 0x%0.8p)", location, count, v);
+    EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat* v = 0x%0.8p)", location, count, v);
 
     try
     {
@@ -4888,7 +4888,7 @@
 
 void __stdcall glUniform1iv(GLint location, GLsizei count, const GLint* v)
 {
-    TRACE("(GLint location = %d, GLsizei count = %d, const GLint* v = 0x%0.8p)", location, count, v);
+    EVENT("(GLint location = %d, GLsizei count = %d, const GLint* v = 0x%0.8p)", location, count, v);
 
     try
     {
@@ -4934,7 +4934,7 @@
 
 void __stdcall glUniform2fv(GLint location, GLsizei count, const GLfloat* v)
 {
-    TRACE("(GLint location = %d, GLsizei count = %d, const GLfloat* v = 0x%0.8p)", location, count, v);
+    EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat* v = 0x%0.8p)", location, count, v);
 
     try
     {
@@ -4980,7 +4980,7 @@
 
 void __stdcall glUniform2iv(GLint location, GLsizei count, const GLint* v)
 {
-    TRACE("(GLint location = %d, GLsizei count = %d, const GLint* v = 0x%0.8p)", location, count, v);
+    EVENT("(GLint location = %d, GLsizei count = %d, const GLint* v = 0x%0.8p)", location, count, v);
 
     try
     {
@@ -5026,7 +5026,7 @@
 
 void __stdcall glUniform3fv(GLint location, GLsizei count, const GLfloat* v)
 {
-    TRACE("(GLint location = %d, GLsizei count = %d, const GLfloat* v = 0x%0.8p)", location, count, v);
+    EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat* v = 0x%0.8p)", location, count, v);
 
     try
     {
@@ -5072,7 +5072,7 @@
 
 void __stdcall glUniform3iv(GLint location, GLsizei count, const GLint* v)
 {
-    TRACE("(GLint location = %d, GLsizei count = %d, const GLint* v = 0x%0.8p)", location, count, v);
+    EVENT("(GLint location = %d, GLsizei count = %d, const GLint* v = 0x%0.8p)", location, count, v);
 
     try
     {
@@ -5118,7 +5118,7 @@
 
 void __stdcall glUniform4fv(GLint location, GLsizei count, const GLfloat* v)
 {
-    TRACE("(GLint location = %d, GLsizei count = %d, const GLfloat* v = 0x%0.8p)", location, count, v);
+    EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat* v = 0x%0.8p)", location, count, v);
 
     try
     {
@@ -5164,7 +5164,7 @@
 
 void __stdcall glUniform4iv(GLint location, GLsizei count, const GLint* v)
 {
-    TRACE("(GLint location = %d, GLsizei count = %d, const GLint* v = 0x%0.8p)", location, count, v);
+    EVENT("(GLint location = %d, GLsizei count = %d, const GLint* v = 0x%0.8p)", location, count, v);
 
     try
     {
@@ -5203,7 +5203,7 @@
 
 void __stdcall glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
 {
-    TRACE("(GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat* value = 0x%0.8p)",
+    EVENT("(GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat* value = 0x%0.8p)",
           location, count, transpose, value);
 
     try
@@ -5243,7 +5243,7 @@
 
 void __stdcall glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
 {
-    TRACE("(GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat* value = 0x%0.8p)",
+    EVENT("(GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat* value = 0x%0.8p)",
           location, count, transpose, value);
 
     try
@@ -5283,7 +5283,7 @@
 
 void __stdcall glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
 {
-    TRACE("(GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat* value = 0x%0.8p)",
+    EVENT("(GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat* value = 0x%0.8p)",
           location, count, transpose, value);
 
     try
@@ -5323,7 +5323,7 @@
 
 void __stdcall glUseProgram(GLuint program)
 {
-    TRACE("(GLuint program = %d)", program);
+    EVENT("(GLuint program = %d)", program);
 
     try
     {
@@ -5361,7 +5361,7 @@
 
 void __stdcall glValidateProgram(GLuint program)
 {
-    TRACE("(GLuint program = %d)", program);
+    EVENT("(GLuint program = %d)", program);
 
     try
     {
@@ -5394,7 +5394,7 @@
 
 void __stdcall glVertexAttrib1f(GLuint index, GLfloat x)
 {
-    TRACE("(GLuint index = %d, GLfloat x = %f)", index, x);
+    EVENT("(GLuint index = %d, GLfloat x = %f)", index, x);
 
     try
     {
@@ -5419,7 +5419,7 @@
 
 void __stdcall glVertexAttrib1fv(GLuint index, const GLfloat* values)
 {
-    TRACE("(GLuint index = %d, const GLfloat* values = 0x%0.8p)", index, values);
+    EVENT("(GLuint index = %d, const GLfloat* values = 0x%0.8p)", index, values);
 
     try
     {
@@ -5444,7 +5444,7 @@
 
 void __stdcall glVertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
 {
-    TRACE("(GLuint index = %d, GLfloat x = %f, GLfloat y = %f)", index, x, y);
+    EVENT("(GLuint index = %d, GLfloat x = %f, GLfloat y = %f)", index, x, y);
 
     try
     {
@@ -5469,7 +5469,7 @@
 
 void __stdcall glVertexAttrib2fv(GLuint index, const GLfloat* values)
 {
-    TRACE("(GLuint index = %d, const GLfloat* values = 0x%0.8p)", index, values);
+    EVENT("(GLuint index = %d, const GLfloat* values = 0x%0.8p)", index, values);
 
     try
     {
@@ -5494,7 +5494,7 @@
 
 void __stdcall glVertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-    TRACE("(GLuint index = %d, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", index, x, y, z);
+    EVENT("(GLuint index = %d, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", index, x, y, z);
 
     try
     {
@@ -5519,7 +5519,7 @@
 
 void __stdcall glVertexAttrib3fv(GLuint index, const GLfloat* values)
 {
-    TRACE("(GLuint index = %d, const GLfloat* values = 0x%0.8p)", index, values);
+    EVENT("(GLuint index = %d, const GLfloat* values = 0x%0.8p)", index, values);
 
     try
     {
@@ -5544,7 +5544,7 @@
 
 void __stdcall glVertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    TRACE("(GLuint index = %d, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f, GLfloat w = %f)", index, x, y, z, w);
+    EVENT("(GLuint index = %d, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f, GLfloat w = %f)", index, x, y, z, w);
 
     try
     {
@@ -5569,7 +5569,7 @@
 
 void __stdcall glVertexAttrib4fv(GLuint index, const GLfloat* values)
 {
-    TRACE("(GLuint index = %d, const GLfloat* values = 0x%0.8p)", index, values);
+    EVENT("(GLuint index = %d, const GLfloat* values = 0x%0.8p)", index, values);
 
     try
     {
@@ -5593,7 +5593,7 @@
 
 void __stdcall glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr)
 {
-    TRACE("(GLuint index = %d, GLint size = %d, GLenum type = 0x%X, "
+    EVENT("(GLuint index = %d, GLint size = %d, GLenum type = 0x%X, "
           "GLboolean normalized = %d, GLsizei stride = %d, const GLvoid* ptr = 0x%0.8p)",
           index, size, type, normalized, stride, ptr);
 
@@ -5642,7 +5642,7 @@
 
 void __stdcall glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    TRACE("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", x, y, width, height);
+    EVENT("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", x, y, width, height);
 
     try
     {
@@ -5667,7 +5667,7 @@
 void __stdcall glBlitFramebufferANGLE(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
                                       GLbitfield mask, GLenum filter)
 {
-    TRACE("(GLint srcX0 = %d, GLint srcY0 = %d, GLint srcX1 = %d, GLint srcY1 = %d, "
+    EVENT("(GLint srcX0 = %d, GLint srcY0 = %d, GLint srcX1 = %d, GLint srcY1 = %d, "
           "GLint dstX0 = %d, GLint dstY0 = %d, GLint dstX1 = %d, GLint dstY1 = %d, "
           "GLbitfield mask = 0x%X, GLenum filter = 0x%X)",
           srcX0, srcY0, srcX1, srcX1, dstX0, dstY0, dstX1, dstY1, mask, filter);
@@ -5715,7 +5715,7 @@
 void __stdcall glTexImage3DOES(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth,
                                GLint border, GLenum format, GLenum type, const GLvoid* pixels)
 {
-    TRACE("(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, "
+    EVENT("(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, "
           "GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLint border = %d, "
           "GLenum format = 0x%X, GLenum type = 0x%x, const GLvoid* pixels = 0x%0.8p)",
           target, level, internalformat, width, height, depth, border, format, type, pixels);