On Thu, Sep 12, 2013 at 9:47 AM, Ian Romanick <i...@freedesktop.org> wrote: > From: Ian Romanick <ian.d.roman...@intel.com> > > Everyone at the Khronos meeting was as surprised that GLSL didn't > already support this as we were. Several vendors said they'd ship it, > but there didn't seem to be enough interest to put in the effort to make > it ARB or KHR. > > Signed-off-by: Ian Romanick <ian.d.roman...@intel.com> > Cc: Matt Turner <matts...@gmail.com>
Nice! Thanks Ian. Reviewed-by: Matt Turner <matts...@gmail.com> > --- > docs/specs/MESA_shader_integer_mix.spec | 19 +++++++++++-------- > src/glsl/builtin_functions.cpp | 2 +- > src/glsl/glcpp/glcpp-parse.y | 4 ++-- > src/glsl/glsl_parser_extras.cpp | 2 +- > src/glsl/glsl_parser_extras.h | 4 ++-- > src/mesa/drivers/dri/i965/intel_extensions.c | 2 +- > src/mesa/main/extensions.c | 2 +- > src/mesa/main/mtypes.h | 2 +- > 8 files changed, 20 insertions(+), 17 deletions(-) > > diff --git a/docs/specs/MESA_shader_integer_mix.spec > b/docs/specs/MESA_shader_integer_mix.spec > index d381ddd..f2f903b 100644 > --- a/docs/specs/MESA_shader_integer_mix.spec > +++ b/docs/specs/MESA_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 Khronso, change vendor Extra o on Khronos. _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
