projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
mesa/es: Remove redundant glPointSizePointer type validation
[mesa.git] / src / mesa / main / APIspec.xml
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index 437b963735367b31b487c77746d26c39bff43a5e..aa6085520c1cd0edd0d0918a01e29da14b639602 100644 (file)
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -48,12 +48,6 @@
                <return type="void"/>
                <param name="mode" type="GLenum"/>
        </proto>
-
-       <desc name="mode">
-               <value name="GL_FRONT"/>
-               <value name="GL_BACK"/>
-               <value name="GL_FRONT_AND_BACK"/>
-       </desc>
 </template>
 
 <template name="Fog">
@@ -94,11 +88,6 @@
                <return type="void"/>
                <param name="mode" type="GLenum"/>
        </proto>
-
-       <desc name="mode">
-               <value name="GL_CW"/>
-               <value name="GL_CCW"/>
-       </desc>
 </template>
 
 <template name="Hint">
@@ -120,12 +109,6 @@
        <desc name="target">
                <value name="GL_GENERATE_MIPMAP_HINT"/>
        </desc>
-
-       <desc name="mode">
-               <value name="GL_FASTEST"/>
-               <value name="GL_NICEST"/>
-               <value name="GL_DONT_CARE"/>
-       </desc>
 </template>
 
 <template name="Light">
@@ -137,35 +120,6 @@
                        <param name="param" type="GLtype"/>
                </vector>
        </proto>
-
-       <desc name="light">
-               <range base="GL_LIGHT" from="0" to="7"/>
-       </desc>
-
-       <desc name="pname">
-               <value name="GL_AMBIENT"/>
-               <value name="GL_DIFFUSE"/>
-               <value name="GL_SPECULAR"/>
-               <value name="GL_POSITION"/>
-
-               <desc name="params" vector_size="4"/>
-       </desc>
-
-       <desc name="pname">
-               <value name="GL_SPOT_DIRECTION"/>
-
-               <desc name="params" vector_size="3"/>
-       </desc>
-
-       <desc name="pname">
-               <value name="GL_SPOT_EXPONENT"/>
-               <value name="GL_SPOT_CUTOFF"/>
-               <value name="GL_CONSTANT_ATTENUATION"/>
-               <value name="GL_LINEAR_ATTENUATION"/>
-               <value name="GL_QUADRATIC_ATTENUATION"/>
-
-               <desc name="params" vector_size="1"/>
-       </desc>
 </template>
 
 <template name="LightModel">
@@ -244,11 +198,6 @@
                <param name="stride" type="GLsizei"/>
                <param name="pointer" type="const GLvoid *"/>
        </proto>
-
-       <desc name="type">
-               <value name="GL_FLOAT"/>
-               <value name="GL_FIXED"/>
-       </desc>
 </template>
 
 <template name="Scissor">
@@ -266,11 +215,6 @@
                <return type="void"/>
                <param name="mode" type="GLenum"/>
        </proto>
-
-       <desc name="mode">
-               <value name="GL_FLAT"/>
-               <value name="GL_SMOOTH"/>
-       </desc>
 </template>
 
 <template name="TexParameter">
@@ -304,27 +248,11 @@
                </desc>
        </desc>
 
-       <desc name="pname">
-               <value name="GL_TEXTURE_MIN_FILTER"/>
-
-               <desc name="param">
-                       <value name="GL_NEAREST"/>
-                       <value name="GL_LINEAR"/>
-                       <value name="GL_NEAREST_MIPMAP_NEAREST"/>
-                       <value name="GL_NEAREST_MIPMAP_LINEAR"/>
-                       <value name="GL_LINEAR_MIPMAP_NEAREST"/>
-                       <value name="GL_LINEAR_MIPMAP_LINEAR"/>
-               </desc>
-       </desc>
-
-       <desc name="pname">
-               <value name="GL_TEXTURE_MAG_FILTER"/>
-
-               <desc name="param">
-                       <value name="GL_NEAREST"/>
-                       <value name="GL_LINEAR"/>
-               </desc>
-       </desc>
+        <desc name="pname">
+               <value name="GL_TEXTURE_MIN_FILTER"/>
+               <value name="GL_TEXTURE_MAG_FILTER"/>
+               <value name="GL_TEXTURE_MAX_ANISOTROPY_EXT" category="EXT_texture_filter_anisotropic"/>
+        </desc>
 
        <desc name="pname" category="GLES1.1">
                <value name="GL_GENERATE_MIPMAP"/>
