andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xwayland: Rename xwl_pixmap_cb → xwl_buffer_release_cb 

Seems clearer.

While we're at it, also drop the unused pixmap parameter.

Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
This commit is contained in:
Michel Dänzer 2020-06-25 17:56:41 +02:00 committed by Michel Dänzer
parent 9eb0b4f731
commit 12af425acd
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xwayland/xwayland-pixmap.c
View File

@ -41,7 +41,7 @@ static DevPrivateKeyRec xwl_pixmap_private_key;
static DevPrivateKeyRec xwl_pixmap_cb_private_key;
struct xwl_pixmap_buffer_release_callback {
xwl_pixmap_cb callback;
xwl_buffer_release_cb callback;
void *data;
};
@ -59,7 +59,7 @@ xwl_pixmap_get(PixmapPtr pixmap)
Bool
xwl_pixmap_set_buffer_release_cb(PixmapPtr pixmap,
xwl_pixmap_cb func, void *data)
xwl_buffer_release_cb func, void *data)
{
struct xwl_pixmap_buffer_release_callback *xwl_pixmap_buffer_release_callback;
@ -107,7 +107,7 @@ xwl_pixmap_buffer_release_cb(void *data, struct wl_buffer *wl_buffer)
&xwl_pixmap_cb_private_key);
if (xwl_pixmap_buffer_release_callback)
(*xwl_pixmap_buffer_release_callback->callback)
(pixmap, xwl_pixmap_buffer_release_callback->data);
(xwl_pixmap_buffer_release_callback->data);
}
Bool

4
hw/xwayland/xwayland-pixmap.h
View File

@ -34,12 +34,12 @@
/* This is an opaque structure implemented in the different backends */
struct xwl_pixmap;
typedef void (*xwl_pixmap_cb) (PixmapPtr pixmap, void *data);
typedef void (*xwl_buffer_release_cb) (void *data);
void xwl_pixmap_set_private(PixmapPtr pixmap, struct xwl_pixmap *xwl_pixmap);
struct xwl_pixmap *xwl_pixmap_get(PixmapPtr pixmap);
Bool xwl_pixmap_set_buffer_release_cb(PixmapPtr pixmap,
xwl_pixmap_cb func, void *data);
xwl_buffer_release_cb func, void *data);
void xwl_pixmap_del_buffer_release_cb(PixmapPtr pixmap);
void xwl_pixmap_buffer_release_cb(void *data, struct wl_buffer *wl_buffer);
Bool xwl_pixmap_init(void);

2
hw/xwayland/xwayland-present.c
View File

@ -176,7 +176,7 @@ xwl_present_cleanup(WindowPtr window)
}
static void
xwl_present_buffer_release(PixmapPtr pixmap, void *data)
xwl_present_buffer_release(void *data)
{
struct xwl_present_event *event = data;

2
hw/xwayland/xwayland-window-buffers.c
View File

@ -181,7 +181,7 @@ xwl_window_buffer_timer_callback(OsTimerPtr timer, CARD32 time, void *arg)
}
static void
xwl_window_buffer_release_callback(PixmapPtr pixmap, void *data)
xwl_window_buffer_release_callback(void *data)
{
struct xwl_window_buffer *xwl_window_buffer = data;
struct xwl_window *xwl_window = xwl_window_buffer->xwl_window;