mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-16 08:56:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into screencontent

Browse source
This commit is contained in:
emersion 2018-05-31 12:33:27 +01:00
commit 21928cbe61
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
39 changed files with 163 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,8 +8,8 @@
#include <wlr/render/wlr_renderer.h>
#include <wlr/render/wlr_texture.h>
#include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_linux_dmabuf.h>
#include <wlr/types/wlr_output.h>
#include <wlr/render/dmabuf.h>
struct wlr_renderer_impl {
void (*begin)(struct wlr_renderer *renderer, uint32_t width,
@ -31,7 +31,7 @@ struct wlr_renderer_impl {
void (*wl_drm_buffer_get_size)(struct wlr_renderer *renderer,
struct wl_resource *buffer, int *width, int *height);
bool (*check_import_dmabuf)(struct wlr_renderer *renderer,
struct wlr_dmabuf_buffer *dmabuf);
struct wlr_dmabuf_attributes *attribs);
int (*get_dmabuf_formats)(struct wlr_renderer *renderer, int **formats);
int (*get_dmabuf_modifiers)(struct wlr_renderer *renderer, int format,
uint64_t **modifiers);
@ -47,7 +47,7 @@ struct wlr_renderer_impl {
struct wlr_texture *(*texture_from_wl_drm)(struct wlr_renderer *renderer,
struct wl_resource *data);
struct wlr_texture *(*texture_from_dmabuf)(struct wlr_renderer *renderer,
struct wlr_dmabuf_buffer_attribs *attribs);
struct wlr_dmabuf_attributes *attribs);
void (*destroy)(struct wlr_renderer *renderer);
void (*init_wl_display)(struct wlr_renderer *renderer,
struct wl_display *wl_display);
@ -63,7 +63,7 @@ struct wlr_texture_impl {
uint32_t height, uint32_t src_x, uint32_t src_y, uint32_t dst_x,
uint32_t dst_y, const void *data);
bool (*to_dmabuf)(struct wlr_texture *texture,
struct wlr_dmabuf_buffer_attribs *attribs);
struct wlr_dmabuf_attributes *attribs);
void (*destroy)(struct wlr_texture *texture);
};