From 6b4c474ed7d217ae27edc6f9e30feba651ef6a53 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Sun, 22 Apr 2018 16:48:15 +0200 Subject: [PATCH] egl: drop unused _EGLDriver from Create{Window,Pixmap,Pbuffer}Surface() & DestroySurface() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Engestrom Reviewed-by: Marek Olšák Part-of: --- src/egl/drivers/dri2/egl_dri2.c | 28 +++++++++---------- src/egl/drivers/dri2/egl_dri2.h | 12 +++----- src/egl/drivers/dri2/platform_android.c | 22 +++++++-------- src/egl/drivers/dri2/platform_device.c | 13 ++++----- src/egl/drivers/dri2/platform_drm.c | 14 ++++------ src/egl/drivers/dri2/platform_surfaceless.c | 12 ++++---- src/egl/drivers/dri2/platform_wayland.c | 14 ++++------ src/egl/drivers/dri2/platform_x11.c | 31 ++++++++------------- src/egl/drivers/dri2/platform_x11_dri3.c | 31 ++++++++------------- src/egl/drivers/haiku/egl_haiku.cpp | 8 +++--- src/egl/main/eglapi.c | 10 +++---- src/egl/main/egldisplay.c | 2 +- src/egl/main/egldriver.h | 16 ++++------- 13 files changed, 88 insertions(+), 125 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 6c7b0014e39..fbf92cfdd23 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -1693,14 +1693,14 @@ dri2_fini_surface(_EGLSurface *surf) } static EGLBoolean -dri2_destroy_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +dri2_destroy_surface(_EGLDisplay *disp, _EGLSurface *surf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); if (!_eglPutSurface(surf)) return EGL_TRUE; - return dri2_dpy->vtbl->destroy_surface(drv, disp, surf); + return dri2_dpy->vtbl->destroy_surface(disp, surf); } static void @@ -1860,8 +1860,8 @@ dri2_make_current(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *dsurf, } } - dri2_destroy_surface(drv, disp, old_dsurf); - dri2_destroy_surface(drv, disp, old_rsurf); + dri2_destroy_surface(disp, old_dsurf); + dri2_destroy_surface(disp, old_rsurf); if (old_ctx) { dri2_destroy_context(disp, old_ctx); @@ -1904,35 +1904,33 @@ dri2_get_proc_address(const _EGLDriver *drv, const char *procname) } static _EGLSurface* -dri2_create_window_surface(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *conf, void *native_window, - const EGLint *attrib_list) +dri2_create_window_surface(_EGLDisplay *disp, _EGLConfig *conf, + void *native_window, const EGLint *attrib_list) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); - return dri2_dpy->vtbl->create_window_surface(drv, disp, conf, native_window, + return dri2_dpy->vtbl->create_window_surface(disp, conf, native_window, attrib_list); } static _EGLSurface* -dri2_create_pixmap_surface(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *conf, void *native_pixmap, - const EGLint *attrib_list) +dri2_create_pixmap_surface(_EGLDisplay *disp, _EGLConfig *conf, + void *native_pixmap, const EGLint *attrib_list) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); if (!dri2_dpy->vtbl->create_pixmap_surface) return NULL; - return dri2_dpy->vtbl->create_pixmap_surface(drv, disp, conf, native_pixmap, + return dri2_dpy->vtbl->create_pixmap_surface(disp, conf, native_pixmap, attrib_list); } static _EGLSurface* -dri2_create_pbuffer_surface(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *conf, const EGLint *attrib_list) +dri2_create_pbuffer_surface(_EGLDisplay *disp, _EGLConfig *conf, + const EGLint *attrib_list) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); if (!dri2_dpy->vtbl->create_pbuffer_surface) return NULL; - return dri2_dpy->vtbl->create_pbuffer_surface(drv, disp, conf, attrib_list); + return dri2_dpy->vtbl->create_pbuffer_surface(disp, conf, attrib_list); } static EGLBoolean diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index 6d7c7ed30b4..cb66f7e91c3 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -92,25 +92,21 @@ struct dri2_egl_display_vtbl { int (*authenticate)(_EGLDisplay *disp, uint32_t id); /* mandatory */ - _EGLSurface* (*create_window_surface)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *config, + _EGLSurface* (*create_window_surface)(_EGLDisplay *disp, _EGLConfig *config, void *native_window, const EGLint *attrib_list); /* optional */ - _EGLSurface* (*create_pixmap_surface)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *config, + _EGLSurface* (*create_pixmap_surface)(_EGLDisplay *disp, _EGLConfig *config, void *native_pixmap, const EGLint *attrib_list); /* optional */ - _EGLSurface* (*create_pbuffer_surface)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *config, + _EGLSurface* (*create_pbuffer_surface)(_EGLDisplay *disp, _EGLConfig *config, const EGLint *attrib_list); /* mandatory */ - EGLBoolean (*destroy_surface)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLSurface *surface); + EGLBoolean (*destroy_surface)(_EGLDisplay *disp, _EGLSurface *surface); /* optional */ EGLBoolean (*swap_interval)(const _EGLDriver *drv, _EGLDisplay *disp, diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index d42a62249af..730229ef4f3 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -332,9 +332,8 @@ droid_set_shared_buffer_mode(_EGLDisplay *disp, _EGLSurface *surf, bool mode) } static _EGLSurface * -droid_create_surface(const _EGLDriver *drv, _EGLDisplay *disp, EGLint type, - _EGLConfig *conf, void *native_window, - const EGLint *attrib_list) +droid_create_surface(_EGLDisplay *disp, EGLint type, _EGLConfig *conf, + void *native_window, const EGLint *attrib_list) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_config *dri2_conf = dri2_egl_config(conf); @@ -445,24 +444,23 @@ cleanup_surface: } static _EGLSurface * -droid_create_window_surface(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *conf, void *native_window, - const EGLint *attrib_list) +droid_create_window_surface(_EGLDisplay *disp, _EGLConfig *conf, + void *native_window, const EGLint *attrib_list) { - return droid_create_surface(drv, disp, EGL_WINDOW_BIT, conf, + return droid_create_surface(disp, EGL_WINDOW_BIT, conf, native_window, attrib_list); } static _EGLSurface * -droid_create_pbuffer_surface(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *conf, const EGLint *attrib_list) +droid_create_pbuffer_surface(_EGLDisplay *disp, _EGLConfig *conf, + const EGLint *attrib_list) { - return droid_create_surface(drv, disp, EGL_PBUFFER_BIT, conf, - NULL, attrib_list); + return droid_create_surface(disp, EGL_PBUFFER_BIT, conf, + NULL, attrib_list); } static EGLBoolean -droid_destroy_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +droid_destroy_surface(_EGLDisplay *disp, _EGLSurface *surf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); diff --git a/src/egl/drivers/dri2/platform_device.c b/src/egl/drivers/dri2/platform_device.c index d27a1bec085..8aee12553b9 100644 --- a/src/egl/drivers/dri2/platform_device.c +++ b/src/egl/drivers/dri2/platform_device.c @@ -115,8 +115,8 @@ device_image_get_buffers(__DRIdrawable *driDrawable, } static _EGLSurface * -dri2_device_create_surface(const _EGLDriver *drv, _EGLDisplay *disp, EGLint type, - _EGLConfig *conf, const EGLint *attrib_list) +dri2_device_create_surface(_EGLDisplay *disp, EGLint type, _EGLConfig *conf, + const EGLint *attrib_list) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_config *dri2_conf = dri2_egl_config(conf); @@ -160,7 +160,7 @@ dri2_device_create_surface(const _EGLDriver *drv, _EGLDisplay *disp, EGLint type } static EGLBoolean -device_destroy_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +device_destroy_surface(_EGLDisplay *disp, _EGLSurface *surf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); @@ -175,11 +175,10 @@ device_destroy_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *su } static _EGLSurface * -dri2_device_create_pbuffer_surface(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *conf, const EGLint *attrib_list) +dri2_device_create_pbuffer_surface(_EGLDisplay *disp, _EGLConfig *conf, + const EGLint *attrib_list) { - return dri2_device_create_surface(drv, disp, EGL_PBUFFER_BIT, conf, - attrib_list); + return dri2_device_create_surface(disp, EGL_PBUFFER_BIT, conf, attrib_list); } static const struct dri2_egl_display_vtbl dri2_device_display_vtbl = { diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c index ceb431fca31..e2a9f77c844 100644 --- a/src/egl/drivers/dri2/platform_drm.c +++ b/src/egl/drivers/dri2/platform_drm.c @@ -138,9 +138,8 @@ dri2_drm_config_is_compatible(struct dri2_egl_display *dri2_dpy, } static _EGLSurface * -dri2_drm_create_window_surface(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *conf, void *native_surface, - const EGLint *attrib_list) +dri2_drm_create_window_surface(_EGLDisplay *disp, _EGLConfig *conf, + void *native_surface, const EGLint *attrib_list) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_config *dri2_conf = dri2_egl_config(conf); @@ -149,8 +148,6 @@ dri2_drm_create_window_surface(const _EGLDriver *drv, _EGLDisplay *disp, struct gbm_dri_surface *surf; const __DRIconfig *config; - (void) drv; - dri2_surf = calloc(1, sizeof *dri2_surf); if (!dri2_surf) { _eglError(EGL_BAD_ALLOC, "dri2_create_surface"); @@ -192,9 +189,8 @@ dri2_drm_create_window_surface(const _EGLDriver *drv, _EGLDisplay *disp, } static _EGLSurface * -dri2_drm_create_pixmap_surface(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *conf, void *native_window, - const EGLint *attrib_list) +dri2_drm_create_pixmap_surface(_EGLDisplay *disp, _EGLConfig *conf, + void *native_window, const EGLint *attrib_list) { /* From the EGL_MESA_platform_gbm spec, version 5: * @@ -207,7 +203,7 @@ dri2_drm_create_pixmap_surface(const _EGLDriver *drv, _EGLDisplay *disp, } static EGLBoolean -dri2_drm_destroy_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +dri2_drm_destroy_surface(_EGLDisplay *disp, _EGLSurface *surf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); diff --git a/src/egl/drivers/dri2/platform_surfaceless.c b/src/egl/drivers/dri2/platform_surfaceless.c index d1e98543b39..dd283673a83 100644 --- a/src/egl/drivers/dri2/platform_surfaceless.c +++ b/src/egl/drivers/dri2/platform_surfaceless.c @@ -108,8 +108,8 @@ surfaceless_image_get_buffers(__DRIdrawable *driDrawable, } static _EGLSurface * -dri2_surfaceless_create_surface(const _EGLDriver *drv, _EGLDisplay *disp, EGLint type, - _EGLConfig *conf, const EGLint *attrib_list) +dri2_surfaceless_create_surface(_EGLDisplay *disp, EGLint type, + _EGLConfig *conf, const EGLint *attrib_list) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_config *dri2_conf = dri2_egl_config(conf); @@ -153,7 +153,7 @@ dri2_surfaceless_create_surface(const _EGLDriver *drv, _EGLDisplay *disp, EGLint } static EGLBoolean -surfaceless_destroy_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +surfaceless_destroy_surface(_EGLDisplay *disp, _EGLSurface *surf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); @@ -168,10 +168,10 @@ surfaceless_destroy_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurfac } static _EGLSurface * -dri2_surfaceless_create_pbuffer_surface(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *conf, const EGLint *attrib_list) +dri2_surfaceless_create_pbuffer_surface(_EGLDisplay *disp, _EGLConfig *conf, + const EGLint *attrib_list) { - return dri2_surfaceless_create_surface(drv, disp, EGL_PBUFFER_BIT, conf, + return dri2_surfaceless_create_surface(disp, EGL_PBUFFER_BIT, conf, attrib_list); } diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index 026ed597ed4..878cc60b5f2 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -307,9 +307,8 @@ get_wl_surface_proxy(struct wl_egl_window *window) * Called via eglCreateWindowSurface(), drv->CreateWindowSurface(). */ static _EGLSurface * -dri2_wl_create_window_surface(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *conf, void *native_window, - const EGLint *attrib_list) +dri2_wl_create_window_surface(_EGLDisplay *disp, _EGLConfig *conf, + void *native_window, const EGLint *attrib_list) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_config *dri2_conf = dri2_egl_config(conf); @@ -410,9 +409,8 @@ dri2_wl_create_window_surface(const _EGLDriver *drv, _EGLDisplay *disp, } static _EGLSurface * -dri2_wl_create_pixmap_surface(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *conf, void *native_window, - const EGLint *attrib_list) +dri2_wl_create_pixmap_surface(_EGLDisplay *disp, _EGLConfig *conf, + void *native_window, const EGLint *attrib_list) { /* From the EGL_EXT_platform_wayland spec, version 3: * @@ -429,13 +427,11 @@ dri2_wl_create_pixmap_surface(const _EGLDriver *drv, _EGLDisplay *disp, * Called via eglDestroySurface(), drv->DestroySurface(). */ static EGLBoolean -dri2_wl_destroy_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +dri2_wl_destroy_surface(_EGLDisplay *disp, _EGLSurface *surf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); - (void) drv; - dri2_dpy->core->destroyDrawable(dri2_surf->dri_drawable); for (int i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++) { diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index 45833a88109..2c0ab609401 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -247,9 +247,8 @@ dri2_x11_get_red_mask_for_depth(struct dri2_egl_display *dri2_dpy, int depth) * Called via eglCreateWindowSurface(), drv->CreateWindowSurface(). */ static _EGLSurface * -dri2_x11_create_surface(const _EGLDriver *drv, _EGLDisplay *disp, EGLint type, - _EGLConfig *conf, void *native_surface, - const EGLint *attrib_list) +dri2_x11_create_surface(_EGLDisplay *disp, EGLint type, _EGLConfig *conf, + void *native_surface, const EGLint *attrib_list) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_config *dri2_conf = dri2_egl_config(conf); @@ -259,8 +258,6 @@ dri2_x11_create_surface(const _EGLDriver *drv, _EGLDisplay *disp, EGLint type, xcb_generic_error_t *error; const __DRIconfig *config; - (void) drv; - dri2_surf = calloc(1, sizeof *dri2_surf); if (!dri2_surf) { _eglError(EGL_BAD_ALLOC, "dri2_create_surface"); @@ -363,14 +360,13 @@ dri2_x11_create_surface(const _EGLDriver *drv, _EGLDisplay *disp, EGLint type, * Called via eglCreateWindowSurface(), drv->CreateWindowSurface(). */ static _EGLSurface * -dri2_x11_create_window_surface(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *conf, void *native_window, - const EGLint *attrib_list) +dri2_x11_create_window_surface(_EGLDisplay *disp, _EGLConfig *conf, + void *native_window, const EGLint *attrib_list) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); _EGLSurface *surf; - surf = dri2_x11_create_surface(drv, disp, EGL_WINDOW_BIT, conf, + surf = dri2_x11_create_surface(disp, EGL_WINDOW_BIT, conf, native_window, attrib_list); if (surf != NULL) { /* When we first create the DRI2 drawable, its swap interval on the @@ -386,30 +382,27 @@ dri2_x11_create_window_surface(const _EGLDriver *drv, _EGLDisplay *disp, } static _EGLSurface * -dri2_x11_create_pixmap_surface(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *conf, void *native_pixmap, - const EGLint *attrib_list) +dri2_x11_create_pixmap_surface(_EGLDisplay *disp, _EGLConfig *conf, + void *native_pixmap, const EGLint *attrib_list) { - return dri2_x11_create_surface(drv, disp, EGL_PIXMAP_BIT, conf, + return dri2_x11_create_surface(disp, EGL_PIXMAP_BIT, conf, native_pixmap, attrib_list); } static _EGLSurface * -dri2_x11_create_pbuffer_surface(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *conf, const EGLint *attrib_list) +dri2_x11_create_pbuffer_surface(_EGLDisplay *disp, _EGLConfig *conf, + const EGLint *attrib_list) { - return dri2_x11_create_surface(drv, disp, EGL_PBUFFER_BIT, conf, + return dri2_x11_create_surface(disp, EGL_PBUFFER_BIT, conf, NULL, attrib_list); } static EGLBoolean -dri2_x11_destroy_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +dri2_x11_destroy_surface(_EGLDisplay *disp, _EGLSurface *surf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); - (void) drv; - dri2_dpy->core->destroyDrawable(dri2_surf->dri_drawable); if (dri2_dpy->dri2) { diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c b/src/egl/drivers/dri2/platform_x11_dri3.c index bf694287a04..8c7ef387222 100644 --- a/src/egl/drivers/dri2/platform_x11_dri3.c +++ b/src/egl/drivers/dri2/platform_x11_dri3.c @@ -104,14 +104,12 @@ static const struct loader_dri3_vtable egl_dri3_vtable = { }; static EGLBoolean -dri3_destroy_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +dri3_destroy_surface(_EGLDisplay *disp, _EGLSurface *surf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri3_egl_surface *dri3_surf = dri3_egl_surface(surf); xcb_drawable_t drawable = dri3_surf->loader_drawable.drawable; - (void) drv; - loader_dri3_drawable_fini(&dri3_surf->loader_drawable); if (surf->Type == EGL_PBUFFER_BIT) @@ -136,9 +134,8 @@ dri3_set_swap_interval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *su } static _EGLSurface * -dri3_create_surface(const _EGLDriver *drv, _EGLDisplay *disp, EGLint type, - _EGLConfig *conf, void *native_surface, - const EGLint *attrib_list) +dri3_create_surface(_EGLDisplay *disp, EGLint type, _EGLConfig *conf, + void *native_surface, const EGLint *attrib_list) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_config *dri2_conf = dri2_egl_config(conf); @@ -146,8 +143,6 @@ dri3_create_surface(const _EGLDriver *drv, _EGLDisplay *disp, EGLint type, const __DRIconfig *dri_config; xcb_drawable_t drawable; - (void) drv; - dri3_surf = calloc(1, sizeof *dri3_surf); if (!dri3_surf) { _eglError(EGL_BAD_ALLOC, "dri3_create_surface"); @@ -222,14 +217,13 @@ dri3_authenticate(_EGLDisplay *disp, uint32_t id) * Called via eglCreateWindowSurface(), drv->CreateWindowSurface(). */ static _EGLSurface * -dri3_create_window_surface(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *conf, void *native_window, - const EGLint *attrib_list) +dri3_create_window_surface(_EGLDisplay *disp, _EGLConfig *conf, + void *native_window, const EGLint *attrib_list) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); _EGLSurface *surf; - surf = dri3_create_surface(drv, disp, EGL_WINDOW_BIT, conf, + surf = dri3_create_surface(disp, EGL_WINDOW_BIT, conf, native_window, attrib_list); if (surf != NULL) dri3_set_swap_interval(disp->Driver, disp, surf, dri2_dpy->default_swap_interval); @@ -238,19 +232,18 @@ dri3_create_window_surface(const _EGLDriver *drv, _EGLDisplay *disp, } static _EGLSurface * -dri3_create_pixmap_surface(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *conf, void *native_pixmap, - const EGLint *attrib_list) +dri3_create_pixmap_surface(_EGLDisplay *disp, _EGLConfig *conf, + void *native_pixmap, const EGLint *attrib_list) { - return dri3_create_surface(drv, disp, EGL_PIXMAP_BIT, conf, + return dri3_create_surface(disp, EGL_PIXMAP_BIT, conf, native_pixmap, attrib_list); } static _EGLSurface * -dri3_create_pbuffer_surface(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *conf, const EGLint *attrib_list) +dri3_create_pbuffer_surface(_EGLDisplay *disp, _EGLConfig *conf, + const EGLint *attrib_list) { - return dri3_create_surface(drv, disp, EGL_PBUFFER_BIT, conf, + return dri3_create_surface(disp, EGL_PBUFFER_BIT, conf, NULL, attrib_list); } diff --git a/src/egl/drivers/haiku/egl_haiku.cpp b/src/egl/drivers/haiku/egl_haiku.cpp index e489f2158b4..2b2c7d90c4f 100644 --- a/src/egl/drivers/haiku/egl_haiku.cpp +++ b/src/egl/drivers/haiku/egl_haiku.cpp @@ -76,7 +76,7 @@ struct haiku_egl_surface * Called via eglCreateWindowSurface(), drv->CreateWindowSurface(). */ static _EGLSurface * -haiku_create_window_surface(const _EGLDriver *drv, _EGLDisplay *disp, +haiku_create_window_surface(_EGLDisplay *disp, _EGLConfig *conf, void *native_window, const EGLint *attrib_list) { CALLED(); @@ -113,7 +113,7 @@ haiku_create_window_surface(const _EGLDriver *drv, _EGLDisplay *disp, static _EGLSurface * -haiku_create_pixmap_surface(const _EGLDriver *drv, _EGLDisplay *disp, +haiku_create_pixmap_surface(_EGLDisplay *disp, _EGLConfig *conf, void *native_pixmap, const EGLint *attrib_list) { return NULL; @@ -121,7 +121,7 @@ haiku_create_pixmap_surface(const _EGLDriver *drv, _EGLDisplay *disp, static _EGLSurface * -haiku_create_pbuffer_surface(const _EGLDriver *drv, _EGLDisplay *disp, +haiku_create_pbuffer_surface(_EGLDisplay *disp, _EGLConfig *conf, const EGLint *attrib_list) { return NULL; @@ -129,7 +129,7 @@ haiku_create_pbuffer_surface(const _EGLDriver *drv, _EGLDisplay *disp, static EGLBoolean -haiku_destroy_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +haiku_destroy_surface(_EGLDisplay *disp, _EGLSurface *surf) { if (_eglPutSurface(surf)) { // XXX: detach haiku_egl_surface::gl from the native window and destroy it diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 70261c3d67b..7177f9e7d2f 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -968,8 +968,7 @@ _eglCreateWindowSurfaceCommon(_EGLDisplay *disp, EGLConfig config, if (_eglNativeSurfaceAlreadyUsed(disp, native_window)) RETURN_EGL_ERROR(disp, EGL_BAD_ALLOC, EGL_NO_SURFACE); - surf = drv->CreateWindowSurface(drv, disp, conf, native_window, - attrib_list); + surf = drv->CreateWindowSurface(disp, conf, native_window, attrib_list); ret = (surf) ? _eglLinkSurface(surf) : EGL_NO_SURFACE; RETURN_EGL_EVAL(disp, ret); @@ -1095,8 +1094,7 @@ _eglCreatePixmapSurfaceCommon(_EGLDisplay *disp, EGLConfig config, if (_eglNativeSurfaceAlreadyUsed(disp, native_pixmap)) RETURN_EGL_ERROR(disp, EGL_BAD_ALLOC, EGL_NO_SURFACE); - surf = drv->CreatePixmapSurface(drv, disp, conf, native_pixmap, - attrib_list); + surf = drv->CreatePixmapSurface(disp, conf, native_pixmap, attrib_list); ret = (surf) ? _eglLinkSurface(surf) : EGL_NO_SURFACE; RETURN_EGL_EVAL(disp, ret); @@ -1168,7 +1166,7 @@ eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig config, if ((conf->SurfaceType & EGL_PBUFFER_BIT) == 0) RETURN_EGL_ERROR(disp, EGL_BAD_MATCH, EGL_NO_SURFACE); - surf = drv->CreatePbufferSurface(drv, disp, conf, attrib_list); + surf = drv->CreatePbufferSurface(disp, conf, attrib_list); ret = (surf) ? _eglLinkSurface(surf) : EGL_NO_SURFACE; RETURN_EGL_EVAL(disp, ret); @@ -1186,7 +1184,7 @@ eglDestroySurface(EGLDisplay dpy, EGLSurface surface) _EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE); _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv); _eglUnlinkSurface(surf); - ret = drv->DestroySurface(drv, disp, surf); + ret = drv->DestroySurface(disp, surf); RETURN_EGL_EVAL(disp, ret); } diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c index c75ce102f9e..894cd54ab5c 100644 --- a/src/egl/main/egldisplay.c +++ b/src/egl/main/egldisplay.c @@ -314,7 +314,7 @@ _eglReleaseDisplayResources(_EGLDisplay *display) list = list->Next; _eglUnlinkSurface(surf); - drv->DestroySurface(drv, display, surf); + drv->DestroySurface(display, surf); } assert(!display->ResourceLists[_EGL_RESOURCE_SURFACE]); diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h index 2f8f37896e7..7e8927970c8 100644 --- a/src/egl/main/egldriver.h +++ b/src/egl/main/egldriver.h @@ -102,17 +102,13 @@ struct _egl_driver _EGLContext *ctx); /* surface funcs */ - _EGLSurface *(*CreateWindowSurface)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *config, void *native_window, - const EGLint *attrib_list); - _EGLSurface *(*CreatePixmapSurface)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *config, void *native_pixmap, - const EGLint *attrib_list); - _EGLSurface *(*CreatePbufferSurface)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLConfig *config, + _EGLSurface *(*CreateWindowSurface)(_EGLDisplay *disp, _EGLConfig *config, + void *native_window, const EGLint *attrib_list); + _EGLSurface *(*CreatePixmapSurface)(_EGLDisplay *disp, _EGLConfig *config, + void *native_pixmap, const EGLint *attrib_list); + _EGLSurface *(*CreatePbufferSurface)(_EGLDisplay *disp, _EGLConfig *config, const EGLint *attrib_list); - EGLBoolean (*DestroySurface)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLSurface *surface); + EGLBoolean (*DestroySurface)(_EGLDisplay *disp, _EGLSurface *surface); EGLBoolean (*QuerySurface)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface, EGLint attribute, EGLint *value); -- 2.30.2