diff options
| author | Xiaowei Guan <xiaowei.guan@samsung.com> | 2019-04-12 15:40:25 +0800 |
|---|---|---|
| committer | Xuelian Bai <xuelian.bai@samsung.com> | 2019-04-19 02:57:21 +0800 |
| commit | 7c8922c1ead5875fda90106793c2fcfab2feb9f3 (patch) | |
| tree | e7a4844c93d2fd55018d19d4810e902fec4da866 | |
| parent | 1b183aa38cfa2f8ab842ebec7e51b7d347d0eebf (diff) | |
| download | mesa-7c8922c1ead5875fda90106793c2fcfab2feb9f3.tar.gz mesa-7c8922c1ead5875fda90106793c2fcfab2feb9f3.tar.bz2 mesa-7c8922c1ead5875fda90106793c2fcfab2feb9f3.zip | |
fix weston build error and app launch error
Change-Id: Iaf3a47f399d5a13fd8e9f1996ee29c3f062ee270
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/egl/drivers/dri2/platform_wayland.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index dcee3e24d58..ebcdc3eb20e 100644 --- a/configure.ac +++ b/configure.ac @@ -1849,9 +1849,9 @@ for plat in $platforms; do PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >= $WAYLAND_REQUIRED]) PKG_CHECK_MODULES([WAYLAND_SERVER], [wayland-server >= $WAYLAND_REQUIRED]) PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED]) - if test "x$enable_egl" = xyes; then - PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl-backend >= $WAYLAND_EGL_BACKEND_REQUIRED]) - fi + #if test "x$enable_egl" = xyes; then + # PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl-backend >= $WAYLAND_EGL_BACKEND_REQUIRED]) + #fi WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index 3025e34ba63..0064f827ef8 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -45,7 +45,8 @@ #include "util/u_vector.h" #include "eglglobals.h" -#include <wayland-egl-backend.h> +//include <wayland-egl-backend.h> +#include <wayland-egl-priv.h> #include <wayland-client.h> #include "wayland-drm-client-protocol.h" #include "linux-dmabuf-unstable-v1-client-protocol.h" @@ -344,7 +345,7 @@ dri2_wl_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, dri2_surf->wl_queue); dri2_surf->wl_win = window; - dri2_surf->wl_win->driver_private = dri2_surf; + dri2_surf->wl_win->private = dri2_surf; dri2_surf->wl_win->destroy_window_callback = destroy_window_callback; if (dri2_dpy->flush) dri2_surf->wl_win->resize_callback = resize_callback; @@ -430,7 +431,7 @@ dri2_wl_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) wl_callback_destroy(dri2_surf->throttle_callback); if (dri2_surf->wl_win) { - dri2_surf->wl_win->driver_private = NULL; + dri2_surf->wl_win->private = NULL; dri2_surf->wl_win->resize_callback = NULL; dri2_surf->wl_win->destroy_window_callback = NULL; } |