render/gles2: check for DRM_CAP_SYNCOBJ_TIMELINE

Before advertising support for timelines, check for
DRM_CAP_SYNCOBJ_TIMELINE. Without this, the user cannot
create/import drm_syncobj timelines.

References: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4715#note_2523517
master
Simon Ser 3 months ago committed by Alexander Orzechowski
parent adf9d8b0be
commit e6dbe4580e

@ -15,6 +15,7 @@
#include <wlr/types/wlr_matrix.h> #include <wlr/types/wlr_matrix.h>
#include <wlr/util/box.h> #include <wlr/util/box.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include <xf86drm.h>
#include "render/egl.h" #include "render/egl.h"
#include "render/gles2.h" #include "render/gles2.h"
#include "render/pixel_format.h" #include "render/pixel_format.h"
@ -684,8 +685,12 @@ struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_egl *egl) {
get_gles2_shm_formats(renderer, &renderer->shm_texture_formats); get_gles2_shm_formats(renderer, &renderer->shm_texture_formats);
renderer->wlr_renderer.features.timeline = int drm_fd = wlr_renderer_get_drm_fd(&renderer->wlr_renderer);
egl->procs.eglDupNativeFenceFDANDROID && egl->procs.eglWaitSyncKHR; uint64_t cap_syncobj_timeline;
if (drm_fd >= 0 && drmGetCap(drm_fd, DRM_CAP_SYNCOBJ_TIMELINE, &cap_syncobj_timeline) == 0) {
renderer->wlr_renderer.features.timeline = egl->procs.eglDupNativeFenceFDANDROID &&
egl->procs.eglWaitSyncKHR && cap_syncobj_timeline != 0;
}
return &renderer->wlr_renderer; return &renderer->wlr_renderer;

Loading…
Cancel
Save