From 777da63e4e85c7f35b3233038ea0fefea04e39d0 Mon Sep 17 00:00:00 2001 From: "J.C. Jones" Date: Wed, 12 May 2004 00:33:12 +0000 Subject: [PATCH] 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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@503 7f0cb862-5218-0410-a997-914c9d46530a --- include/GL/freeglut_ext.h | 9 +++++++++ include/GL/freeglut_std.h | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/GL/freeglut_ext.h b/include/GL/freeglut_ext.h index 0f5ff00..6a6f1f7 100644 --- a/include/GL/freeglut_ext.h +++ b/include/GL/freeglut_ext.h @@ -46,6 +46,14 @@ #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 */ #define GLUT_ACTION_ON_WINDOW_CLOSE 0x01F9 @@ -56,6 +64,7 @@ #define GLUT_VERSION 0x01FC #define GLUT_RENDERING_CONTEXT 0x01FD +#define GLUT_DIRECT_RENDERING 0x01FE /* * Process loop function, see freeglut_main.c diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h index 2acbabd..eb22e0b 100644 --- a/include/GL/freeglut_std.h +++ b/include/GL/freeglut_std.h @@ -106,6 +106,7 @@ #define FREEGLUT 1 #define GLUT_API_VERSION 4 #define FREEGLUT_VERSION_2_0 1 +#define GLUT_XLIB_IMPLEMENTATION 13 /* * 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 */ 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 ); /* -- 1.7.10.4