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

in freeglut_init set gamemode defaults to -1 (no change from current

Browse Source 
display mode) so that it is not attempted to change the display mode
to some arbitrary default when entering gamemode (only applies if
glutGameModeString is never called)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1097 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho 2012-03-10 03:17:55 +00:00
parent ec322806c9
commit 429507ee23
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
freeglut/freeglut/src/Common/freeglut_init.c
View File

@ -73,9 +73,9 @@ SFG_State fgState = { { -1, -1, GL_FALSE }, /* Position */
0, /* ActiveMenus */ 0, /* ActiveMenus */
NULL, /* MenuStateCallback */ NULL, /* MenuStateCallback */
NULL, /* MenuStatusCallback */ NULL, /* MenuStatusCallback */
{ 640, 480, GL_TRUE }, /* GameModeSize */ { -1, -1, GL_TRUE }, /* GameModeSize */
16, /* GameModeDepth */ -1, /* GameModeDepth */
72, /* GameModeRefresh */ -1, /* GameModeRefresh */
GLUT_ACTION_EXIT, /* ActionOnWindowClose */ GLUT_ACTION_EXIT, /* ActionOnWindowClose */
GLUT_EXEC_STATE_INIT, /* ExecState */ GLUT_EXEC_STATE_INIT, /* ExecState */
NULL, /* ProgramName */ NULL, /* ProgramName */
@ -286,10 +286,10 @@ void fgDeinitialize( void )
fgState.KeyRepeat = GLUT_KEY_REPEAT_ON; fgState.KeyRepeat = GLUT_KEY_REPEAT_ON;
fgState.Modifiers = INVALID_MODIFIERS; fgState.Modifiers = INVALID_MODIFIERS;
fgState.GameModeSize.X = 640; fgState.GameModeSize.X = -1;
fgState.GameModeSize.Y = 480; fgState.GameModeSize.Y = -1;
fgState.GameModeDepth = 16; fgState.GameModeDepth = -1;
fgState.GameModeRefresh = 72; fgState.GameModeRefresh = -1;
fgListInit( &fgState.Timers ); fgListInit( &fgState.Timers );
fgListInit( &fgState.FreeTimers ); fgListInit( &fgState.FreeTimers );

8
freeglut/freeglut/src/mswin/freeglut_gamemode_mswin.c
View File

@ -34,12 +34,10 @@
*/ */
void fgPlatformRememberState( void ) void fgPlatformRememberState( void )
{ {
/* DEVMODE devMode; */
/* Grab the current desktop settings... */ /* Grab the current desktop settings... */
/* hack to get around my stupid cross-gcc headers */ /* hack to get around my stupid cross-gcc headers */
#define FREEGLUT_ENUM_CURRENT_SETTINGS -1 #define FREEGLUT_ENUM_CURRENT_SETTINGS -1
EnumDisplaySettings( fgDisplay.pDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS, EnumDisplaySettings( fgDisplay.pDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS,
&fgDisplay.pDisplay.DisplayMode ); &fgDisplay.pDisplay.DisplayMode );
@ -57,7 +55,6 @@ void fgPlatformRestoreState( void )
{ {
/* Restore the previously remembered desktop display settings */ /* Restore the previously remembered desktop display settings */
ChangeDisplaySettingsEx( fgDisplay.pDisplay.DisplayName,&fgDisplay.pDisplay.DisplayMode, 0,0,0 ); ChangeDisplaySettingsEx( fgDisplay.pDisplay.DisplayName,&fgDisplay.pDisplay.DisplayMode, 0,0,0 );
} }
@ -154,4 +151,3 @@ void fgPlatformEnterGameMode( void )
void fgPlatformLeaveGameMode( void ) void fgPlatformLeaveGameMode( void )
{ {
} }