X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=include%2FGL%2Ffreeglut_ext.h;h=90117c7deb6853c217ea72edd6de36800c40ea4a;hb=dd1b89a1b346bc2eb501229b6524527c0534a646;hp=35573dd6daedc5e7ef380e8d8ddfb6e095083d19;hpb=25c02c0a02ba2231f22d69fb2a54b6ede7f17504;p=freeglut diff --git a/include/GL/freeglut_ext.h b/include/GL/freeglut_ext.h index 35573dd..90117c7 100644 --- a/include/GL/freeglut_ext.h +++ b/include/GL/freeglut_ext.h @@ -46,9 +46,12 @@ #define GLUT_USE_CURRENT_CONTEXT 1 /* - * GLUT API Extension macro definitions -- display mode + * Direct/Indirect rendering context options (has meaning only in Unix/X11) */ -#define GLUT_OFFSCREEN 0x0400 +#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 @@ -61,6 +64,16 @@ #define GLUT_VERSION 0x01FC #define GLUT_RENDERING_CONTEXT 0x01FD +#define GLUT_DIRECT_RENDERING 0x01FE + +/* + * New tokens for glutInitDisplayMode. + * Value 0x0400 is defined in OpenGLUT. + */ +#define GLUT_AUX1 0x1000 +#define GLUT_AUX2 0x2000 +#define GLUT_AUX3 0x4000 +#define GLUT_AUX4 0x8000 /* * Process loop function, see freeglut_main.c @@ -108,7 +121,8 @@ FGAPI void FGAPIENTRY glutSolidCylinder( GLdouble radius, GLdouble height, GL /* * Extension functions, see freeglut_ext.c */ -FGAPI void * FGAPIENTRY glutGetProcAddress( const char *procName ); +typedef void (*GLUTproc)(); +FGAPI GLUTproc FGAPIENTRY glutGetProcAddress( const char *procName ); #ifdef __cplusplus