KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

egl: delete unused vfuncs 

Nobody ever uses these, so let's just hard code them instead.

If an EGL driver ever comes around that needs them they're trivial to
re-add.

Suggested-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
This commit is contained in:
Eric Engestrom 2019-06-14 16:08:44 +01:00
parent 83f01f5261
commit eeacd66324
2 changed files with 7 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/egl/main/eglapi.c
View File

@ -725,10 +725,7 @@ eglGetConfigs(EGLDisplay dpy, EGLConfig *configs,
if (!num_config)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
if (drv->API.GetConfigs)
ret = drv->API.GetConfigs(drv, disp, configs, config_size, num_config);
else
ret = _eglGetConfigs(drv, disp, configs, config_size, num_config);
ret = _eglGetConfigs(drv, disp, configs, config_size, num_config);
RETURN_EGL_EVAL(disp, ret);
}
@ -749,12 +746,8 @@ eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs,
if (!num_config)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
if (drv->API.ChooseConfig)
ret = drv->API.ChooseConfig(drv, disp, attrib_list, configs,
config_size, num_config);
else
ret = _eglChooseConfig(drv, disp, attrib_list, configs,
config_size, num_config);
ret = _eglChooseConfig(drv, disp, attrib_list, configs,
config_size, num_config);
RETURN_EGL_EVAL(disp, ret);
}
@ -773,10 +766,7 @@ eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config,
_EGL_CHECK_CONFIG(disp, conf, EGL_FALSE, drv);
if (drv->API.GetConfigAttrib)
ret = drv->API.GetConfigAttrib(drv, disp, conf, attribute, value);
else
ret = _eglGetConfigAttrib(drv, disp, conf, attribute, value);
ret = _eglGetConfigAttrib(drv, disp, conf, attribute, value);
RETURN_EGL_EVAL(disp, ret);
}
@ -901,10 +891,7 @@ eglQueryContext(EGLDisplay dpy, EGLContext ctx,
_EGL_CHECK_CONTEXT(disp, context, EGL_FALSE, drv);
if (drv->API.QueryContext)
ret = drv->API.QueryContext(drv, disp, context, attribute, value);
else
ret = _eglQueryContext(drv, disp, context, attribute, value);
ret = _eglQueryContext(drv, disp, context, attribute, value);
RETURN_EGL_EVAL(disp, ret);
}
@ -1229,10 +1216,7 @@ eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface,
_EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE);
_EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
if (drv->API.SurfaceAttrib)
ret = drv->API.SurfaceAttrib(drv, disp, surf, attribute, value);
else
ret = _eglSurfaceAttrib(drv, disp, surf, attribute, value);
ret = _eglSurfaceAttrib(drv, disp, surf, attribute, value);
RETURN_EGL_EVAL(disp, ret);
}
@ -2113,10 +2097,7 @@ _eglGetSyncAttribCommon(_EGLDisplay *disp, _EGLSync *s, EGLint attribute, EGLAtt
disp->Extensions.KHR_fence_sync ||
disp->Extensions.ANDROID_native_fence_sync);
if (drv->API.GetSyncAttrib)
ret = drv->API.GetSyncAttrib(drv, disp, s, attribute, value);
else
ret = _eglGetSyncAttrib(drv, disp, s, attribute, value);
ret = _eglGetSyncAttrib(drv, disp, s, attribute, value);
RETURN_EGL_EVAL(disp, ret);
}

20
src/egl/main/eglapi.h
View File

@ -58,17 +58,6 @@ struct _egl_api
const char *(*QueryDriverName)(_EGLDisplay *disp);
char *(*QueryDriverConfig)(_EGLDisplay *disp);
/* config funcs */
EGLBoolean (*GetConfigs)(_EGLDriver *drv, _EGLDisplay *disp,
EGLConfig *configs, EGLint config_size,
EGLint *num_config);
EGLBoolean (*ChooseConfig)(_EGLDriver *drv, _EGLDisplay *disp,
const EGLint *attrib_list, EGLConfig *configs,
EGLint config_size, EGLint *num_config);
EGLBoolean (*GetConfigAttrib)(_EGLDriver *drv, _EGLDisplay *disp,
_EGLConfig *config, EGLint attribute,
EGLint *value);
/* context funcs */
_EGLContext *(*CreateContext)(_EGLDriver *drv, _EGLDisplay *disp,
_EGLConfig *config, _EGLContext *share_list,
@ -81,9 +70,6 @@ struct _egl_api
EGLBoolean (*MakeCurrent)(_EGLDriver *drv, _EGLDisplay *disp,
_EGLSurface *draw, _EGLSurface *read,
_EGLContext *ctx);
EGLBoolean (*QueryContext)(_EGLDriver *drv, _EGLDisplay *disp,
_EGLContext *ctx, EGLint attribute,
EGLint *value);
/* surface funcs */
_EGLSurface *(*CreateWindowSurface)(_EGLDriver *drv, _EGLDisplay *disp,
@ -100,9 +86,6 @@ struct _egl_api
EGLBoolean (*QuerySurface)(_EGLDriver *drv, _EGLDisplay *disp,
_EGLSurface *surface, EGLint attribute,
EGLint *value);
EGLBoolean (*SurfaceAttrib)(_EGLDriver *drv, _EGLDisplay *disp,
_EGLSurface *surface, EGLint attribute,
EGLint value);
EGLBoolean (*BindTexImage)(_EGLDriver *drv, _EGLDisplay *disp,
_EGLSurface *surface, EGLint buffer);
EGLBoolean (*ReleaseTexImage)(_EGLDriver *drv, _EGLDisplay *disp,
@ -148,9 +131,6 @@ struct _egl_api
EGLint (*WaitSyncKHR)(_EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync);
EGLBoolean (*SignalSyncKHR)(_EGLDriver *drv, _EGLDisplay *disp,
_EGLSync *sync, EGLenum mode);
EGLBoolean (*GetSyncAttrib)(_EGLDriver *drv, _EGLDisplay *disp,
_EGLSync *sync, EGLint attribute,
EGLAttrib *value);
EGLint (*DupNativeFenceFDANDROID)(_EGLDriver *drv, _EGLDisplay *disp,
_EGLSync *sync);