- updated to 9.2.4

[packages/Mesa.git] / 0001-gallium-egl-Simplify-native_wayland_drm_bufmgr_helpe.patch

diff --git a/0001-gallium-egl-Simplify-native_wayland_drm_bufmgr_helpe.patch b/0001-gallium-egl-Simplify-native_wayland_drm_bufmgr_helpe.patch
index 134c417b067d2fef60549c05e8b0dcab6a54b719..bd283111f55c8bd0171ad7b4f13ee818c35a4f7f 100644 (file)
--- a/0001-gallium-egl-Simplify-native_wayland_drm_bufmgr_helpe.patch
+++ b/0001-gallium-egl-Simplify-native_wayland_drm_bufmgr_helpe.patch
@@ -60,9 +60,9 @@ index 431bd3f..797933d 100644
     const struct native_display_modeset *modeset;
 -   const struct native_display_wayland_bufmgr *wayland_bufmgr;
 +   struct native_display_wayland_bufmgr *wayland_bufmgr;
- };
  
- /**
+ #ifdef HAVE_WAYLAND_BACKEND
+    struct wl_drm *wl_server_drm; /* for EGL_WL_bind_wayland_display */
 diff --git a/src/gallium/state_trackers/egl/common/native_wayland_drm_bufmgr.c b/src/gallium/state_trackers/egl/common/native_wayland_drm_bufmgr.c
 new file mode 100644
 index 0000000..1603a3a
@@ -221,7 +221,7 @@ index 0000000..1603a3a
 +   struct wl_drm_buffer *buffer = (struct wl_drm_buffer *) _buffer;
 +   struct pipe_resource *resource = buffer->driver_buffer;
 +
