pixman mesa git update 17 oct 2012

pixman: 6e56098c0338ce74228187e4c96fed1a66cb0956
mesa: 0199ff7fe323cf527ffacfdef3258ab85799dd13

1 files changed, 84 insertions, 48 deletions

diff --git a/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml b/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml
index 1313da0f5..8e000a8bc 100644
--- a/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml
@@ -3,11 +3,6 @@
 
 <!-- OpenGL + OpenGL ES -->
 
-<!-- IMPORTANT
-     Remember to update gles_api.py when new OpenGL ES specific entry points
-     are added.  Otherwise, they will be filtered out.
--->
-
 <OpenGLAPI>
 
 <xi:include href="gl_API.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
@@ -24,45 +19,51 @@
     <type name="fixed"   size="4"                                    />
     <type name="clampx"  size="4"                                    />
 
-    <function name="AlphaFuncx" alias="AlphaFuncxOES" static_dispatch="false">
+    <function name="AlphaFuncx" alias="AlphaFuncxOES" static_dispatch="false"
+              es1="1.0">
         <param name="func" type="GLenum"/>
         <param name="ref" type="GLclampx"/>
     </function>
 
-    <function name="ClearColorx" alias="ClearColorxOES" static_dispatch="false">
+    <function name="ClearColorx" alias="ClearColorxOES" 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="ClearDepthx" alias="ClearDepthxOES" static_dispatch="false">
+    <function name="ClearDepthx" alias="ClearDepthxOES" static_dispatch="false"
+              es1="1.0">
         <param name="depth" type="GLclampx"/>
     </function>
 
-    <function name="Color4x" alias="Color4xOES" static_dispatch="false">
+    <function name="Color4x" alias="Color4xOES" 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="DepthRangex" alias="DepthRangexOES" static_dispatch="false">
+    <function name="DepthRangex" alias="DepthRangexOES" static_dispatch="false"
+              es1="1.0">
         <param name="zNear" type="GLclampx"/>
         <param name="zFar" type="GLclampx"/>
     </function>
 
-    <function name="Fogx" alias="FogxOES" static_dispatch="false">
+    <function name="Fogx" alias="FogxOES" static_dispatch="false" es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="Fogxv" alias="FogxvOES" static_dispatch="false">
+    <function name="Fogxv" alias="FogxvOES" static_dispatch="false" es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
-    <function name="Frustumx" alias="FrustumxOES" static_dispatch="false">
+    <function name="Frustumx" alias="FrustumxOES" static_dispatch="false"
+              es1="1.0">
         <param name="left" type="GLfixed"/>
         <param name="right" type="GLfixed"/>
         <param name="bottom" type="GLfixed"/>
@@ -71,53 +72,63 @@
         <param name="zFar" type="GLfixed"/>
     </function>
 
-    <function name="LightModelx" alias="LightModelxOES" static_dispatch="false">
+    <function name="LightModelx" alias="LightModelxOES" static_dispatch="false"
+              es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="LightModelxv" alias="LightModelxvOES" static_dispatch="false">
+    <function name="LightModelxv" alias="LightModelxvOES"
+              static_dispatch="false" es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
-    <function name="Lightx" alias="LightxOES" static_dispatch="false">
+    <function name="Lightx" alias="LightxOES" static_dispatch="false"
+              es1="1.0">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="Lightxv" alias="LightxvOES" static_dispatch="false">
+    <function name="Lightxv" alias="LightxvOES" 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="LineWidthx" alias="LineWidthxOES" static_dispatch="false">
+    <function name="LineWidthx" alias="LineWidthxOES" static_dispatch="false"
+              es1="1.0">
         <param name="width" type="GLfixed"/>
     </function>
 
-    <function name="LoadMatrixx" alias="LoadMatrixxOES" static_dispatch="false">
+    <function name="LoadMatrixx" alias="LoadMatrixxOES" static_dispatch="false"
+              es1="1.0">
         <param name="m" type="const GLfixed *" count="16"/>
     </function>
 
-    <function name="Materialx" alias="MaterialxOES" static_dispatch="false">
+    <function name="Materialx" alias="MaterialxOES" static_dispatch="false"
+              es1="1.0">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="Materialxv" alias="MaterialxvOES" static_dispatch="false">
+    <function name="Materialxv" alias="MaterialxvOES" 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="MultMatrixx" alias="MultMatrixxOES" static_dispatch="false">
+    <function name="MultMatrixx" alias="MultMatrixxOES" static_dispatch="false"
+              es1="1.0">
         <param name="m" type="const GLfixed *" count="16"/>
     </function>
 
-    <function name="MultiTexCoord4x" alias="MultiTexCoord4xOES" static_dispatch="false">
+    <function name="MultiTexCoord4x" alias="MultiTexCoord4xOES"
+              static_dispatch="false" es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfixed"/>
         <param name="t" type="GLfixed"/>
@@ -125,13 +136,15 @@
         <param name="q" type="GLfixed"/>
     </function>
 
-    <function name="Normal3x" alias="Normal3xOES" static_dispatch="false">
+    <function name="Normal3x" alias="Normal3xOES" static_dispatch="false"
+              es1="1.0">
         <param name="nx" type="GLfixed"/>
         <param name="ny" type="GLfixed"/>
         <param name="nz" type="GLfixed"/>
     </function>
 
-    <function name="Orthox" alias="OrthoxOES" static_dispatch="false">
+    <function name="Orthox" alias="OrthoxOES" static_dispatch="false"
+              es1="1.0">
         <param name="left" type="GLfixed"/>
         <param name="right" type="GLfixed"/>
         <param name="bottom" type="GLfixed"/>
@@ -140,59 +153,69 @@
         <param name="zFar" type="GLfixed"/>
     </function>
 
-    <function name="PointSizex" alias="PointSizexOES" static_dispatch="false">
+    <function name="PointSizex" alias="PointSizexOES" static_dispatch="false"
+              es1="1.0">
         <param name="size" type="GLfixed"/>
     </function>
 
-    <function name="PolygonOffsetx" alias="PolygonOffsetxOES" static_dispatch="false">
+    <function name="PolygonOffsetx" alias="PolygonOffsetxOES"
+              static_dispatch="false" es1="1.0">
         <param name="factor" type="GLfixed"/>
         <param name="units" type="GLfixed"/>
     </function>
 
-    <function name="Rotatex" alias="RotatexOES" static_dispatch="false">
+    <function name="Rotatex" alias="RotatexOES" 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="SampleCoveragex" alias="SampleCoveragexOES" static_dispatch="false">
+    <function name="SampleCoveragex" alias="SampleCoveragexOES"
+              static_dispatch="false" es1="1.0">
         <param name="value" type="GLclampx"/>
         <param name="invert" type="GLboolean"/>
     </function>
 
-    <function name="Scalex" alias="ScalexOES" static_dispatch="false">
+    <function name="Scalex" alias="ScalexOES" static_dispatch="false"
+              es1="1.0">
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
     </function>
 
-    <function name="TexEnvx" alias="TexEnvxOES" static_dispatch="false">
+    <function name="TexEnvx" alias="TexEnvxOES" static_dispatch="false"
+              es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="TexEnvxv" alias="TexEnvxvOES" static_dispatch="false">
+    <function name="TexEnvxv" alias="TexEnvxvOES" 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="TexParameterx" alias="TexParameterxOES" static_dispatch="false">
+    <function name="TexParameterx" alias="TexParameterxOES"
+              static_dispatch="false" es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="Translatex" alias="TranslatexOES" static_dispatch="false">
+    <function name="Translatex" alias="TranslatexOES" static_dispatch="false"
+              es1="1.0">
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
     </function>
 
     <!-- from GL_OES_single_precision -->
-    <function name="Frustumf" alias="FrustumfOES" static_dispatch="false">
+    <function name="Frustumf" alias="FrustumfOES" static_dispatch="false"
+              es1="1.0">
         <param name="left" type="GLfloat"/>
         <param name="right" type="GLfloat"/>
         <param name="bottom" type="GLfloat"/>
@@ -201,7 +224,8 @@
         <param name="zFar" type="GLfloat"/>
     </function>
 
-    <function name="Orthof" alias="OrthofOES" static_dispatch="false">
+    <function name="Orthof" alias="OrthofOES" static_dispatch="false"
+              es1="1.0">
         <param name="left" type="GLfloat"/>
         <param name="right" type="GLfloat"/>
         <param name="bottom" type="GLfloat"/>
@@ -213,68 +237,80 @@
 
 <category name="es1.1">
     <!-- from GL_OES_fixed_point -->
-    <function name="ClipPlanex" alias="ClipPlanexOES" static_dispatch="false">
+    <function name="ClipPlanex" alias="ClipPlanexOES" static_dispatch="false"
+              es1="1.1">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="const GLfixed *" count="4"/>
     </function>
 
-    <function name="GetClipPlanex" alias="GetClipPlanexOES" static_dispatch="false">
+    <function name="GetClipPlanex" alias="GetClipPlanexOES"
+              static_dispatch="false" es1="1.1">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="GLfixed *" output="true" count="4"/>
     </function>
 
-    <function name="GetFixedv" alias="GetFixedvOES" static_dispatch="false">
+    <function name="GetFixedv" alias="GetFixedvOES" static_dispatch="false"
+              es1="1.1">
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetLightxv" alias="GetLightxvOES" static_dispatch="false">
+    <function name="GetLightxv" alias="GetLightxvOES" static_dispatch="false"
+              es1="1.1">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetMaterialxv" alias="GetMaterialxvOES" static_dispatch="false">
+    <function name="GetMaterialxv" alias="GetMaterialxvOES"
+              static_dispatch="false" es1="1.1">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetTexEnvxv" alias="GetTexEnvxvOES" static_dispatch="false">
+    <function name="GetTexEnvxv" alias="GetTexEnvxvOES" static_dispatch="false"
+              es1="1.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetTexParameterxv" alias="GetTexParameterxvOES" static_dispatch="false">
+    <function name="GetTexParameterxv" alias="GetTexParameterxvOES"
+              static_dispatch="false" es1="1.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="PointParameterx" alias="PointParameterxOES" static_dispatch="false">
+    <function name="PointParameterx" alias="PointParameterxOES"
+              static_dispatch="false" es1="1.1">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="PointParameterxv" alias="PointParameterxvOES" static_dispatch="false">
+    <function name="PointParameterxv" alias="PointParameterxvOES"
+              static_dispatch="false" es1="1.1">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *"/>
     </function>
 
-    <function name="TexParameterxv" alias="TexParameterxvOES" static_dispatch="false">
+    <function name="TexParameterxv" alias="TexParameterxvOES"
+              static_dispatch="false" es1="1.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
     <!-- from GL_OES_single_precision -->
-    <function name="ClipPlanef" alias="ClipPlanefOES" static_dispatch="false">
+    <function name="ClipPlanef" alias="ClipPlanefOES" static_dispatch="false"
+              es1="1.1">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="const GLfloat *" count="4"/>
     </function>
 
-    <function name="GetClipPlanef" alias="GetClipPlanefOES" static_dispatch="false">
+    <function name="GetClipPlanef" alias="GetClipPlanefOES"
+              static_dispatch="false" es1="1.1">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="GLfloat *" output="true" count="4"/>
     </function>