gallium-egl: Fix compile errors introduced in de315f76a

The commit changed API in a helper library shared by both egl_dri2 and
the gallium egl state tracker, but only egl_dri2 was updated to use the
new interface.

Tested-by: Giulio Camuffo <giuliocamuffo@gmail.com>

diff --git a/src/gallium/state_trackers/egl/common/native_wayland_drm_bufmgr_helper.c b/src/gallium/state_trackers/egl/common/native_wayland_drm_bufmgr_helper.c
index 4365553..a9e7342 100644 (file)
--- a/src/gallium/state_trackers/egl/common/native_wayland_drm_bufmgr_helper.c
+++ b/src/gallium/state_trackers/egl/common/native_wayland_drm_bufmgr_helper.c
@@ -13,7 +13,7 @@
 #include "native_wayland_drm_bufmgr_helper.h"
 
 void
-egl_g3d_wl_drm_helper_reference_buffer(void *user_data, uint32_t name,
+egl_g3d_wl_drm_helper_reference_buffer(void *user_data, uint32_t name, int fd,
                                        struct wl_drm_buffer *buffer)
 {
    struct native_display *ndpy = user_data;

diff --git a/src/gallium/state_trackers/egl/common/native_wayland_drm_bufmgr_helper.h b/src/gallium/state_trackers/egl/common/native_wayland_drm_bufmgr_helper.h
index 40c46e9..de00580 100644 (file)
--- a/src/gallium/state_trackers/egl/common/native_wayland_drm_bufmgr_helper.h
+++ b/src/gallium/state_trackers/egl/common/native_wayland_drm_bufmgr_helper.h
@@ -29,7 +29,7 @@
 #include "wayland-drm.h"
 
 void
-egl_g3d_wl_drm_helper_reference_buffer(void *user_data, uint32_t name,
+egl_g3d_wl_drm_helper_reference_buffer(void *user_data, uint32_t name, int fd,
                                        struct wl_drm_buffer *buffer);
 
 void

diff --git a/src/gallium/state_trackers/egl/drm/native_drm.c b/src/gallium/state_trackers/egl/drm/native_drm.c
index f0c0f54..c153865 100644 (file)
--- a/src/gallium/state_trackers/egl/drm/native_drm.c
+++ b/src/gallium/state_trackers/egl/drm/native_drm.c
@@ -213,7 +213,7 @@ drm_display_bind_wayland_display(struct native_display *ndpy,
 
    drmdpy->wl_server_drm = wayland_drm_init(wl_dpy,
          drmdpy->device_name,
-         &wl_drm_callbacks, ndpy);
+         &wl_drm_callbacks, ndpy, 0);
 
    if (!drmdpy->wl_server_drm)
       return FALSE;

diff --git a/src/gallium/state_trackers/egl/wayland/native_drm.c b/src/gallium/state_trackers/egl/wayland/native_drm.c
index 3801fac..2eb7043 100644 (file)
--- a/src/gallium/state_trackers/egl/wayland/native_drm.c
+++ b/src/gallium/state_trackers/egl/wayland/native_drm.c
@@ -271,7 +271,7 @@ wayland_drm_display_bind_wayland_display(struct native_display *ndpy,
 
    drmdpy->wl_server_drm =
       wayland_drm_init(wl_dpy, drmdpy->device_name,
-                       &wl_drm_callbacks, ndpy);
+                       &wl_drm_callbacks, ndpy, 0);
 
    if (!drmdpy->wl_server_drm)
       return FALSE;

diff --git a/src/gallium/state_trackers/egl/x11/native_dri2.c b/src/gallium/state_trackers/egl/x11/native_dri2.c
index a989f9e..fc18a4c 100644 (file)
--- a/src/gallium/state_trackers/egl/x11/native_dri2.c
+++ b/src/gallium/state_trackers/egl/x11/native_dri2.c
@@ -861,7 +861,7 @@ dri2_display_bind_wayland_display(struct native_display *ndpy,
 
    dri2dpy->wl_server_drm = wayland_drm_init(wl_dpy,
          x11_screen_get_device_name(dri2dpy->xscr),
-         &wl_drm_callbacks, ndpy);
+         &wl_drm_callbacks, ndpy, 0);
 
    if (!dri2dpy->wl_server_drm)
       return FALSE;