mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-03-10 05:34:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

render: drop <linux/dma-buf.h> compat defines

Browse source 
It's been 3 years, so these defines are widespread enough by now.
This commit is contained in:
Simon Ser 2026-01-01 19:34:06 +01:00 • committed by Kenny Levinsen
parent 3f9a164484
commit caed9d78d7
2 changed files with 5 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

24
render/dmabuf_linux.c
View file

@ -50,30 +50,6 @@ bool dmabuf_check_sync_file_import_export(void) {
return KERNEL_VERSION(major, minor, patch) >= KERNEL_VERSION(5, 20, 0); return KERNEL_VERSION(major, minor, patch) >= KERNEL_VERSION(5, 20, 0);
} }
// TODO: drop these definitions once widespread
#if !defined(DMA_BUF_IOCTL_IMPORT_SYNC_FILE)
struct dma_buf_import_sync_file {
__u32 flags;
__s32 fd;
};
#define DMA_BUF_IOCTL_IMPORT_SYNC_FILE _IOW(DMA_BUF_BASE, 3, struct dma_buf_import_sync_file)
#endif
#if !defined(DMA_BUF_IOCTL_EXPORT_SYNC_FILE)
struct dma_buf_export_sync_file {
__u32 flags;
__s32 fd;
};
#define DMA_BUF_IOCTL_EXPORT_SYNC_FILE _IOWR(DMA_BUF_BASE, 2, struct dma_buf_export_sync_file)
#endif
bool dmabuf_import_sync_file(int dmabuf_fd, uint32_t flags, int sync_file_fd) { bool dmabuf_import_sync_file(int dmabuf_fd, uint32_t flags, int sync_file_fd) {
struct dma_buf_import_sync_file data = { struct dma_buf_import_sync_file data = {
.flags = flags, .flags = flags,

6
render/meson.build
View file

@ -17,7 +17,11 @@ wlr_files += files(
'wlr_texture.c', 'wlr_texture.c',
) )
if cc.has_header('linux/dma-buf.h') and target_machine.system() == 'linux' has_dma_buf_import_sync_file = cc.has_header('linux/dma-buf.h') and cc.has_define(
'DMA_BUF_IOCTL_IMPORT_SYNC_FILE',
prefix: '#include <linux/dma-buf.h>',
)
if has_dma_buf_import_sync_file and target_machine.system() == 'linux'
wlr_files += files('dmabuf_linux.c') wlr_files += files('dmabuf_linux.c')
else else
wlr_files += files('dmabuf_fallback.c') wlr_files += files('dmabuf_fallback.c')