AUX buffers for Windows (John Fay)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@568 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
brianp 2005-02-15 14:49:39 +00:00
parent fd3bf94540
commit 5653791bd0
2 changed files with 12 additions and 14 deletions

View File

@ -690,18 +690,6 @@ static char* Tokens[] =
"xtruecolour", "xdirectcolour", "borderless", "aux" "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,
5, 5, 3, 3, 4, 3, 9, 7,
6, 6, 7, 4, 8, 8, 7,
11, 10, 12, 12,
10, 12,
11, 10, 13, 13,
11, 13, 10, 3
};
void FGAPIENTRY glutInitDisplayString( const char* displayMode ) void FGAPIENTRY glutInitDisplayString( const char* displayMode )
{ {
int glut_state_flag = 0 ; int glut_state_flag = 0 ;
@ -722,7 +710,7 @@ void FGAPIENTRY glutInitDisplayString( const char* displayMode )
int i ; int i ;
for ( i = 0; i < NUM_TOKENS; i++ ) for ( i = 0; i < NUM_TOKENS; i++ )
{ {
if ( strncmp ( token, Tokens[i], TokenLengths[i] ) == 0 ) break ; if ( strcmp ( token, Tokens[i] ) == 0 ) break ;
} }
switch ( i ) switch ( i )

View File

@ -214,7 +214,17 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
pfd.cDepthBits = 24; pfd.cDepthBits = 24;
pfd.cStencilBits = 8; pfd.cStencilBits = 8;
#endif #endif
if( fgState.DisplayMode & GLUT_AUX4 )
pfd.cAuxBuffers = 4;
else if( fgState.DisplayMode & GLUT_AUX3 )
pfd.cAuxBuffers = 3;
else if( fgState.DisplayMode & GLUT_AUX2 )
pfd.cAuxBuffers = 2;
else if( fgState.DisplayMode & GLUT_AUX1 )
pfd.cAuxBuffers = 1;
else
pfd.cAuxBuffers = 0; pfd.cAuxBuffers = 0;
pfd.iLayerType = layer_type; pfd.iLayerType = layer_type;
pfd.bReserved = 0; pfd.bReserved = 0;
pfd.dwLayerMask = 0; pfd.dwLayerMask = 0;