diff options
| author | Emil Velikov <[email protected]> | 2018-11-19 16:12:49 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2019-01-24 18:13:25 +0000 |
| commit | 5fa6c3494965e3b01b513c69d16ac31a43e0324a (patch) | |
| tree | 418e8bd218b73ec07c32b6d758475bb1615295a2 /src/mapi/new | |
| parent | babec55f7eb00486bc60b6edd9673599e6579c2c (diff) | |
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 <[email protected]>
Reviewed-by: Erik Faye-Lund <[email protected]>
Diffstat (limited to 'src/mapi/new')
| -rw-r--r-- | src/mapi/new/genCommon.py | 1 | ||||
| -rwxr-xr-x | src/mapi/new/gen_gldispatch_mapi.py | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/mapi/new/genCommon.py b/src/mapi/new/genCommon.py index bfcf6ed3eea..f4eb1728e95 100644 --- 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 e9dc6d401e3..86958de3007 100755 --- 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")) |