Merge remote-tracking branch 'origin/released'

* origin/released:
  libX11 mesa pixman xserver git update 18 Sep 2013

Conflicts:
	pixman/pixman/pixman-sse2.c

1 files changed, 18 insertions, 0 deletions

diff --git a/mesalib/docs/specs/WL_bind_wayland_display.spec b/mesalib/docs/specs/WL_bind_wayland_display.spec
index 8f0083c24..4057b4e4b 100644
--- a/mesalib/docs/specs/WL_bind_wayland_display.spec
+++ b/mesalib/docs/specs/WL_bind_wayland_display.spec
@@ -76,6 +76,11 @@ New Tokens
         EGL_TEXTURE_Y_UV_WL                     0x31D8
         EGL_TEXTURE_Y_XUXV_WL                   0x31D9
 
+    Accepted in the <attribute> parameter of eglQueryWaylandBufferWL:
+
+        EGL_TEXTURE_FORMAT                      0x3080
+        EGL_WAYLAND_Y_INVERTED_WL               0x31DB
+
 
 Additions to the EGL 1.4 Specification:
 
@@ -157,6 +162,16 @@ Additions to the EGL 1.4 Specification:
     Further, eglQueryWaylandBufferWL accepts attributes EGL_WIDTH and
     EGL_HEIGHT to query the width and height of the wl_buffer.
 
+    Also, eglQueryWaylandBufferWL may accept
+    EGL_WAYLAND_Y_INVERTED_WL attribute to query orientation of
+    wl_buffer. If EGL_WAYLAND_Y_INVERTED_WL is supported
+    eglQueryWaylandBufferWL returns EGL_TRUE and value is a boolean
+    that tells if wl_buffer is y-inverted or not. If
+    EGL_WAYLAND_Y_INVERTED_WL is not supported
+    eglQueryWaylandBufferWL returns EGL_FALSE, in that case
+    wl_buffer should be treated as if value of
+    EGL_WAYLAND_Y_INVERTED_WL was EGL_TRUE.
+
 Issues
 
 Revision History
@@ -177,3 +192,6 @@ Revision History
         Change eglQueryWaylandBufferWL to take a resource pointer to the
         buffer instead of a pointer to a struct wl_buffer, as the latter has
         been deprecated. (Ander Conselvan de Oliveira)
+    Version 6, September 16, 2013
+        Add EGL_WAYLAND_Y_INVERTED_WL attribute to allow specifying
+        wl_buffer's orientation.