@@ -335,11 +263,6 @@
                </desc>
        </desc>
 
-       <desc name="pname" category="EXT_texture_filter_anisotropic">
-               <value name="GL_TEXTURE_MAX_ANISOTROPY_EXT"/>
-               <desc name="params" vector_size="1"/>
-       </desc>
-
        <desc name="pname" category="OES_draw_texture">
                <value name="GL_TEXTURE_CROP_RECT_OES"/>
                <desc name="params" vector_size="4"/>
@@ -762,12 +685,6 @@
                <param name="face" type="GLenum"/>
                <param name="mask" type="GLuint"/>
        </proto>
-
-       <desc name="face">
-               <value name="GL_FRONT"/>
-               <value name="GL_BACK"/>
-               <value name="GL_FRONT_AND_BACK"/>
-       </desc>
 </template>
 
 <template name="ColorMask">
@@ -920,16 +837,6 @@
                <param name="func" type="GLenum"/>
                <param name="ref" type="GLtype"/>
        </proto>
-       <desc name="func">
-               <value name="GL_NEVER"/>
-               <value name="GL_LESS"/>
-               <value name="GL_EQUAL"/>
-               <value name="GL_LEQUAL"/>
-               <value name="GL_GREATER"/>
-               <value name="GL_NOTEQUAL"/>
-               <value name="GL_GEQUAL"/>
-               <value name="GL_ALWAYS"/>
-       </desc>
 </template>
 
 <template name="BlendFunc">
@@ -982,25 +889,6 @@
                <return type="void"/>
                <param name="opcode" type="GLenum"/>
        </proto>
-
-       <desc name="opcode">
-               <value name="GL_CLEAR"/>
-               <value name="GL_SET"/>
-               <value name="GL_COPY"/>
-               <value name="GL_COPY_INVERTED"/>
-               <value name="GL_NOOP"/>
-               <value name="GL_INVERT"/>
-               <value name="GL_AND"/>
-               <value name="GL_NAND"/>
-               <value name="GL_OR"/>
-               <value name="GL_NOR"/>
-               <value name="GL_XOR"/>
-               <value name="GL_EQUIV"/>
-               <value name="GL_AND_REVERSE"/>
-               <value name="GL_AND_INVERTED"/>
-               <value name="GL_OR_REVERSE"/>
-               <value name="GL_OR_INVERTED"/>
-       </desc>
 </template>
 
 <template name="StencilFunc">
@@ -1010,17 +898,6 @@
                <param name="ref" type="GLint"/>
                <param name="mask" type="GLuint"/>
        </proto>
-
-       <desc name="func">
-               <value name="GL_NEVER"/>
-               <value name="GL_LESS"/>
-               <value name="GL_LEQUAL"/>
-               <value name="GL_GREATER"/>
-               <value name="GL_GEQUAL"/>
-               <value name="GL_EQUAL"/>
-               <value name="GL_NOTEQUAL"/>
-               <value name="GL_ALWAYS"/>
-       </desc>
 </template>
 
 <template name="StencilFuncSeparate">
@@ -1031,23 +908,6 @@
                <param name="ref" type="GLint"/>
                <param name="mask" type="GLuint"/>
        </proto>
