svn merge ^/branches/released .

3 files changed, 17 insertions, 8 deletions

diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt
index d57d56366..fbdeaad17 100644
--- a/mesalib/docs/GL3.txt
+++ b/mesalib/docs/GL3.txt
@@ -65,7 +65,7 @@ BGRA vertex order (GL_ARB_vertex_array_bgra)          DONE
 Base vertex offset(GL_ARB_draw_elements_base_vertex)  DONE

 Frag shader coord (GL_ARB_fragment_coord_conventions) DONE (swrast, gallium)

 Provoking vertex (GL_ARB_provoking_vertex)            DONE

-Seamless cubemaps (GL_ARB_seamless_cube_map)          DONE, mostly?

+Seamless cubemaps (GL_ARB_seamless_cube_map)          DONE

 Multisample textures (GL_ARB_texture_multisample)     not started

 Frag depth clamp (GL_ARB_depth_clamp)                 DONE

 Fence objects (GL_ARB_sync)                           DONE

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

diff --git a/mesalib/docs/relnotes-7.11.html b/mesalib/docs/relnotes-7.11.html
index 6951984bd..898958705 100644
--- a/mesalib/docs/relnotes-7.11.html
+++ b/mesalib/docs/relnotes-7.11.html
@@ -44,6 +44,8 @@ tbd
 <li>GL_ARB_occlusion_query2 (gallium drivers, swrast)

 <li>GL_ARB_robustness (all drivers)

 <li>GL_ARB_sampler_objects (gallium drivers)

+<li>GL_ARB_seamless_cube_map (gallium r600)

+<li>GL_ARB_sync (gallium drivers only, intel support was in 7.6)

 <li>GL_ARB_texture_compression_rgtc (gallium drivers, swrast, i965)

 <li>GL_ARB_texture_float (gallium, i965)

 <li>GL_EXT_packed_float (gallium r600)

@@ -52,6 +54,9 @@ tbd
 <li>GL_EXT_texture_shared_exponent (gallium drivers, swrast)

 <li>GL_EXT_texture_sRGB_decode (gallium drivers, swrast, i965)

 <li>GL_EXT_texture_snorm (gallium drivers)

+<li>GL_AMD_draw_buffers_blend (alias of the ARB variant)

+<li>GL_AMD_seamless_cubemap_per_texture (gallium r600)

+<li>GL_AMD_shader_stencil_export (alias of the ARB variant)

 <li>GL_ATI_draw_buffers (all drivers)

 <li>GL_ATI_texture_compression_3dc (gallium drivers, swrast)

 <li>GL_ATI_texture_float (gallium, i965)