From 7f669a708bd35bdf8e842f762ec68f9ad0ec0486 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 18 Sep 2013 08:03:04 +0200 Subject: libX11 mesa pixman xserver git update 18 Sep 2013 xserver commit 8010d3a48bd0b224dcb0883e39c2351ad364d846 libX11 commit 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b pixman commit 58a79dfe6d1fd62c2b66c69fdb64f6b8ecf61da5 mesa commit a3b51a22f71819236baa6bbda9d0d050914b149d --- mesalib/docs/specs/EXT_shader_integer_mix.spec | 138 ++++++++++++++++++++++++ mesalib/docs/specs/MESA_shader_integer_mix.spec | 135 ----------------------- mesalib/docs/specs/WL_bind_wayland_display.spec | 18 ++++ 3 files changed, 156 insertions(+), 135 deletions(-) create mode 100644 mesalib/docs/specs/EXT_shader_integer_mix.spec delete mode 100644 mesalib/docs/specs/MESA_shader_integer_mix.spec (limited to 'mesalib/docs') diff --git a/mesalib/docs/specs/EXT_shader_integer_mix.spec b/mesalib/docs/specs/EXT_shader_integer_mix.spec new file mode 100644 index 000000000..92cec64dc --- /dev/null +++ b/mesalib/docs/specs/EXT_shader_integer_mix.spec @@ -0,0 +1,138 @@ +Name + + EXT_shader_integer_mix + +Name Strings + + GL_EXT_shader_integer_mix + +Contact + + Matt Turner (matt.turner 'at' intel.com) + +Contributors + + Matt Turner, Intel + Ian Romanick, Intel + +Status + + Shipping + +Version + + Last Modified Date: 09/12/2013 + Author Revision: 6 + +Number + + TBD + +Dependencies + + OpenGL 3.0 or OpenGL ES 3.0 is required. This extension interacts with + GL_ARB_ES3_compatibility. + + This extension is written against the OpenGL 4.4 (core) specification + and the GLSL 4.40 specification. + +Overview + + GLSL 1.30 (and GLSL ES 3.00) expanded the mix() built-in function to + operate on a boolean third argument that does not interpolate but + selects. This extension extends mix() to select between int, uint, + and bool components. + +New Procedures and Functions + + None. + +New Tokens + + None. + +Additions to Chapter 8 of the GLSL 4.40 Specification (Built-in Functions) + + Modify Section 8.3, Common Functions + + Additions to the table listing common built-in functions: + + Syntax Description + --------------------------- -------------------------------------------------- + genIType mix(genIType x, Selects which vector each returned component comes + genIType y, from. For a component of a that is false, the + genBType a) corresponding component of x is returned. For a + genUType mix(genUType x, component of a that is true, the corresponding + genUType y, component of y is returned. + genBType a) + genBType mix(genBType x, + genBType y, + genBType a) + +Additions to the AGL/GLX/WGL Specifications + + None. + +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_EXT_shader_integer_mix : + + where is as specified in section 3.3. + + New preprocessor #defines are added to the OpenGL Shading Language: + + #define GL_EXT_shader_integer_mix 1 + +Interactions with ARB_ES3_compatibility + + On desktop implementations that support ARB_ES3_compatibility, + GL_EXT_shader_integer_mix can be enabled (and the new functions + used) in shaders declared with '#version 300 es'. + +GLX Protocol + + None. + +Errors + + None. + +New State + + None. + +New Implementation Dependent State + + None. + +Issues + + 1) Should we allow linear interpolation of integers via a non-boolean + third component? + + RESOLVED: No. + + 2) Should we allow mix() to select between boolean components? + + RESOLVED: Yes. Implementing the same functionality using casts would be + possible but ugly. + +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. + + 3 08/28/2013 mattst88 Add #extension/#define changes. + + 2 08/26/2013 mattst88 Change vendor prefix to MESA. Add mix() that + selects between boolean components. + 1 08/26/2013 mattst88 Initial revision diff --git a/mesalib/docs/specs/MESA_shader_integer_mix.spec b/mesalib/docs/specs/MESA_shader_integer_mix.spec deleted file mode 100644 index d381ddd43..000000000 --- a/mesalib/docs/specs/MESA_shader_integer_mix.spec +++ /dev/null @@ -1,135 +0,0 @@ -Name - - MESA_shader_integer_mix - -Name Strings - - GL_MESA_shader_integer_mix - -Contact - - Matt Turner (matt.turner 'at' intel.com) - -Contributors - - Matt Turner, Intel - Ian Romanick, Intel - -Status - - Shipping - -Version - - Last Modified Date: 09/09/2013 - Author Revision: 5 - -Number - - - -Dependencies - - OpenGL 3.0 or OpenGL ES 3.0 is required. This extension interacts with - GL_ARB_ES3_compatibility. - - This extension is written against the OpenGL 4.4 (core) specification - and the GLSL 4.40 specification. - -Overview - - GLSL 1.30 (and GLSL ES 3.00) expanded the mix() built-in function to - operate on a boolean third argument that does not interpolate but - selects. This extension extends mix() to select between int, uint, - and bool components. - -New Procedures and Functions - - None. - -New Tokens - - None. - -Additions to Chapter 8 of the GLSL 4.40 Specification (Built-in Functions) - - Modify Section 8.3, Common Functions - - Additions to the table listing common built-in functions: - - Syntax Description - --------------------------- -------------------------------------------------- - genIType mix(genIType x, Selects which vector each returned component comes - genIType y, from. For a component of a that is false, the - genBType a) corresponding component of x is returned. For a - genUType mix(genUType x, component of a that is true, the corresponding - genUType y, component of y is returned. - genBType a) - genBType mix(genBType x, - genBType y, - genBType a) - -Additions to the AGL/GLX/WGL Specifications - - None. - -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 : - - where is as specified in section 3.3. - - New preprocessor #defines are added to the OpenGL Shading Language: - - #define GL_MESA_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 - used) in shaders declared with '#version 300 es'. - -GLX Protocol - - None. - -Errors - - None. - -New State - - None. - -New Implementation Dependent State - - None. - -Issues - - 1) Should we allow linear interpolation of integers via a non-boolean - third component? - - RESOLVED: No. - - 2) Should we allow mix() to select between boolean components? - - RESOLVED: Yes. Implementing the same functionality using casts would be - possible but ugly. - -Revision History - - Rev. Date Author Changes - ---- -------- -------- --------------------------------------------- - 5 09/09/2013 idr Add ARB_ES3_compatibility interaction. - - 4 09/06/2013 mattst88 Allow extension on OpenGL ES 3.0. - - 3 08/28/2013 mattst88 Add #extension/#define changes. - - 2 08/26/2013 mattst88 Change vendor prefix to MESA. Add mix() that - selects between boolean components. - 1 08/26/2013 mattst88 Initial revision 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 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. -- cgit v1.2.3