-
-       <desc name="face">
-               <value name="GL_FRONT"/>
-               <value name="GL_BACK"/>
-               <value name="GL_FRONT_AND_BACK"/>
-       </desc>
-
-       <desc name="func">
-               <value name="GL_NEVER"/>
-               <value name="GL_LESS"/>
-               <value name="GL_LEQUAL"/>
-               <value name="GL_GREATER"/>
-               <value name="GL_GEQUAL"/>
-               <value name="GL_EQUAL"/>
-               <value name="GL_NOTEQUAL"/>
-               <value name="GL_ALWAYS"/>
-       </desc>
 </template>
 
 <template name="StencilOp">
@@ -1057,45 +917,6 @@
                <param name="zfail" type="GLenum"/>
                <param name="zpass" type="GLenum"/>
        </proto>
-
-       <desc name="fail">
-               <value name="GL_KEEP"/>
-               <value name="GL_ZERO"/>
-               <value name="GL_REPLACE"/>
-               <value name="GL_INCR"/>
-               <value name="GL_DECR"/>
-               <value name="GL_INVERT"/>
-               <value name="GL_INCR_WRAP" category="GLES2.0"/>
-               <value name="GL_DECR_WRAP" category="GLES2.0"/>
-               <value name="GL_INCR_WRAP_OES" category="OES_stencil_wrap"/>
-               <value name="GL_DECR_WRAP_OES" category="OES_stencil_wrap"/>
-       </desc>
-
-       <desc name="zfail">
-               <value name="GL_KEEP"/>
-               <value name="GL_ZERO"/>
-               <value name="GL_REPLACE"/>
-               <value name="GL_INCR"/>
-               <value name="GL_DECR"/>
-               <value name="GL_INVERT"/>
-               <value name="GL_INCR_WRAP" category="GLES2.0"/>
-               <value name="GL_DECR_WRAP" category="GLES2.0"/>
-               <value name="GL_INCR_WRAP_OES" category="OES_stencil_wrap"/>
-               <value name="GL_DECR_WRAP_OES" category="OES_stencil_wrap"/>
-       </desc>
-
-       <desc name="zpass">
-               <value name="GL_KEEP"/>
-               <value name="GL_ZERO"/>
-               <value name="GL_REPLACE"/>
-               <value name="GL_INCR"/>
-               <value name="GL_DECR"/>
-               <value name="GL_INVERT"/>
-               <value name="GL_INCR_WRAP" category="GLES2.0"/>
-               <value name="GL_DECR_WRAP" category="GLES2.0"/>
-               <value name="GL_INCR_WRAP_OES" category="OES_stencil_wrap"/>
-               <value name="GL_DECR_WRAP_OES" category="OES_stencil_wrap"/>
-       </desc>
 </template>
 
 <template name="StencilOpSeparate">
@@ -1106,45 +927,6 @@
                <param name="zfail" type="GLenum"/>
                <param name="zpass" type="GLenum"/>
        </proto>
-
-       <desc name="face">
-               <value name="GL_FRONT"/>
-               <value name="GL_BACK"/>
-               <value name="GL_FRONT_AND_BACK"/>
-       </desc>
-
-       <desc name="fail">
-               <value name="GL_KEEP"/>
-               <value name="GL_ZERO"/>
-               <value name="GL_REPLACE"/>
-               <value name="GL_INCR"/>
-               <value name="GL_DECR"/>
-               <value name="GL_INVERT"/>
-               <value name="GL_INCR_WRAP"/>
-               <value name="GL_DECR_WRAP"/>
-       </desc>
-
-       <desc name="zfail">
-               <value name="GL_KEEP"/>
-               <value name="GL_ZERO"/>
-               <value name="GL_REPLACE"/>
-               <value name="GL_INCR"/>
-               <value name="GL_DECR"/>
-               <value name="GL_INVERT"/>
-               <value name="GL_INCR_WRAP"/>
-               <value name="GL_DECR_WRAP"/>
-       </desc>
-
-       <desc name="zpass">
-               <value name="GL_KEEP"/>
-               <value name="GL_ZERO"/>
-               <value name="GL_REPLACE"/>
-               <value name="GL_INCR"/>
-               <value name="GL_DECR"/>
-               <value name="GL_INVERT"/>
-               <value name="GL_INCR_WRAP"/>
-               <value name="GL_DECR_WRAP"/>
-       </desc>
 </template>
 
 <template name="DepthFunc">
