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

xwayland: swap "name" and "id" in init_wl_registry() 

Both xwl_glamor_init_wl_registry() and the Wayland global registry
handler use the interface id/name in that order, using name/id in the
egl_backend vfunc makes things confusing and error prone.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Olivier Fourdan 2018-06-05 19:38:37 +02:00 committed by Adam Jackson
parent f6b2109c1b
commit 78ce4aa979
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -641,8 +641,8 @@ const struct wl_eglstream_display_listener eglstream_display_listener = {
static void static void
xwl_glamor_eglstream_init_wl_registry(struct xwl_screen *xwl_screen, xwl_glamor_eglstream_init_wl_registry(struct xwl_screen *xwl_screen,
struct wl_registry *wl_registry, struct wl_registry *wl_registry,
const char *name, uint32_t id, const char *name,
uint32_t id, uint32_t version) uint32_t version)
{ {
struct xwl_eglstream_private *xwl_eglstream = struct xwl_eglstream_private *xwl_eglstream =
xwl_eglstream_get(xwl_screen); xwl_eglstream_get(xwl_screen);

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

@ -737,8 +737,8 @@ xwl_screen_set_dmabuf_interface(struct xwl_screen *xwl_screen,
static void static void
xwl_glamor_gbm_init_wl_registry(struct xwl_screen *xwl_screen, xwl_glamor_gbm_init_wl_registry(struct xwl_screen *xwl_screen,
struct wl_registry *wl_registry, struct wl_registry *wl_registry,
const char *name, uint32_t id, const char *name,
uint32_t id, uint32_t version) uint32_t version)
{ {
if (strcmp(name, "wl_drm") == 0) if (strcmp(name, "wl_drm") == 0)
xwl_screen_set_drm_interface(xwl_screen, id, version); xwl_screen_set_drm_interface(xwl_screen, id, version);

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

@ -73,7 +73,7 @@ xwl_glamor_init_wl_registry(struct xwl_screen *xwl_screen,
{ {
if (xwl_screen->egl_backend.init_wl_registry) if (xwl_screen->egl_backend.init_wl_registry)
xwl_screen->egl_backend.init_wl_registry(xwl_screen, registry, xwl_screen->egl_backend.init_wl_registry(xwl_screen, registry,
interface, id, version); id, interface, version);
} }
struct wl_buffer * struct wl_buffer *

2
hw/xwayland/xwayland.h
View File

@ -117,7 +117,7 @@ struct xwl_screen {
*/ */
void (*init_wl_registry)(struct xwl_screen *xwl_screen, void (*init_wl_registry)(struct xwl_screen *xwl_screen,
struct wl_registry *wl_registry, struct wl_registry *wl_registry,
const char *name, uint32_t id, uint32_t id, const char *name,
uint32_t version); uint32_t version);
/* Called before glamor has been initialized. Backends should setup a /* Called before glamor has been initialized. Backends should setup a