diff options
author | marha <marha@users.sourceforge.net> | 2009-10-09 16:41:40 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-10-09 16:41:40 +0000 |
commit | d6a7362183b858e5a9677b763b348fb13b9eac63 (patch) | |
tree | 6b93f45da934b0946bd2cb8f031139df3a99a479 /gl/glxext.h | |
parent | 382cdac4921c29f51d628b8e051c35365cd0940f (diff) | |
download | vcxsrv-d6a7362183b858e5a9677b763b348fb13b9eac63.tar.gz vcxsrv-d6a7362183b858e5a9677b763b348fb13b9eac63.tar.bz2 vcxsrv-d6a7362183b858e5a9677b763b348fb13b9eac63.zip |
Opengl is working now.
Diffstat (limited to 'gl/glxext.h')
-rw-r--r-- | gl/glxext.h | 56 |
1 files changed, 42 insertions, 14 deletions
diff --git a/gl/glxext.h b/gl/glxext.h index 5328acd1d..eac09f94f 100644 --- a/gl/glxext.h +++ b/gl/glxext.h @@ -6,7 +6,7 @@ extern "C" { #endif /* -** Copyright (c) 2007 The Khronos Group Inc. +** Copyright (c) 2007-2009 The Khronos Group Inc. ** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the @@ -28,6 +28,8 @@ extern "C" { ** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. */ +/* Function declaration macros - to move into glplatform.h */ + #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) #define WIN32_LEAN_AND_MEAN 1 #include <windows.h> @@ -46,9 +48,9 @@ extern "C" { /*************************************************************/ /* Header file version number, required by OpenGL ABI for Linux */ -/* glxext.h last updated 2008/08/10 */ +/* glxext.h last updated 2009/08/03 */ /* Current version at http://www.opengl.org/registry/ */ -#define GLX_GLXEXT_VERSION 20 +#define GLX_GLXEXT_VERSION 23 #ifndef GLX_VERSION_1_3 #define GLX_WINDOW_BIT 0x00000001 @@ -127,6 +129,20 @@ extern "C" { #define GLX_RGBA_FLOAT_BIT_ARB 0x00000004 #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_ARB_create_context_profile +#define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 +#define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 +#define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126 +#endif + #ifndef GLX_SGIS_multisample #define GLX_SAMPLE_BUFFERS_SGIS 100000 #define GLX_SAMPLES_SGIS 100001 @@ -347,20 +363,20 @@ extern "C" { #endif #ifndef GLX_NV_present_video -#define GLX_GLX_NUM_VIDEO_SLOTS_NV 0x20F0 +#define GLX_NUM_VIDEO_SLOTS_NV 0x20F0 #endif #ifndef GLX_NV_video_out -#define GLX_GLX_VIDEO_OUT_COLOR_NV 0x20C3 -#define GLX_GLX_VIDEO_OUT_ALPHA_NV 0x20C4 -#define GLX_GLX_VIDEO_OUT_DEPTH_NV 0x20C5 -#define GLX_GLX_VIDEO_OUT_COLOR_AND_ALPHA_NV 0x20C6 -#define GLX_GLX_VIDEO_OUT_COLOR_AND_DEPTH_NV 0x20C7 -#define GLX_GLX_VIDEO_OUT_FRAME_NV 0x20C8 -#define GLX_GLX_VIDEO_OUT_FIELD_1_NV 0x20C9 -#define GLX_GLX_VIDEO_OUT_FIELD_2_NV 0x20CA -#define GLX_GLX_VIDEO_OUT_STACKED_FIELDS_1_2_NV 0x20CB -#define GLX_GLX_VIDEO_OUT_STACKED_FIELDS_2_1_NV 0x20CC +#define GLX_VIDEO_OUT_COLOR_NV 0x20C3 +#define GLX_VIDEO_OUT_ALPHA_NV 0x20C4 +#define GLX_VIDEO_OUT_DEPTH_NV 0x20C5 +#define GLX_VIDEO_OUT_COLOR_AND_ALPHA_NV 0x20C6 +#define GLX_VIDEO_OUT_COLOR_AND_DEPTH_NV 0x20C7 +#define GLX_VIDEO_OUT_FRAME_NV 0x20C8 +#define GLX_VIDEO_OUT_FIELD_1_NV 0x20C9 +#define GLX_VIDEO_OUT_FIELD_2_NV 0x20CA +#define GLX_VIDEO_OUT_STACKED_FIELDS_1_2_NV 0x20CB +#define GLX_VIDEO_OUT_STACKED_FIELDS_2_1_NV 0x20CC #endif #ifndef GLX_NV_swap_group @@ -502,6 +518,18 @@ typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSARBPROC) (const GLubyte *procNam #define GLX_ARB_fbconfig_float 1 #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_ARB_create_context_profile +#define GLX_ARB_create_context_profile 1 +#endif + #ifndef GLX_SGIS_multisample #define GLX_SGIS_multisample 1 #endif |