mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-25 22:25:58 +01:00
render: add wlr_texture_to_dmabuf
This commit is contained in:
parent
bd430b8620
commit
5ba1a9af56
7 changed files with 92 additions and 3 deletions
|
@ -20,6 +20,7 @@ struct wlr_egl {
|
||||||
bool swap_buffers_with_damage;
|
bool swap_buffers_with_damage;
|
||||||
bool dmabuf_import;
|
bool dmabuf_import;
|
||||||
bool dmabuf_import_modifiers;
|
bool dmabuf_import_modifiers;
|
||||||
|
bool dmabuf_export;
|
||||||
bool bind_wayland_display;
|
bool bind_wayland_display;
|
||||||
} egl_exts;
|
} egl_exts;
|
||||||
|
|
||||||
|
@ -85,6 +86,10 @@ int wlr_egl_get_dmabuf_formats(struct wlr_egl *egl, int **formats);
|
||||||
int wlr_egl_get_dmabuf_modifiers(struct wlr_egl *egl, int format,
|
int wlr_egl_get_dmabuf_modifiers(struct wlr_egl *egl, int format,
|
||||||
uint64_t **modifiers);
|
uint64_t **modifiers);
|
||||||
|
|
||||||
|
bool wlr_egl_export_image_to_dmabuf(struct wlr_egl *egl, EGLImageKHR image,
|
||||||
|
int32_t width, int32_t height, uint32_t flags,
|
||||||
|
struct wlr_dmabuf_buffer_attribs *attribs);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Destroys an EGL image created with the given wlr_egl.
|
* Destroys an EGL image created with the given wlr_egl.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -62,6 +62,8 @@ struct wlr_texture_impl {
|
||||||
enum wl_shm_format wl_fmt, uint32_t stride, uint32_t width,
|
enum wl_shm_format wl_fmt, uint32_t stride, uint32_t width,
|
||||||
uint32_t height, uint32_t src_x, uint32_t src_y, uint32_t dst_x,
|
uint32_t height, uint32_t src_x, uint32_t src_y, uint32_t dst_x,
|
||||||
uint32_t dst_y, const void *data);
|
uint32_t dst_y, const void *data);
|
||||||
|
bool (*to_dmabuf)(struct wlr_texture *texture,
|
||||||
|
struct wlr_dmabuf_buffer_attribs *attribs);
|
||||||
void (*destroy)(struct wlr_texture *texture);
|
void (*destroy)(struct wlr_texture *texture);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -48,6 +48,9 @@ bool wlr_texture_write_pixels(struct wlr_texture *texture,
|
||||||
uint32_t src_x, uint32_t src_y, uint32_t dst_x, uint32_t dst_y,
|
uint32_t src_x, uint32_t src_y, uint32_t dst_x, uint32_t dst_y,
|
||||||
const void *data);
|
const void *data);
|
||||||
|
|
||||||
|
bool wlr_texture_to_dmabuf(struct wlr_texture *texture,
|
||||||
|
struct wlr_dmabuf_buffer_attribs *attribs);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Destroys this wlr_texture.
|
* Destroys this wlr_texture.
|
||||||
*/
|
*/
|
||||||
|
|
46
render/egl.c
46
render/egl.c
|
@ -178,8 +178,12 @@ bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *remote_display,
|
||||||
check_egl_ext(egl->exts_str, "EGL_EXT_image_dma_buf_import_modifiers")
|
check_egl_ext(egl->exts_str, "EGL_EXT_image_dma_buf_import_modifiers")
|
||||||
&& eglQueryDmaBufFormatsEXT && eglQueryDmaBufModifiersEXT;
|
&& eglQueryDmaBufFormatsEXT && eglQueryDmaBufModifiersEXT;
|
||||||
|
|
||||||
|
egl->egl_exts.dmabuf_export =
|
||||||
|
check_egl_ext(egl->exts_str, "EGL_MESA_image_dma_buf_export");
|
||||||
|
|
||||||
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");
|
||||||
|
|
||||||
print_dmabuf_formats(egl);
|
print_dmabuf_formats(egl);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -209,7 +213,7 @@ void wlr_egl_finish(struct wlr_egl *egl) {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wlr_egl_bind_display(struct wlr_egl *egl, struct wl_display *local_display) {
|
bool wlr_egl_bind_display(struct wlr_egl *egl, struct wl_display *local_display) {
|
||||||
if (!egl->egl_exts.bind_wayland_display) {
|
if (!egl->egl_exts.bind_wayland_display || !eglBindWaylandDisplayWL) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -414,7 +418,7 @@ EGLImageKHR wlr_egl_create_image_from_dmabuf(struct wlr_egl *egl,
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef DRM_FORMAT_BIG_ENDIAN
|
#ifndef DRM_FORMAT_BIG_ENDIAN
|
||||||
# define DRM_FORMAT_BIG_ENDIAN 0x80000000
|
#define DRM_FORMAT_BIG_ENDIAN 0x80000000
|
||||||
#endif
|
#endif
|
||||||
bool wlr_egl_check_import_dmabuf(struct wlr_egl *egl,
|
bool wlr_egl_check_import_dmabuf(struct wlr_egl *egl,
|
||||||
struct wlr_dmabuf_buffer *dmabuf) {
|
struct wlr_dmabuf_buffer *dmabuf) {
|
||||||
|
@ -446,7 +450,7 @@ bool wlr_egl_check_import_dmabuf(struct wlr_egl *egl,
|
||||||
int wlr_egl_get_dmabuf_formats(struct wlr_egl *egl,
|
int wlr_egl_get_dmabuf_formats(struct wlr_egl *egl,
|
||||||
int **formats) {
|
int **formats) {
|
||||||
if (!egl->egl_exts.dmabuf_import ||
|
if (!egl->egl_exts.dmabuf_import ||
|
||||||
!egl->egl_exts.dmabuf_import_modifiers) {
|
!egl->egl_exts.dmabuf_import_modifiers) {
|
||||||
wlr_log(L_DEBUG, "dmabuf extension not present");
|
wlr_log(L_DEBUG, "dmabuf extension not present");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
@ -501,6 +505,42 @@ int wlr_egl_get_dmabuf_modifiers(struct wlr_egl *egl,
|
||||||
return num;
|
return num;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wlr_egl_export_image_to_dmabuf(struct wlr_egl *egl, EGLImageKHR image,
|
||||||
|
int32_t width, int32_t height, uint32_t flags,
|
||||||
|
struct wlr_dmabuf_buffer_attribs *attribs) {
|
||||||
|
memset(attribs, 0, sizeof(struct wlr_dmabuf_buffer_attribs));
|
||||||
|
|
||||||
|
if (!egl->egl_exts.dmabuf_export || !eglExportDMABUFImageQueryMESA ||
|
||||||
|
!eglExportDMABUFImageMESA) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only one set of modifiers is returned for all planes
|
||||||
|
EGLuint64KHR modifiers;
|
||||||
|
if (!eglExportDMABUFImageQueryMESA(egl->display, image,
|
||||||
|
(int *)&attribs->format, &attribs->n_planes, &modifiers)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (attribs->n_planes > WLR_LINUX_DMABUF_MAX_PLANES) {
|
||||||
|
wlr_log(L_ERROR, "EGL returned %d planes, but only %d are supported",
|
||||||
|
attribs->n_planes, WLR_LINUX_DMABUF_MAX_PLANES);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
for (int i = 0; i < attribs->n_planes; ++i) {
|
||||||
|
attribs->modifier[i] = modifiers;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!eglExportDMABUFImageMESA(egl->display, image, attribs->fd,
|
||||||
|
(EGLint *)attribs->stride, (EGLint *)attribs->offset)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
attribs->width = width;
|
||||||
|
attribs->height = height;
|
||||||
|
attribs->flags = flags;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
bool wlr_egl_destroy_surface(struct wlr_egl *egl, EGLSurface surface) {
|
bool wlr_egl_destroy_surface(struct wlr_egl *egl, EGLSurface surface) {
|
||||||
if (!surface) {
|
if (!surface) {
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -10,6 +10,8 @@ eglCreatePlatformWindowSurfaceEXT
|
||||||
-eglSwapBuffersWithDamageKHR
|
-eglSwapBuffersWithDamageKHR
|
||||||
-eglQueryDmaBufFormatsEXT
|
-eglQueryDmaBufFormatsEXT
|
||||||
-eglQueryDmaBufModifiersEXT
|
-eglQueryDmaBufModifiersEXT
|
||||||
|
-eglExportDMABUFImageQueryMESA
|
||||||
|
-eglExportDMABUFImageMESA
|
||||||
-eglDebugMessageControlKHR
|
-eglDebugMessageControlKHR
|
||||||
-glDebugMessageCallbackKHR
|
-glDebugMessageCallbackKHR
|
||||||
-glDebugMessageControlKHR
|
-glDebugMessageControlKHR
|
||||||
|
|
|
@ -74,6 +74,34 @@ static bool gles2_texture_write_pixels(struct wlr_texture *wlr_texture,
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool gles2_texture_to_dmabuf(struct wlr_texture *wlr_texture,
|
||||||
|
struct wlr_dmabuf_buffer_attribs *attribs) {
|
||||||
|
struct wlr_gles2_texture *texture = gles2_get_texture(wlr_texture);
|
||||||
|
|
||||||
|
if (!texture->image) {
|
||||||
|
assert(texture->type == WLR_GLES2_TEXTURE_GLTEX);
|
||||||
|
|
||||||
|
if (!eglCreateImageKHR) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
texture->image = eglCreateImageKHR(texture->egl->display,
|
||||||
|
texture->egl->context, EGL_GL_TEXTURE_2D_KHR,
|
||||||
|
(EGLClientBuffer)(uintptr_t)texture->gl_tex, NULL);
|
||||||
|
if (texture->image == EGL_NO_IMAGE_KHR) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t flags = 0;
|
||||||
|
if (texture->inverted_y) {
|
||||||
|
flags |= WLR_DMABUF_BUFFER_ATTRIBS_FLAGS_Y_INVERT;
|
||||||
|
}
|
||||||
|
|
||||||
|
return wlr_egl_export_image_to_dmabuf(texture->egl, texture->image,
|
||||||
|
texture->width, texture->height, flags, attribs);
|
||||||
|
}
|
||||||
|
|
||||||
static void gles2_texture_destroy(struct wlr_texture *wlr_texture) {
|
static void gles2_texture_destroy(struct wlr_texture *wlr_texture) {
|
||||||
if (wlr_texture == NULL) {
|
if (wlr_texture == NULL) {
|
||||||
return;
|
return;
|
||||||
|
@ -102,6 +130,7 @@ static void gles2_texture_destroy(struct wlr_texture *wlr_texture) {
|
||||||
static const struct wlr_texture_impl texture_impl = {
|
static const struct wlr_texture_impl texture_impl = {
|
||||||
.get_size = gles2_texture_get_size,
|
.get_size = gles2_texture_get_size,
|
||||||
.write_pixels = gles2_texture_write_pixels,
|
.write_pixels = gles2_texture_write_pixels,
|
||||||
|
.to_dmabuf = gles2_texture_to_dmabuf,
|
||||||
.destroy = gles2_texture_destroy,
|
.destroy = gles2_texture_destroy,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -54,3 +54,11 @@ bool wlr_texture_write_pixels(struct wlr_texture *texture,
|
||||||
return texture->impl->write_pixels(texture, wl_fmt, stride, width, height,
|
return texture->impl->write_pixels(texture, wl_fmt, stride, width, height,
|
||||||
src_x, src_y, dst_x, dst_y, data);
|
src_x, src_y, dst_x, dst_y, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wlr_texture_to_dmabuf(struct wlr_texture *texture,
|
||||||
|
struct wlr_dmabuf_buffer_attribs *attribs) {
|
||||||
|
if (!texture->impl->to_dmabuf) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return texture->impl->to_dmabuf(texture, attribs);
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue