Commit f43d2dfa authored by hybrid's avatar hybrid

New versions of glext.h (43) and glxext.h (21) with two new GL extensions.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1699 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 8504d91c
...@@ -160,6 +160,7 @@ static const char* const OpenGLFeatureStrings[] = { ...@@ -160,6 +160,7 @@ static const char* const OpenGLFeatureStrings[] = {
"GL_EXT_copy_texture", "GL_EXT_copy_texture",
"GL_EXT_cull_vertex", "GL_EXT_cull_vertex",
"GL_EXT_depth_bounds_test", "GL_EXT_depth_bounds_test",
"GL_EXT_direct_state_access",
"GL_EXT_draw_buffers2", "GL_EXT_draw_buffers2",
"GL_EXT_draw_instanced", "GL_EXT_draw_instanced",
"GL_EXT_draw_range_elements", "GL_EXT_draw_range_elements",
...@@ -220,6 +221,7 @@ static const char* const OpenGLFeatureStrings[] = { ...@@ -220,6 +221,7 @@ static const char* const OpenGLFeatureStrings[] = {
"GL_EXT_timer_query", "GL_EXT_timer_query",
"GL_EXT_transform_feedback", "GL_EXT_transform_feedback",
"GL_EXT_vertex_array", "GL_EXT_vertex_array",
"GL_EXT_vertex_array_bgra",
"GL_EXT_vertex_shader", "GL_EXT_vertex_shader",
"GL_EXT_vertex_weighting", "GL_EXT_vertex_weighting",
"GL_FfdMaskSGIX", "GL_FfdMaskSGIX",
...@@ -470,6 +472,7 @@ class COpenGLExtensionHandler ...@@ -470,6 +472,7 @@ class COpenGLExtensionHandler
IRR_EXT_copy_texture, IRR_EXT_copy_texture,
IRR_EXT_cull_vertex, IRR_EXT_cull_vertex,
IRR_EXT_depth_bounds_test, IRR_EXT_depth_bounds_test,
IRR_EXT_direct_state_access,
IRR_EXT_draw_buffers2, IRR_EXT_draw_buffers2,
IRR_EXT_draw_instanced, IRR_EXT_draw_instanced,
IRR_EXT_draw_range_elements, IRR_EXT_draw_range_elements,
...@@ -530,6 +533,7 @@ class COpenGLExtensionHandler ...@@ -530,6 +533,7 @@ class COpenGLExtensionHandler
IRR_EXT_timer_query, IRR_EXT_timer_query,
IRR_EXT_transform_feedback, IRR_EXT_transform_feedback,
IRR_EXT_vertex_array, IRR_EXT_vertex_array,
IRR_EXT_vertex_array_bgra,
IRR_EXT_vertex_shader, IRR_EXT_vertex_shader,
IRR_EXT_vertex_weighting, IRR_EXT_vertex_weighting,
IRR_FfdMaskSGIX, IRR_FfdMaskSGIX,
...@@ -858,9 +862,6 @@ class COpenGLExtensionHandler ...@@ -858,9 +862,6 @@ class COpenGLExtensionHandler
PFNGLISBUFFERARBPROC pGlIsBufferARB; PFNGLISBUFFERARBPROC pGlIsBufferARB;
PFNGLGETBUFFERPARAMETERIVARBPROC pGlGetBufferParameterivARB; PFNGLGETBUFFERPARAMETERIVARBPROC pGlGetBufferParameterivARB;
PFNGLGETBUFFERPOINTERVARBPROC pGlGetBufferPointervARB; PFNGLGETBUFFERPOINTERVARBPROC pGlGetBufferPointervARB;
#endif #endif
}; };
......
This diff is collapsed.
...@@ -46,9 +46,9 @@ extern "C" { ...@@ -46,9 +46,9 @@ extern "C" {
/*************************************************************/ /*************************************************************/
/* Header file version number, required by OpenGL ABI for Linux */ /* Header file version number, required by OpenGL ABI for Linux */
/* glxext.h last updated 2008/08/10 */ /* glxext.h last updated 2008/10/22 */
/* Current version at http://www.opengl.org/registry/ */ /* Current version at http://www.opengl.org/registry/ */
#define GLX_GLXEXT_VERSION 20 #define GLX_GLXEXT_VERSION 21
#ifndef GLX_VERSION_1_3 #ifndef GLX_VERSION_1_3
#define GLX_WINDOW_BIT 0x00000001 #define GLX_WINDOW_BIT 0x00000001
...@@ -127,6 +127,14 @@ extern "C" { ...@@ -127,6 +127,14 @@ extern "C" {
#define GLX_RGBA_FLOAT_BIT_ARB 0x00000004 #define GLX_RGBA_FLOAT_BIT_ARB 0x00000004
#endif #endif
#ifndef GLX_ARB_create_context
#define GLX_CONTEXT_DEBUG_BIT_ARB 0x00000001
#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002
#define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091
#define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092
#define GLX_CONTEXT_FLAGS_ARB 0x2094
#endif
#ifndef GLX_SGIS_multisample #ifndef GLX_SGIS_multisample
#define GLX_SAMPLE_BUFFERS_SGIS 100000 #define GLX_SAMPLE_BUFFERS_SGIS 100000
#define GLX_SAMPLES_SGIS 100001 #define GLX_SAMPLES_SGIS 100001
...@@ -347,20 +355,20 @@ extern "C" { ...@@ -347,20 +355,20 @@ extern "C" {
#endif #endif
#ifndef GLX_NV_present_video #ifndef GLX_NV_present_video
#define GLX_GLX_NUM_VIDEO_SLOTS_NV 0x20F0 #define GLX_NUM_VIDEO_SLOTS_NV 0x20F0
#endif #endif
#ifndef GLX_NV_video_out #ifndef GLX_NV_video_out
#define GLX_GLX_VIDEO_OUT_COLOR_NV 0x20C3 #define GLX_VIDEO_OUT_COLOR_NV 0x20C3
#define GLX_GLX_VIDEO_OUT_ALPHA_NV 0x20C4 #define GLX_VIDEO_OUT_ALPHA_NV 0x20C4
#define GLX_GLX_VIDEO_OUT_DEPTH_NV 0x20C5 #define GLX_VIDEO_OUT_DEPTH_NV 0x20C5
#define GLX_GLX_VIDEO_OUT_COLOR_AND_ALPHA_NV 0x20C6 #define GLX_VIDEO_OUT_COLOR_AND_ALPHA_NV 0x20C6
#define GLX_GLX_VIDEO_OUT_COLOR_AND_DEPTH_NV 0x20C7 #define GLX_VIDEO_OUT_COLOR_AND_DEPTH_NV 0x20C7
#define GLX_GLX_VIDEO_OUT_FRAME_NV 0x20C8 #define GLX_VIDEO_OUT_FRAME_NV 0x20C8
#define GLX_GLX_VIDEO_OUT_FIELD_1_NV 0x20C9 #define GLX_VIDEO_OUT_FIELD_1_NV 0x20C9
#define GLX_GLX_VIDEO_OUT_FIELD_2_NV 0x20CA #define GLX_VIDEO_OUT_FIELD_2_NV 0x20CA
#define GLX_GLX_VIDEO_OUT_STACKED_FIELDS_1_2_NV 0x20CB #define GLX_VIDEO_OUT_STACKED_FIELDS_1_2_NV 0x20CB
#define GLX_GLX_VIDEO_OUT_STACKED_FIELDS_2_1_NV 0x20CC #define GLX_VIDEO_OUT_STACKED_FIELDS_2_1_NV 0x20CC
#endif #endif
#ifndef GLX_NV_swap_group #ifndef GLX_NV_swap_group
...@@ -502,6 +510,14 @@ typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSARBPROC) (const GLubyte *procNam ...@@ -502,6 +510,14 @@ typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSARBPROC) (const GLubyte *procNam
#define GLX_ARB_fbconfig_float 1 #define GLX_ARB_fbconfig_float 1
#endif #endif
#ifndef GLX_ARB_create_context
#define GLX_ARB_create_context 1
#ifdef GLX_GLXEXT_PROTOTYPES
extern GLXContext glXCreateContextAttribsARB (Display *, GLXFBConfig, GLXContext, Bool, const int *);
#endif /* GLX_GLXEXT_PROTOTYPES */
typedef GLXContext ( * PFNGLXCREATECONTEXTATTRIBSARBPROC) (Display *dpy, GLXFBConfig config, GLXContext share_context, Bool direct, const int *attrib_list);
#endif
#ifndef GLX_SGIS_multisample #ifndef GLX_SGIS_multisample
#define GLX_SGIS_multisample 1 #define GLX_SGIS_multisample 1
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment