Roll back premature version bump.

[mesa.git] / src / glx / x11 / glxextensions.h

diff --git a/src/glx/x11/glxextensions.h b/src/glx/x11/glxextensions.h
index 5821550f65b130cfe902880c356de5f9ae344b29..144b02ad0335546e1c37d2742bbad46c938e47eb 100644 (file)
--- 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
@@ -46,7 +45,6 @@ enum {
    MESA_depth_float_bit,
    MESA_pixmap_colormap_bit,
    MESA_release_buffers_bit,
-   MESA_set_3dfx_mode_bit,
    MESA_swap_control_bit,
    MESA_swap_frame_usage_bit,
    NV_float_buffer_bit,
@@ -55,27 +53,25 @@ enum {
    NV_vertex_array_range_bit,
    OML_swap_method_bit,
    OML_sync_control_bit,
-   SGI_cushion_bit,
    SGI_make_current_read_bit,
    SGI_swap_control_bit,
    SGI_video_sync_bit,
    SGIS_blended_overlay_bit,
    SGIS_color_range_bit,
    SGIS_multisample_bit,
-   SGIX_dm_buffer_bit,
    SGIX_fbconfig_bit,
    SGIX_pbuffer_bit,
    SGIX_swap_barrier_bit,
    SGIX_swap_group_bit,
-   SGIX_video_resize_bit,
-   SGIX_video_source_bit,
    SGIX_visual_select_group_bit,
-   SUN_get_transparent_index_bit
+   EXT_texture_from_pixmap_bit
 };
 
 enum {
    GL_ARB_depth_texture_bit = 0,
+   GL_ARB_draw_buffers_bit,
    GL_ARB_fragment_program_bit,
+   GL_ARB_fragment_program_shadow_bit,
    GL_ARB_imaging_bit,
    GL_ARB_multisample_bit,
    GL_ARB_multitexture_bit,
@@ -114,6 +110,7 @@ enum {
    GL_EXT_depth_bounds_test_bit,
    GL_EXT_draw_range_elements_bit,
    GL_EXT_fog_coord_bit,
+   GL_EXT_framebuffer_object_bit,
    GL_EXT_multi_draw_arrays_bit,
    GL_EXT_packed_pixels_bit,
    GL_EXT_paletted_texture_bit,
@@ -129,6 +126,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,
@@ -142,6 +140,7 @@ enum {
    GL_3DFX_texture_compression_FXT1_bit,
    GL_APPLE_packed_pixels_bit,
    GL_APPLE_ycbcr_422_bit,
+   GL_ATI_text_fragment_shader_bit,
    GL_ATI_texture_env_combine3_bit,
    GL_ATI_texture_float_bit,
    GL_ATI_texture_mirror_once_bit,
@@ -158,13 +157,25 @@ enum {
    GL_NV_copy_depth_to_color_bit,
    GL_NV_depth_clamp_bit,
    GL_NV_fog_distance_bit,
+   GL_NV_fragment_program_bit,
+   GL_NV_fragment_program_option_bit,
+   GL_NV_fragment_program2_bit,
    GL_NV_light_max_exponent_bit,
    GL_NV_multisample_filter_hint_bit,
    GL_NV_point_sprite_bit,
    GL_NV_texgen_reflection_bit,
    GL_NV_texture_compression_vtc_bit,
    GL_NV_texture_env_combine4_bit,
+   GL_NV_vertex_program_bit,
+   GL_NV_vertex_program1_1_bit,
+   GL_NV_vertex_program2_bit,
+   GL_NV_vertex_program2_option_bit,
+   GL_NV_vertex_program3_bit,
+   GL_OES_compressed_paletted_texture_bit,
    GL_OES_read_format_bit,
+   GL_SGI_color_matrix_bit,
+   GL_SGI_color_table_bit,
+   GL_SGI_texture_color_table_bit,
    GL_SGIS_generate_mipmap_bit,
    GL_SGIS_multisample_bit,
    GL_SGIS_texture_lod_bit,
@@ -199,6 +210,7 @@ enum {
     */
 
    GL_ATI_blend_equation_separate_bit = GL_EXT_blend_equation_separate_bit,
+   GL_ATI_draw_buffers_bit = GL_ARB_draw_buffers_bit,
    GL_ATIX_texture_env_combine3_bit = GL_ATI_texture_env_combine3_bit,
    GL_EXT_point_parameters_bit = GL_ARB_point_parameters_bit,
    GL_EXT_texture_env_add_bit = GL_ARB_texture_env_add_bit,
@@ -213,16 +225,29 @@ enum {
    GL_SUN_multi_draw_arrays_bit = GL_EXT_multi_draw_arrays_bit
 };
 
-extern GLboolean __glXExtensionBitIsEnabled( __GLXscreenConfigs *psc, unsigned bit );
+#define __GL_EXT_BYTES   ((__NUM_GL_EXTS + 7) / 8)
+
+struct __GLXscreenConfigsRec;
+struct __GLXcontextRec;
+
+extern GLboolean __glXExtensionBitIsEnabled( struct __GLXscreenConfigsRec *psc, unsigned bit );
 extern const char * __glXGetClientExtensions( void );
-extern void __glXCalculateUsableExtensions( __GLXscreenConfigs *psc,
+extern void __glXCalculateUsableExtensions( struct __GLXscreenConfigsRec *psc,
     GLboolean display_is_direct_capable, int server_minor_version );
-extern void __glXScrEnableExtension( __GLXscreenConfigs *psc, const char * name );
-extern void __glXCalculateUsableGLExtensions( __GLXcontext * gc,
+
+#ifdef GLX_DIRECT_RENDERING
+extern void __glXScrEnableDRIExtension( struct __GLXscreenConfigsRec *psc );
+#endif
+
+extern void __glXCalculateUsableGLExtensions( struct __GLXcontextRec * gc,
     const char * server_string, int major_version, int minor_version );
 extern void __glXGetGLVersion( int * major_version, int * minor_version );
 extern char * __glXGetClientGLExtensionString( void );
 
+extern GLboolean __glExtensionBitIsEnabled( const struct __GLXcontextRec * gc, 
+    unsigned bit );
+
+
 /* Source-level backwards compatibility with old drivers. They won't
  * find the respective functions, though. 
  */
@@ -238,16 +263,16 @@ typedef void (* PFNGLXDISABLEEXTENSIONPROC) ( const char * name );
 #else
 # if defined(__GNUC__) && !defined(GLX_ALIAS_UNSUPPORTED)
 #  define GLX_ALIAS(return_type, real_func, proto_args, args, aliased_func) \
-       return_type GLX_PREFIX( real_func ) proto_args \
+       return_type  real_func  proto_args \
        __attribute__ ((alias( # aliased_func ) ));
 #  define GLX_ALIAS_VOID(real_func, proto_args, args, aliased_func) \
        GLX_ALIAS(void, real_func, proto_args, args, aliased_func)
 # else
 #  define GLX_ALIAS(return_type, real_func, proto_args, args, aliased_func) \
-       return_type GLX_PREFIX( real_func ) proto_args \
+       return_type  real_func  proto_args \
        { return aliased_func args ; }
 #  define GLX_ALIAS_VOID(real_func, proto_args, args, aliased_func) \
-       void GLX_PREFIX( real_func ) proto_args \
+       void  real_func  proto_args \
        { aliased_func args ; }
 # endif /* __GNUC__ */
 #endif /* GLX_NO_STATIC_EXTENSION_FUNCTIONS */