nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-25 08:32:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

render/egl: add support for explicit sync extensions

Browse Source
This commit is contained in:
Simon Ser 2020-03-16 17:24:25 +01:00
parent a1635fdb76
commit 19ffbfe356
2 changed files with 86 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/render/egl.h
View File

@ -38,6 +38,10 @@ struct wlr_egl {
PFNEGLQUERYDISPLAYATTRIBEXTPROC eglQueryDisplayAttribEXT; PFNEGLQUERYDISPLAYATTRIBEXTPROC eglQueryDisplayAttribEXT;
PFNEGLQUERYDEVICESTRINGEXTPROC eglQueryDeviceStringEXT; PFNEGLQUERYDEVICESTRINGEXTPROC eglQueryDeviceStringEXT;
PFNEGLQUERYDEVICESEXTPROC eglQueryDevicesEXT; PFNEGLQUERYDEVICESEXTPROC eglQueryDevicesEXT;
PFNEGLCREATESYNCKHRPROC eglCreateSyncKHR;
PFNEGLDESTROYSYNCKHRPROC eglDestroySyncKHR;
PFNEGLDUPNATIVEFENCEFDANDROIDPROC eglDupNativeFenceFDANDROID;
PFNEGLWAITSYNCKHRPROC eglWaitSyncKHR;
} procs; } procs;
bool has_modifiers; bool has_modifiers;
@ -105,4 +109,12 @@ bool wlr_egl_make_current(struct wlr_egl *egl, struct wlr_egl_context *save_cont
bool wlr_egl_unset_current(struct wlr_egl *egl); bool wlr_egl_unset_current(struct wlr_egl *egl);
EGLSyncKHR wlr_egl_create_sync(struct wlr_egl *egl, int fence_fd);
void wlr_egl_destroy_sync(struct wlr_egl *egl, EGLSyncKHR sync);
int wlr_egl_dup_fence_fd(struct wlr_egl *egl, EGLSyncKHR sync);
bool wlr_egl_wait_sync(struct wlr_egl *egl, EGLSyncKHR sync);
#endif #endif

74
render/egl.c
View File

@ -348,6 +348,18 @@ static bool egl_init_display(struct wlr_egl *egl, EGLDisplay display) {
return false; return false;
} }
if (check_egl_ext(display_exts_str, "EGL_KHR_fence_sync") &&
check_egl_ext(display_exts_str, "EGL_ANDROID_native_fence_sync")) {
load_egl_proc(&egl->procs.eglCreateSyncKHR, "eglCreateSyncKHR");
load_egl_proc(&egl->procs.eglDestroySyncKHR, "eglDestroySyncKHR");
load_egl_proc(&egl->procs.eglDupNativeFenceFDANDROID,
"eglDupNativeFenceFDANDROID");
}
if (check_egl_ext(display_exts_str, "EGL_KHR_wait_sync")) {
load_egl_proc(&egl->procs.eglWaitSyncKHR, "eglWaitSyncKHR");
}
egl->exts.IMG_context_priority = egl->exts.IMG_context_priority =
check_egl_ext(display_exts_str, "EGL_IMG_context_priority"); check_egl_ext(display_exts_str, "EGL_IMG_context_priority");
@ -1014,3 +1026,65 @@ int wlr_egl_dup_drm_fd(struct wlr_egl *egl) {
} }
return fd; return fd;
} }
EGLSyncKHR wlr_egl_create_sync(struct wlr_egl *egl, int fence_fd) {
if (!egl->procs.eglCreateSyncKHR) {
return EGL_NO_SYNC_KHR;
}
EGLint attribs[3] = { EGL_NONE };
int dup_fd = -1;
if (fence_fd >= 0) {
dup_fd = fcntl(fence_fd, F_DUPFD_CLOEXEC, 0);
if (dup_fd < 0) {
wlr_log_errno(WLR_ERROR, "dup failed");
return EGL_NO_SYNC_KHR;
}
attribs[0] = EGL_SYNC_NATIVE_FENCE_FD_ANDROID;
attribs[1] = dup_fd;
attribs[2] = EGL_NONE;
}
EGLSyncKHR sync = egl->procs.eglCreateSyncKHR(egl->display,
EGL_SYNC_NATIVE_FENCE_ANDROID, attribs);
if (sync == EGL_NO_SYNC_KHR) {
wlr_log(WLR_ERROR, "eglCreateSyncKHR failed");
if (dup_fd >= 0) {
close(dup_fd);
}
}
return sync;
}
void wlr_egl_destroy_sync(struct wlr_egl *egl, EGLSyncKHR sync) {
if (sync == EGL_NO_SYNC_KHR) {
return;
}
assert(egl->procs.eglDestroySyncKHR);
if (egl->procs.eglDestroySyncKHR(egl->display, sync) != EGL_TRUE) {
wlr_log(WLR_ERROR, "eglDestroySyncKHR failed");
}
}
int wlr_egl_dup_fence_fd(struct wlr_egl *egl, EGLSyncKHR sync) {
if (!egl->procs.eglDupNativeFenceFDANDROID) {
return -1;
}
int fd = egl->procs.eglDupNativeFenceFDANDROID(egl->display, sync);
if (fd == EGL_NO_NATIVE_FENCE_FD_ANDROID) {
wlr_log(WLR_ERROR, "eglDupNativeFenceFDANDROID failed");
return -1;
}
return fd;
}
bool wlr_egl_wait_sync(struct wlr_egl *egl, EGLSyncKHR sync) {
if (egl->procs.eglWaitSyncKHR(egl->display, sync, 0) != EGL_TRUE) {
wlr_log(WLR_ERROR, "eglWaitSyncKHR failed");
return false;
}
return true;
}