From ad61d4f14619ce43c5f558fc2ce5ac1267a95e25 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 Initialize() 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 | 16 ++++++------- src/egl/drivers/dri2/egl_dri2.h | 26 ++++++++++----------- src/egl/drivers/dri2/platform_android.c | 6 ++--- src/egl/drivers/dri2/platform_device.c | 4 ++-- src/egl/drivers/dri2/platform_drm.c | 8 +++---- src/egl/drivers/dri2/platform_surfaceless.c | 6 ++--- src/egl/drivers/dri2/platform_wayland.c | 18 +++++++------- src/egl/drivers/dri2/platform_x11.c | 26 ++++++++++----------- src/egl/drivers/haiku/egl_haiku.cpp | 2 +- src/egl/main/egldriver.c | 4 ++-- src/egl/main/egldriver.h | 2 +- 11 files changed, 58 insertions(+), 60 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 7c8ae43e7c4..82804934d35 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -644,7 +644,7 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config, int id, } EGLBoolean -dri2_add_pbuffer_configs_for_visuals(const _EGLDriver *drv, _EGLDisplay *disp) +dri2_add_pbuffer_configs_for_visuals(_EGLDisplay *disp) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); unsigned int format_count[ARRAY_SIZE(dri2_pbuffer_visuals)] = { 0 }; @@ -1142,7 +1142,7 @@ dri2_setup_extensions(_EGLDisplay *disp) * called many times (without a eglTerminate in between). */ static EGLBoolean -dri2_initialize(const _EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize(_EGLDisplay *disp) { EGLBoolean ret = EGL_FALSE; struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -1168,22 +1168,22 @@ dri2_initialize(const _EGLDriver *drv, _EGLDisplay *disp) switch (disp->Platform) { case _EGL_PLATFORM_SURFACELESS: - ret = dri2_initialize_surfaceless(drv, disp); + ret = dri2_initialize_surfaceless(disp); break; case _EGL_PLATFORM_DEVICE: - ret = dri2_initialize_device(drv, disp); + ret = dri2_initialize_device(disp); break; case _EGL_PLATFORM_X11: - ret = dri2_initialize_x11(drv, disp); + ret = dri2_initialize_x11(disp); break; case _EGL_PLATFORM_DRM: - ret = dri2_initialize_drm(drv, disp); + ret = dri2_initialize_drm(disp); break; case _EGL_PLATFORM_WAYLAND: - ret = dri2_initialize_wayland(drv, disp); + ret = dri2_initialize_wayland(disp); break; case _EGL_PLATFORM_ANDROID: - ret = dri2_initialize_android(drv, disp); + ret = dri2_initialize_android(disp); break; default: unreachable("Callers ensure we cannot get here."); diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index 7e5f03c19de..6d7c7ed30b4 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -446,7 +446,7 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config, int id, const int *rgba_shifts, const unsigned int *rgba_sizes); EGLBoolean -dri2_add_pbuffer_configs_for_visuals(const _EGLDriver *drv, _EGLDisplay *disp); +dri2_add_pbuffer_configs_for_visuals(_EGLDisplay *disp); _EGLImage * dri2_create_image_khr(const _EGLDriver *drv, _EGLDisplay *disp, @@ -459,14 +459,14 @@ dri2_create_image_dma_buf(_EGLDisplay *disp, _EGLContext *ctx, #ifdef HAVE_X11_PLATFORM EGLBoolean -dri2_initialize_x11(const _EGLDriver *drv, _EGLDisplay *disp); +dri2_initialize_x11(_EGLDisplay *disp); void dri2_teardown_x11(struct dri2_egl_display *dri2_dpy); unsigned int dri2_x11_get_red_mask_for_depth(struct dri2_egl_display *dri2_dpy, int depth); #else static inline EGLBoolean -dri2_initialize_x11(const _EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_x11(_EGLDisplay *disp) { return _eglError(EGL_NOT_INITIALIZED, "X11 platform not built"); } @@ -481,12 +481,12 @@ dri2_x11_get_red_mask_for_depth(struct dri2_egl_display *dri2_dpy, int depth) #ifdef HAVE_DRM_PLATFORM EGLBoolean -dri2_initialize_drm(const _EGLDriver *drv, _EGLDisplay *disp); +dri2_initialize_drm(_EGLDisplay *disp); void dri2_teardown_drm(struct dri2_egl_display *dri2_dpy); #else static inline EGLBoolean -dri2_initialize_drm(const _EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_drm(_EGLDisplay *disp) { return _eglError(EGL_NOT_INITIALIZED, "GBM/DRM platform not built"); } @@ -496,14 +496,14 @@ dri2_teardown_drm(struct dri2_egl_display *dri2_dpy) {} #ifdef HAVE_WAYLAND_PLATFORM EGLBoolean -dri2_initialize_wayland(const _EGLDriver *drv, _EGLDisplay *disp); +dri2_initialize_wayland(_EGLDisplay *disp); void dri2_teardown_wayland(struct dri2_egl_display *dri2_dpy); bool dri2_wl_is_format_supported(void* user_data, uint32_t format); #else static inline EGLBoolean -dri2_initialize_wayland(const _EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_wayland(_EGLDisplay *disp) { return _eglError(EGL_NOT_INITIALIZED, "Wayland platform not built"); } @@ -513,20 +513,20 @@ dri2_teardown_wayland(struct dri2_egl_display *dri2_dpy) {} #ifdef HAVE_ANDROID_PLATFORM EGLBoolean -dri2_initialize_android(const _EGLDriver *drv, _EGLDisplay *disp); +dri2_initialize_android(_EGLDisplay *disp); #else static inline EGLBoolean -dri2_initialize_android(const _EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_android(_EGLDisplay *disp) { return _eglError(EGL_NOT_INITIALIZED, "Android platform not built"); } #endif EGLBoolean -dri2_initialize_surfaceless(const _EGLDriver *drv, _EGLDisplay *disp); +dri2_initialize_surfaceless(_EGLDisplay *disp); EGLBoolean -dri2_initialize_device(const _EGLDriver *drv, _EGLDisplay *disp); +dri2_initialize_device(_EGLDisplay *disp); static inline void dri2_teardown_device(struct dri2_egl_display *dri2_dpy) { /* noop */ } @@ -538,13 +538,11 @@ dri2_get_dri_config(struct dri2_egl_config *conf, EGLint surface_type, EGLenum colorspace); static inline void -dri2_set_WL_bind_wayland_display(const _EGLDriver *drv, _EGLDisplay *disp) +dri2_set_WL_bind_wayland_display(_EGLDisplay *disp) { #ifdef HAVE_WAYLAND_PLATFORM struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); - (void) drv; - if (dri2_dpy->device_name && dri2_dpy->image) { if (dri2_dpy->image->base.version >= 10 && dri2_dpy->image->getCapabilities != NULL) { diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index b1efd02786c..d42a62249af 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -1178,7 +1178,7 @@ droid_get_capability(void *loaderPrivate, enum dri_loader_cap cap) } static EGLBoolean -droid_add_configs_for_visuals(const _EGLDriver *drv, _EGLDisplay *disp) +droid_add_configs_for_visuals(_EGLDisplay *disp) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); static const struct { @@ -1584,7 +1584,7 @@ droid_open_device(_EGLDisplay *disp, bool swrast) #endif EGLBoolean -dri2_initialize_android(const _EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_android(_EGLDisplay *disp) { _EGLDevice *dev; bool device_opened = false; @@ -1664,7 +1664,7 @@ dri2_initialize_android(const _EGLDriver *drv, _EGLDisplay *disp) /* Create configs *after* enabling extensions because presence of DRI * driver extensions can affect the capabilities of EGLConfigs. */ - if (!droid_add_configs_for_visuals(drv, disp)) { + if (!droid_add_configs_for_visuals(disp)) { err = "DRI2: failed to add configs"; goto cleanup; } diff --git a/src/egl/drivers/dri2/platform_device.c b/src/egl/drivers/dri2/platform_device.c index 90df073ddab..d27a1bec085 100644 --- a/src/egl/drivers/dri2/platform_device.c +++ b/src/egl/drivers/dri2/platform_device.c @@ -317,7 +317,7 @@ device_probe_device_sw(_EGLDisplay *disp) } EGLBoolean -dri2_initialize_device(const _EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_device(_EGLDisplay *disp) { _EGLDevice *dev; struct dri2_egl_display *dri2_dpy; @@ -357,7 +357,7 @@ dri2_initialize_device(const _EGLDriver *drv, _EGLDisplay *disp) dri2_setup_screen(disp); - if (!dri2_add_pbuffer_configs_for_visuals(drv, disp)) { + if (!dri2_add_pbuffer_configs_for_visuals(disp)) { err = "DRI2: failed to add configs"; goto cleanup; } diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c index 6b279b65a17..ceb431fca31 100644 --- a/src/egl/drivers/dri2/platform_drm.c +++ b/src/egl/drivers/dri2/platform_drm.c @@ -610,7 +610,7 @@ swrast_get_image(__DRIdrawable *driDrawable, } static EGLBoolean -drm_add_configs_for_visuals(const _EGLDriver *drv, _EGLDisplay *disp) +drm_add_configs_for_visuals(_EGLDisplay *disp) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); const struct gbm_dri_visual *visuals = dri2_dpy->gbm_dri->visual_table; @@ -682,7 +682,7 @@ static const struct dri2_egl_display_vtbl dri2_drm_display_vtbl = { }; EGLBoolean -dri2_initialize_drm(const _EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_drm(_EGLDisplay *disp) { _EGLDevice *dev; struct dri2_egl_display *dri2_dpy; @@ -774,7 +774,7 @@ dri2_initialize_drm(const _EGLDriver *drv, _EGLDisplay *disp) dri2_setup_screen(disp); - if (!drm_add_configs_for_visuals(drv, disp)) { + if (!drm_add_configs_for_visuals(disp)) { err = "DRI2: failed to add configs"; goto cleanup; } @@ -786,7 +786,7 @@ dri2_initialize_drm(const _EGLDriver *drv, _EGLDisplay *disp) #ifdef HAVE_WAYLAND_PLATFORM dri2_dpy->device_name = loader_get_device_name_for_fd(dri2_dpy->fd); #endif - dri2_set_WL_bind_wayland_display(drv, disp); + dri2_set_WL_bind_wayland_display(disp); /* Fill vtbl last to prevent accidentally calling virtual function during * initialization. diff --git a/src/egl/drivers/dri2/platform_surfaceless.c b/src/egl/drivers/dri2/platform_surfaceless.c index 679099e5218..d1e98543b39 100644 --- a/src/egl/drivers/dri2/platform_surfaceless.c +++ b/src/egl/drivers/dri2/platform_surfaceless.c @@ -313,7 +313,7 @@ surfaceless_probe_device_sw(_EGLDisplay *disp) } EGLBoolean -dri2_initialize_surfaceless(const _EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_surfaceless(_EGLDisplay *disp) { struct dri2_egl_display *dri2_dpy; const char* err; @@ -358,9 +358,9 @@ dri2_initialize_surfaceless(const _EGLDriver *drv, _EGLDisplay *disp) #ifdef HAVE_WAYLAND_PLATFORM dri2_dpy->device_name = loader_get_device_name_for_fd(dri2_dpy->fd); #endif - dri2_set_WL_bind_wayland_display(drv, disp); + dri2_set_WL_bind_wayland_display(disp); - if (!dri2_add_pbuffer_configs_for_visuals(drv, disp)) { + if (!dri2_add_pbuffer_configs_for_visuals(disp)) { err = "DRI2: failed to add configs"; goto cleanup; } diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index 3d9f0f76d72..026ed597ed4 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -1407,7 +1407,7 @@ static const __DRIextension *image_loader_extensions[] = { }; static EGLBoolean -dri2_wl_add_configs_for_visuals(const _EGLDriver *drv, _EGLDisplay *disp) +dri2_wl_add_configs_for_visuals(_EGLDisplay *disp) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); unsigned int format_count[ARRAY_SIZE(dri2_wl_visuals)] = { 0 }; @@ -1482,7 +1482,7 @@ dri2_wl_add_configs_for_visuals(const _EGLDriver *drv, _EGLDisplay *disp) } static EGLBoolean -dri2_initialize_wayland_drm(const _EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_wayland_drm(_EGLDisplay *disp) { _EGLDevice *dev; struct dri2_egl_display *dri2_dpy; @@ -1620,12 +1620,12 @@ dri2_initialize_wayland_drm(const _EGLDriver *drv, _EGLDisplay *disp) goto cleanup; } - if (!dri2_wl_add_configs_for_visuals(drv, disp)) { + if (!dri2_wl_add_configs_for_visuals(disp)) { _eglError(EGL_NOT_INITIALIZED, "DRI2: failed to add configs"); goto cleanup; } - dri2_set_WL_bind_wayland_display(drv, disp); + dri2_set_WL_bind_wayland_display(disp); /* When cannot convert EGLImage to wl_buffer when on a different gpu, * because the buffer of the EGLImage has likely a tiling mode the server * gpu won't support. These is no way to check for now. Thus do not support the @@ -2019,7 +2019,7 @@ static const __DRIextension *swrast_loader_extensions[] = { }; static EGLBoolean -dri2_initialize_wayland_swrast(const _EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_wayland_swrast(_EGLDisplay *disp) { _EGLDevice *dev; struct dri2_egl_display *dri2_dpy; @@ -2086,7 +2086,7 @@ dri2_initialize_wayland_swrast(const _EGLDriver *drv, _EGLDisplay *disp) dri2_wl_setup_swap_interval(disp); - if (!dri2_wl_add_configs_for_visuals(drv, disp)) { + if (!dri2_wl_add_configs_for_visuals(disp)) { _eglError(EGL_NOT_INITIALIZED, "DRI2: failed to add configs"); goto cleanup; } @@ -2104,15 +2104,15 @@ dri2_initialize_wayland_swrast(const _EGLDriver *drv, _EGLDisplay *disp) } EGLBoolean -dri2_initialize_wayland(const _EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_wayland(_EGLDisplay *disp) { EGLBoolean initialized = EGL_FALSE; if (!disp->Options.ForceSoftware) - initialized = dri2_initialize_wayland_drm(drv, disp); + initialized = dri2_initialize_wayland_drm(disp); if (!initialized) - initialized = dri2_initialize_wayland_swrast(drv, disp); + initialized = dri2_initialize_wayland_swrast(disp); return initialized; diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index 9d3e4484c53..45833a88109 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -1230,7 +1230,7 @@ dri2_find_screen_for_display(const _EGLDisplay *disp, int fallback_screen) } static EGLBoolean -dri2_get_xcb_connection(const _EGLDriver *drv, _EGLDisplay *disp, +dri2_get_xcb_connection(_EGLDisplay *disp, struct dri2_egl_display *dri2_dpy) { xcb_screen_iterator_t s; @@ -1269,7 +1269,7 @@ disconnect: } static EGLBoolean -dri2_initialize_x11_swrast(const _EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_x11_swrast(_EGLDisplay *disp) { _EGLDevice *dev; struct dri2_egl_display *dri2_dpy; @@ -1279,7 +1279,7 @@ dri2_initialize_x11_swrast(const _EGLDriver *drv, _EGLDisplay *disp) return _eglError(EGL_BAD_ALLOC, "eglInitialize"); dri2_dpy->fd = -1; - if (!dri2_get_xcb_connection(drv, disp, dri2_dpy)) + if (!dri2_get_xcb_connection(disp, dri2_dpy)) goto cleanup; dev = _eglAddDevice(dri2_dpy->fd, true); @@ -1356,7 +1356,7 @@ static const __DRIextension *dri3_image_loader_extensions[] = { }; static EGLBoolean -dri2_initialize_x11_dri3(const _EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_x11_dri3(_EGLDisplay *disp) { _EGLDevice *dev; struct dri2_egl_display *dri2_dpy; @@ -1366,7 +1366,7 @@ dri2_initialize_x11_dri3(const _EGLDriver *drv, _EGLDisplay *disp) return _eglError(EGL_BAD_ALLOC, "eglInitialize"); dri2_dpy->fd = -1; - if (!dri2_get_xcb_connection(drv, disp, dri2_dpy)) + if (!dri2_get_xcb_connection(disp, dri2_dpy)) goto cleanup; if (!dri3_x11_connect(dri2_dpy)) @@ -1404,7 +1404,7 @@ dri2_initialize_x11_dri3(const _EGLDriver *drv, _EGLDisplay *disp) disp->Extensions.CHROMIUM_sync_control = EGL_TRUE; disp->Extensions.EXT_buffer_age = EGL_TRUE; - dri2_set_WL_bind_wayland_display(drv, disp); + dri2_set_WL_bind_wayland_display(disp); if (!dri2_x11_add_configs_for_visuals(dri2_dpy, disp, false)) goto cleanup; @@ -1463,7 +1463,7 @@ static const __DRIextension *dri2_loader_extensions[] = { }; static EGLBoolean -dri2_initialize_x11_dri2(const _EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_x11_dri2(_EGLDisplay *disp) { _EGLDevice *dev; struct dri2_egl_display *dri2_dpy; @@ -1473,7 +1473,7 @@ dri2_initialize_x11_dri2(const _EGLDriver *drv, _EGLDisplay *disp) return _eglError(EGL_BAD_ALLOC, "eglInitialize"); dri2_dpy->fd = -1; - if (!dri2_get_xcb_connection(drv, disp, dri2_dpy)) + if (!dri2_get_xcb_connection(disp, dri2_dpy)) goto cleanup; if (!dri2_x11_connect(dri2_dpy)) @@ -1514,7 +1514,7 @@ dri2_initialize_x11_dri2(const _EGLDriver *drv, _EGLDisplay *disp) disp->Extensions.NV_post_sub_buffer = EGL_TRUE; disp->Extensions.CHROMIUM_sync_control = EGL_TRUE; - dri2_set_WL_bind_wayland_display(drv, disp); + dri2_set_WL_bind_wayland_display(disp); if (!dri2_x11_add_configs_for_visuals(dri2_dpy, disp, true)) goto cleanup; @@ -1534,22 +1534,22 @@ dri2_initialize_x11_dri2(const _EGLDriver *drv, _EGLDisplay *disp) } EGLBoolean -dri2_initialize_x11(const _EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_x11(_EGLDisplay *disp) { EGLBoolean initialized = EGL_FALSE; if (!disp->Options.ForceSoftware) { #ifdef HAVE_DRI3 if (!env_var_as_boolean("LIBGL_DRI3_DISABLE", false)) - initialized = dri2_initialize_x11_dri3(drv, disp); + initialized = dri2_initialize_x11_dri3(disp); #endif if (!initialized) - initialized = dri2_initialize_x11_dri2(drv, disp); + initialized = dri2_initialize_x11_dri2(disp); } if (!initialized) - initialized = dri2_initialize_x11_swrast(drv, disp); + initialized = dri2_initialize_x11_swrast(disp); return initialized; } diff --git a/src/egl/drivers/haiku/egl_haiku.cpp b/src/egl/drivers/haiku/egl_haiku.cpp index 323907f86d4..ac598827c5f 100644 --- a/src/egl/drivers/haiku/egl_haiku.cpp +++ b/src/egl/drivers/haiku/egl_haiku.cpp @@ -205,7 +205,7 @@ cleanup: extern "C" EGLBoolean -init_haiku(const _EGLDriver *drv, _EGLDisplay *disp) +init_haiku(_EGLDisplay *disp) { _EGLDevice *dev; CALLED(); diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c index b4930069d9c..b5d9c9652e6 100644 --- a/src/egl/main/egldriver.c +++ b/src/egl/main/egldriver.c @@ -63,7 +63,7 @@ _eglInitializeDisplay(_EGLDisplay *disp) if (disp->Options.ForceSoftware) _eglLog(_EGL_DEBUG, "Found 'LIBGL_ALWAYS_SOFTWARE' set, will use a CPU renderer"); - if (_eglDriver.Initialize(&_eglDriver, disp)) { + if (_eglDriver.Initialize(disp)) { disp->Driver = &_eglDriver; disp->Initialized = EGL_TRUE; return true; @@ -73,7 +73,7 @@ _eglInitializeDisplay(_EGLDisplay *disp) return false; disp->Options.ForceSoftware = EGL_TRUE; - if (!_eglDriver.Initialize(&_eglDriver, disp)) + if (!_eglDriver.Initialize(disp)) return false; disp->Driver = &_eglDriver; diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h index 1741a2000b5..49d26b10164 100644 --- a/src/egl/main/egldriver.h +++ b/src/egl/main/egldriver.h @@ -85,7 +85,7 @@ struct mesa_glinterop_export_out; struct _egl_driver { /* driver funcs */ - EGLBoolean (*Initialize)(const _EGLDriver *, _EGLDisplay *disp); + EGLBoolean (*Initialize)(_EGLDisplay *disp); EGLBoolean (*Terminate)(const _EGLDriver *, _EGLDisplay *disp); const char *(*QueryDriverName)(_EGLDisplay *disp); char *(*QueryDriverConfig)(_EGLDisplay *disp); -- 2.30.2