mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2026-04-14 08:22:25 -04:00
Merge branch 'pixman_dmabuf' into 'master'
Implement dmabufs in pixman renderer Closes #3844 See merge request wlroots/wlroots!4714
This commit is contained in:
commit
d848f49bac
13 changed files with 156 additions and 46 deletions
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue