This reverts commit ff621a5055
.
with default warnings configuration, this commit generates:
../src/egl/main/eglapi.c:2654:1: error: no previous prototype for
‘eglGetDisplayDriverConfig’ [-Werror=missing-prototypes]
tags/19.0-branchpoint
@@ -528,7 +528,6 @@ _eglCreateExtensionsString(_EGLDisplay *dpy) | |||
_eglAppendExtension(&exts, "EGL_MESA_configless_context"); | |||
_EGL_CHECK_EXTENSION(MESA_drm_image); | |||
_EGL_CHECK_EXTENSION(MESA_image_dma_buf_export); | |||
_EGL_CHECK_EXTENSION(MESA_query_driver); | |||
_EGL_CHECK_EXTENSION(NOK_swap_region); | |||
_EGL_CHECK_EXTENSION(NOK_texture_from_pixmap); | |||
@@ -2650,38 +2649,6 @@ eglQueryDisplayAttribEXT(EGLDisplay dpy, | |||
RETURN_EGL_SUCCESS(disp, EGL_TRUE); | |||
} | |||
char * EGLAPIENTRY | |||
eglGetDisplayDriverConfig(EGLDisplay dpy) | |||
{ | |||
_EGLDisplay *disp = _eglLockDisplay(dpy); | |||
_EGLDriver *drv; | |||
char *ret; | |||
_EGL_FUNC_START(disp, EGL_NONE, NULL, NULL); | |||
_EGL_CHECK_DISPLAY(disp, NULL, drv); | |||
assert(disp->Extensions.MESA_query_driver); | |||
ret = drv->API.QueryDriverConfig(disp); | |||
RETURN_EGL_EVAL(disp, ret); | |||
} | |||
const char * EGLAPIENTRY | |||
eglGetDisplayDriverName(EGLDisplay dpy) | |||
{ | |||
_EGLDisplay *disp = _eglLockDisplay(dpy); | |||
_EGLDriver *drv; | |||
const char *ret; | |||
_EGL_FUNC_START(disp, EGL_NONE, NULL, NULL); | |||
_EGL_CHECK_DISPLAY(disp, NULL, drv); | |||
assert(disp->Extensions.MESA_query_driver); | |||
ret = drv->API.QueryDriverName(disp); | |||
RETURN_EGL_EVAL(disp, ret); | |||
} | |||
__eglMustCastToProperFunctionPointerType EGLAPIENTRY | |||
eglGetProcAddress(const char *procname) | |||
{ |
@@ -55,8 +55,6 @@ struct _egl_api | |||
/* driver funcs */ | |||
EGLBoolean (*Initialize)(_EGLDriver *, _EGLDisplay *dpy); | |||
EGLBoolean (*Terminate)(_EGLDriver *, _EGLDisplay *dpy); | |||
const char *(*QueryDriverName)(_EGLDisplay *dpy); | |||
char *(*QueryDriverConfig)(_EGLDisplay *dpy); | |||
/* config funcs */ | |||
EGLBoolean (*GetConfigs)(_EGLDriver *drv, _EGLDisplay *dpy, |
@@ -138,7 +138,6 @@ struct _egl_extensions | |||
EGLBoolean MESA_drm_image; | |||
EGLBoolean MESA_image_dma_buf_export; | |||
EGLBoolean MESA_query_driver; | |||
EGLBoolean NOK_swap_region; | |||
EGLBoolean NOK_texture_from_pixmap; |
@@ -42,8 +42,6 @@ EGL_ENTRYPOINT(eglGetCurrentContext) | |||
EGL_ENTRYPOINT(eglGetCurrentDisplay) | |||
EGL_ENTRYPOINT(eglGetCurrentSurface) | |||
EGL_ENTRYPOINT(eglGetDisplay) | |||
EGL_ENTRYPOINT(eglGetDisplayDriverConfig) | |||
EGL_ENTRYPOINT(eglGetDisplayDriverName) | |||
EGL_ENTRYPOINT(eglGetError) | |||
EGL_ENTRYPOINT(eglGetPlatformDisplay) | |||
EGL_ENTRYPOINT(eglGetPlatformDisplayEXT) |