Commit eeacd663 authored by Eric Engestrom's avatar Eric Engestrom

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: default avatarEmil Velikov <emil.velikov@collabora.com>
Signed-off-by: Eric Engestrom's avatarEric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Tapani Pälli's avatarTapani Pälli <tapani.palli@intel.com>
parent 83f01f52
...@@ -725,10 +725,7 @@ eglGetConfigs(EGLDisplay dpy, EGLConfig *configs, ...@@ -725,10 +725,7 @@ eglGetConfigs(EGLDisplay dpy, EGLConfig *configs,
if (!num_config) if (!num_config)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE); RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
if (drv->API.GetConfigs) ret = _eglGetConfigs(drv, disp, configs, config_size, num_config);
ret = drv->API.GetConfigs(drv, disp, configs, config_size, num_config);
else
ret = _eglGetConfigs(drv, disp, configs, config_size, num_config);
RETURN_EGL_EVAL(disp, ret); RETURN_EGL_EVAL(disp, ret);
} }
...@@ -749,12 +746,8 @@ eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, ...@@ -749,12 +746,8 @@ eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs,
if (!num_config) if (!num_config)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE); RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
if (drv->API.ChooseConfig) ret = _eglChooseConfig(drv, disp, attrib_list, configs,
ret = drv->API.ChooseConfig(drv, disp, attrib_list, configs, config_size, num_config);
config_size, num_config);
else
ret = _eglChooseConfig(drv, disp, attrib_list, configs,
config_size, num_config);
RETURN_EGL_EVAL(disp, ret); RETURN_EGL_EVAL(disp, ret);
} }
...@@ -773,10 +766,7 @@ eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config, ...@@ -773,10 +766,7 @@ eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config,
_EGL_CHECK_CONFIG(disp, conf, EGL_FALSE, drv); _EGL_CHECK_CONFIG(disp, conf, EGL_FALSE, drv);
if (drv->API.GetConfigAttrib) ret = _eglGetConfigAttrib(drv, disp, conf, attribute, value);
ret = drv->API.GetConfigAttrib(drv, disp, conf, attribute, value);
else
ret = _eglGetConfigAttrib(drv, disp, conf, attribute, value);
RETURN_EGL_EVAL(disp, ret); RETURN_EGL_EVAL(disp, ret);
} }
...@@ -901,10 +891,7 @@ eglQueryContext(EGLDisplay dpy, EGLContext ctx, ...@@ -901,10 +891,7 @@ eglQueryContext(EGLDisplay dpy, EGLContext ctx,
_EGL_CHECK_CONTEXT(disp, context, EGL_FALSE, drv); _EGL_CHECK_CONTEXT(disp, context, EGL_FALSE, drv);
if (drv->API.QueryContext) ret = _eglQueryContext(drv, disp, context, attribute, value);
ret = drv->API.QueryContext(drv, disp, context, attribute, value);
else
ret = _eglQueryContext(drv, disp, context, attribute, value);
RETURN_EGL_EVAL(disp, ret); RETURN_EGL_EVAL(disp, ret);
} }
...@@ -1229,10 +1216,7 @@ eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface, ...@@ -1229,10 +1216,7 @@ eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface,
_EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE); _EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE);
_EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv); _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
if (drv->API.SurfaceAttrib) ret = _eglSurfaceAttrib(drv, disp, surf, attribute, value);
ret = drv->API.SurfaceAttrib(drv, disp, surf, attribute, value);
else
ret = _eglSurfaceAttrib(drv, disp, surf, attribute, value);
RETURN_EGL_EVAL(disp, ret); RETURN_EGL_EVAL(disp, ret);
} }
...@@ -2113,10 +2097,7 @@ _eglGetSyncAttribCommon(_EGLDisplay *disp, _EGLSync *s, EGLint attribute, EGLAtt ...@@ -2113,10 +2097,7 @@ _eglGetSyncAttribCommon(_EGLDisplay *disp, _EGLSync *s, EGLint attribute, EGLAtt
disp->Extensions.KHR_fence_sync || disp->Extensions.KHR_fence_sync ||
disp->Extensions.ANDROID_native_fence_sync); disp->Extensions.ANDROID_native_fence_sync);
if (drv->API.GetSyncAttrib) ret = _eglGetSyncAttrib(drv, disp, s, attribute, value);
ret = drv->API.GetSyncAttrib(drv, disp, s, attribute, value);
else
ret = _eglGetSyncAttrib(drv, disp, s, attribute, value);
RETURN_EGL_EVAL(disp, ret); RETURN_EGL_EVAL(disp, ret);
} }
......
...@@ -58,17 +58,6 @@ struct _egl_api ...@@ -58,17 +58,6 @@ struct _egl_api
const char *(*QueryDriverName)(_EGLDisplay *disp); const char *(*QueryDriverName)(_EGLDisplay *disp);
char *(*QueryDriverConfig)(_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 */ /* context funcs */
_EGLContext *(*CreateContext)(_EGLDriver *drv, _EGLDisplay *disp, _EGLContext *(*CreateContext)(_EGLDriver *drv, _EGLDisplay *disp,
_EGLConfig *config, _EGLContext *share_list, _EGLConfig *config, _EGLContext *share_list,
...@@ -81,9 +70,6 @@ struct _egl_api ...@@ -81,9 +70,6 @@ struct _egl_api
EGLBoolean (*MakeCurrent)(_EGLDriver *drv, _EGLDisplay *disp, EGLBoolean (*MakeCurrent)(_EGLDriver *drv, _EGLDisplay *disp,
_EGLSurface *draw, _EGLSurface *read, _EGLSurface *draw, _EGLSurface *read,
_EGLContext *ctx); _EGLContext *ctx);
EGLBoolean (*QueryContext)(_EGLDriver *drv, _EGLDisplay *disp,
_EGLContext *ctx, EGLint attribute,
EGLint *value);
/* surface funcs */ /* surface funcs */
_EGLSurface *(*CreateWindowSurface)(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *(*CreateWindowSurface)(_EGLDriver *drv, _EGLDisplay *disp,
...@@ -100,9 +86,6 @@ struct _egl_api ...@@ -100,9 +86,6 @@ struct _egl_api
EGLBoolean (*QuerySurface)(_EGLDriver *drv, _EGLDisplay *disp, EGLBoolean (*QuerySurface)(_EGLDriver *drv, _EGLDisplay *disp,
_EGLSurface *surface, EGLint attribute, _EGLSurface *surface, EGLint attribute,
EGLint *value); EGLint *value);
EGLBoolean (*SurfaceAttrib)(_EGLDriver *drv, _EGLDisplay *disp,
_EGLSurface *surface, EGLint attribute,
EGLint value);
EGLBoolean (*BindTexImage)(_EGLDriver *drv, _EGLDisplay *disp, EGLBoolean (*BindTexImage)(_EGLDriver *drv, _EGLDisplay *disp,
_EGLSurface *surface, EGLint buffer); _EGLSurface *surface, EGLint buffer);
EGLBoolean (*ReleaseTexImage)(_EGLDriver *drv, _EGLDisplay *disp, EGLBoolean (*ReleaseTexImage)(_EGLDriver *drv, _EGLDisplay *disp,
...@@ -148,9 +131,6 @@ struct _egl_api ...@@ -148,9 +131,6 @@ struct _egl_api
EGLint (*WaitSyncKHR)(_EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync); EGLint (*WaitSyncKHR)(_EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync);
EGLBoolean (*SignalSyncKHR)(_EGLDriver *drv, _EGLDisplay *disp, EGLBoolean (*SignalSyncKHR)(_EGLDriver *drv, _EGLDisplay *disp,
_EGLSync *sync, EGLenum mode); _EGLSync *sync, EGLenum mode);
EGLBoolean (*GetSyncAttrib)(_EGLDriver *drv, _EGLDisplay *disp,
_EGLSync *sync, EGLint attribute,
EGLAttrib *value);
EGLint (*DupNativeFenceFDANDROID)(_EGLDriver *drv, _EGLDisplay *disp, EGLint (*DupNativeFenceFDANDROID)(_EGLDriver *drv, _EGLDisplay *disp,
_EGLSync *sync); _EGLSync *sync);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment