diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/glx/x11/glxextensions.c | 11 | ||||
| -rw-r--r-- | src/glx/x11/glxextensions.h | 3 | ||||
| -rw-r--r-- | src/mesa/glapi/gl_API.xml | 13 |
3 files changed, 21 insertions, 6 deletions
diff --git a/src/glx/x11/glxextensions.c b/src/glx/x11/glxextensions.c index 78a2b075db..9623cdfc25 100644 --- a/src/glx/x11/glxextensions.c +++ b/src/glx/x11/glxextensions.c @@ -27,7 +27,6 @@ * * \author Ian Romanick <idr@us.ibm.com> */ -/* $XFree86: xc/lib/GL/glx/glxextensions.c,v 1.1 2003/09/28 20:15:03 alanh Exp $ */ #include "glxclient.h" #include <extutil.h> @@ -123,7 +122,7 @@ static const struct extension_info known_gl_extensions[] = { { GL(ARB_shadow), VER(1,4), Y, N, N, N }, { GL(ARB_shadow_ambient), VER(0,0), Y, N, N, N }, { GL(ARB_texture_border_clamp), VER(1,3), Y, N, N, N }, - { GL(ARB_texture_compression), VER(1,3), N, N, N, N }, + { GL(ARB_texture_compression), VER(1,3), Y, N, N, N }, { GL(ARB_texture_cube_map), VER(1,3), Y, N, N, N }, { GL(ARB_texture_env_add), VER(1,3), Y, N, N, N }, { GL(ARB_texture_env_combine), VER(1,3), Y, N, N, N }, @@ -167,7 +166,8 @@ static const struct extension_info known_gl_extensions[] = { { GL(EXT_subtexture), VER(1,1), Y, N, N, N }, { GL(EXT_texture), VER(1,1), Y, N, N, N }, { GL(EXT_texture3D), VER(1,2), Y, N, N, N }, - { GL(EXT_texture_compression_s3tc), VER(0,0), N, N, N, N }, + { GL(EXT_texture_compression_dxt1), VER(0,0), Y, N, N, N }, + { GL(EXT_texture_compression_s3tc), VER(0,0), Y, N, N, N }, { GL(EXT_texture_edge_clamp), VER(1,2), Y, N, N, N }, { GL(EXT_texture_env_add), VER(1,3), Y, N, N, N }, { GL(EXT_texture_env_combine), VER(1,3), Y, N, N, N }, @@ -179,7 +179,7 @@ static const struct extension_info known_gl_extensions[] = { { GL(EXT_texture_object), VER(1,1), Y, N, N, N }, { GL(EXT_texture_rectangle), VER(0,0), Y, N, N, N }, { GL(EXT_vertex_array), VER(0,0), Y, N, N, N }, - { GL(3DFX_texture_compression_FXT1), VER(0,0), N, N, N, N }, + { GL(3DFX_texture_compression_FXT1), VER(0,0), Y, N, N, N }, { GL(APPLE_packed_pixels), VER(1,2), Y, N, N, N }, { GL(APPLE_ycbcr_422), VER(0,0), Y, N, N, N }, { GL(ATI_texture_env_combine3), VER(0,0), Y, N, N, N }, @@ -205,10 +205,11 @@ static const struct extension_info known_gl_extensions[] = { { GL(NV_multisample_filter_hint), VER(0,0), Y, N, N, N }, { GL(NV_point_sprite), VER(0,0), Y, N, N, N }, { GL(NV_texgen_reflection), VER(0,0), Y, N, N, N }, - { GL(NV_texture_compression_vtc), VER(0,0), N, N, N, N }, + { GL(NV_texture_compression_vtc), VER(0,0), Y, N, N, N }, { GL(NV_texture_env_combine4), VER(0,0), Y, N, N, N }, { GL(NV_texture_rectangle), VER(0,0), Y, N, N, N }, { GL(OES_read_format), VER(0,0), Y, N, N, N }, + { GL(OES_compressed_paletted_texture),VER(0,0), Y, N, N, N }, { GL(SGI_color_matrix), VER(0,0), Y, N, N, N }, { GL(SGI_texture_color_table), VER(0,0), Y, N, N, N }, { GL(SGIS_generate_mipmap), VER(1,4), Y, N, N, N }, diff --git a/src/glx/x11/glxextensions.h b/src/glx/x11/glxextensions.h index e725ad7787..e7d0248a6f 100644 --- a/src/glx/x11/glxextensions.h +++ b/src/glx/x11/glxextensions.h @@ -27,7 +27,6 @@ * * \author Ian Romanick <idr@us.ibm.com> */ -/* $XFree86: xc/lib/GL/glx/glxextensions.h,v 1.2tsi Exp $ */ #ifndef GLX_GLXEXTENSIONS_H #define GLX_GLXEXTENSIONS_H @@ -129,6 +128,7 @@ enum { GL_EXT_subtexture_bit, GL_EXT_texture_bit, GL_EXT_texture3D_bit, + GL_EXT_texture_compression_dxt1_bit, GL_EXT_texture_compression_s3tc_bit, GL_EXT_texture_edge_clamp_bit, GL_EXT_texture_env_combine_bit, @@ -164,6 +164,7 @@ enum { GL_NV_texgen_reflection_bit, GL_NV_texture_compression_vtc_bit, GL_NV_texture_env_combine4_bit, + GL_OES_compressed_paletted_texture_bit, GL_OES_read_format_bit, GL_SGI_color_matrix_bit, GL_SGI_texture_color_table_bit, diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml index 084a6aed31..1458f96123 100644 --- a/src/mesa/glapi/gl_API.xml +++ b/src/mesa/glapi/gl_API.xml @@ -10295,6 +10295,19 @@ glx: </enum> </category> +<category name="GL_OES_compressed_paletted_texture" number="294"> + <enum name="PALETTE4_RGB8_OES" value="0x8B90"/> + <enum name="PALETTE4_RGBA8_OES" value="0x8B91"/> + <enum name="PALETTE4_R5_G6_B5_OES" value="0x8B92"/> + <enum name="PALETTE4_RGBA4_OES" value="0x8B93"/> + <enum name="PALETTE4_RGB5_A1_OES" value="0x8B94"/> + <enum name="PALETTE8_RGB8_OES" value="0x8B95"/> + <enum name="PALETTE8_RGBA8_OES" value="0x8B96"/> + <enum name="PALETTE8_R5_G6_B5_OES" value="0x8B97"/> + <enum name="PALETTE8_RGBA4_OES" value="0x8B98"/> + <enum name="PALETTE8_RGB5_A1_OES" value="0x8B99"/> +</category> + <category name="GL_OES_read_format" number="295"> <enum name="IMPLEMENTATION_COLOR_READ_TYPE_OES" value="0x8B9A"/> <enum name="IMPLEMENTATION_COLOR_READ_FORMAT_OES" value="0x8B9B"/> |