diff options
author | marha <marha@users.sourceforge.net> | 2012-03-28 09:11:07 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-03-28 09:11:07 +0200 |
commit | 9b51c6da8bffdd67353b1e1245698a7eac478481 (patch) | |
tree | cde44c263cb1756fae5b4a83facb3c0cdfa474e4 /mesalib/src/mesa/main/APIspec.xml | |
parent | fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8 (diff) | |
parent | ec617f09d07e32d6f57c0da133f53ad3d43a568a (diff) | |
download | vcxsrv-9b51c6da8bffdd67353b1e1245698a7eac478481.tar.gz vcxsrv-9b51c6da8bffdd67353b1e1245698a7eac478481.tar.bz2 vcxsrv-9b51c6da8bffdd67353b1e1245698a7eac478481.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/APIspec.xml')
-rw-r--r-- | mesalib/src/mesa/main/APIspec.xml | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/mesalib/src/mesa/main/APIspec.xml b/mesalib/src/mesa/main/APIspec.xml index eeae59929..f23857ad2 100644 --- a/mesalib/src/mesa/main/APIspec.xml +++ b/mesalib/src/mesa/main/APIspec.xml @@ -1174,15 +1174,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"> @@ -3829,6 +3844,8 @@ <category name="OES_element_index_uint"/> <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 @@ -4123,12 +4140,14 @@ <category name="OES_packed_depth_stencil"/> <category name="OES_standard_derivatives"/> <category name="EXT_texture_format_BGRA8888"/> + <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"/> <function name="DrawBuffersNV" template="DrawBuffers"/> |