fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-08 21:30:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

egl: drop unused _EGLDriver from SwapInterval()

Browse source 
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6241>
This commit is contained in:
Eric Engestrom 2018-04-22 16:48:15 +02:00 • committed by Marge Bot
parent 2f4a6ad3b3
commit 347840cf43
9 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/egl/drivers/dri2/egl_dri2.c
View file

@ -1934,13 +1934,12 @@ dri2_create_pbuffer_surface(_EGLDisplay *disp, _EGLConfig *conf,
}
static EGLBoolean
dri2_swap_interval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf,
EGLint interval)
dri2_swap_interval(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
if (!dri2_dpy->vtbl->swap_interval)
return EGL_TRUE;
return dri2_dpy->vtbl->swap_interval(drv, disp, surf, interval);
return dri2_dpy->vtbl->swap_interval(disp, surf, interval);
}
/**

4
src/egl/drivers/dri2/egl_dri2.h
View file

@ -109,8 +109,8 @@ struct dri2_egl_display_vtbl {
EGLBoolean (*destroy_surface)(_EGLDisplay *disp, _EGLSurface *surface);
/* optional */
EGLBoolean (*swap_interval)(const _EGLDriver *drv, _EGLDisplay *disp,
_EGLSurface *surf, EGLint interval);
EGLBoolean (*swap_interval)(_EGLDisplay *disp, _EGLSurface *surf,
EGLint interval);
/* mandatory */
_EGLImage* (*create_image)(const _EGLDriver *drv, _EGLDisplay *disp,

3
src/egl/drivers/dri2/platform_android.c
View file

@ -496,8 +496,7 @@ droid_destroy_surface(_EGLDisplay *disp, _EGLSurface *surf)
}
static EGLBoolean
droid_swap_interval(const _EGLDriver *drv, _EGLDisplay *disp,
_EGLSurface *surf, EGLint interval)
droid_swap_interval(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval)
{
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
struct ANativeWindow *window = dri2_surf->window;

8
src/egl/drivers/dri2/platform_x11.c
View file

@ -52,8 +52,7 @@
#endif
static EGLBoolean
dri2_x11_swap_interval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf,
EGLint interval);
dri2_x11_swap_interval(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval);
uint32_t
dri2_format_for_depth(struct dri2_egl_display *dri2_dpy, uint32_t depth);
@ -375,7 +374,7 @@ dri2_x11_create_window_surface(_EGLDisplay *disp, _EGLConfig *conf,
surf->SwapInterval = 1;
/* Override that with a driconf-set value. */
dri2_x11_swap_interval(disp->Driver, disp, surf, dri2_dpy->default_swap_interval);
dri2_x11_swap_interval(disp, surf, dri2_dpy->default_swap_interval);
}
return surf;
@ -982,8 +981,7 @@ dri2_x11_post_sub_buffer(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *
}
static EGLBoolean
dri2_x11_swap_interval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf,
EGLint interval)
dri2_x11_swap_interval(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);

5
src/egl/drivers/dri2/platform_x11_dri3.c
View file

@ -122,8 +122,7 @@ dri3_destroy_surface(_EGLDisplay *disp, _EGLSurface *surf)
}
static EGLBoolean
dri3_set_swap_interval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf,
EGLint interval)
dri3_set_swap_interval(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval)
{
struct dri3_egl_surface *dri3_surf = dri3_egl_surface(surf);
@ -226,7 +225,7 @@ dri3_create_window_surface(_EGLDisplay *disp, _EGLConfig *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);
dri3_set_swap_interval(disp, surf, dri2_dpy->default_swap_interval);
return surf;
}

4
src/egl/main/eglapi.c
View file

@ -1287,9 +1287,9 @@ eglSwapInterval(EGLDisplay dpy, EGLint interval)
if (surf->SwapInterval != interval) {
if (drv->SwapInterval)
ret = drv->SwapInterval(drv, disp, surf, interval);
ret = drv->SwapInterval(disp, surf, interval);
else
ret = _eglSwapInterval(drv, disp, surf, interval);
ret = _eglSwapInterval(disp, surf, interval);
}
else {
ret = EGL_TRUE;

4
src/egl/main/egldriver.h
View file

@ -115,8 +115,8 @@ struct _egl_driver
EGLint buffer);
EGLBoolean (*ReleaseTexImage)(_EGLDisplay *disp, _EGLSurface *surface,
EGLint buffer);
EGLBoolean (*SwapInterval)(const _EGLDriver *drv, _EGLDisplay *disp,
_EGLSurface *surf, EGLint interval);
EGLBoolean (*SwapInterval)(_EGLDisplay *disp, _EGLSurface *surf,
EGLint interval);
EGLBoolean (*SwapBuffers)(const _EGLDriver *drv, _EGLDisplay *disp,
_EGLSurface *draw);
EGLBoolean (*CopyBuffers)(const _EGLDriver *drv, _EGLDisplay *disp,

3
src/egl/main/eglsurface.c
View file

@ -784,8 +784,7 @@ _eglReleaseTexImage(_EGLDisplay *disp, _EGLSurface *surf, EGLint buffer)
EGLBoolean
_eglSwapInterval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf,
EGLint interval)
_eglSwapInterval(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval)
{
return EGL_TRUE;
}

2
src/egl/main/eglsurface.h
View file

@ -197,7 +197,7 @@ _eglReleaseTexImage(_EGLDisplay *disp, _EGLSurface *surf, EGLint buffer);
extern EGLBoolean
_eglSwapInterval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint interval);
_eglSwapInterval(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval);
extern EGLBoolean
_eglSurfaceHasMutableRenderBuffer(_EGLSurface *surf);