Omit types in EVENT macros.

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":
-    "75138689ccfce402b1ef5a048aa490d0",
+    "8198ebce5e1f82001aac3d47c34ea221",
   "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":
-    "1af18890703e1ef4214298016001ef7b",
+    "cb974a5a4230f15b0de83a3f690dc481",
   "src/libGL/entry_points_gl_1_0_autogen.h":
     "4ff00afc21780bc6c138b5431a2d067c",
   "src/libGL/entry_points_gl_1_1_autogen.cpp":
-    "58bd1bdd6ea2950e5dc1f39a1f648186",
+    "25b8fa135fd328dc5781e7acac15f2c1",
   "src/libGL/entry_points_gl_1_1_autogen.h":
     "570a839bb336d8f5f83d3b50fe49411a",
   "src/libGL/entry_points_gl_1_2_autogen.cpp":
-    "c6efd43aacd1f6be0ed218ab03433440",
+    "df1563b8fc606f9d4d7022e1ed2aa8ba",
   "src/libGL/entry_points_gl_1_2_autogen.h":
     "3f52187f299fe96672384e1646f4a1cb",
   "src/libGL/entry_points_gl_1_3_autogen.cpp":
-    "8244c271177b945db9c7535a01526e4c",
+    "d536065308f2b67bb043e04a70f31f6f",
   "src/libGL/entry_points_gl_1_3_autogen.h":
     "5ea36d869b82a824d5f290625c4ea052",
   "src/libGL/entry_points_gl_1_4_autogen.cpp":
-    "c49d26ec23951864eebf6b35dc662a52",
+    "489b169ac60632b44335e0ce3f20dd19",
   "src/libGL/entry_points_gl_1_4_autogen.h":
     "2c5d31ca248507a024e4724c74283ec4",
   "src/libGL/entry_points_gl_1_5_autogen.cpp":
-    "094e544e9e1724ce5574ec37a3399c40",
+    "c3b20077ff54e2148f687d4654364cd8",
   "src/libGL/entry_points_gl_1_5_autogen.h":
     "978457aa9a40e427846b6dea24608903",
   "src/libGL/entry_points_gl_2_0_autogen.cpp":
-    "e73295c806505992941a8f0c4631aedd",
+    "327055976b3009f2cffb4129efddaca5",
   "src/libGL/entry_points_gl_2_0_autogen.h":
     "41b0cd064167fac84bcdb1896a275b1b",
   "src/libGL/entry_points_gl_2_1_autogen.cpp":
-    "b087a810518aeb3400f449a05a98be87",
+    "a91d1832697d6ebd8789ff4831615b0a",
   "src/libGL/entry_points_gl_2_1_autogen.h":
     "1da48dec560ea5ff8cadf4d0b6bfde1c",
   "src/libGL/entry_points_gl_3_0_autogen.cpp":
-    "78ce8bb4294b4dfd3e02670f589d8c8f",
+    "100ea68ec10b12ae445683fa616e8ad4",
   "src/libGL/entry_points_gl_3_0_autogen.h":
     "0fad8005f23815beb8ee9b3797c00b83",
   "src/libGL/entry_points_gl_3_1_autogen.cpp":
-    "57b7230f0502051fe787b10856908d23",
+    "fcfdbb2add1da66c7812c670fe1ff4bc",
   "src/libGL/entry_points_gl_3_1_autogen.h":
     "a68ff6c69f0ce95d9730e22bb4c63366",
   "src/libGL/entry_points_gl_3_2_autogen.cpp":
-    "a2bc1f3c2bb78a67de723f1c97ed16c5",
+    "50befe764d78c30f1cbc4734dca23809",
   "src/libGL/entry_points_gl_3_2_autogen.h":
     "f162c4e93a64ab2e43048a0937f7c46f",
   "src/libGL/entry_points_gl_3_3_autogen.cpp":
-    "d5166ac9b256aea2aaa657ff308e6448",
+    "ca18f0aebac8485a074174b758a854e5",
   "src/libGL/entry_points_gl_3_3_autogen.h":
     "51c0e4f074c85447f5d910c63b9ea61c",
   "src/libGL/entry_points_gl_4_0_autogen.cpp":
-    "5a83d1fe6984c9df6df4106ebf57d3d8",
+    "9f81556e90b50859614d69d7d0162c2d",
   "src/libGL/entry_points_gl_4_0_autogen.h":
     "35d611138951cebc29db99c9bf3a9e5f",
   "src/libGL/entry_points_gl_4_1_autogen.cpp":
