FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing game mode in Windows so that it doesn't override unspecified settings per e-mail from Diederick C. Niehorster, 1/25/2011, 11:09 PM. I think this addresses bug report 3112718.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@892 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2011-03-13 21:00:37 +00:00
parent f86a562414
commit 4f556f9516
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
freeglut/freeglut/src/freeglut_gamemode.c
View File

@ -324,13 +324,28 @@ static GLboolean fghChangeDisplayMode( GLboolean haveToTest )
success = GL_FALSE; success = GL_FALSE;
EnumDisplaySettings( fgDisplay.DisplayName, -1, &devMode ); EnumDisplaySettings( fgDisplay.DisplayName, -1, &devMode );
devMode.dmFields |= DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY; devMode.dmFields = 0;
devMode.dmPelsWidth = fgState.GameModeSize.X; if (fgState.GameModeSize.X!=-1)
devMode.dmPelsHeight = fgState.GameModeSize.Y; {
devMode.dmBitsPerPel = fgState.GameModeDepth; devMode.dmPelsWidth = fgState.GameModeSize.X;
devMode.dmDisplayFrequency = fgState.GameModeRefresh; devMode.dmFields |= DM_PELSWIDTH;
devMode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY; }
if (fgState.GameModeSize.Y!=-1)
{
devMode.dmPelsHeight = fgState.GameModeSize.Y;
devMode.dmFields |= DM_PELSHEIGHT;
}
if (fgState.GameModeDepth!=-1)
{
devMode.dmBitsPerPel = fgState.GameModeDepth;
devMode.dmFields |= DM_BITSPERPEL;
}
if (fgState.GameModeRefresh!=-1)
{
devMode.dmDisplayFrequency = fgState.GameModeRefresh;
devMode.dmFields |= DM_DISPLAYFREQUENCY;
}
switch ( ChangeDisplaySettingsEx(fgDisplay.DisplayName, &devMode, NULL, haveToTest ? CDS_TEST : CDS_FULLSCREEN , NULL) ) switch ( ChangeDisplaySettingsEx(fgDisplay.DisplayName, &devMode, NULL, haveToTest ? CDS_TEST : CDS_FULLSCREEN , NULL) )
{ {
@ -380,7 +395,7 @@ static GLboolean fghChangeDisplayMode( GLboolean haveToTest )
*/ */
void FGAPIENTRY glutGameModeString( const char* string ) void FGAPIENTRY glutGameModeString( const char* string )
{ {
int width = 640, height = 480, depth = 16, refresh = 72; int width = -1, height = -1, depth = -1, refresh = -1;
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGameModeString" ); FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGameModeString" );