From 8c9df0daf20206fafb7df77b1edcbc41b8e91372 Mon Sep 17 00:00:00 2001 From: Mark Janes Date: Wed, 30 Aug 2017 08:45:36 -0700 Subject: [PATCH] Revert "egl: Allow creation of per surface out fence" This reverts commit 13c23b19d0b3b965d666498eb759e63fc4a625d9. Mesa CI was brought down by this commit, with: mesa/drivers/dri/i965/brw_sync.c:491: brw_dri_create_fence_fd: Assertion `brw->screen->has_exec_fence' failed. --- src/egl/drivers/dri2/egl_dri2.c | 71 --------------------- src/egl/drivers/dri2/egl_dri2.h | 9 --- src/egl/drivers/dri2/platform_android.c | 29 ++++----- src/egl/drivers/dri2/platform_drm.c | 3 +- src/egl/drivers/dri2/platform_surfaceless.c | 3 +- src/egl/drivers/dri2/platform_wayland.c | 3 +- src/egl/drivers/dri2/platform_x11.c | 3 +- src/egl/drivers/dri2/platform_x11_dri3.c | 3 +- 8 files changed, 18 insertions(+), 106 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index af238a974c9..2667aa5d647 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -1388,45 +1388,6 @@ dri2_destroy_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx) return EGL_TRUE; } -EGLBoolean -dri2_init_surface(_EGLSurface *surf, _EGLDisplay *dpy, EGLint type, - _EGLConfig *conf, const EGLint *attrib_list, EGLBoolean enable_out_fence) -{ - struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); - struct dri2_egl_display *dri2_dpy = dri2_egl_display(dpy); - - dri2_surf->out_fence_fd = -1; - dri2_surf->enable_out_fence = false; - if (dri2_dpy->fence && dri2_dpy->fence->base.version >= 2 && - dri2_dpy->fence->get_capabilities && - (dri2_dpy->fence->get_capabilities(dri2_dpy->dri_screen) & - __DRI_FENCE_CAP_NATIVE_FD)) { - dri2_surf->enable_out_fence = enable_out_fence; - } - - return _eglInitSurface(surf, dpy, type, conf, attrib_list); -} - -static void -dri2_surface_set_out_fence_fd( _EGLSurface *surf, int fence_fd) -{ - struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); - - if (dri2_surf->out_fence_fd >=0) - close(dri2_surf->out_fence_fd); - - dri2_surf->out_fence_fd = fence_fd; -} - -void -dri2_fini_surface(_EGLSurface *surf) -{ - struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); - - dri2_surface_set_out_fence_fd(surf, -1); - dri2_surf->enable_out_fence = false; -} - static EGLBoolean dri2_destroy_surface(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf) { @@ -1438,28 +1399,6 @@ dri2_destroy_surface(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf) return dri2_dpy->vtbl->destroy_surface(drv, dpy, surf); } -static void -dri2_surf_update_fence_fd(_EGLContext *ctx, - _EGLDisplay *dpy, _EGLSurface *surf) -{ - __DRIcontext *dri_ctx = dri2_egl_context(ctx)->dri_context; - struct dri2_egl_display *dri2_dpy = dri2_egl_display(dpy); - struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); - int fence_fd = -1; - void *fence; - - if (!dri2_surf->enable_out_fence) - return; - - fence = dri2_dpy->fence->create_fence_fd(dri_ctx, -1); - if (fence) { - fence_fd = dri2_dpy->fence->get_fence_fd(dri2_dpy->dri_screen, - fence); - dri2_dpy->fence->destroy_fence(dri2_dpy->dri_screen, fence); - } - dri2_surface_set_out_fence_fd(surf, fence_fd); -} - /** * Called via eglMakeCurrent(), drv->API.MakeCurrent(). */ @@ -1496,8 +1435,6 @@ dri2_make_current(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *dsurf, if (old_ctx) { __DRIcontext *old_cctx = dri2_egl_context(old_ctx)->dri_context; - if (old_dsurf) - dri2_surf_update_fence_fd(old_ctx, disp, old_dsurf); dri2_dpy->core->unbindContext(old_cctx); } @@ -1636,10 +1573,6 @@ static EGLBoolean dri2_swap_buffers(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(dpy); - _EGLContext *ctx = _eglGetCurrentContext(); - - if (ctx && surf) - dri2_surf_update_fence_fd(ctx, dpy, surf); return dri2_dpy->vtbl->swap_buffers(drv, dpy, surf); } @@ -1649,10 +1582,6 @@ dri2_swap_buffers_with_damage(_EGLDriver *drv, _EGLDisplay *dpy, const EGLint *rects, EGLint n_rects) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(dpy); - _EGLContext *ctx = _eglGetCurrentContext(); - - if (ctx && surf) - dri2_surf_update_fence_fd(ctx, dpy, surf); return dri2_dpy->vtbl->swap_buffers_with_damage(drv, dpy, surf, rects, n_rects); } diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index 10a41518172..4a52b490a87 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -327,8 +327,6 @@ struct dri2_egl_surface __DRIimage *front; unsigned int visual; #endif - int out_fence_fd; - EGLBoolean enable_out_fence; }; struct dri2_egl_config @@ -464,11 +462,4 @@ dri2_egl_surface_alloc_local_buffer(struct dri2_egl_surface *dri2_surf, void dri2_egl_surface_free_local_buffers(struct dri2_egl_surface *dri2_surf); -EGLBoolean -dri2_init_surface(_EGLSurface *surf, _EGLDisplay *dpy, EGLint type, - _EGLConfig *conf, const EGLint *attrib_list, EGLBoolean enable_out_fence); - -void -dri2_fini_surface(_EGLSurface *surf); - #endif /* EGL_DRI2_INCLUDED */ diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index d08a8b22b7d..a864a2af3d7 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -229,18 +229,19 @@ droid_window_enqueue_buffer(_EGLDisplay *disp, struct dri2_egl_surface *dri2_sur */ mtx_unlock(&disp->Mutex); - /* Queue the buffer with stored out fence fd. The ANativeWindow or buffer - * consumer may choose to wait for the fence to signal before accessing - * it. If fence fd value is -1, buffer can be accessed by consumer - * immediately. Consumer or application shouldn't rely on timestamp - * associated with fence if the fence fd is -1. + /* Queue the buffer without a sync fence. This informs the ANativeWindow + * that it may access the buffer immediately. * - * Ownership of fd is transferred to consumer after queueBuffer and the - * consumer is responsible for closing it. Caller must not use the fd - * after passing it to queueBuffer. + * From ANativeWindow::dequeueBuffer: + * + * The fenceFd argument specifies a libsync fence file descriptor for + * a fence that must signal before the buffer can be accessed. If + * the buffer can be accessed immediately then a value of -1 should + * be used. The caller must not use the file descriptor after it + * is passed to queueBuffer, and the ANativeWindow implementation + * is responsible for closing it. */ - int fence_fd = dri2_surf->out_fence_fd; - dri2_surf->out_fence_fd = -1; + int fence_fd = -1; dri2_surf->window->queueBuffer(dri2_surf->window, dri2_surf->buffer, fence_fd); @@ -262,11 +263,8 @@ static void droid_window_cancel_buffer(struct dri2_egl_surface *dri2_surf) { int ret; - int fence_fd = dri2_surf->out_fence_fd; - dri2_surf->out_fence_fd = -1; - ret = dri2_surf->window->cancelBuffer(dri2_surf->window, - dri2_surf->buffer, fence_fd); + ret = dri2_surf->window->cancelBuffer(dri2_surf->window, dri2_surf->buffer, -1); if (ret < 0) { _eglLog(_EGL_WARNING, "ANativeWindow::cancelBuffer failed"); dri2_surf->base.Lost = EGL_TRUE; @@ -291,7 +289,7 @@ droid_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type, return NULL; } - if (!dri2_init_surface(&dri2_surf->base, disp, type, conf, attrib_list, true)) + if (!_eglInitSurface(&dri2_surf->base, disp, type, conf, attrib_list)) goto cleanup_surface; if (type == EGL_WINDOW_BIT) { @@ -391,7 +389,6 @@ droid_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) dri2_dpy->core->destroyDrawable(dri2_surf->dri_drawable); - dri2_fini_surface(surf); free(dri2_surf); return EGL_TRUE; diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c index fbdf8b1672a..0ccbd9a30a0 100644 --- a/src/egl/drivers/dri2/platform_drm.c +++ b/src/egl/drivers/dri2/platform_drm.c @@ -110,7 +110,7 @@ dri2_drm_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, return NULL; } - if (!dri2_init_surface(&dri2_surf->base, disp, EGL_WINDOW_BIT, conf, attrib_list, false)) + if (!_eglInitSurface(&dri2_surf->base, disp, EGL_WINDOW_BIT, conf, attrib_list)) goto cleanup_surf; surf = gbm_dri_surface(surface); @@ -178,7 +178,6 @@ dri2_drm_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) dri2_egl_surface_free_local_buffers(dri2_surf); - dri2_fini_surface(surf); free(surf); return EGL_TRUE; diff --git a/src/egl/drivers/dri2/platform_surfaceless.c b/src/egl/drivers/dri2/platform_surfaceless.c index ff8f88d5375..1091b4febdb 100644 --- a/src/egl/drivers/dri2/platform_surfaceless.c +++ b/src/egl/drivers/dri2/platform_surfaceless.c @@ -124,7 +124,7 @@ dri2_surfaceless_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type, return NULL; } - if (!dri2_init_surface(&dri2_surf->base, disp, type, conf, attrib_list, false)) + if (!_eglInitSurface(&dri2_surf->base, disp, type, conf, attrib_list)) goto cleanup_surface; config = dri2_get_dri_config(dri2_conf, type, @@ -165,7 +165,6 @@ surfaceless_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *sur dri2_dpy->core->destroyDrawable(dri2_surf->dri_drawable); - dri2_fini_surface(surf); free(dri2_surf); return EGL_TRUE; } diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index 81e346ba798..bf2adbf63bd 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -142,7 +142,7 @@ dri2_wl_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, return NULL; } - if (!dri2_init_surface(&dri2_surf->base, disp, EGL_WINDOW_BIT, conf, attrib_list, false)) + if (!_eglInitSurface(&dri2_surf->base, disp, EGL_WINDOW_BIT, conf, attrib_list)) goto cleanup_surf; if (dri2_dpy->wl_dmabuf || dri2_dpy->wl_drm) { @@ -295,7 +295,6 @@ dri2_wl_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) wl_proxy_wrapper_destroy(dri2_surf->wl_drm_wrapper); wl_event_queue_destroy(dri2_surf->wl_queue); - dri2_fini_surface(surf); free(surf); return EGL_TRUE; diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index cfdf76ee8d1..062c8a4e198 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -232,7 +232,7 @@ dri2_x11_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type, return NULL; } - if (!dri2_init_surface(&dri2_surf->base, disp, type, conf, attrib_list, false)) + if (!_eglInitSurface(&dri2_surf->base, disp, type, conf, attrib_list)) goto cleanup_surf; dri2_surf->region = XCB_NONE; @@ -394,7 +394,6 @@ dri2_x11_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) if (surf->Type == EGL_PBUFFER_BIT) xcb_free_pixmap (dri2_dpy->conn, dri2_surf->drawable); - dri2_fini_surface(surf); free(surf); return EGL_TRUE; diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c b/src/egl/drivers/dri2/platform_x11_dri3.c index 1e326984dd1..290b1504732 100644 --- a/src/egl/drivers/dri2/platform_x11_dri3.c +++ b/src/egl/drivers/dri2/platform_x11_dri3.c @@ -101,7 +101,6 @@ dri3_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) loader_dri3_drawable_fini(&dri3_surf->loader_drawable); - dri2_fini_surface(surf); free(surf); return EGL_TRUE; @@ -138,7 +137,7 @@ dri3_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type, return NULL; } - if (!dri2_init_surface(&dri3_surf->base, disp, type, conf, attrib_list, false)) + if (!_eglInitSurface(&dri3_surf->base, disp, type, conf, attrib_list)) goto cleanup_surf; if (type == EGL_PBUFFER_BIT) { -- 2.30.2