Add dri2_egl_display_vtbl::copy_buffers, set it for each platform, and let egl_dri2 dispatch eglCopyBuffers 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>tags/mesa-10.2-rc1
@@ -1073,6 +1073,14 @@ dri2_swap_buffers_with_damage(_EGLDriver *drv, _EGLDisplay *dpy, | |||
rects, n_rects); | |||
} | |||
static EGLBoolean | |||
dri2_copy_buffers(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf, | |||
EGLNativePixmapType target) | |||
{ | |||
struct dri2_egl_display *dri2_dpy = dri2_egl_display(dpy); | |||
return dri2_dpy->vtbl->copy_buffers(drv, dpy, surf, target); | |||
} | |||
static EGLint | |||
dri2_query_buffer_age(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf) | |||
{ | |||
@@ -2110,6 +2118,7 @@ _eglBuiltInDriverDRI2(const char *args) | |||
dri2_drv->base.API.SwapInterval = dri2_swap_interval; | |||
dri2_drv->base.API.SwapBuffers = dri2_swap_buffers; | |||
dri2_drv->base.API.SwapBuffersWithDamageEXT = dri2_swap_buffers_with_damage; | |||
dri2_drv->base.API.CopyBuffers = dri2_copy_buffers, | |||
dri2_drv->base.API.QueryBufferAge = dri2_query_buffer_age; | |||
dri2_drv->base.API.CreateImageKHR = dri2_create_image_khr; | |||
dri2_drv->base.API.DestroyImageKHR = dri2_destroy_image_khr; |
@@ -114,6 +114,9 @@ struct dri2_egl_display_vtbl { | |||
_EGLSurface *surface, | |||
const EGLint *rects, EGLint n_rects); | |||
EGLBoolean (*copy_buffers)(_EGLDriver *drv, _EGLDisplay *dpy, | |||
_EGLSurface *surf, EGLNativePixmapType target); | |||
EGLint (*query_buffer_age)(_EGLDriver *drv, _EGLDisplay *dpy, | |||
_EGLSurface *surf); | |||
}; |
@@ -58,6 +58,14 @@ dri2_fallback_swap_buffers_with_damage(_EGLDriver *drv, _EGLDisplay *dpy, | |||
return EGL_FALSE; | |||
} | |||
static inline EGLBoolean | |||
dri2_fallback_copy_buffers(_EGLDriver *drv, _EGLDisplay *dpy, | |||
_EGLSurface *surf, | |||
EGLNativePixmapType target) | |||
{ | |||
return EGL_FALSE; | |||
} | |||
static inline EGLint | |||
dri2_fallback_query_buffer_age(_EGLDriver *drv, _EGLDisplay *dpy, | |||
_EGLSurface *surf) |
@@ -648,6 +648,7 @@ static struct dri2_egl_display_vtbl droid_display_vtbl = { | |||
.swap_interval = dri2_fallback_swap_interval, | |||
.swap_buffers = droid_swap_buffers, | |||
.swap_buffers_with_damage = dri2_fallback_swap_buffers_with_damage, | |||
.copy_buffers = dri2_fallback_copy_buffers, | |||
.query_buffer_age = dri2_fallback_query_buffer_age, | |||
}; | |||
@@ -450,6 +450,7 @@ static struct dri2_egl_display_vtbl dri2_drm_display_vtbl = { | |||
.swap_interval = dri2_fallback_swap_interval, | |||
.swap_buffers = dri2_drm_swap_buffers, | |||
.swap_buffers_with_damage = dri2_fallback_swap_buffers_with_damage, | |||
.copy_buffers = dri2_fallback_copy_buffers, | |||
.query_buffer_age = dri2_drm_query_buffer_age, | |||
}; | |||
@@ -966,6 +966,7 @@ static struct dri2_egl_display_vtbl dri2_wl_display_vtbl = { | |||
.swap_interval = dri2_wl_swap_interval, | |||
.swap_buffers = dri2_wl_swap_buffers, | |||
.swap_buffers_with_damage = dri2_wl_swap_buffers_with_damage, | |||
.copy_buffers = dri2_fallback_copy_buffers, | |||
.query_buffer_age = dri2_wl_query_buffer_age, | |||
}; | |||
@@ -1000,6 +1000,7 @@ static struct dri2_egl_display_vtbl dri2_x11_swrast_display_vtbl = { | |||
.destroy_surface = dri2_x11_destroy_surface, | |||
.swap_interval = dri2_fallback_swap_interval, | |||
.swap_buffers = dri2_x11_swap_buffers, | |||
.copy_buffers = dri2_x11_copy_buffers, | |||
.query_buffer_age = dri2_fallback_query_buffer_age, | |||
}; | |||
@@ -1012,6 +1013,7 @@ static struct dri2_egl_display_vtbl dri2_x11_display_vtbl = { | |||
.swap_interval = dri2_x11_swap_interval, | |||
.swap_buffers = dri2_x11_swap_buffers, | |||
.swap_buffers_with_damage = dri2_fallback_swap_buffers_with_damage, | |||
.copy_buffers = dri2_x11_copy_buffers, | |||
.query_buffer_age = dri2_fallback_query_buffer_age, | |||
}; | |||
@@ -1020,8 +1022,6 @@ dri2_initialize_x11_swrast(_EGLDriver *drv, _EGLDisplay *disp) | |||
{ | |||
struct dri2_egl_display *dri2_dpy; | |||
drv->API.CopyBuffers = dri2_x11_copy_buffers; | |||
drv->API.SwapBuffersRegionNOK = NULL; | |||
drv->API.CreateImageKHR = NULL; | |||
drv->API.DestroyImageKHR = NULL; | |||
@@ -1141,7 +1141,6 @@ dri2_initialize_x11_dri2(_EGLDriver *drv, _EGLDisplay *disp) | |||
{ | |||
struct dri2_egl_display *dri2_dpy; | |||
drv->API.CopyBuffers = dri2_x11_copy_buffers; | |||
drv->API.CreateImageKHR = dri2_x11_create_image_khr; | |||
drv->API.SwapBuffersRegionNOK = dri2_x11_swap_buffers_region; | |||
drv->API.PostSubBufferNV = dri2_x11_post_sub_buffer; |