Magellan Linux

Diff of /trunk/opengl-update/glxext.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 788 by niro, Wed Nov 14 18:36:58 2007 UTC revision 789 by niro, Thu Dec 25 23:21:29 2008 UTC
# Line 46  extern "C" { Line 46  extern "C" {
46  /*************************************************************/  /*************************************************************/
47    
48  /* Header file version number, required by OpenGL ABI for Linux */  /* Header file version number, required by OpenGL ABI for Linux */
49  /* glxext.h last updated 2007/04/21 */  /* glxext.h last updated 2008/10/22 */
50  /* Current version at http://www.opengl.org/registry/ */  /* Current version at http://www.opengl.org/registry/ */
51  #define GLX_GLXEXT_VERSION 19  #define GLX_GLXEXT_VERSION 21
52    
53  #ifndef GLX_VERSION_1_3  #ifndef GLX_VERSION_1_3
54  #define GLX_WINDOW_BIT                     0x00000001  #define GLX_WINDOW_BIT                     0x00000001
# Line 127  extern "C" { Line 127  extern "C" {
127  #define GLX_RGBA_FLOAT_BIT_ARB             0x00000004  #define GLX_RGBA_FLOAT_BIT_ARB             0x00000004
128  #endif  #endif
129    
130    #ifndef GLX_ARB_create_context
131    #define GLX_CONTEXT_DEBUG_BIT_ARB          0x00000001
132    #define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002
133    #define GLX_CONTEXT_MAJOR_VERSION_ARB      0x2091
134    #define GLX_CONTEXT_MINOR_VERSION_ARB      0x2092
135    #define GLX_CONTEXT_FLAGS_ARB              0x2094
136    #endif
137    
138  #ifndef GLX_SGIS_multisample  #ifndef GLX_SGIS_multisample
139  #define GLX_SAMPLE_BUFFERS_SGIS            100000  #define GLX_SAMPLE_BUFFERS_SGIS            100000
140  #define GLX_SAMPLES_SGIS                   100001  #define GLX_SAMPLES_SGIS                   100001
# Line 346  extern "C" { Line 354  extern "C" {
354  #define GLX_AUX9_EXT                       0x20EB  #define GLX_AUX9_EXT                       0x20EB
355  #endif  #endif
356    
357    #ifndef GLX_NV_present_video
358    #define GLX_NUM_VIDEO_SLOTS_NV             0x20F0
359    #endif
360    
361    #ifndef GLX_NV_video_out
362    #define GLX_VIDEO_OUT_COLOR_NV             0x20C3
363    #define GLX_VIDEO_OUT_ALPHA_NV             0x20C4
364    #define GLX_VIDEO_OUT_DEPTH_NV             0x20C5
365    #define GLX_VIDEO_OUT_COLOR_AND_ALPHA_NV   0x20C6
366    #define GLX_VIDEO_OUT_COLOR_AND_DEPTH_NV   0x20C7
367    #define GLX_VIDEO_OUT_FRAME_NV             0x20C8
368    #define GLX_VIDEO_OUT_FIELD_1_NV           0x20C9
369    #define GLX_VIDEO_OUT_FIELD_2_NV           0x20CA
370    #define GLX_VIDEO_OUT_STACKED_FIELDS_1_2_NV 0x20CB
371    #define GLX_VIDEO_OUT_STACKED_FIELDS_2_1_NV 0x20CC
372    #endif
373    
374    #ifndef GLX_NV_swap_group
375    #endif
376    
377    
378  /*************************************************************/  /*************************************************************/
379    
# Line 380  typedef struct { Line 408  typedef struct {
408  #endif  #endif
409    
410  #ifndef GLEXT_64_TYPES_DEFINED  #ifndef GLEXT_64_TYPES_DEFINED
411  /* This code block is duplicated in glxext.h, so must be protected */  /* This code block is duplicated in glext.h, so must be protected */
412  #define GLEXT_64_TYPES_DEFINED  #define GLEXT_64_TYPES_DEFINED
413  /* Define int32_t, int64_t, and uint64_t types for UST/MSC */  /* Define int32_t, int64_t, and uint64_t types for UST/MSC */
414  /* (as used in the GLX_OML_sync_control extension). */  /* (as used in the GLX_OML_sync_control extension). */
# Line 389  typedef struct { Line 417  typedef struct {
417  #elif defined(__sun__) || defined(__digital__)  #elif defined(__sun__) || defined(__digital__)
418  #include <inttypes.h>  #include <inttypes.h>
419  #if defined(__STDC__)  #if defined(__STDC__)
420  #if defined(__arch64__)  #if defined(__arch64__) || defined(_LP64)
421  typedef long int int64_t;  typedef long int int64_t;
422  typedef unsigned long int uint64_t;  typedef unsigned long int uint64_t;
423  #else  #else
# Line 397  typedef long long int int64_t; Line 425  typedef long long int int64_t;
425  typedef unsigned long long int uint64_t;  typedef unsigned long long int uint64_t;
426  #endif /* __arch64__ */  #endif /* __arch64__ */
427  #endif /* __STDC__ */  #endif /* __STDC__ */
428  #elif defined( __VMS )  #elif defined( __VMS ) || defined(__sgi)
429  #include <inttypes.h>  #include <inttypes.h>
430  #elif defined(__SCO__) || defined(__USLC__)  #elif defined(__SCO__) || defined(__USLC__)
431  #include <stdint.h>  #include <stdint.h>
# Line 482  typedef __GLXextFuncPtr ( * PFNGLXGETPRO Line 510  typedef __GLXextFuncPtr ( * PFNGLXGETPRO
510  #define GLX_ARB_fbconfig_float 1  #define GLX_ARB_fbconfig_float 1
511  #endif  #endif
512    
513    #ifndef GLX_ARB_create_context
514    #define GLX_ARB_create_context 1
515    #ifdef GLX_GLXEXT_PROTOTYPES
516    extern GLXContext glXCreateContextAttribsARB (Display *, GLXFBConfig, GLXContext, Bool, const int *);
517    #endif /* GLX_GLXEXT_PROTOTYPES */
518    typedef GLXContext ( * PFNGLXCREATECONTEXTATTRIBSARBPROC) (Display *dpy, GLXFBConfig config, GLXContext share_context, Bool direct, const int *attrib_list);
519    #endif
520    
521  #ifndef GLX_SGIS_multisample  #ifndef GLX_SGIS_multisample
522  #define GLX_SGIS_multisample 1  #define GLX_SGIS_multisample 1
523  #endif  #endif
# Line 777  typedef void ( * PFNGLXBINDTEXIMAGEEXTPR Line 813  typedef void ( * PFNGLXBINDTEXIMAGEEXTPR
813  typedef void ( * PFNGLXRELEASETEXIMAGEEXTPROC) (Display *dpy, GLXDrawable drawable, int buffer);  typedef void ( * PFNGLXRELEASETEXIMAGEEXTPROC) (Display *dpy, GLXDrawable drawable, int buffer);
814  #endif  #endif
815    
816    #ifndef GLX_NV_present_video
817    #define GLX_NV_present_video 1
818    #endif
819    
820    #ifndef GLX_NV_video_out
821    #define GLX_NV_video_out 1
822    #endif
823    
824    #ifndef GLX_NV_swap_group
825    #define GLX_NV_swap_group 1
826    #endif
827    
828    
829  #ifdef __cplusplus  #ifdef __cplusplus
830  }  }

Legend:
Removed from v.788  
changed lines
  Added in v.789