On 07/18/2013 02:11 PM, Ander Conselvan de Oliveira wrote: > Hi, > > Wayland 1.2 server API changed a little bit. The change that affects > mesa the most is the deprecation of struct wl_buffer. This series > updates all EGL code to use the new API. > > The motivation for the first patch was to split the usage of server and > client API in the same source file in gallium egl. Even though struct > wl_buffer is deprecated on the server side, occurences of it on the > client side are still valid, but due to the mix of APIs that would > cause warnings. In the process of doing that some code duplication is > removed. > > Cheers, > Ander > > Ander Conselvan de Oliveira (3): > gallium-egl: Simplify native_wayland_drm_bufmgr_helper interface > gallium-egl: Don't add a listener for wl_drm twice in wayland platform > egl: Update to Wayland 1.2 server API > > docs/specs/WL_bind_wayland_display.spec | 8 +- > include/EGL/eglmesaext.h | 6 +- > src/egl/drivers/dri2/egl_dri2.c | 28 ++- > src/egl/drivers/dri2/egl_dri2.h | 1 - > src/egl/main/eglapi.c | 2 +- > src/egl/main/eglapi.h | 2 +- > src/egl/wayland/wayland-drm/wayland-drm.c | 66 +++--- > src/egl/wayland/wayland-drm/wayland-drm.h | 13 +- > src/gallium/state_trackers/egl/Makefile.am | 2 +- > .../state_trackers/egl/common/egl_g3d_api.c | 2 +- > .../state_trackers/egl/common/egl_g3d_image.c | 4 +- > src/gallium/state_trackers/egl/common/native.h | 2 +- > .../egl/common/native_wayland_bufmgr.h | 6 +- > .../egl/common/native_wayland_drm_bufmgr.c | 221 > +++++++++++++++++++++ > .../egl/common/native_wayland_drm_bufmgr.h | 37 ++++ > .../egl/common/native_wayland_drm_bufmgr_helper.c | 106 ---------- > .../egl/common/native_wayland_drm_bufmgr_helper.h | 47 ----- > src/gallium/state_trackers/egl/drm/native_drm.c | 52 +---- > src/gallium/state_trackers/egl/drm/native_drm.h | 2 +- > .../state_trackers/egl/wayland/native_drm.c | 94 +++------ > src/gallium/state_trackers/egl/x11/native_dri2.c | 87 +++----- > src/gbm/backends/dri/gbm_dri.c | 5 +- > 22 files changed, 395 insertions(+), 398 deletions(-) > create mode 100644 > src/gallium/state_trackers/egl/common/native_wayland_drm_bufmgr.c > create mode 100644 > src/gallium/state_trackers/egl/common/native_wayland_drm_bufmgr.h > delete mode 100644 > src/gallium/state_trackers/egl/common/native_wayland_drm_bufmgr_helper.c > delete mode 100644 > src/gallium/state_trackers/egl/common/native_wayland_drm_bufmgr_helper.h >
patches break my multilib build (without wayland) CC x11/native_x11.lo x11/native_dri2.c: In function 'dri2_display_destroy': x11/native_dri2.c:760:4: error: implicit declaration of function 'wayland_drm_bufmgr_destroy' [-Werror=implicit-function-declaration] wayland_drm_bufmgr_destroy(ndpy->wayland_bufmgr); ^ cc1: some warnings being treated as errors make[3]: *** [x11/native_dri2.lo] Error 1 make[3]: *** Waiting for unfinished jobs.... _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev