xserver mesa xkbcomp git update 7 nov 2012

xserver: 011f8458805e443ac9130865d2840a929a00cabf
xkbcomp: bd1103ef3cfef9cfed645566f944a69e7ca568b4
mesa: f42518962a08ce927e4ddd233d19d2661e135834

1 files changed, 43 insertions, 42 deletions

diff --git a/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml b/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml
index 974240c49..ad775728f 100644
--- a/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml
+++ b/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml
@@ -14,13 +14,13 @@
 
     <!-- OpenGL ES 1.0 -->
     <function name="AlphaFuncxOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="func" type="GLenum"/>
         <param name="ref" type="GLclampx"/>
     </function>
 
     <function name="ClearColorxOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="red" type="GLclampx"/>
         <param name="green" type="GLclampx"/>
         <param name="blue" type="GLclampx"/>
@@ -28,12 +28,12 @@
     </function>
 
     <function name="ClearDepthxOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="depth" type="GLclampx"/>
     </function>
 
     <function name="Color4xOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="red" type="GLfixed"/>
         <param name="green" type="GLfixed"/>
         <param name="blue" type="GLfixed"/>
@@ -41,24 +41,25 @@
     </function>
 
     <function name="DepthRangexOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="zNear" type="GLclampx"/>
         <param name="zFar" type="GLclampx"/>
     </function>
 
-    <function name="FogxOES" offset="assign" static_dispatch="false" es1="1.0">
+    <function name="FogxOES" offset="assign" static_dispatch="false" es1="1.0"
+              exec="es" mesa_name="-OES">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
     <function name="FogxvOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
     <function name="FrustumxOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="left" type="GLfixed"/>
         <param name="right" type="GLfixed"/>
         <param name="bottom" type="GLfixed"/>
@@ -68,62 +69,62 @@
     </function>
 
     <function name="LightModelxOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
     <function name="LightModelxvOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
     <function name="LightxOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
     <function name="LightxvOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
     <function name="LineWidthxOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="width" type="GLfixed"/>
     </function>
 
     <function name="LoadMatrixxOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="m" type="const GLfixed *" count="16"/>
     </function>
 
     <function name="MaterialxOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
     <function name="MaterialxvOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
     <function name="MultMatrixxOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="m" type="const GLfixed *" count="16"/>
     </function>
 
     <function name="MultiTexCoord4xOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfixed"/>
         <param name="t" type="GLfixed"/>
@@ -132,14 +133,14 @@
     </function>
 
     <function name="Normal3xOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="nx" type="GLfixed"/>
         <param name="ny" type="GLfixed"/>
         <param name="nz" type="GLfixed"/>
     </function>
 
     <function name="OrthoxOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="left" type="GLfixed"/>
         <param name="right" type="GLfixed"/>
         <param name="bottom" type="GLfixed"/>
@@ -149,18 +150,18 @@
     </function>
 
     <function name="PointSizexOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="size" type="GLfixed"/>
     </function>
 
     <function name="PolygonOffsetxOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="factor" type="GLfixed"/>
         <param name="units" type="GLfixed"/>
     </function>
 
     <function name="RotatexOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="angle" type="GLfixed"/>
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
@@ -168,41 +169,41 @@
     </function>
 
     <function name="SampleCoveragexOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="value" type="GLclampx"/>
         <param name="invert" type="GLboolean"/>
     </function>
 
     <function name="ScalexOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
     </function>
 
     <function name="TexEnvxOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
     <function name="TexEnvxvOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
     <function name="TexParameterxOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
     <function name="TranslatexOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
@@ -210,65 +211,65 @@
 
     <!-- OpenGL ES 1.1 -->
     <function name="ClipPlanexOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="const GLfixed *" count="4"/>
     </function>
 
     <function name="GetClipPlanexOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" desktop="false" mesa_name="-OES">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="GLfixed *" output="true" count="4"/>
     </function>
 
     <function name="GetFixedvOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" mesa_name="-OES">
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
     <function name="GetLightxvOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
     <function name="GetMaterialxvOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
     <function name="GetTexEnvxvOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
     <function name="GetTexParameterxvOES" offset="assign"
-              static_dispatch="false" es1="1.0">
+              static_dispatch="false" es1="1.0" exec="es" mesa_name="-OES">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
     <function name="PointParameterxOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
     <function name="PointParameterxvOES" offset="assign"
-              static_dispatch="false" es1="1.0">
+              static_dispatch="false" es1="1.0" exec="es" mesa_name="-OES">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *"/>
     </function>
 
     <function name="TexParameterxvOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
@@ -276,21 +277,21 @@
 
     <!-- texgen -->
     <function name="GetTexGenxvOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="check" desktop="false">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
     <function name="TexGenxOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="check" desktop="false">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
     </function>
 
     <function name="TexGenxvOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" exec="check" desktop="false">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>