diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/egl/Makefile.am | 3 | ||||
| -rw-r--r-- | src/egl/drivers/dri2/platform_wayland.c | 7 | ||||
| -rw-r--r-- | src/egl/meson.build | 10 | ||||
| -rw-r--r-- | src/gallium/state_trackers/omx/tizonia/Makefile.am | 2 |
5 files changed, 8 insertions, 19 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index fd5ae445502..9bb3bce3c07 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -95,11 +95,6 @@ if HAVE_GBM SUBDIRS += gbm endif -## Optionally required by EGL -if HAVE_PLATFORM_WAYLAND -SUBDIRS += egl/wayland/wayland-egl -endif - if HAVE_EGL SUBDIRS += egl endif diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am index 086a4a1e630..be3547d968f 100644 --- a/src/egl/Makefile.am +++ b/src/egl/Makefile.am @@ -84,6 +84,8 @@ drivers/dri2/egl_dri2.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol. AM_CFLAGS += $(WAYLAND_CLIENT_CFLAGS) libEGL_common_la_LIBADD += $(WAYLAND_CLIENT_LIBS) libEGL_common_la_LIBADD += $(LIBDRM_LIBS) +AM_CFLAGS += $(WAYLAND_EGL_CFLAGS) +libEGL_common_la_LIBADD += $(WAYLAND_EGL_LIBS) AM_CFLAGS += $(WAYLAND_SERVER_CFLAGS) libEGL_common_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la libEGL_common_la_LIBADD += $(WAYLAND_SERVER_LIBS) @@ -114,7 +116,6 @@ AM_CFLAGS += \ -I$(top_builddir)/src/egl/drivers/dri2 \ -I$(top_srcdir)/src/egl/drivers/dri2 \ -I$(top_srcdir)/src/gbm/backends/dri \ - -I$(top_srcdir)/src/egl/wayland/wayland-egl \ -I$(top_builddir)/src/egl/wayland/wayland-drm \ -I$(top_srcdir)/src/egl/wayland/wayland-drm \ -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \ diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index 63da21cdf55..11026f9fbf4 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -45,12 +45,11 @@ #include "util/u_vector.h" #include "eglglobals.h" +#include <wayland-egl-backend.h> #include <wayland-client.h> #include "wayland-drm-client-protocol.h" #include "linux-dmabuf-unstable-v1-client-protocol.h" -#include "wayland/wayland-egl/wayland-egl-backend.h" - #ifndef DRM_FORMAT_MOD_INVALID #define DRM_FORMAT_MOD_INVALID ((1ULL << 56) - 1) #endif @@ -298,7 +297,7 @@ dri2_wl_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, dri2_surf->wl_queue); dri2_surf->wl_win = window; - dri2_surf->wl_win->private = dri2_surf; + dri2_surf->wl_win->driver_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; @@ -384,7 +383,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->private = NULL; + dri2_surf->wl_win->driver_private = NULL; dri2_surf->wl_win->resize_callback = NULL; dri2_surf->wl_win->destroy_window_callback = NULL; } diff --git a/src/egl/meson.build b/src/egl/meson.build index 9050d763a6c..dc67b7b1536 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -116,7 +116,7 @@ if with_platform_surfaceless files_egl += files('drivers/dri2/platform_surfaceless.c') endif if with_platform_wayland - deps_for_egl += [dep_wayland_client, dep_wayland_server] + deps_for_egl += [dep_wayland_client, dep_wayland_server, dep_wayland_egl] link_for_egl += libwayland_drm files_egl += files('drivers/dri2/platform_wayland.c') files_egl += [ @@ -124,9 +124,7 @@ if with_platform_wayland linux_dmabuf_unstable_v1_client_protocol_h, wayland_drm_client_protocol_h, ] - incs_for_egl += include_directories( - 'wayland/wayland-egl', 'wayland/wayland-drm', - ) + incs_for_egl += include_directories('wayland/wayland-drm') endif if with_platform_android deps_for_egl += dep_android @@ -198,10 +196,6 @@ pkg.generate( extra_cflags : gl_pkgconfig_c_flags, ) -if with_platform_wayland - subdir('wayland/wayland-egl') -endif - if with_tests if with_glvnd # TODO: add glvnd symbol check diff --git a/src/gallium/state_trackers/omx/tizonia/Makefile.am b/src/gallium/state_trackers/omx/tizonia/Makefile.am index 0eac85a319e..ac72affa326 100644 --- a/src/gallium/state_trackers/omx/tizonia/Makefile.am +++ b/src/gallium/state_trackers/omx/tizonia/Makefile.am @@ -29,7 +29,6 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/egl \ -I$(top_srcdir)/src/egl/drivers/dri2 \ - -I$(top_srcdir)/src/egl/wayland/wayland-egl \ -I$(top_srcdir)/src/egl/main \ -I$(top_srcdir)/src/gbm/main \ -I$(top_srcdir)/src/loader \ @@ -38,6 +37,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/gallium/state_trackers/omx \ $(GALLIUM_CFLAGS) \ $(LIBDRM_CFLAGS) \ + $(WAYLAND_EGL_CFLAGS) \ $(VISIBILITY_CFLAGS) \ $(VL_CFLAGS) \ $(XCB_DRI3_CFLAGS) \ |