Reviewed-by: Erik Faye-Lund <erik.faye-l...@collabora.com> On Fri, 2018-12-14 at 14:04 +0000, Emil Velikov wrote: > From: Emil Velikov <emil.veli...@collabora.com> > > 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.veli...@collabora.com> > --- > src/mapi/new/genCommon.py | 1 + > src/mapi/new/gen_gldispatch_mapi.py | 1 - > 2 files changed, 1 insertion(+), 1 deletion(-) > > 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 cc0e286e221..65e42bd2a0d 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")) >
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev