Add dri2_egl_display_vtbl::post_sub_buffer, set it for each platform, and let egl_dri2 dispatch eglPostSubBufferNV 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
@@ -1081,6 +1081,14 @@ dri2_swap_buffers_region(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf, | |||
return dri2_dpy->vtbl->swap_buffers_region(drv, dpy, surf, numRects, rects); | |||
} | |||
static EGLBoolean | |||
dri2_post_sub_buffer(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf, | |||
EGLint x, EGLint y, EGLint width, EGLint height) | |||
{ | |||
struct dri2_egl_display *dri2_dpy = dri2_egl_display(dpy); | |||
return dri2_dpy->vtbl->post_sub_buffer(drv, dpy, surf, x, y, width, height); | |||
} | |||
static EGLBoolean | |||
dri2_copy_buffers(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf, | |||
EGLNativePixmapType target) | |||
@@ -2127,6 +2135,7 @@ _eglBuiltInDriverDRI2(const char *args) | |||
dri2_drv->base.API.SwapBuffers = dri2_swap_buffers; | |||
dri2_drv->base.API.SwapBuffersWithDamageEXT = dri2_swap_buffers_with_damage; | |||
dri2_drv->base.API.SwapBuffersRegionNOK = dri2_swap_buffers_region; | |||
dri2_drv->base.API.PostSubBufferNV = dri2_post_sub_buffer; | |||
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; |
@@ -118,6 +118,11 @@ struct dri2_egl_display_vtbl { | |||
_EGLSurface *surf, EGLint numRects, | |||
const EGLint *rects); | |||
EGLBoolean (*post_sub_buffer)(_EGLDriver *drv, _EGLDisplay *dpy, | |||
_EGLSurface *surf, | |||
EGLint x, EGLint y, | |||
EGLint width, EGLint height); | |||
EGLBoolean (*copy_buffers)(_EGLDriver *drv, _EGLDisplay *dpy, | |||
_EGLSurface *surf, EGLNativePixmapType target); | |||
@@ -66,6 +66,14 @@ dri2_fallback_swap_buffers_region(_EGLDriver *drv, _EGLDisplay *dpy, | |||
return EGL_FALSE; | |||
} | |||
static inline EGLBoolean | |||
dri2_fallback_post_sub_buffer(_EGLDriver *drv, _EGLDisplay *dpy, | |||
_EGLSurface *draw, | |||
EGLint x, EGLint y, EGLint width, EGLint height) | |||
{ | |||
return EGL_FALSE; | |||
} | |||
static inline EGLBoolean | |||
dri2_fallback_copy_buffers(_EGLDriver *drv, _EGLDisplay *dpy, | |||
_EGLSurface *surf, |
@@ -649,6 +649,7 @@ static struct dri2_egl_display_vtbl droid_display_vtbl = { | |||
.swap_buffers = droid_swap_buffers, | |||
.swap_buffers_with_damage = dri2_fallback_swap_buffers_with_damage, | |||
.swap_buffers_region = dri2_fallback_swap_buffers_region, | |||
.post_sub_buffer = dri2_fallback_post_sub_buffer, | |||
.copy_buffers = dri2_fallback_copy_buffers, | |||
.query_buffer_age = dri2_fallback_query_buffer_age, | |||
}; |
@@ -451,6 +451,7 @@ static struct dri2_egl_display_vtbl dri2_drm_display_vtbl = { | |||
.swap_buffers = dri2_drm_swap_buffers, | |||
.swap_buffers_with_damage = dri2_fallback_swap_buffers_with_damage, | |||
.swap_buffers_region = dri2_fallback_swap_buffers_region, | |||
.post_sub_buffer = dri2_fallback_post_sub_buffer, | |||
.copy_buffers = dri2_fallback_copy_buffers, | |||
.query_buffer_age = dri2_drm_query_buffer_age, | |||
}; |
@@ -967,6 +967,7 @@ static struct dri2_egl_display_vtbl dri2_wl_display_vtbl = { | |||
.swap_buffers = dri2_wl_swap_buffers, | |||
.swap_buffers_with_damage = dri2_wl_swap_buffers_with_damage, | |||
.swap_buffers_region = dri2_fallback_swap_buffers_region, | |||
.post_sub_buffer = dri2_fallback_post_sub_buffer, | |||
.copy_buffers = dri2_fallback_copy_buffers, | |||
.query_buffer_age = dri2_wl_query_buffer_age, | |||
}; |
@@ -1001,6 +1001,7 @@ static struct dri2_egl_display_vtbl dri2_x11_swrast_display_vtbl = { | |||
.swap_interval = dri2_fallback_swap_interval, | |||
.swap_buffers = dri2_x11_swap_buffers, | |||
.swap_buffers_region = dri2_fallback_swap_buffers_region, | |||
.post_sub_buffer = dri2_fallback_post_sub_buffer, | |||
.copy_buffers = dri2_x11_copy_buffers, | |||
.query_buffer_age = dri2_fallback_query_buffer_age, | |||
}; | |||
@@ -1015,6 +1016,7 @@ static struct dri2_egl_display_vtbl dri2_x11_display_vtbl = { | |||
.swap_buffers = dri2_x11_swap_buffers, | |||
.swap_buffers_with_damage = dri2_fallback_swap_buffers_with_damage, | |||
.swap_buffers_region = dri2_x11_swap_buffers_region, | |||
.post_sub_buffer = dri2_x11_post_sub_buffer, | |||
.copy_buffers = dri2_x11_copy_buffers, | |||
.query_buffer_age = dri2_fallback_query_buffer_age, | |||
}; | |||
@@ -1143,7 +1145,6 @@ dri2_initialize_x11_dri2(_EGLDriver *drv, _EGLDisplay *disp) | |||
struct dri2_egl_display *dri2_dpy; | |||
drv->API.CreateImageKHR = dri2_x11_create_image_khr; | |||
drv->API.PostSubBufferNV = dri2_x11_post_sub_buffer; | |||
dri2_dpy = calloc(1, sizeof *dri2_dpy); | |||
if (!dri2_dpy) |