-+   if (!wayland_buffer_is_drm(&buffer->buffer))
++   if (!wayland_buffer_is_drm(wayland_drm_bufmgr(ndpy->wayland_bufmgr)->wl_server_drm, &buffer->buffer))
 +      return EGL_FALSE;
 +
 +   switch (attribute) {
@@ -410,7 +410,7 @@ index a9e7342..0000000
 -   struct wl_drm_buffer *buffer = (struct wl_drm_buffer *) _buffer;
 -   struct pipe_resource *resource = buffer->driver_buffer;
 -
--   if (!wayland_buffer_is_drm(&buffer->buffer))
+-   if (!wayland_buffer_is_drm(ndpy->wl_server_drm, &buffer->buffer))
 -      return EGL_FALSE;
 -
 -   switch (attribute) {
@@ -441,6 +441,15 @@ diff --git a/src/gallium/state_trackers/egl/drm/native_drm.c b/src/gallium/state
 index 03bfdda..88ac490 100644
 --- a/src/gallium/state_trackers/egl/drm/native_drm.c
 +++ b/src/gallium/state_trackers/egl/drm/native_drm.c
+@@ -40,7 +40,7 @@
+ #endif
+ 
+ #ifdef HAVE_WAYLAND_BACKEND
+-#include "common/native_wayland_drm_bufmgr_helper.h"
++#include "common/native_wayland_drm_bufmgr.h"
+ #endif
+ 
+ static boolean
 @@ -132,6 +132,8 @@ drm_display_destroy(struct native_display *ndpy)
  
     FREE(drmdpy->device_name);
@@ -450,7 +459,7 @@ index 03bfdda..88ac490 100644
     if (drmdpy->own_gbm) {
        gbm_device_destroy(&drmdpy->gbmdrm->base.base);
        if (drmdpy->fd >= 0)
-@@ -195,53 +197,6 @@ drm_display_authenticate(void *user_data, uint32_t magic)
+@@ -195,51 +197,6 @@ drm_display_authenticate(void *user_data, uint32_t magic)
     return drmAuthMagic(drmdpy->fd, magic);
  }
  
@@ -466,14 +475,14 @@ index 03bfdda..88ac490 100644
 -{
 -   struct drm_display *drmdpy = drm_display(ndpy);
 -
--   if (drmdpy->wl_server_drm)
+-   if (ndpy->wl_server_drm)
 -      return FALSE;
 -
--   drmdpy->wl_server_drm = wayland_drm_init(wl_dpy,
+-   ndpy->wl_server_drm = wayland_drm_init(wl_dpy,
 -         drmdpy->device_name,
 -         &wl_drm_callbacks, ndpy, 0);
 -
--   if (!drmdpy->wl_server_drm)
+-   if (!ndpy->wl_server_drm)
 -      return FALSE;
 -   
 -   return TRUE;
@@ -483,13 +492,11 @@ index 03bfdda..88ac490 100644
 -drm_display_unbind_wayland_display(struct native_display *ndpy,
 -                                    struct wl_display *wl_dpy)
 -{
--   struct drm_display *drmdpy = drm_display(ndpy);
--
--   if (!drmdpy->wl_server_drm)
+-   if (!ndpy->wl_server_drm)
 -      return FALSE;
 -
--   wayland_drm_uninit(drmdpy->wl_server_drm);
--   drmdpy->wl_server_drm = NULL;
+-   wayland_drm_uninit(ndpy->wl_server_drm);
+-   ndpy->wl_server_drm = NULL;
 -
 -   return TRUE;
 -}
@@ -514,19 +521,19 @@ index 03bfdda..88ac490 100644
  #endif
     drm_display_init_modeset(&drmdpy->base);
  
-diff --git a/src/gallium/state_trackers/egl/drm/native_drm.h b/src/gallium/state_trackers/egl/drm/native_drm.h
-index 16a4251..2c015b2 100644
---- a/src/gallium/state_trackers/egl/drm/native_drm.h
-+++ b/src/gallium/state_trackers/egl/drm/native_drm.h
-@@ -37,7 +37,7 @@
- #include "common/native_helper.h"
- 
- #ifdef HAVE_WAYLAND_BACKEND
--#include "common/native_wayland_drm_bufmgr_helper.h"
-+#include "common/native_wayland_drm_bufmgr.h"
- #endif
- 
- #include "gbm_gallium_drmint.h"
+#diff --git a/src/gallium/state_trackers/egl/drm/native_drm.h b/src/gallium/state_trackers/egl/drm/native_drm.h
+#index 16a4251..2c015b2 100644
+#--- a/src/gallium/state_trackers/egl/drm/native_drm.h
+#+++ b/src/gallium/state_trackers/egl/drm/native_drm.h
+#@@ -37,7 +37,7 @@
+# #include "common/native_helper.h"
+# 
+# #ifdef HAVE_WAYLAND_BACKEND
+#-#include "common/native_wayland_drm_bufmgr_helper.h"
+#+#include "common/native_wayland_drm_bufmgr.h"
+# #endif
+# 
+# #include "gbm_gallium_drmint.h"
 diff --git a/src/gallium/state_trackers/egl/wayland/native_drm.c b/src/gallium/state_trackers/egl/wayland/native_drm.c
 index fc8aac7..a4bcdd8 100644
 --- a/src/gallium/state_trackers/egl/wayland/native_drm.c
@@ -629,7 +636,7 @@ index fc8aac7..a4bcdd8 100644
 -   if (drmdpy->wl_server_drm)
 -      return FALSE;
 -
--   drmdpy->wl_server_drm =
+-   ndpy->wl_server_drm =
 -      wayland_drm_init(wl_dpy, drmdpy->device_name,
 -                       &wl_drm_callbacks, ndpy, 0);
 -
@@ -759,7 +766,7 @@ index 053044a..3d08863 100644
 -   if (dri2dpy->wl_server_drm)
 -      return FALSE;
 -
--   dri2dpy->wl_server_drm = wayland_drm_init(wl_dpy,
+-   ndpy->wl_server_drm = wayland_drm_init(wl_dpy,
 -         x11_screen_get_device_name(dri2dpy->xscr),
 -         &wl_drm_callbacks, ndpy, 0);
 -