-    "0a46ed3eaa8042ebacb5e5c27cf4433c",
+    "c72f43ffdafddddaedbfc810c249ede5",
   "src/libGL/entry_points_gl_4_1_autogen.h":
     "beec6659a3a77695dad66df90717c6ba",
   "src/libGL/entry_points_gl_4_2_autogen.cpp":
-    "3f4ce3abc37ce4a09f89d76e89febe50",
+    "cbc5d16252560a1102e8bbf8835d780c",
   "src/libGL/entry_points_gl_4_2_autogen.h":
     "a2cb2a48cceaf6131f96bf8ec556aa55",
   "src/libGL/entry_points_gl_4_3_autogen.cpp":
-    "28656d7d423a9248f9b8672498ab9be7",
+    "8fb2ed33a82ce2dfe4333305c63bd79c",
   "src/libGL/entry_points_gl_4_3_autogen.h":
     "abfa431742a2b643db21220944e10ab0",
   "src/libGL/entry_points_gl_4_4_autogen.cpp":
-    "75b4e590639e1bd50038ecfa9fbe0689",
+    "8565d56889a0ce6c087c2b6133fbd2fd",
   "src/libGL/entry_points_gl_4_4_autogen.h":
     "cdf1651f00d26db547b153afc09acc1c",
   "src/libGL/entry_points_gl_4_5_autogen.cpp":
-    "77fd834a85ca95e57fb9138add224ed9",
+    "dc051b47e0cf2c44bfb4a5177a6fdbef",
   "src/libGL/entry_points_gl_4_5_autogen.h":
     "9f5de9513c06b82aca60856860f7b716",
   "src/libGL/entry_points_gl_4_6_autogen.cpp":
-    "57e477bc7542824bb5a610d22f2ddd51",
+    "7d3b31a7f6e1c457540f14669d7025f5",
   "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":
-    "18a0ddab4e160604cf886e39b9781f92",
+    "3e96283f3ebd6428e0e7c04a7e38db14",
   "src/libGLESv2/entry_points_gles_1_0_autogen.h":
     "899dcff9383465380f94fbdfe5bcf0a0",
   "src/libGLESv2/entry_points_gles_2_0_autogen.cpp":
-    "af77d101530aed63add31d60e061217a",
+    "437816f35190f56d1a1658e79cdb60b0",
   "src/libGLESv2/entry_points_gles_2_0_autogen.h":
     "26387e27cbddf5e34d6cd9f850cb8b64",
   "src/libGLESv2/entry_points_gles_3_0_autogen.cpp":
-    "2a2711e268444629851e24ccb1794e15",
+    "39c316c6dbc9a9c2d1ea04bc6a73a4f6",
   "src/libGLESv2/entry_points_gles_3_0_autogen.h":
     "0d246024379fbf55b87204db5d6a37e3",
   "src/libGLESv2/entry_points_gles_3_1_autogen.cpp":
-    "fd497342cd51bb47eab8755b9392b064",
+    "3b1106dee3086c98baba6f54bd7f987c",
   "src/libGLESv2/entry_points_gles_3_1_autogen.h":
     "69bae5c94ed4665836a8464b6c353f9a",
   "src/libGLESv2/entry_points_gles_3_2_autogen.cpp":
-    "fbbcb25644eb0f830bb9b36dd79b4911",
+    "c3a29c34f8cb1308ce156c948bf520ac",
   "src/libGLESv2/entry_points_gles_3_2_autogen.h":
     "5798aa0a73af1d4ba5dfe99b6217a247",
   "src/libGLESv2/entry_points_gles_ext_autogen.cpp":
-    "75dbc8cbb20caa2028770a2acc92842c",
+    "aba37c32a371cd40daf2366d7edd4671",
   "src/libGLESv2/entry_points_gles_ext_autogen.h":
     "776240b5afbf762c7b1efb71733d8ecd",
   "src/libGLESv2/libGLESv2_autogen.cpp":

scripts/generate_entry_points.py

@@ -782,13 +782,13 @@ def param_print_argument(command_node, param):
 
 def param_format_string(param):
     if "*" in param:
-        return param + " = 0x%016\" PRIxPTR \""
+        return just_the_name(param) + " = 0x%016\" PRIxPTR \""
     else:
         type_only = just_the_type(param)
         if type_only not in format_dict:
             raise Exception(type_only + " is not a known type in 'format_dict'")
 
-        return param + " = " + format_dict[type_only]
+        return just_the_name(param) + " = " + format_dict[type_only]
 
 
 def default_return_value(cmd_name, return_type):

