EGL: Fix two exported extension functions

Fix a bug in gen_egl_dispatch.py which caused libEGL.so to export two extension
functions, eglCreatePlatformWindowSurfaceEXT and
eglCreatePlatformPixmapSurfaceEXT.

Fixes https://gitlab.freedesktop.org/glvnd/libglvnd/issues/196
This commit is contained in:
Kyle Brenneman 2019-12-02 16:07:17 -07:00
parent e9b5e559a1
commit fc32d56862
2 changed files with 8 additions and 7 deletions

View file

@ -53,12 +53,10 @@ method values:
Select the vendor that owns the current context.
"""
def _eglFunc(name, method, static=False, public=False, inheader=None, prefix="", extension=None, retval=None):
def _eglFunc(name, method, inheader, static=False, public=False, prefix="", extension=None, retval=None):
"""
A convenience function to define an entry in the EGL function list.
"""
if (inheader == None):
inheader = (not public)
values = {
"method" : method,
"prefix" : prefix,
@ -71,10 +69,13 @@ def _eglFunc(name, method, static=False, public=False, inheader=None, prefix="",
return (name, values)
def _eglCore(name, method, **kwargs):
return _eglFunc(name, method, public=True, **kwargs)
return _eglFunc(name, method, public=True, inheader=False, **kwargs)
def _eglExt(name, method, **kwargs):
return _eglFunc(name, method, public=False, **kwargs)
def _eglExt(name, method, static=None, **kwargs):
if (static is None):
static = (method != "custom")
inheader = not static
return _eglFunc(name, method, static=static, inheader=inheader, public=False, **kwargs)
EGL_FUNCTIONS = (
# EGL_VERSION_1_0

View file

@ -156,7 +156,7 @@ def generateDispatchFunc(func, eglFunc):
if (eglFunc.get("static")):
text += "static "
else:
elif (eglFunc.get("public")):
text += "PUBLIC "
text += r"""{f.rt} EGLAPIENTRY {ef[prefix]}{f.name}({f.decArgs})
{{