xserver: Branch 'master' - 2 commits

[Adam Jackson]

 glamor/glamor.h     |    3 +--
 hw/xwayland/drm.xml |   35 +++++++++++++++++++----------------
 2 files changed, 20 insertions(+), 18 deletions(-)

New commits:
commit 05a4396f08c83d9261b8ad16908d9e2730bd4bbf
Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Thu Jun 29 02:17:06 2017 +0100

    glamor: update "required EGL extensions" comment
    
    The extensions listed have not been needed in a while. Replace with the
    only remaining requirement.
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

diff --git a/glamor/glamor.h b/glamor/glamor.h
index 4ad28df17..5b15a46e5 100644
--- a/glamor/glamor.h
+++ b/glamor/glamor.h
@@ -155,8 +155,7 @@ extern _X_EXPORT struct gbm_device *glamor_egl_get_gbm_device(ScreenPtr screen);
  *
  * The EGL layer needs to have the following extensions working:
  *
- * .EGL_KHR_gl_texture_2D_image
- * .EGL_EXT_image_dma_buf_import
+ * .EGL_KHR_surfaceless_context
  * */
 extern _X_EXPORT Bool glamor_supports_pixmap_import_export(ScreenPtr screen);
 
commit 04511a0476b5c860e7d157b01080dff94d935f74
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Jun 29 10:32:00 2017 -0400

    wayland: Sync drm.xml with Mesa
    
    ... where it is named src/egl/wayland/wayland-drm/wayland-drm.xml and
    has its requests sorted by protocol version number, avoiding a warning
    from wayland-scanner.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Daniel Stone <daniels at collabora.com>

diff --git a/hw/xwayland/drm.xml b/hw/xwayland/drm.xml
index 8a3ad69b2..5e64622df 100644
--- a/hw/xwayland/drm.xml
+++ b/hw/xwayland/drm.xml
@@ -135,22 +135,6 @@
       <arg name="stride2" type="int"/>
     </request>
 
-    <!-- Create a wayland buffer for the prime fd.  Use for regular and planar
-         buffers.  Pass 0 for offset and stride for unused planes. -->
-    <request name="create_prime_buffer" since="2">
-      <arg name="id" type="new_id" interface="wl_buffer"/>
-      <arg name="name" type="fd"/>
-      <arg name="width" type="int"/>
-      <arg name="height" type="int"/>
-      <arg name="format" type="uint"/>
-      <arg name="offset0" type="int"/>
-      <arg name="stride0" type="int"/>
-      <arg name="offset1" type="int"/>
-      <arg name="stride1" type="int"/>
-      <arg name="offset2" type="int"/>
-      <arg name="stride2" type="int"/>
-    </request>
-
     <!-- Notification of the path of the drm device which is used by
          the server.  The client should use this device for creating
          local buffers.  Only buffers created from this device should
@@ -177,6 +161,25 @@
     <event name="capabilities">
       <arg name="value" type="uint"/>
     </event>
+
+    <!-- Version 2 additions -->
+
+    <!-- Create a wayland buffer for the prime fd.  Use for regular and planar
+         buffers.  Pass 0 for offset and stride for unused planes. -->
+    <request name="create_prime_buffer" since="2">
+      <arg name="id" type="new_id" interface="wl_buffer"/>
+      <arg name="name" type="fd"/>
+      <arg name="width" type="int"/>
+      <arg name="height" type="int"/>
+      <arg name="format" type="uint"/>
+      <arg name="offset0" type="int"/>
+      <arg name="stride0" type="int"/>
+      <arg name="offset1" type="int"/>
+      <arg name="stride1" type="int"/>
+      <arg name="offset2" type="int"/>
+      <arg name="stride2" type="int"/>
+    </request>
+
   </interface>
 
 </protocol>