mapi/new: fixup the GLDEBUGPROCKHR typedef to the non KHR one

This way we can reuse the latter, which is already present in the
headers that we use. Thus we can drop the manual typedef we generate.

We might want to merge this back in GLVND.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>

diff --git a/src/mapi/new/genCommon.py b/src/mapi/new/genCommon.py
index bfcf6ed3eea87f922b9ee89fee82f0a7ca173f6c..f4eb1728e95270ef4f039e9cd840ee012a2c25e4 100644 (file)
--- a/src/mapi/new/genCommon.py
+++ b/src/mapi/new/genCommon.py
@@ -227,6 +227,7 @@ def _fixupTypeName(typeName):
     rv = re.sub(r"\b(GLhalf|GLintptr|GLsizeiptr|GLint64|GLuint64)(?:ARB|EXT|NV|ATI)\b", r"\1", rv)
 
     rv = re.sub(r"\bGLvoid\b", "void", rv)
+    rv = re.sub(r"\bGLDEBUGPROCKHR\b", "GLDEBUGPROC", rv)
 
     # Clear out any leading and trailing whitespace.
     rv = rv.strip()

diff --git a/src/mapi/new/gen_gldispatch_mapi.py b/src/mapi/new/gen_gldispatch_mapi.py
index e9dc6d401e3877a449c0f69f987b7783e9dd0d7a..86958de3007faf8b3be8aa7f56f937c01f5cc363 100755 (executable)
--- a/src/mapi/new/gen_gldispatch_mapi.py
+++ b/src/mapi/new/gen_gldispatch_mapi.py
@@ -58,7 +58,6 @@ def _main():
 #ifndef _GLAPI_TMP_H_
 #define _GLAPI_TMP_H_
 typedef int GLclampx;
-typedef void (APIENTRY  *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
 #endif /* _GLAPI_TMP_H_ */
 """.lstrip("\n"))