mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-19 06:47:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'pixman_dmabuf' into 'master'

Browse source 
Implement dmabufs in pixman renderer

Closes #3844

See merge request wlroots/wlroots!4714
This commit is contained in:
David Turner 2025-07-11 03:13:12 +00:00
commit d848f49bac
13 changed files with 156 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/meson.build
View file

@ -32,6 +32,9 @@ install_subdir('wlr',
foreach name, have : internal_features
internal_config.set10('HAVE_' + name.underscorify().to_upper(), have)
endforeach
internal_config.set10('HAVE_LINUX_DMA_BUF_H', cc.has_header('linux/dma-buf.h'))
wlr_files += configure_file(
output: 'config.h',
configuration: internal_config,

1
include/render/gles2.h
View file

@ -41,7 +41,6 @@ struct wlr_gles2_renderer {
struct wlr_renderer wlr_renderer;
struct wlr_egl *egl;
int drm_fd;
struct wlr_drm_format_set shm_texture_formats;

2
include/render/vulkan.h
View file

@ -39,8 +39,6 @@ struct wlr_vk_device {
VkPhysicalDevice phdev;
VkDevice dev;
int drm_fd;
bool sync_file_import_export;
bool implicit_sync_interop;
bool sampler_ycbcr_conversion;

1
include/wlr/render/interface.h
View file

@ -25,7 +25,6 @@ struct wlr_renderer_impl {
const struct wlr_drm_format_set *(*get_render_formats)(
struct wlr_renderer *renderer);
void (*destroy)(struct wlr_renderer *renderer);
int (*get_drm_fd)(struct wlr_renderer *renderer);
struct wlr_texture *(*texture_from_buffer)(struct wlr_renderer *renderer,
struct wlr_buffer *buffer);
struct wlr_render_pass *(*begin_buffer_pass)(struct wlr_renderer *renderer,

1
include/wlr/render/pixman.h
View file

@ -13,7 +13,6 @@
#include <wlr/render/wlr_renderer.h>
struct wlr_renderer *wlr_pixman_renderer_create(void);
bool wlr_renderer_is_pixman(struct wlr_renderer *wlr_renderer);
bool wlr_texture_is_pixman(struct wlr_texture *texture);

5
include/wlr/render/wlr_renderer.h
View file

@ -26,8 +26,8 @@ struct wlr_fbox;
* A renderer for basic 2D operations.
*/
struct wlr_renderer {
// Capabilities required for the buffer used as a render target (bitmask of
// enum wlr_buffer_cap)
// Capabilities required for the buffers used as texture sources and
// render target (bitmask of enum wlr_buffer_cap)
uint32_t render_buffer_caps;
struct {
@ -59,6 +59,7 @@ struct wlr_renderer {
struct {
const struct wlr_renderer_impl *impl;
int drm_fd;
} WLR_PRIVATE;
};

6
include/wlr/types/wlr_linux_dmabuf_v1.h
View file

@ -26,6 +26,12 @@ struct wlr_dmabuf_v1_buffer {
struct {
struct wl_listener release;
// Cache mapped address while ptr_data_access is open
void *addr;
// WLR_BUFFER_DATA_PTR_ACCESS_* flags describing the type of
// the current ptr_data_access
uint32_t access_flags;
} WLR_PRIVATE;
};