frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xwayland: remove unused parameter of xwl_glamor_pixmap_get_wl_buffer 

There are currently no callers that make use of the "created" output parameter
of xwl_glamor_pixmap_get_wl_buffer. Remove it, along with the corresponding
argument of the associated EGL backend entrypoint.
This commit is contained in:
Erik Kurzinger 2021-01-07 07:00:33 -08:00
parent 5322457980
commit a9269808f3
6 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xwayland/xwayland-glamor-eglstream.c
View File

@ -331,10 +331,8 @@ xwl_glamor_eglstream_destroy_pixmap(PixmapPtr pixmap)
} }
static struct wl_buffer * static struct wl_buffer *
xwl_glamor_eglstream_get_wl_buffer_for_pixmap(PixmapPtr pixmap, xwl_glamor_eglstream_get_wl_buffer_for_pixmap(PixmapPtr pixmap)
Bool *created)
{ {
/* XXX created? */
return xwl_pixmap_get(pixmap)->buffer; return xwl_pixmap_get(pixmap)->buffer;
} }

11
hw/xwayland/xwayland-glamor-gbm.c
View File

@ -270,8 +270,7 @@ static const struct wl_buffer_listener xwl_glamor_gbm_buffer_listener = {
}; };
static struct wl_buffer * static struct wl_buffer *
xwl_glamor_gbm_get_wl_buffer_for_pixmap(PixmapPtr pixmap, xwl_glamor_gbm_get_wl_buffer_for_pixmap(PixmapPtr pixmap)
Bool *created)
{ {
struct xwl_screen *xwl_screen = xwl_screen_get(pixmap->drawable.pScreen); struct xwl_screen *xwl_screen = xwl_screen_get(pixmap->drawable.pScreen);
struct xwl_pixmap *xwl_pixmap = xwl_pixmap_get(pixmap); struct xwl_pixmap *xwl_pixmap = xwl_pixmap_get(pixmap);
@ -292,16 +291,10 @@ xwl_glamor_gbm_get_wl_buffer_for_pixmap(PixmapPtr pixmap,
return NULL; return NULL;
if (xwl_pixmap->buffer) { if (xwl_pixmap->buffer) {
/* Buffer already exists. Return it and inform caller if interested. */ /* Buffer already exists. */
if (created)
*created = FALSE;
return xwl_pixmap->buffer; return xwl_pixmap->buffer;
} }
/* Buffer does not exist yet. Create now and inform caller if interested. */
if (created)
*created = TRUE;
if (!xwl_pixmap->bo) if (!xwl_pixmap->bo)
return NULL; return NULL;

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

@ -106,14 +106,12 @@ xwl_glamor_has_wl_interfaces(struct xwl_screen *xwl_screen,
} }
struct wl_buffer * struct wl_buffer *
xwl_glamor_pixmap_get_wl_buffer(PixmapPtr pixmap, xwl_glamor_pixmap_get_wl_buffer(PixmapPtr pixmap)
Bool *created)
{ {
struct xwl_screen *xwl_screen = xwl_screen_get(pixmap->drawable.pScreen); struct xwl_screen *xwl_screen = xwl_screen_get(pixmap->drawable.pScreen);
if (xwl_screen->egl_backend->get_wl_buffer_for_pixmap) if (xwl_screen->egl_backend->get_wl_buffer_for_pixmap)
return xwl_screen->egl_backend->get_wl_buffer_for_pixmap(pixmap, return xwl_screen->egl_backend->get_wl_buffer_for_pixmap(pixmap);
created);
return NULL; return NULL;
} }

6
hw/xwayland/xwayland-glamor.h
View File

@ -76,8 +76,7 @@ struct xwl_egl_backend {
* wl_buffer for a currently buffer-less pixmap, or simply return the * wl_buffer for a currently buffer-less pixmap, or simply return the
* pixmap they've prepared beforehand. * pixmap they've prepared beforehand.
*/ */
struct wl_buffer *(*get_wl_buffer_for_pixmap)(PixmapPtr pixmap, struct wl_buffer *(*get_wl_buffer_for_pixmap)(PixmapPtr pixmap);
Bool *created);
/* Called by Xwayland to perform any pre-wl_surface damage routines /* Called by Xwayland to perform any pre-wl_surface damage routines
* that are required by the backend. If your backend is poorly * that are required by the backend. If your backend is poorly
@ -107,8 +106,7 @@ Bool xwl_screen_set_drm_interface(struct xwl_screen *xwl_screen,
uint32_t id, uint32_t version); uint32_t id, uint32_t version);
Bool xwl_screen_set_dmabuf_interface(struct xwl_screen *xwl_screen, Bool xwl_screen_set_dmabuf_interface(struct xwl_screen *xwl_screen,
uint32_t id, uint32_t version); uint32_t id, uint32_t version);
struct wl_buffer *xwl_glamor_pixmap_get_wl_buffer(PixmapPtr pixmap, struct wl_buffer *xwl_glamor_pixmap_get_wl_buffer(PixmapPtr pixmap);
Bool *created);
void xwl_glamor_init_wl_registry(struct xwl_screen *xwl_screen, void xwl_glamor_init_wl_registry(struct xwl_screen *xwl_screen,
struct wl_registry *registry, struct wl_registry *registry,
uint32_t id, const char *interface, uint32_t id, const char *interface,

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

@ -447,7 +447,7 @@ xwl_present_flip(WindowPtr present_window,
return FALSE; return FALSE;
pixmap->refcnt++; pixmap->refcnt++;
buffer = xwl_glamor_pixmap_get_wl_buffer(pixmap, NULL); buffer = xwl_glamor_pixmap_get_wl_buffer(pixmap);
event->event_id = event_id; event->event_id = event_id;
event->xwl_present_window = xwl_present_window; event->xwl_present_window = xwl_present_window;

3
hw/xwayland/xwayland-window.c
View File

@ -800,8 +800,7 @@ xwl_window_post_damage(struct xwl_window *xwl_window)
#ifdef XWL_HAS_GLAMOR #ifdef XWL_HAS_GLAMOR
if (xwl_screen->glamor) if (xwl_screen->glamor)
buffer = xwl_glamor_pixmap_get_wl_buffer(pixmap, buffer = xwl_glamor_pixmap_get_wl_buffer(pixmap);
NULL);
else else
#endif #endif
buffer = xwl_shm_pixmap_get_wl_buffer(pixmap); buffer = xwl_shm_pixmap_get_wl_buffer(pixmap);