John Fay: Direct/indirect rendering context change, fix a bug that somebody reported (about needing "GLUT_XLIB_IMPLEMENTATION" defined) and remove a false deprecation of a function.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@503 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
994e73cad8
commit
92180def60
@ -45,6 +45,14 @@
|
|||||||
#define GLUT_CREATE_NEW_CONTEXT 0
|
#define GLUT_CREATE_NEW_CONTEXT 0
|
||||||
#define GLUT_USE_CURRENT_CONTEXT 1
|
#define GLUT_USE_CURRENT_CONTEXT 1
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Direct/Indirect rendering context options (has meaning only in Unix/X11)
|
||||||
|
*/
|
||||||
|
#define GLUT_FORCE_INDIRECT_CONTEXT 0
|
||||||
|
#define GLUT_ALLOW_DIRECT_CONTEXT 1
|
||||||
|
#define GLUT_TRY_DIRECT_CONTEXT 2
|
||||||
|
#define GLUT_FORCE_DIRECT_CONTEXT 3
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* GLUT API Extension macro definitions -- the glutGet parameters
|
* GLUT API Extension macro definitions -- the glutGet parameters
|
||||||
*/
|
*/
|
||||||
@ -56,6 +64,7 @@
|
|||||||
#define GLUT_VERSION 0x01FC
|
#define GLUT_VERSION 0x01FC
|
||||||
|
|
||||||
#define GLUT_RENDERING_CONTEXT 0x01FD
|
#define GLUT_RENDERING_CONTEXT 0x01FD
|
||||||
|
#define GLUT_DIRECT_RENDERING 0x01FE
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Process loop function, see freeglut_main.c
|
* Process loop function, see freeglut_main.c
|
||||||
|
@ -106,6 +106,7 @@
|
|||||||
#define FREEGLUT 1
|
#define FREEGLUT 1
|
||||||
#define GLUT_API_VERSION 4
|
#define GLUT_API_VERSION 4
|
||||||
#define FREEGLUT_VERSION_2_0 1
|
#define FREEGLUT_VERSION_2_0 1
|
||||||
|
#define GLUT_XLIB_IMPLEMENTATION 13
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Always include OpenGL and GLU headers
|
* Always include OpenGL and GLU headers
|
||||||
@ -557,7 +558,7 @@ FGAPI void FGAPIENTRY glutCopyColormap( int window );
|
|||||||
* Misc keyboard and joystick functions, see freeglut_misc.c
|
* Misc keyboard and joystick functions, see freeglut_misc.c
|
||||||
*/
|
*/
|
||||||
FGAPI void FGAPIENTRY glutIgnoreKeyRepeat( int ignore );
|
FGAPI void FGAPIENTRY glutIgnoreKeyRepeat( int ignore );
|
||||||
FGAPI void FGAPIENTRY glutSetKeyRepeat( int repeatMode ); /* DEPRECATED 11/4/02 - Do not use */
|
FGAPI void FGAPIENTRY glutSetKeyRepeat( int repeatMode );
|
||||||
FGAPI void FGAPIENTRY glutForceJoystickFunc( void );
|
FGAPI void FGAPIENTRY glutForceJoystickFunc( void );
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Reference in New Issue
Block a user