pixman mesa git update 17 oct 2012

pixman: 6e56098c0338ce74228187e4c96fed1a66cb0956
mesa: 0199ff7fe323cf527ffacfdef3258ab85799dd13

1 files changed, 83 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 ee408f4f1..974240c49 100644
--- a/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml
+++ b/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml
@@ -13,45 +13,52 @@
     <type name="clampx"  size="4"                                    />
 
     <!-- OpenGL ES 1.0 -->
-    <function name="AlphaFuncxOES" offset="assign" static_dispatch="false">
+    <function name="AlphaFuncxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="func" type="GLenum"/>
         <param name="ref" type="GLclampx"/>
     </function>
 
-    <function name="ClearColorxOES" offset="assign" static_dispatch="false">
+    <function name="ClearColorxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="red" type="GLclampx"/>
         <param name="green" type="GLclampx"/>
         <param name="blue" type="GLclampx"/>
         <param name="alpha" type="GLclampx"/>
     </function>
 
-    <function name="ClearDepthxOES" offset="assign" static_dispatch="false">
+    <function name="ClearDepthxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="depth" type="GLclampx"/>
     </function>
 
-    <function name="Color4xOES" offset="assign" static_dispatch="false">
+    <function name="Color4xOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="red" type="GLfixed"/>
         <param name="green" type="GLfixed"/>
         <param name="blue" type="GLfixed"/>
         <param name="alpha" type="GLfixed"/>
     </function>
 
-    <function name="DepthRangexOES" offset="assign" static_dispatch="false">
+    <function name="DepthRangexOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="zNear" type="GLclampx"/>
         <param name="zFar" type="GLclampx"/>
     </function>
 
-    <function name="FogxOES" offset="assign" static_dispatch="false">
+    <function name="FogxOES" offset="assign" static_dispatch="false" es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="FogxvOES" offset="assign" static_dispatch="false">
+    <function name="FogxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
-    <function name="FrustumxOES" offset="assign" static_dispatch="false">
+    <function name="FrustumxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="left" type="GLfixed"/>
         <param name="right" type="GLfixed"/>
         <param name="bottom" type="GLfixed"/>
@@ -60,53 +67,63 @@
         <param name="zFar" type="GLfixed"/>
     </function>
 
-    <function name="LightModelxOES" offset="assign" static_dispatch="false">
+    <function name="LightModelxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="LightModelxvOES" offset="assign" static_dispatch="false">
+    <function name="LightModelxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
-    <function name="LightxOES" offset="assign" static_dispatch="false">
+    <function name="LightxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="LightxvOES" offset="assign" static_dispatch="false">
+    <function name="LightxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <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">
+    <function name="LineWidthxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="width" type="GLfixed"/>
     </function>
 
-    <function name="LoadMatrixxOES" offset="assign" static_dispatch="false">
+    <function name="LoadMatrixxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="m" type="const GLfixed *" count="16"/>
     </function>
 
-    <function name="MaterialxOES" offset="assign" static_dispatch="false">
+    <function name="MaterialxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="MaterialxvOES" offset="assign" static_dispatch="false">
+    <function name="MaterialxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <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">
+    <function name="MultMatrixxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="m" type="const GLfixed *" count="16"/>
     </function>
 
-    <function name="MultiTexCoord4xOES" offset="assign" static_dispatch="false">
+    <function name="MultiTexCoord4xOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfixed"/>
         <param name="t" type="GLfixed"/>
@@ -114,13 +131,15 @@
         <param name="q" type="GLfixed"/>
     </function>
 
-    <function name="Normal3xOES" offset="assign" static_dispatch="false">
+    <function name="Normal3xOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="nx" type="GLfixed"/>
         <param name="ny" type="GLfixed"/>
         <param name="nz" type="GLfixed"/>
     </function>
 
-    <function name="OrthoxOES" offset="assign" static_dispatch="false">
+    <function name="OrthoxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="left" type="GLfixed"/>
         <param name="right" type="GLfixed"/>
         <param name="bottom" type="GLfixed"/>
@@ -129,127 +148,149 @@
         <param name="zFar" type="GLfixed"/>
     </function>
 
-    <function name="PointSizexOES" offset="assign" static_dispatch="false">
+    <function name="PointSizexOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="size" type="GLfixed"/>
     </function>
 
-    <function name="PolygonOffsetxOES" offset="assign" static_dispatch="false">
+    <function name="PolygonOffsetxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="factor" type="GLfixed"/>
         <param name="units" type="GLfixed"/>
     </function>
 
-    <function name="RotatexOES" offset="assign" static_dispatch="false">
+    <function name="RotatexOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="angle" type="GLfixed"/>
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
     </function>
 
-    <function name="SampleCoveragexOES" offset="assign" static_dispatch="false">
+    <function name="SampleCoveragexOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="value" type="GLclampx"/>
         <param name="invert" type="GLboolean"/>
     </function>
 
-    <function name="ScalexOES" offset="assign" static_dispatch="false">
+    <function name="ScalexOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
     </function>
 
-    <function name="TexEnvxOES" offset="assign" static_dispatch="false">
+    <function name="TexEnvxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="TexEnvxvOES" offset="assign" static_dispatch="false">
+    <function name="TexEnvxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <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">
+    <function name="TexParameterxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="TranslatexOES" offset="assign" static_dispatch="false">
+    <function name="TranslatexOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
     </function>
 
     <!-- OpenGL ES 1.1 -->
-    <function name="ClipPlanexOES" offset="assign" static_dispatch="false">
+    <function name="ClipPlanexOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="const GLfixed *" count="4"/>
     </function>
 
-    <function name="GetClipPlanexOES" offset="assign" static_dispatch="false">
+    <function name="GetClipPlanexOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="GLfixed *" output="true" count="4"/>
     </function>
 
-    <function name="GetFixedvOES" offset="assign" static_dispatch="false">
+    <function name="GetFixedvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetLightxvOES" offset="assign" static_dispatch="false">
+    <function name="GetLightxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <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">
+    <function name="GetMaterialxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <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">
+    <function name="GetTexEnvxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <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">
+    <function name="GetTexParameterxvOES" offset="assign"
+              static_dispatch="false" es1="1.0">
         <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">
+    <function name="PointParameterxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="PointParameterxvOES" offset="assign" static_dispatch="false">
+    <function name="PointParameterxvOES" offset="assign"
+              static_dispatch="false" es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *"/>
     </function>
 
-    <function name="TexParameterxvOES" offset="assign" static_dispatch="false">
+    <function name="TexParameterxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
     <!-- texgen -->
-    <function name="GetTexGenxvOES" offset="assign" static_dispatch="false">
+    <function name="GetTexGenxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <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">
+    <function name="TexGenxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
     </function>
 
-    <function name="TexGenxvOES" offset="assign" static_dispatch="false">
+    <function name="TexGenxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>