diff options
author | marha <marha@users.sourceforge.net> | 2013-09-18 08:09:44 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-09-18 08:09:44 +0200 |
commit | 09bfe74fc7d4a6f97eddb034df371e66e314ea12 (patch) | |
tree | b63caf666a8c36ddcc9a4202f7cecac49998e98d /mesalib/docs | |
parent | 5a54fa6e45ee10cf58ee1b6d2eb5522a24bb8745 (diff) | |
parent | 7f669a708bd35bdf8e842f762ec68f9ad0ec0486 (diff) | |
download | vcxsrv-09bfe74fc7d4a6f97eddb034df371e66e314ea12.tar.gz vcxsrv-09bfe74fc7d4a6f97eddb034df371e66e314ea12.tar.bz2 vcxsrv-09bfe74fc7d4a6f97eddb034df371e66e314ea12.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa pixman xserver git update 18 Sep 2013
Conflicts:
pixman/pixman/pixman-sse2.c
Diffstat (limited to 'mesalib/docs')
-rw-r--r-- | mesalib/docs/specs/EXT_shader_integer_mix.spec (renamed from mesalib/docs/specs/MESA_shader_integer_mix.spec) | 19 | ||||
-rw-r--r-- | mesalib/docs/specs/WL_bind_wayland_display.spec | 18 |
2 files changed, 29 insertions, 8 deletions
diff --git a/mesalib/docs/specs/MESA_shader_integer_mix.spec b/mesalib/docs/specs/EXT_shader_integer_mix.spec index d381ddd43..92cec64dc 100644 --- a/mesalib/docs/specs/MESA_shader_integer_mix.spec +++ b/mesalib/docs/specs/EXT_shader_integer_mix.spec @@ -1,10 +1,10 @@ Name - MESA_shader_integer_mix + EXT_shader_integer_mix Name Strings - GL_MESA_shader_integer_mix + GL_EXT_shader_integer_mix Contact @@ -21,12 +21,12 @@ Status Version - Last Modified Date: 09/09/2013 - Author Revision: 5 + Last Modified Date: 09/12/2013 + Author Revision: 6 Number - + TBD Dependencies @@ -78,18 +78,18 @@ Modifications to The OpenGL Shading Language Specification, Version 4.40 Including the following line in a shader can be used to control the language features described in this extension: - #extension GL_MESA_shader_integer_mix : <behavior> + #extension GL_EXT_shader_integer_mix : <behavior> where <behavior> is as specified in section 3.3. New preprocessor #defines are added to the OpenGL Shading Language: - #define GL_MESA_shader_integer_mix 1 + #define GL_EXT_shader_integer_mix 1 Interactions with ARB_ES3_compatibility On desktop implementations that support ARB_ES3_compatibility, - GL_MESA_shader_integer_mix can be enabled (and the new functions + GL_EXT_shader_integer_mix can be enabled (and the new functions used) in shaders declared with '#version 300 es'. GLX Protocol @@ -124,6 +124,9 @@ Revision History Rev. Date Author Changes ---- -------- -------- --------------------------------------------- + 6 09/12/2013 idr After discussions in Khronos, change vendor + prefix to EXT. + 5 09/09/2013 idr Add ARB_ES3_compatibility interaction. 4 09/06/2013 mattst88 Allow extension on OpenGL ES 3.0. 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. |