mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

egl/dri2: Dispatch eglSwapBuffers by display, not driver 

Add dri2_egl_display_vtbl::swap_buffers, set it for each platform, and
let egl_dri2 dispatch eglSwapBuffers to that.

This prepares for the EGL platform extensions.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
This commit is contained in:
Chad Versace 2014-01-28 16:21:21 -08:00
parent 8b9298af0a
commit ad173bcfdb
6 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/egl/drivers/dri2/egl_dri2.c
View File

@ -1021,6 +1021,13 @@ dri2_swap_interval(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf,
return dri2_dpy->vtbl->swap_interval(drv, dpy, surf, interval);
}
static EGLBoolean
dri2_swap_buffers(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(dpy);
return dri2_dpy->vtbl->swap_buffers(drv, dpy, surf);
}
static EGLBoolean
dri2_wait_client(_EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx)
{
@ -2045,6 +2052,7 @@ _eglBuiltInDriverDRI2(const char *args)
dri2_drv->base.API.BindTexImage = dri2_bind_tex_image;
dri2_drv->base.API.ReleaseTexImage = dri2_release_tex_image;
dri2_drv->base.API.SwapInterval = dri2_swap_interval;
dri2_drv->base.API.SwapBuffers = dri2_swap_buffers;
dri2_drv->base.API.CreateImageKHR = dri2_create_image_khr;
dri2_drv->base.API.DestroyImageKHR = dri2_destroy_image_khr;
#ifdef HAVE_DRM_PLATFORM

3
src/egl/drivers/dri2/egl_dri2.h
View File

@ -89,6 +89,9 @@ struct dri2_egl_display_vtbl {
EGLBoolean (*swap_interval)(_EGLDriver *drv, _EGLDisplay *dpy,
_EGLSurface *surf, EGLint interval);
EGLBoolean (*swap_buffers)(_EGLDriver *drv, _EGLDisplay *dpy,
_EGLSurface *surf);
};
struct dri2_egl_display

2
src/egl/drivers/dri2/platform_android.c
View File

@ -435,7 +435,6 @@ droid_init_driver_functions(_EGLDriver *drv)
drv->API.CreatePixmapSurface = droid_create_pixmap_surface;
drv->API.CreatePbufferSurface = droid_create_pbuffer_surface;
drv->API.DestroySurface = droid_destroy_surface;
drv->API.SwapBuffers = droid_swap_buffers;
drv->API.CreateImageKHR = droid_create_image_khr;
}
@ -656,6 +655,7 @@ droid_log(EGLint level, const char *msg)
static struct dri2_egl_display_vtbl droid_display_vtbl = {
.authenticate = NULL,
.swap_interval = dri2_fallback_swap_interval,
.swap_buffers = droid_swap_buffers,
};
EGLBoolean

2
src/egl/drivers/dri2/platform_drm.c
View File

@ -444,6 +444,7 @@ dri2_drm_authenticate(_EGLDisplay *disp, uint32_t id)
static struct dri2_egl_display_vtbl dri2_drm_display_vtbl = {
.authenticate = dri2_drm_authenticate,
.swap_interval = dri2_fallback_swap_interval,
.swap_buffers = dri2_drm_swap_buffers,
};
EGLBoolean
@ -540,7 +541,6 @@ dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp)
drv->API.CreateWindowSurface = dri2_drm_create_window_surface;
drv->API.DestroySurface = dri2_drm_destroy_surface;
drv->API.SwapBuffers = dri2_drm_swap_buffers;
drv->API.CreateImageKHR = dri2_drm_create_image_khr;
drv->API.QueryBufferAge = dri2_drm_query_buffer_age;

2
src/egl/drivers/dri2/platform_wayland.c
View File

@ -960,6 +960,7 @@ dri2_wl_setup_swap_interval(struct dri2_egl_display *dri2_dpy)
static struct dri2_egl_display_vtbl dri2_wl_display_vtbl = {
.authenticate = dri2_wl_authenticate,
.swap_interval = dri2_wl_swap_interval,
.swap_buffers = dri2_wl_swap_buffers,
};
EGLBoolean
@ -978,7 +979,6 @@ dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp)
drv->API.CreateWindowSurface = dri2_wl_create_window_surface;
drv->API.DestroySurface = dri2_wl_destroy_surface;
drv->API.SwapBuffers = dri2_wl_swap_buffers;
drv->API.SwapBuffersWithDamageEXT = dri2_wl_swap_buffers_with_damage;
drv->API.Terminate = dri2_wl_terminate;
drv->API.QueryBufferAge = dri2_wl_query_buffer_age;

4
src/egl/drivers/dri2/platform_x11.c
View File

@ -995,11 +995,13 @@ dri2_x11_create_image_khr(_EGLDriver *drv, _EGLDisplay *disp,
static struct dri2_egl_display_vtbl dri2_x11_swrast_display_vtbl = {
.authenticate = NULL,
.swap_interval = dri2_fallback_swap_interval,
.swap_buffers = dri2_x11_swap_buffers,
};
static struct dri2_egl_display_vtbl dri2_x11_display_vtbl = {
.authenticate = dri2_x11_authenticate,
.swap_interval = dri2_x11_swap_interval,
.swap_buffers = dri2_x11_swap_buffers,
};
static EGLBoolean
@ -1011,7 +1013,6 @@ dri2_initialize_x11_swrast(_EGLDriver *drv, _EGLDisplay *disp)
drv->API.CreatePixmapSurface = dri2_x11_create_pixmap_surface;
drv->API.CreatePbufferSurface = dri2_x11_create_pbuffer_surface;
drv->API.DestroySurface = dri2_x11_destroy_surface;
drv->API.SwapBuffers = dri2_x11_swap_buffers;
drv->API.CopyBuffers = dri2_x11_copy_buffers;
drv->API.SwapBuffersRegionNOK = NULL;
@ -1137,7 +1138,6 @@ dri2_initialize_x11_dri2(_EGLDriver *drv, _EGLDisplay *disp)
drv->API.CreatePixmapSurface = dri2_x11_create_pixmap_surface;
drv->API.CreatePbufferSurface = dri2_x11_create_pbuffer_surface;
drv->API.DestroySurface = dri2_x11_destroy_surface;
drv->API.SwapBuffers = dri2_x11_swap_buffers;
drv->API.CopyBuffers = dri2_x11_copy_buffers;
drv->API.CreateImageKHR = dri2_x11_create_image_khr;
drv->API.SwapBuffersRegionNOK = dri2_x11_swap_buffers_region;