Magellan Linux

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

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

revision 1426 by niro, Mon May 30 08:59:09 2011 UTC revision 1427 by niro, Mon Jul 18 20:17:53 2011 UTC
# Line 6  extern "C" { Line 6  extern "C" {
6  #endif  #endif
7    
8  /*  /*
9  ** Copyright (c) 2007-2010 The Khronos Group Inc.  ** Copyright (c) 2007-2011 The Khronos Group Inc.
10  **  **
11  ** Permission is hereby granted, free of charge, to any person obtaining a  ** Permission is hereby granted, free of charge, to any person obtaining a
12  ** copy of this software and/or associated documentation files (the  ** copy of this software and/or associated documentation files (the
# Line 29  extern "C" { Line 29  extern "C" {
29  */  */
30    
31  /* Header file version number, required by OpenGL ABI for Linux */  /* Header file version number, required by OpenGL ABI for Linux */
32  /* glext.h last updated $Date: 2011-04-05 23:08:32 -0700 (Tue, 05 Apr 2011) $ */  /* glext.h last updated $Date: 2011-07-06 02:49:14 -0700 (Wed, 06 Jul 2011) $ */
33  /* Current version at http://www.opengl.org/registry/ */  /* Current version at http://www.opengl.org/registry/ */
34  #define GL_GLEXT_VERSION 68  #define GL_GLEXT_VERSION 71
35  /* Function declaration macros - to move into glplatform.h */  /* Function declaration macros - to move into glplatform.h */
36    
37  #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)  #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
# Line 5042  extern "C" { Line 5042  extern "C" {
5042  #define GL_FACTOR_MAX_AMD                 0x901D  #define GL_FACTOR_MAX_AMD                 0x901D
5043  #endif  #endif
5044    
5045    #ifndef GL_AMD_sample_positions
5046    #define GL_SUBSAMPLE_DISTANCE_AMD         0x883F
5047    #endif
5048    
5049    #ifndef GL_EXT_x11_sync_object
5050    #define GL_SYNC_X11_FENCE_EXT             0x90E1
5051    #endif
5052    
5053    #ifndef GL_AMD_multi_draw_indirect
5054    #endif
5055    
5056    #ifndef GL_EXT_framebuffer_multisample_blit_scaled
5057    #define GL_SCALED_RESOLVE_FASTEST_EXT     0x90BA
5058    #define GL_SCALED_RESOLVE_NICEST_EXT      0x90BB
5059    #endif
5060    
5061    
5062  /*************************************************************/  /*************************************************************/
5063    
# Line 11073  typedef void (APIENTRYP PFNGLTEXTUREIMAG Line 11089  typedef void (APIENTRYP PFNGLTEXTUREIMAG
11089  #define GL_AMD_blend_minmax_factor 1  #define GL_AMD_blend_minmax_factor 1
11090  #endif  #endif
11091    
11092    #ifndef GL_AMD_sample_positions
11093    #define GL_AMD_sample_positions 1
11094    #ifdef GL_GLEXT_PROTOTYPES
11095    GLAPI void APIENTRY glSetMultisamplefvAMD (GLenum pname, GLuint index, const GLfloat *val);
11096    #endif /* GL_GLEXT_PROTOTYPES */
11097    typedef void (APIENTRYP PFNGLSETMULTISAMPLEFVAMDPROC) (GLenum pname, GLuint index, const GLfloat *val);
11098    #endif
11099    
11100    #ifndef GL_EXT_x11_sync_object
11101    #define GL_EXT_x11_sync_object 1
11102    #ifdef GL_GLEXT_PROTOTYPES
11103    GLAPI GLsync APIENTRY glImportSyncEXT (GLenum external_sync_type, GLintptr external_sync, GLbitfield flags);
11104    #endif /* GL_GLEXT_PROTOTYPES */
11105    typedef GLsync (APIENTRYP PFNGLIMPORTSYNCEXTPROC) (GLenum external_sync_type, GLintptr external_sync, GLbitfield flags);
11106    #endif
11107    
11108    #ifndef GL_AMD_multi_draw_indirect
11109    #define GL_AMD_multi_draw_indirect 1
11110    #ifdef GL_GLEXT_PROTOTYPES
11111    GLAPI void APIENTRY glMultiDrawArraysIndirectAMD (GLenum mode, const GLvoid *indirect, GLsizei primcount, GLsizei stride);
11112    GLAPI void APIENTRY glMultiDrawElementsIndirectAMD (GLenum mode, GLenum type, const GLvoid *indirect, GLsizei primcount, GLsizei stride);
11113    #endif /* GL_GLEXT_PROTOTYPES */
11114    typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTAMDPROC) (GLenum mode, const GLvoid *indirect, GLsizei primcount, GLsizei stride);
11115    typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTAMDPROC) (GLenum mode, GLenum type, const GLvoid *indirect, GLsizei primcount, GLsizei stride);
11116    #endif
11117    
11118    #ifndef GL_EXT_framebuffer_multisample_blit_scaled
11119    #define GL_EXT_framebuffer_multisample_blit_scaled 1
11120    #endif
11121    
11122    
11123  #ifdef __cplusplus  #ifdef __cplusplus
11124  }  }

Legend:
Removed from v.1426  
changed lines
  Added in v.1427