src/libGL/entry_points_gl_1_2_autogen.cpp

@@ -39,9 +39,8 @@ void GL_APIENTRY CopyTexSubImage3D(GLenum target,
 {
     Context *context = GetValidGlobalContext();
     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",
+          "context = %d, target = %s, level = %d, xoffset = %d, yoffset = %d, zoffset = %d, x = "
+          "%d, y = %d, width = %d, height = %d",
           CID(context), GLenumToString(GLenumGroup::TextureTarget, target), level, xoffset, yoffset,
           zoffset, x, y, width, height);
 
@@ -75,8 +74,8 @@ void GL_APIENTRY DrawRangeElements(GLenum mode,
 {
     Context *context = GetValidGlobalContext();
     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 "",
+          "context = %d, mode = %s, start = %u, end = %u, count = %d, type = %s, indices = "
+          "0x%016" PRIxPTR "",
           CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), start, end, count,
           GLenumToString(GLenumGroup::DrawElementsType, type), (uintptr_t)indices);
 
@@ -114,9 +113,8 @@ void GL_APIENTRY TexImage3D(GLenum target,
 {
     Context *context = GetValidGlobalContext();
     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 "",
+          "context = %d, target = %s, level = %d, internalformat = %d, width = %d, height = %d, "
+          "depth = %d, border = %d, format = %s, type = %s, pixels = 0x%016" PRIxPTR "",
           CID(context), GLenumToString(GLenumGroup::TextureTarget, target), level, internalformat,
           width, height, depth, border, GLenumToString(GLenumGroup::PixelFormat, format),
           GLenumToString(GLenumGroup::PixelType, type), (uintptr_t)pixels);
@@ -156,9 +154,8 @@ void GL_APIENTRY TexSubImage3D(GLenum target,
 {
     Context *context = GetValidGlobalContext();
     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 "",
+          "context = %d, target = %s, level = %d, xoffset = %d, yoffset = %d, zoffset = %d, width "
+          "= %d, height = %d, depth = %d, format = %s, type = %s, pixels = 0x%016" PRIxPTR "",
           CID(context), GLenumToString(GLenumGroup::TextureTarget, target), level, xoffset, yoffset,
           zoffset, width, height, depth, GLenumToString(GLenumGroup::PixelFormat, format),
           GLenumToString(GLenumGroup::PixelType, type), (uintptr_t)pixels);

src/libGL/entry_points_gl_2_1_autogen.cpp

@@ -34,8 +34,7 @@ void GL_APIENTRY UniformMatrix2x3fv(GLint location,
 {
     Context *context = GetValidGlobalContext();
     EVENT(context, gl::EntryPoint::UniformMatrix2x3fv, "glUniformMatrix2x3fv",
-          "context = %d, GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const "
-          "GLfloat *value = 0x%016" PRIxPTR "",
+          "context = %d, location = %d, count = %d, transpose = %s, value = 0x%016" PRIxPTR "",
           CID(context), location, count, GLbooleanToString(transpose), (uintptr_t)value);
 
     if (context)
@@ -65,8 +64,7 @@ void GL_APIENTRY UniformMatrix2x4fv(GLint location,
 {
     Context *context = GetValidGlobalContext();
     EVENT(context, gl::EntryPoint::UniformMatrix2x4fv, "glUniformMatrix2x4fv",
-          "context = %d, GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const "
-          "GLfloat *value = 0x%016" PRIxPTR "",
+          "context = %d, location = %d, count = %d, transpose = %s, value = 0x%016" PRIxPTR "",
           CID(context), location, count, GLbooleanToString(transpose), (uintptr_t)value);
 
     if (context)
@@ -96,8 +94,7 @@ void GL_APIENTRY UniformMatrix3x2fv(GLint location,
 {
     Context *context = GetValidGlobalContext();
     EVENT(context, gl::EntryPoint::UniformMatrix3x2fv, "glUniformMatrix3x2fv",
-          "context = %d, GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const "
-          "GLfloat *value = 0x%016" PRIxPTR "",
+          "context = %d, location = %d, count = %d, transpose = %s, value = 0x%016" PRIxPTR "",
           CID(context), location, count, GLbooleanToString(transpose), (uintptr_t)value);
 
     if (context)
@@ -127,8 +124,7 @@ void GL_APIENTRY UniformMatrix3x4fv(GLint location,
 {
     Context *context = GetValidGlobalContext();
     EVENT(context, gl::EntryPoint::UniformMatrix3x4fv, "glUniformMatrix3x4fv",
-          "context = %d, GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const "
-          "GLfloat *value = 0x%016" PRIxPTR "",
+          "context = %d, location = %d, count = %d, transpose = %s, value = 0x%016" PRIxPTR "",
           CID(context), location, count, GLbooleanToString(transpose), (uintptr_t)value);
 
     if (context)
@@ -158,8 +154,7 @@ void GL_APIENTRY UniformMatrix4x2fv(GLint location,
 {
     Context *context = GetValidGlobalContext();
     EVENT(context, gl::EntryPoint::UniformMatrix4x2fv, "glUniformMatrix4x2fv",
-          "context = %d, GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const "
-          "GLfloat *value = 0x%016" PRIxPTR "",
+          "context = %d, location = %d, count = %d, transpose = %s, value = 0x%016" PRIxPTR "",
           CID(context), location, count, GLbooleanToString(transpose), (uintptr_t)value);
 
     if (context)
@@ -189,8 +184,7 @@ void GL_APIENTRY UniformMatrix4x3fv(GLint location,
 {
     Context *context = GetValidGlobalContext();
     EVENT(context, gl::EntryPoint::UniformMatrix4x3fv, "glUniformMatrix4x3fv",
-          "context = %d, GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const "
-          "GLfloat *value = 0x%016" PRIxPTR "",
+          "context = %d, location = %d, count = %d, transpose = %s, value = 0x%016" PRIxPTR "",
           CID(context), location, count, GLbooleanToString(transpose), (uintptr_t)value);
 
     if (context)

src/libGL/entry_points_gl_3_1_autogen.cpp

@@ -35,8 +35,8 @@ void GL_APIENTRY CopyBufferSubData(GLenum readTarget,
 {
     Context *context = GetValidGlobalContext();
     EVENT(context, gl::EntryPoint::CopyBufferSubData, "glCopyBufferSubData",
-          "context = %d, GLenum readTarget = %s, GLenum writeTarget = %s, GLintptr readOffset = "
-          "%llu, GLintptr writeOffset = %llu, GLsizeiptr size = %llu",
+          "context = %d, readTarget = %s, writeTarget = %s, readOffset = %llu, writeOffset = %llu, "
+          "size = %llu",
           CID(context), GLenumToString(GLenumGroup::CopyBufferSubDataTarget, readTarget),
           GLenumToString(GLenumGroup::CopyBufferSubDataTarget, writeTarget),
           static_cast<unsigned long long>(readOffset), static_cast<unsigned long long>(writeOffset),
@@ -68,10 +68,8 @@ void GL_APIENTRY DrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GL
 {
     Context *context = GetValidGlobalContext();
     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,
-          instancecount);
+          "context = %d, mode = %s, first = %d, count = %d, instancecount = %d", CID(context),
+          GLenumToString(GLenumGroup::PrimitiveType, mode), first, count, instancecount);
 
     if (context)
     {
@@ -101,8 +99,8 @@ void GL_APIENTRY DrawElementsInstanced(GLenum mode,
 {
     Context *context = GetValidGlobalContext();
     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",
+          "context = %d, mode = %s, count = %d, type = %s, indices = 0x%016" PRIxPTR
+          ", instancecount = %d",
           CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), count,
           GLenumToString(GLenumGroup::DrawElementsType, type), (uintptr_t)indices, instancecount);
 
@@ -134,11 +132,12 @@ void GL_APIENTRY GetActiveUniformBlockName(GLuint program,
                                            GLchar *uniformBlockName)
 {
     Context *context = GetValidGlobalContext();
-    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,
-          (uintptr_t)uniformBlockName);
+    EVENT(
+        context, gl::EntryPoint::GetActiveUniformBlockName, "glGetActiveUniformBlockName",
+        "context = %d, program = %u, uniformBlockIndex = %u, bufSize = %d, length = 0x%016" PRIxPTR
+        ", uniformBlockName = 0x%016" PRIxPTR "",
+        CID(context), program, uniformBlockIndex, bufSize, (uintptr_t)length,
+        (uintptr_t)uniformBlockName);
 
     if (context)
     {
@@ -169,8 +168,8 @@ void GL_APIENTRY GetActiveUniformBlockiv(GLuint program,
 {
     Context *context = GetValidGlobalContext();
     EVENT(context, gl::EntryPoint::GetActiveUniformBlockiv, "glGetActiveUniformBlockiv",
-          "context = %d, GLuint program = %u, GLuint uniformBlockIndex = %u, GLenum pname = %s, "
-          "GLint *params = 0x%016" PRIxPTR "",
+          "context = %d, program = %u, uniformBlockIndex = %u, pname = %s, params = 0x%016" PRIxPTR
+          "",
           CID(context), program, uniformBlockIndex,
           GLenumToString(GLenumGroup::UniformBlockPName, pname), (uintptr_t)params);
 
@@ -202,8 +201,8 @@ void GL_APIENTRY GetActiveUniformName(GLuint program,
 {
     Context *context = GetValidGlobalContext();
     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 "",
+          "context = %d, program = %u, uniformIndex = %u, bufSize = %d, length = 0x%016" PRIxPTR
+          ", uniformName = 0x%016" PRIxPTR "",
           CID(context), program, uniformIndex, bufSize, (uintptr_t)length, (uintptr_t)uniformName);
 
     if (context)
@@ -235,9 +234,8 @@ void GL_APIENTRY GetActiveUniformsiv(GLuint program,
 {
     Context *context = GetValidGlobalContext();
     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
-          "",
+          "context = %d, program = %u, uniformCount = %d, uniformIndices = 0x%016" PRIxPTR
+          ", pname = %s, params = 0x%016" PRIxPTR "",
           CID(context), program, uniformCount, (uintptr_t)uniformIndices,
           GLenumToString(GLenumGroup::UniformPName, pname), (uintptr_t)params);
 
@@ -266,8 +264,8 @@ GLuint GL_APIENTRY GetUniformBlockIndex(GLuint program, const GLchar *uniformBlo
 {
     Context *context = GetValidGlobalContext();
     EVENT(context, gl::EntryPoint::GetUniformBlockIndex, "glGetUniformBlockIndex",
-          "context = %d, GLuint program = %u, const GLchar *uniformBlockName = 0x%016" PRIxPTR "",
-          CID(context), program, (uintptr_t)uniformBlockName);
+          "context = %d, program = %u, uniformBlockName = 0x%016" PRIxPTR "", CID(context), program,
+          (uintptr_t)uniformBlockName);
 
     GLuint returnValue;
     if (context)
@@ -302,8 +300,8 @@ void GL_APIENTRY GetUniformIndices(GLuint program,
 {
     Context *context = GetValidGlobalContext();
     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 "",
+          "context = %d, program = %u, uniformCount = %d, uniformNames = 0x%016" PRIxPTR
+          ", uniformIndices = 0x%016" PRIxPTR "",
           CID(context), program, uniformCount, (uintptr_t)uniformNames, (uintptr_t)uniformIndices);
 
     if (context)
@@ -330,7 +328,7 @@ void GL_APIENTRY PrimitiveRestartIndex(GLuint index)
 {
     Context *context = GetValidGlobalContext();
     EVENT(context, gl::EntryPoint::PrimitiveRestartIndex, "glPrimitiveRestartIndex",
-          "context = %d, GLuint index = %u", CID(context), index);
+          "context = %d, index = %u", CID(context), index);
 
     if (context)
     {
@@ -353,8 +351,8 @@ void GL_APIENTRY TexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
 {
     Context *context = GetValidGlobalContext();
     EVENT(context, gl::EntryPoint::TexBuffer, "glTexBuffer",
-          "context = %d, GLenum target = %s, GLenum internalformat = %s, GLuint buffer = %u",
-          CID(context), GLenumToString(GLenumGroup::TextureTarget, target),
+          "context = %d, target = %s, internalformat = %s, buffer = %u", CID(context),
+          GLenumToString(GLenumGroup::TextureTarget, target),
           GLenumToString(GLenumGroup::InternalFormat, internalformat), buffer);
 
     if (context)
@@ -382,8 +380,7 @@ void GL_APIENTRY UniformBlockBinding(GLuint program,
 {
     Context *context = GetValidGlobalContext();
     EVENT(context, gl::EntryPoint::UniformBlockBinding, "glUniformBlockBinding",
-          "context = %d, GLuint program = %u, GLuint uniformBlockIndex = %u, GLuint "
-          "uniformBlockBinding = %u",
+          "context = %d, program = %u, uniformBlockIndex = %u, uniformBlockBinding = %u",
           CID(context), program, uniformBlockIndex, uniformBlockBinding);
 
     if (context)

src/libGL/entry_points_gl_4_2_autogen.cpp

@@ -37,8 +37,8 @@ void GL_APIENTRY BindImageTexture(GLuint unit,
 {
     Context *context = GetValidGlobalContext();
     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",
+          "context = %d, unit = %u, texture = %u, level = %d, layered = %s, layer = %d, access = "
+          "%s, format = %s",
           CID(context), unit, texture, level, GLbooleanToString(layered), layer,
           GLenumToString(GLenumGroup::BufferAccessARB, access),
           GLenumToString(GLenumGroup::InternalFormat, format));
@@ -72,8 +72,7 @@ void GL_APIENTRY DrawArraysInstancedBaseInstance(GLenum mode,
     Context *context = GetValidGlobalContext();
     EVENT(context, gl::EntryPoint::DrawArraysInstancedBaseInstance,
           "glDrawArraysInstancedBaseInstance",
-          "context = %d, GLenum mode = %s, GLint first = %d, GLsizei count = %d, GLsizei "
-          "instancecount = %d, GLuint baseinstance = %u",
+          "context = %d, mode = %s, first = %d, count = %d, instancecount = %d, baseinstance = %u",
           CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), first, count,
           instancecount, baseinstance);
 
@@ -108,8 +107,8 @@ void GL_APIENTRY DrawElementsInstancedBaseInstance(GLenum mode,
     Context *context = GetValidGlobalContext();
     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",
+          "context = %d, mode = %s, count = %d, type = %s, indices = 0x%016" PRIxPTR
+          ", instancecount = %d, baseinstance = %u",
           CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), count,
           GLenumToString(GLenumGroup::PrimitiveType, type), (uintptr_t)indices, instancecount,
           baseinstance);
@@ -145,9 +144,8 @@ void GL_APIENTRY DrawElementsInstancedBaseVertexBaseInstance(GLenum mode,
     Context *context = GetValidGlobalContext();
     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",
+          "context = %d, mode = %s, count = %d, type = %s, indices = 0x%016" PRIxPTR
+          ", instancecount = %d, basevertex = %d, baseinstance = %u",
           CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), count,
           GLenumToString(GLenumGroup::PrimitiveType, type), (uintptr_t)indices, instancecount,
           basevertex, baseinstance);
@@ -180,8 +178,8 @@ void GL_APIENTRY DrawTransformFeedbackInstanced(GLenum mode, GLuint id, GLsizei
     Context *context = GetValidGlobalContext();
     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);
+          "context = %d, mode = %s, id = %u, instancecount = %d", CID(context),
+          GLenumToString(GLenumGroup::PrimitiveType, mode), id, instancecount);
 
     if (context)
     {
@@ -211,10 +209,8 @@ void GL_APIENTRY DrawTransformFeedbackStreamInstanced(GLenum mode,
     Context *context = GetValidGlobalContext();
     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,
-          instancecount);
+          "context = %d, mode = %s, id = %u, stream = %u, instancecount = %d", CID(context),
+          GLenumToString(GLenumGroup::PrimitiveType, mode), id, stream, instancecount);
 
     if (context)
     {
@@ -244,8 +240,7 @@ void GL_APIENTRY GetActiveAtomicCounterBufferiv(GLuint program,
     Context *context = GetValidGlobalContext();
     EVENT(context, gl::EntryPoint::GetActiveAtomicCounterBufferiv,
           "glGetActiveAtomicCounterBufferiv",
-          "context = %d, GLuint program = %u, GLuint bufferIndex = %u, GLenum pname = %s, GLint "
-          "*params = 0x%016" PRIxPTR "",
+          "context = %d, program = %u, bufferIndex = %u, pname = %s, params = 0x%016" PRIxPTR "",
           CID(context), program, bufferIndex,
           GLenumToString(GLenumGroup::AtomicCounterBufferPName, pname), (uintptr_t)params);
 
@@ -277,8 +272,8 @@ void GL_APIENTRY GetInternalformativ(GLenum target,
 {
     Context *context = GetValidGlobalContext();
     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 "",
+          "context = %d, target = %s, internalformat = %s, pname = %s, bufSize = %d, params = "
+          "0x%016" PRIxPTR "",
           CID(context), GLenumToString(GLenumGroup::TextureTarget, target),
           GLenumToString(GLenumGroup::InternalFormat, internalformat),
           GLenumToString(GLenumGroup::InternalFormatPName, pname), bufSize, (uintptr_t)params);
@@ -305,9 +300,8 @@ void GL_APIENTRY GetInternalformativ(GLenum target,
 void GL_APIENTRY MemoryBarrier(GLbitfield barriers)
 {
     Context *context = GetValidGlobalContext();
-    EVENT(context, gl::EntryPoint::MemoryBarrier, "glMemoryBarrier",
-          "context = %d, GLbitfield barriers = %s", CID(context),
-          GLbitfieldToString(GLenumGroup::MemoryBarrierMask, barriers).c_str());
+    EVENT(context, gl::EntryPoint::MemoryBarrier, "glMemoryBarrier", "context = %d, barriers = %s",
+          CID(context), GLbitfieldToString(GLenumGroup::MemoryBarrierMask, barriers).c_str());
 
     if (context)
     {
@@ -329,9 +323,8 @@ void GL_APIENTRY TexStorage1D(GLenum target, GLsizei levels, GLenum internalform
 {
     Context *context = GetValidGlobalContext();
     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,
+          "context = %d, target = %s, levels = %d, internalformat = %s, width = %d", CID(context),
+          GLenumToString(GLenumGroup::TextureTarget, target), levels,
           GLenumToString(GLenumGroup::InternalFormat, internalformat), width);
 
     if (context)
@@ -356,8 +349,7 @@ TexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width
 {
     Context *context = GetValidGlobalContext();
     EVENT(context, gl::EntryPoint::TexStorage2D, "glTexStorage2D",
-          "context = %d, GLenum target = %s, GLsizei levels = %d, GLenum internalformat = %s, "
-          "GLsizei width = %d, GLsizei height = %d",
+          "context = %d, target = %s, levels = %d, internalformat = %s, width = %d, height = %d",
           CID(context), GLenumToString(GLenumGroup::TextureTarget, target), levels,
           GLenumToString(GLenumGroup::InternalFormat, internalformat), width, height);
 
@@ -390,8 +382,8 @@ void GL_APIENTRY TexStorage3D(GLenum target,
 {
     Context *context = GetValidGlobalContext();
     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",
+          "context = %d, target = %s, levels = %d, internalformat = %s, width = %d, height = %d, "
+          "depth = %d",
           CID(context), GLenumToString(GLenumGroup::TextureTarget, target), levels,
           GLenumToString(GLenumGroup::InternalFormat, internalformat), width, height, depth);
 

src/libGL/entry_points_gl_4_4_autogen.cpp

@@ -31,8 +31,7 @@ void GL_APIENTRY BindBuffersBase(GLenum target, GLuint first, GLsizei count, con
 {
     Context *context = GetValidGlobalContext();
     EVENT(context, gl::EntryPoint::BindBuffersBase, "glBindBuffersBase",
-          "context = %d, GLenum target = %s, GLuint first = %u, GLsizei count = %d, const GLuint "
-          "*buffers = 0x%016" PRIxPTR "",
+          "context = %d, target = %s, first = %u, count = %d, buffers = 0x%016" PRIxPTR "",
           CID(context), GLenumToString(GLenumGroup::BufferTargetARB, target), first, count,
           (uintptr_t)buffers);
 
@@ -63,9 +62,8 @@ void GL_APIENTRY BindBuffersRange(GLenum target,
 {
     Context *context = GetValidGlobalContext();
     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 "",
+          "context = %d, target = %s, first = %u, count = %d, buffers = 0x%016" PRIxPTR
+          ", offsets = 0x%016" PRIxPTR ", sizes = 0x%016" PRIxPTR "",
           CID(context), GLenumToString(GLenumGroup::BufferTargetARB, target), first, count,
           (uintptr_t)buffers, (uintptr_t)offsets, (uintptr_t)sizes);
 
@@ -93,9 +91,8 @@ void GL_APIENTRY BindImageTextures(GLuint first, GLsizei count, const GLuint *te
 {
     Context *context = GetValidGlobalContext();
     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);
+          "context = %d, first = %u, count = %d, textures = 0x%016" PRIxPTR "", CID(context), first,
+          count, (uintptr_t)textures);
 
     if (context)
     {
@@ -118,9 +115,8 @@ void GL_APIENTRY BindSamplers(GLuint first, GLsizei count, const GLuint *sampler
 {
     Context *context = GetValidGlobalContext();
     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);
+          "context = %d, first = %u, count = %d, samplers = 0x%016" PRIxPTR "", CID(context), first,
+          count, (uintptr_t)samplers);
 
     if (context)
     {
@@ -143,9 +139,8 @@ void GL_APIENTRY BindTextures(GLuint first, GLsizei count, const GLuint *texture
 {
     Context *context = GetValidGlobalContext();
     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);
+          "context = %d, first = %u, count = %d, textures = 0x%016" PRIxPTR "", CID(context), first,
+          count, (uintptr_t)textures);
 
     if (context)
     {
@@ -172,9 +167,8 @@ void GL_APIENTRY BindVertexBuffers(GLuint first,
 {
     Context *context = GetValidGlobalContext();
     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 "",
+          "context = %d, first = %u, count = %d, buffers = 0x%016" PRIxPTR
+          ", offsets = 0x%016" PRIxPTR ", strides = 0x%016" PRIxPTR "",
           CID(context), first, count, (uintptr_t)buffers, (uintptr_t)offsets, (uintptr_t)strides);
 
     if (context)
@@ -201,8 +195,7 @@ void GL_APIENTRY BufferStorage(GLenum target, GLsizeiptr size, const void *data,
 {
     Context *context = GetValidGlobalContext();
     EVENT(context, gl::EntryPoint::BufferStorage, "glBufferStorage",
-          "context = %d, GLenum target = %s, GLsizeiptr size = %llu, const void *data = "
-          "0x%016" PRIxPTR ", GLbitfield flags = %s",
+          "context = %d, target = %s, size = %llu, data = 0x%016" PRIxPTR ", flags = %s",
           CID(context), GLenumToString(GLenumGroup::BufferStorageTarget, target),
           static_cast<unsigned long long>(size), (uintptr_t)data,
           GLbitfieldToString(GLenumGroup::MapBufferUsageMask, flags).c_str());
@@ -230,8 +223,8 @@ ClearTexImage(GLuint texture, GLint level, GLenum format, GLenum type, const voi
 {
     Context *context = GetValidGlobalContext();
     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 "",
+          "context = %d, texture = %u, level = %d, format = %s, type = %s, data = 0x%016" PRIxPTR
+          "",
           CID(context), texture, level, GLenumToString(GLenumGroup::PixelFormat, format),
           GLenumToString(GLenumGroup::PixelType, type), (uintptr_t)data);
 
@@ -269,9 +262,8 @@ void GL_APIENTRY ClearTexSubImage(GLuint texture,
 {
     Context *context = GetValidGlobalContext();
     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 "",
+          "context = %d, texture = %u, level = %d, xoffset = %d, yoffset = %d, zoffset = %d, width "
+          "= %d, height = %d, depth = %d, format = %s, type = %s, data = 0x%016" PRIxPTR "",
           CID(context), texture, level, xoffset, yoffset, zoffset, width, height, depth,
           GLenumToString(GLenumGroup::PixelFormat, format),
           GLenumToString(GLenumGroup::PixelType, type), (uintptr_t)data);

src/libGL/entry_points_gl_4_6_autogen.cpp

@@ -35,8 +35,8 @@ void GL_APIENTRY MultiDrawArraysIndirectCount(GLenum mode,
 {
     Context *context = GetValidGlobalContext();
     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",
+          "context = %d, mode = %s, indirect = 0x%016" PRIxPTR
+          ", drawcount = %llu, maxdrawcount = %d, stride = %d",
           CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), (uintptr_t)indirect,
           static_cast<unsigned long long>(drawcount), maxdrawcount, stride);
 
@@ -69,8 +69,8 @@ void GL_APIENTRY MultiDrawElementsIndirectCount(GLenum mode,
     Context *context = GetValidGlobalContext();
     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",
+          "context = %d, mode = %s, type = %s, indirect = 0x%016" PRIxPTR
+          ", drawcount = %llu, maxdrawcount = %d, stride = %d",
           CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode),
           GLenumToString(GLenumGroup::DefaultGroup, type), (uintptr_t)indirect,
           static_cast<unsigned long long>(drawcount), maxdrawcount, stride);
@@ -99,8 +99,7 @@ void GL_APIENTRY PolygonOffsetClamp(GLfloat factor, GLfloat units, GLfloat clamp
 {
     Context *context = GetValidGlobalContext();
     EVENT(context, gl::EntryPoint::PolygonOffsetClamp, "glPolygonOffsetClamp",
-          "context = %d, GLfloat factor = %f, GLfloat units = %f, GLfloat clamp = %f", CID(context),
-          factor, units, clamp);
+          "context = %d, factor = %f, units = %f, clamp = %f", CID(context), factor, units, clamp);
 
     if (context)
     {
@@ -127,9 +126,9 @@ void GL_APIENTRY SpecializeShader(GLuint shader,
 {
     Context *context = GetValidGlobalContext();
     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 "",
+          "context = %d, shader = %u, pEntryPoint = 0x%016" PRIxPTR
+          ", numSpecializationConstants = %u, pConstantIndex = 0x%016" PRIxPTR
+          ", pConstantValue = 0x%016" PRIxPTR "",
           CID(context), shader, (uintptr_t)pEntryPoint, numSpecializationConstants,
           (uintptr_t)pConstantIndex, (uintptr_t)pConstantValue);