Cleanup to fgSetupixelFormat(). Should be no functional changes.

Code facelift included:

 * Consistant indentation.
 * Removal of all TABs (there were a bunch).
 * Fit to 80 columns.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@273 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
rkrolib 2003-10-31 04:25:34 +00:00
parent 807042d126
commit 570e2aa0b6

View File

@ -153,87 +153,64 @@ XVisualInfo* fgChooseVisual( void )
* Setup the pixel format for a Win32 window * Setup the pixel format for a Win32 window
*/ */
#if TARGET_HOST_WIN32 #if TARGET_HOST_WIN32
GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly, unsigned char layer_type ) GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
unsigned char layer_type )
{ {
PIXELFORMATDESCRIPTOR* ppfd, pfd; PIXELFORMATDESCRIPTOR* ppfd, pfd;
int flags, pixelformat; int flags, pixelformat;
/* freeglut_return_val_if_fail( window != NULL, 0 );
* Check if the window seems valid flags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL;
*/ if( fgState.DisplayMode & GLUT_DOUBLE )
freeglut_return_val_if_fail( window != NULL, 0 ); flags |= PFD_DOUBLEBUFFER;
/* #pragma message( "fgSetupPixelFormat(): there is still some work to do here!" )
* The pixel format should allow us to draw to the window using OpenGL
*/
flags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL;
/* /*
* It might be the case for us to use double buffering * Specify which pixel format do we opt for...
*/ */
if( fgState.DisplayMode & GLUT_DOUBLE ) pfd.nSize = sizeof(PIXELFORMATDESCRIPTOR);
flags |= PFD_DOUBLEBUFFER; pfd.nVersion = 1;
pfd.dwFlags = flags;
/* pfd.iPixelType = PFD_TYPE_RGBA;
* Specify which pixel format do we opt for... pfd.cColorBits = 24;
*/ pfd.cRedBits = 0;
# pragma message( "fgSetupPixelFormat(): there is still some work to do here!" ) pfd.cRedShift = 0;
pfd.cGreenBits = 0;
pfd.nSize = sizeof(PIXELFORMATDESCRIPTOR); pfd.cGreenShift = 0;
pfd.nVersion = 1; pfd.cBlueBits = 0;
pfd.dwFlags = flags; pfd.cBlueShift = 0;
pfd.iPixelType = PFD_TYPE_RGBA; pfd.cAlphaBits = 0;
pfd.cColorBits = 24; pfd.cAlphaShift = 0;
pfd.cRedBits = 0; pfd.cAccumBits = 0;
pfd.cRedShift = 0; pfd.cAccumRedBits = 0;
pfd.cGreenBits = 0; pfd.cAccumGreenBits = 0;
pfd.cGreenShift = 0; pfd.cAccumBlueBits = 0;
pfd.cBlueBits = 0; pfd.cAccumAlphaBits = 0;
pfd.cBlueShift = 0;
pfd.cAlphaBits = 0;
pfd.cAlphaShift = 0;
pfd.cAccumBits = 0;
pfd.cAccumRedBits = 0;
pfd.cAccumGreenBits = 0;
pfd.cAccumBlueBits = 0;
pfd.cAccumAlphaBits = 0;
#if 0 #if 0
pfd.cDepthBits = 32; pfd.cDepthBits = 32;
pfd.cStencilBits = 0; pfd.cStencilBits = 0;
#else #else
pfd.cDepthBits = 24; pfd.cDepthBits = 24;
pfd.cStencilBits = 8; pfd.cStencilBits = 8;
#endif #endif
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;
pfd.dwVisibleMask = 0; pfd.dwVisibleMask = 0;
pfd.dwDamageMask = 0; pfd.dwDamageMask = 0;
/* pfd.cColorBits = (BYTE) GetDeviceCaps( window->Window.Device, BITSPIXEL );
* Fill in the color bits... ppfd = &pfd;
*/
pfd.cColorBits = (BYTE) GetDeviceCaps( window->Window.Device, BITSPIXEL );
ppfd = &pfd;
/* pixelformat = ChoosePixelFormat( window->Window.Device, ppfd );
* Choose the pixel format that matches our demand if( pixelformat == 0 )
*/ return FALSE;
pixelformat = ChoosePixelFormat( window->Window.Device, ppfd );
if( pixelformat == 0 )
return( FALSE );
/* if( checkOnly )
* We might have been called to check if the pixel format exists only return TRUE;
*/ return SetPixelFormat( window->Window.Device, pixelformat, ppfd );
if( checkOnly )
return( TRUE );
/*
* Finally, set the window's pixel format
*/
return ( SetPixelFormat( window->Window.Device, pixelformat, ppfd ) ) ;
} }
#endif #endif