svn merge ^/branches/released .

1 files changed, 11 insertions, 7 deletions

diff --git a/mesalib/docs/MESA_drm_image.spec b/mesalib/docs/MESA_drm_image.spec
index 76de3f8b6..fa1e32e06 100644
--- a/mesalib/docs/MESA_drm_image.spec
+++ b/mesalib/docs/MESA_drm_image.spec
@@ -66,6 +66,7 @@ New Tokens
 

         EGL_DRM_BUFFER_USE_SCANOUT_MESA		0x0001

         EGL_DRM_BUFFER_USE_SHARE_MESA		0x0002

+        EGL_DRM_BUFFER_USE_CURSOR_MESA		0x0004

 

     Accepted in the <target> parameter of eglCreateImageKHR:

 

@@ -89,13 +90,16 @@ Additions to the EGL 1.4 Specification:
     extension is EGL_DRM_BUFFER_FORMAT_ARGB32_MESA, where each pixel

     is a CPU-endian, 32-bit quantity, with alpha in the upper 8 bits,

     then red, then green, then blue.  The bit values accepted by

-    EGL_DRM_BUFFER_USE_MESA are EGL_DRM_BUFFER_USE_SCANOUT_MESA and

-    EGL_DRM_BUFFER_USE_SHARE_MESA.  EGL_DRM_BUFFER_USE_SCANOUT_MESA

-    requests that the created EGLImage should be usable as a scanout

-    buffer with the DRM kernel modesetting API.  The

-    EGL_DRM_BUFFER_USE_SHARE_MESA bit requests that the EGLImage can

-    be shared with other processes by passing the underlying DRM

-    buffer name.

+    EGL_DRM_BUFFER_USE_MESA are EGL_DRM_BUFFER_USE_SCANOUT_MESA,

+    EGL_DRM_BUFFER_USE_SHARE_MESA and EGL_DRM_BUFFER_USE_CURSOR_MESA.

+    EGL_DRM_BUFFER_USE_SCANOUT_MESA requests that the created EGLImage

+    should be usable as a scanout buffer with the DRM kernel

+    modesetting API.  EGL_DRM_BUFFER_USE_SHARE_MESA requests that the

+    EGLImage can be shared with other processes by passing the

+    underlying DRM buffer name.  EGL_DRM_BUFFER_USE_CURSOR_MESA

+    requests that the image must be usable as a cursor with KMS.  When

+    EGL_DRM_BUFFER_USE_CURSOR_MESA is set, width and height must both

+    be 64.

 

     To create a process local handle or a global DRM name for a

     buffer, call