@@ -1152,17 +934,6 @@
                <return type="void"/>
                <param name="func" type="GLenum"/>
        </proto>
-
-       <desc name="func">
-               <value name="GL_NEVER"/>
-               <value name="GL_LESS"/>
-               <value name="GL_EQUAL"/>
-               <value name="GL_LEQUAL"/>
-               <value name="GL_GREATER"/>
-               <value name="GL_NOTEQUAL"/>
-               <value name="GL_GEQUAL"/>
-               <value name="GL_ALWAYS"/>
-       </desc>
 </template>
 
 <template name="PixelStore">
@@ -1174,15 +945,30 @@
 
        <desc name="pname">
                <value name="GL_PACK_ALIGNMENT"/>
+               <desc name="param" error="GL_INVALID_VALUE">
+                       <value name="1"/>
+                       <value name="2"/>
+                       <value name="4"/>
+                       <value name="8"/>
+               </desc>
+       </desc>
+
+       <desc name="pname">
                <value name="GL_UNPACK_ALIGNMENT"/>
+               <desc name="param" error="GL_INVALID_VALUE">
+                       <value name="1"/>
+                       <value name="2"/>
+                       <value name="4"/>
+                       <value name="8"/>
+               </desc>
        </desc>
 
-       <desc name="param" error="GL_INVALID_VALUE">
-               <value name="1"/>
-               <value name="2"/>
-               <value name="4"/>
-               <value name="8"/>
+       <desc name="pname" category="EXT_unpack_subimage">
+               <value name="GL_UNPACK_ROW_LENGTH"/>
+               <value name="GL_UNPACK_SKIP_PIXELS"/>
+               <value name="GL_UNPACK_SKIP_ROWS"/>
        </desc>
+
 </template>
 
 <template name="ReadPixels" direction="get">
@@ -1282,35 +1068,6 @@
                <param name="pname" type="GLenum"/>
                <vector name="params" type="GLtype *" size="dynamic"/>
        </proto>
-
-       <desc name="light">
-               <range base="GL_LIGHT" from="0" to="7"/>
-       </desc>
-
-       <desc name="pname">
-               <value name="GL_AMBIENT"/>
-               <value name="GL_DIFFUSE"/>
-               <value name="GL_SPECULAR"/>
-               <value name="GL_POSITION"/>
-
-               <desc name="params" vector_size="4"/>
-       </desc>
-
-       <desc name="pname">
-               <value name="GL_SPOT_DIRECTION"/>
-
-               <desc name="params" vector_size="3"/>
-       </desc>
-
-       <desc name="pname">
-               <value name="GL_SPOT_EXPONENT"/>
-               <value name="GL_SPOT_CUTOFF"/>
-               <value name="GL_CONSTANT_ATTENUATION"/>
-               <value name="GL_LINEAR_ATTENUATION"/>
-               <value name="GL_QUADRATIC_ATTENUATION"/>
-
-               <desc name="params" vector_size="1"/>
-       </desc>
 </template>
 
 <template name="GetMaterial" direction="get">
@@ -1755,12 +1512,6 @@
                <value name="GL_TRIANGLE_STRIP"/>
                <value name="GL_TRIANGLE_FAN"/>
        </desc>
-
-       <desc name="type">
-               <value name="GL_UNSIGNED_BYTE"/>
-               <value name="GL_UNSIGNED_SHORT"/>
-               <value name="GL_UNSIGNED_INT" category="OES_element_index_uint"/>
-       </desc>
 </template>
 
 <template name="EnableClientState">
@@ -2118,18 +1869,6 @@
                <return type="void"/>
                <param name="mode" type="GLenum"/>
        </proto>
-
-       <desc name="mode">
-               <value name="GL_FUNC_ADD" category="GLES2.0"/>
-               <value name="GL_FUNC_SUBTRACT" category="GLES2.0"/>
-               <value name="GL_FUNC_REVERSE_SUBTRACT" category="GLES2.0"/>
-               <value name="GL_FUNC_ADD_OES" category="OES_blend_subtract"/>
-               <value name="GL_FUNC_SUBTRACT_OES" category="OES_blend_subtract"/>
-               <value name="GL_FUNC_REVERSE_SUBTRACT_OES" category="OES_blend_subtract"/>
-
-               <value name="GL_MIN_EXT" category="EXT_blend_minmax"/>
-               <value name="GL_MAX_EXT" category="EXT_blend_minmax"/>
-       </desc>
 </template>
 
 <template name="BlendEquationSeparate">
@@ -2138,30 +1877,6 @@
                <param name="modeRGB" type="GLenum"/>
                <param name="modeAlpha" type="GLenum"/>
        </proto>
-
-       <desc name="modeRGB">
-               <value name="GL_FUNC_ADD" category="GLES2.0"/>
-               <value name="GL_FUNC_SUBTRACT" category="GLES2.0"/>
-               <value name="GL_FUNC_REVERSE_SUBTRACT" category="GLES2.0"/>
-               <value name="GL_FUNC_ADD_OES" category="OES_blend_subtract"/>
-               <value name="GL_FUNC_SUBTRACT_OES" category="OES_blend_subtract"/>
-               <value name="GL_FUNC_REVERSE_SUBTRACT_OES" category="OES_blend_subtract"/>
-
-               <value name="GL_MIN_EXT" category="EXT_blend_minmax"/>
-               <value name="GL_MAX_EXT" category="EXT_blend_minmax"/>
-       </desc>
-
-       <desc name="modeAlpha">
-               <value name="GL_FUNC_ADD" category="GLES2.0"/>
-               <value name="GL_FUNC_SUBTRACT" category="GLES2.0"/>
-               <value name="GL_FUNC_REVERSE_SUBTRACT" category="GLES2.0"/>
-               <value name="GL_FUNC_ADD_OES" category="OES_blend_subtract"/>
-               <value name="GL_FUNC_SUBTRACT_OES" category="OES_blend_subtract"/>
-               <value name="GL_FUNC_REVERSE_SUBTRACT_OES" category="OES_blend_subtract"/>
-
-               <value name="GL_MIN_EXT" category="EXT_blend_minmax"/>
-               <value name="GL_MAX_EXT" category="EXT_blend_minmax"/>
-       </desc>
 </template>
 
 <template name="TexImage3D">
@@ -2351,10 +2066,6 @@
                        <param name="q" type="GLtype"/>
                </vector>
        </proto>
-
-       <desc name="texture">
-               <range base="GL_TEXTURE" from="0" to="31"/>
-       </desc>
 </template>
 
 <template name="CompressedTexImage3D">
@@ -2410,10 +2121,6 @@
                <return type="void"/>
                <param name="texture" type="GLenum"/>
        </proto>
-
-       <desc name="texture">
-               <range base="GL_TEXTURE" from="0" to="31"/>
-       </desc>
 </template>
 
 <template name="ClientActiveTexture">
@@ -2421,10 +2128,6 @@
                <return type="void"/>
                <param name="texture" type="GLenum"/>
        </proto>
-
-       <desc name="texture">
-               <range base="GL_TEXTURE" from="0" to="31"/>
-       </desc>
 </template>
 
 <template name="SampleCoverage">
@@ -2768,10 +2471,6 @@
                <param name="pname" type="GLenum"/>
                <vector name="pointer" type="GLvoid **" size="dynamic"/>
        </proto>
-
-       <desc name="pname">
-               <value name="GL_VERTEX_ATTRIB_ARRAY_POINTER"/>
-       </desc>
 </template>
 
 <template name="GetBufferPointer" direction="get">
