Aux color buffer support. Pass one of GLUT_AUX[1234] to glutInitDisplayMode.

Only implemented/tested on GLX, not Windows.

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@567 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/include/GL/freeglut_ext.h b/include/GL/freeglut_ext.h
index 570f998..90117c7 100644 (file)
--- a/include/GL/freeglut_ext.h
+++ b/include/GL/freeglut_ext.h
@@ -67,6 +67,15 @@
 #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
  */
 FGAPI void    FGAPIENTRY glutMainLoopEvent( void );

diff --git a/src/freeglut_init.c b/src/freeglut_init.c
index d5a5aa6..799c86c 100644 (file)
--- a/src/freeglut_init.c
+++ b/src/freeglut_init.c
@@ -687,9 +687,10 @@ static char* Tokens[] =
     "xstaticgray", "xgrayscale", "xstaticcolor", "xpseudocolor",
     "xtruecolor", "xdirectcolor",
     "xstaticgrey", "xgreyscale", "xstaticcolour", "xpseudocolour",
-    "xtruecolour", "xdirectcolour", "borderless"
+    "xtruecolour", "xdirectcolour", "borderless", "aux"
 };
 
+/* XXX why the heck do we use this table instead of strlen(Tokens[i])? */
 static int TokenLengths[] =
 {
     5,       4,      3,     4,      6,        10,           5,       6,
@@ -698,7 +699,7 @@ static int TokenLengths[] =
     11,            10,           12,             12,
     10,           12,
     11,            10,           13,             13,
-    11,            13,              10
+    11,            13,              10,          3
 };
 
 void FGAPIENTRY glutInitDisplayString( const char* displayMode )
@@ -874,7 +875,11 @@ void FGAPIENTRY glutInitDisplayString( const char* displayMode )
 #endif
             break ;
 
-        case 36 :  /* Unrecognized */
+        case 36 :  /* "aux":  some number of aux buffers */
+            glut_state_flag |= GLUT_AUX1;
+            break ;
+
+        case 37 :  /* Unrecognized */
             fgWarning ( "WARNING - Display string token not recognized:  %s",
                         token );
             break ;

diff --git a/src/freeglut_window.c b/src/freeglut_window.c
index 77f2594..a032ab4 100644 (file)
--- a/src/freeglut_window.c
+++ b/src/freeglut_window.c
@@ -127,6 +127,16 @@ XVisualInfo* fgChooseVisual( void )
             ATTRIB_VAL( GLX_ACCUM_ALPHA_SIZE, 1 );
     }
 
+    if( fgState.DisplayMode & GLUT_AUX1 )
+        ATTRIB_VAL( GLX_AUX_BUFFERS, 1 );
+    if( fgState.DisplayMode & GLUT_AUX2 )
+        ATTRIB_VAL( GLX_AUX_BUFFERS, 2 );
+    if( fgState.DisplayMode & GLUT_AUX3 )
+        ATTRIB_VAL( GLX_AUX_BUFFERS, 3 );
+    if( fgState.DisplayMode & GLUT_AUX4 )
+        ATTRIB_VAL( GLX_AUX_BUFFERS, 4 );
+
+
     /* Push a null at the end of the list */
     ATTRIB( None );