blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

render/egl: consistent extension checking

This commit is contained in:
emersion 2018-06-05 09:59:26 +01:00
parent cbfe0e834a
commit d425edc96c
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/wlr/render/egl.h
View File

@ -16,12 +16,13 @@ struct wlr_egl {
const char *exts_str; const char *exts_str;
struct { struct {
bool buffer_age;
bool swap_buffers_with_damage;
bool dmabuf_import;
bool dmabuf_import_modifiers;
bool bind_wayland_display; bool bind_wayland_display;
bool buffer_age;
bool context_priority; bool context_priority;
bool dmabuf_import_modifiers;
bool dmabuf_import;
bool image_base;
bool swap_buffers_with_damage;
} egl_exts; } egl_exts;
struct wl_display *wl_display; struct wl_display *wl_display;

25
render/egl.c
View File

@ -155,11 +155,17 @@ bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *remote_display,
goto error; goto error;
} }
egl->egl_exts.image_base =
check_egl_ext(egl->exts_str, "EGL_KHR_image_base")
&& eglCreateImageKHR && eglDestroyImageKHR;
egl->egl_exts.buffer_age = egl->egl_exts.buffer_age =
check_egl_ext(egl->exts_str, "EGL_EXT_buffer_age"); check_egl_ext(egl->exts_str, "EGL_EXT_buffer_age");
egl->egl_exts.swap_buffers_with_damage = egl->egl_exts.swap_buffers_with_damage =
check_egl_ext(egl->exts_str, "EGL_EXT_swap_buffers_with_damage") || (check_egl_ext(egl->exts_str, "EGL_EXT_swap_buffers_with_damage") &&
check_egl_ext(egl->exts_str, "EGL_KHR_swap_buffers_with_damage"); eglSwapBuffersWithDamageEXT) ||
(check_egl_ext(egl->exts_str, "EGL_KHR_swap_buffers_with_damage") &&
eglSwapBuffersWithDamageKHR);
egl->egl_exts.dmabuf_import = egl->egl_exts.dmabuf_import =
check_egl_ext(egl->exts_str, "EGL_EXT_image_dma_buf_import"); check_egl_ext(egl->exts_str, "EGL_EXT_image_dma_buf_import");
@ -169,7 +175,9 @@ bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *remote_display,
print_dmabuf_formats(egl); print_dmabuf_formats(egl);
egl->egl_exts.bind_wayland_display = egl->egl_exts.bind_wayland_display =
check_egl_ext(egl->exts_str, "EGL_WL_bind_wayland_display"); check_egl_ext(egl->exts_str, "EGL_WL_bind_wayland_display")
&& eglBindWaylandDisplayWL && eglUnbindWaylandDisplayWL
&& eglQueryWaylandBufferWL;
egl->egl_exts.context_priority = egl->egl_exts.context_priority =
check_egl_ext(egl->exts_str, "EGL_IMG_context_priority"); check_egl_ext(egl->exts_str, "EGL_IMG_context_priority");
@ -228,7 +236,8 @@ void wlr_egl_finish(struct wlr_egl *egl) {
} }
eglMakeCurrent(egl->display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); eglMakeCurrent(egl->display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
if (egl->wl_display && egl->egl_exts.bind_wayland_display) { if (egl->wl_display) {
assert(egl->egl_exts.bind_wayland_display);
eglUnbindWaylandDisplayWL(egl->display, egl->wl_display); eglUnbindWaylandDisplayWL(egl->display, egl->wl_display);
} }
@ -251,7 +260,7 @@ bool wlr_egl_bind_display(struct wlr_egl *egl, struct wl_display *local_display)
} }
bool wlr_egl_destroy_image(struct wlr_egl *egl, EGLImage image) { bool wlr_egl_destroy_image(struct wlr_egl *egl, EGLImage image) {
if (!eglDestroyImageKHR) { if (!egl->egl_exts.image_base) {
return false; return false;
} }
if (!image) { if (!image) {
@ -341,7 +350,7 @@ bool wlr_egl_swap_buffers(struct wlr_egl *egl, EGLSurface surface,
EGLImageKHR wlr_egl_create_image_from_wl_drm(struct wlr_egl *egl, EGLImageKHR wlr_egl_create_image_from_wl_drm(struct wlr_egl *egl,
struct wl_resource *data, EGLint *fmt, int *width, int *height, struct wl_resource *data, EGLint *fmt, int *width, int *height,
bool *inverted_y) { bool *inverted_y) {
if (!eglQueryWaylandBufferWL || !eglCreateImageKHR) { if (!egl->egl_exts.bind_wayland_display || !egl->egl_exts.image_base) {
return NULL; return NULL;
} }
@ -370,6 +379,10 @@ EGLImageKHR wlr_egl_create_image_from_wl_drm(struct wlr_egl *egl,
EGLImageKHR wlr_egl_create_image_from_dmabuf(struct wlr_egl *egl, EGLImageKHR wlr_egl_create_image_from_dmabuf(struct wlr_egl *egl,
struct wlr_dmabuf_attributes *attributes) { struct wlr_dmabuf_attributes *attributes) {
if (!egl->egl_exts.image_base) {
return NULL;
}
bool has_modifier = false; bool has_modifier = false;
if (attributes->modifier != DRM_FORMAT_MOD_INVALID) { if (attributes->modifier != DRM_FORMAT_MOD_INVALID) {
if (!egl->egl_exts.dmabuf_import_modifiers) { if (!egl->egl_exts.dmabuf_import_modifiers) {