@@ -2786,10 +2485,6 @@
                <value name="GL_ARRAY_BUFFER"/>
                <value name="GL_ELEMENT_ARRAY_BUFFER"/>
        </desc>
-
-       <desc name="pname">
-               <value name="GL_BUFFER_MAP_POINTER_OES"/>
-       </desc>
 </template>
 
 <template name="MapBuffer" direction="get">
@@ -2931,7 +2626,7 @@
                <return type="void"/>
                <param name="shader" type="GLuint"/>
                <param name="count" type="GLsizei"/>
-               <param name="string" type="const GLchar **"/>
+               <param name="string" type="const GLchar * const *"/>
                <param name="length" type="const int *"/>
        </proto>
 </template>
@@ -3397,20 +3092,6 @@
                <param name="range" type="GLint *"/>
                <param name="precision" type="GLint *"/>
        </proto>
-
-       <desc name="shadertype">
-               <value name="GL_VERTEX_SHADER"/>
-               <value name="GL_FRAGMENT_SHADER"/>
-       </desc>
-
-       <desc name="precisiontype">
-               <value name="GL_LOW_FLOAT"/>
-               <value name="GL_MEDIUM_FLOAT"/>
-               <value name="GL_HIGH_FLOAT"/>
-               <value name="GL_LOW_INT"/>
-               <value name="GL_MEDIUM_INT"/>
-               <value name="GL_HIGH_INT"/>
-       </desc>
 </template>
 
 <template name="GetUniform" direction="get">
@@ -3482,12 +3163,6 @@
                <value name="GL_TRIANGLE_STRIP"/>
                <value name="GL_TRIANGLE_FAN"/>
        </desc>
-
-       <desc name="type">
-               <value name="GL_UNSIGNED_BYTE"/>
-               <value name="GL_UNSIGNED_SHORT"/>
-               <value name="GL_UNSIGNED_INT" category="OES_element_index_uint"/>
-       </desc>
 </template>
 
 <template name="EGLImageTargetTexture2D">
@@ -3519,6 +3194,13 @@
        </proto>
 </template>
 
+<template name="ReadBuffer">
+       <proto>
+               <return type="void"/>
+               <param name="mode" type="GLenum"/>
+       </proto>
+</template>
+
 <api name="mesa" implementation="true">
        <category name="MESA"/>
 
@@ -3795,6 +3477,9 @@
         <function name="EGLImageTargetRenderbufferStorageOES" template="EGLImageTargetRenderbufferStorage"/>
 
        <function name="DrawBuffersARB" template="DrawBuffers"/>
+
+       <function name="ReadBuffer" template="ReadBuffer"/>
+
 </api>
 
 <api name="GLES1.1">
@@ -3830,6 +3515,7 @@
        <category name="OES_mapbuffer"/>
        <category name="EXT_texture_filter_anisotropic"/>
        <category name="EXT_texture_format_BGRA8888"/>
+       <category name="EXT_read_format_bgra"/>
 
        <category name="ARB_texture_non_power_of_two"/>
        <!-- disabled due to missing enums
@@ -4124,15 +3810,21 @@
        <category name="OES_packed_depth_stencil"/>
        <category name="OES_standard_derivatives"/>
        <category name="EXT_texture_format_BGRA8888"/>
+       <category name="EXT_texture_rg"/>
+       <category name="EXT_read_format_bgra"/>
 
        <category name="EXT_texture_compression_dxt1"/>
        <category name="EXT_blend_minmax"/>
        <category name="EXT_multi_draw_arrays"/>
        <category name="OES_EGL_image"/>
        <category name="OES_EGL_image_external"/>
+        <category name="EXT_unpack_subimage"/>
 
        <category name="NV_draw_buffers"/>
+       <category name="NV_read_buffer"/>
+
        <function name="DrawBuffersNV" template="DrawBuffers"/>
+       <function name="ReadBufferNV" template="ReadBuffer"/> 
 
        <function name="CullFace" template="CullFace"/>