projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timers internally now use 64bit unsigned int, if available
[freeglut]
/
src
/
Common
/
freeglut_init.c
diff --git
a/src/Common/freeglut_init.c
b/src/Common/freeglut_init.c
index
0c3e697
..
bb0c097
100644
(file)
--- a/
src/Common/freeglut_init.c
+++ b/
src/Common/freeglut_init.c
@@
-73,9
+73,9
@@
SFG_State fgState = { { -1, -1, GL_FALSE }, /* Position */
0, /* ActiveMenus */
NULL, /* MenuStateCallback */
NULL, /* MenuStatusCallback */
0, /* ActiveMenus */
NULL, /* MenuStateCallback */
NULL, /* MenuStatusCallback */
- { 640, 480, GL_TRUE }, /* GameModeSize */
- 16, /* GameModeDepth */
- 72, /* GameModeRefresh */
+ { -1, -1, GL_TRUE }, /* GameModeSize */
+ -1, /* GameModeDepth */
+ -1, /* GameModeRefresh */
GLUT_ACTION_EXIT, /* ActionOnWindowClose */
GLUT_EXEC_STATE_INIT, /* ExecState */
NULL, /* ProgramName */
GLUT_ACTION_EXIT, /* ActionOnWindowClose */
GLUT_EXEC_STATE_INIT, /* ExecState */
NULL, /* ProgramName */
@@
-286,10
+286,10
@@
void fgDeinitialize( void )
fgState.KeyRepeat = GLUT_KEY_REPEAT_ON;
fgState.Modifiers = INVALID_MODIFIERS;
fgState.KeyRepeat = GLUT_KEY_REPEAT_ON;
fgState.Modifiers = INVALID_MODIFIERS;
- fgState.GameModeSize.X = 640;
- fgState.GameModeSize.Y = 480;
- fgState.GameModeDepth = 16;
- fgState.GameModeRefresh = 72;
+ fgState.GameModeSize.X = -1;
+ fgState.GameModeSize.Y = -1;
+ fgState.GameModeDepth = -1;
+ fgState.GameModeRefresh = -1;
fgListInit( &fgState.Timers );
fgListInit( &fgState.FreeTimers );
fgListInit( &fgState.Timers );
fgListInit( &fgState.FreeTimers );
@@
-315,9
+315,8
@@
void fgDeinitialize( void )
/* -- INTERFACE FUNCTIONS -------------------------------------------------- */
/* -- INTERFACE FUNCTIONS -------------------------------------------------- */
-
#if !TARGET_HOST_POSIX_X11
#if !TARGET_HOST_POSIX_X11
-#include "Common/xparsegeometry_repl.h"
+# include "../Common/xparsegeometry_repl.h"
#endif
/*
#endif
/*
@@
-499,7
+498,7
@@
void FGAPIENTRY glutInitDisplayString( const char* displayMode )
configuration is conformant or not */
break ;
configuration is conformant or not */
break ;
- case 6 : /* "depth": Number of bits of precsion in the depth buffer */
+ case 6 : /* "depth": Number of bits of precision in the depth buffer */
glut_state_flag |= GLUT_DEPTH ; /* Somebody fix this for me! */
break ;
glut_state_flag |= GLUT_DEPTH ; /* Somebody fix this for me! */
break ;
@@
-619,8
+618,7
@@
void FGAPIENTRY glutInitDisplayString( const char* displayMode )
break ;
case 35 : /* "borderless": windows should not have borders */
break ;
case 35 : /* "borderless": windows should not have borders */
-#if TARGET_HOST_POSIX_X11
-#endif
+ glut_state_flag |= GLUT_BORDERLESS;
break ;
case 36 : /* "aux": some number of aux buffers */
break ;
case 36 : /* "aux": some number of aux buffers */
@@
-646,7
+644,7
@@
void FGAPIENTRY glutInitDisplayString( const char* displayMode )
void FGAPIENTRY glutInitContextVersion( int majorVersion, int minorVersion )
{
void FGAPIENTRY glutInitContextVersion( int majorVersion, int minorVersion )
{
- /* We will make use of these valuse when creating a new OpenGL context... */
+ /* We will make use of these value when creating a new OpenGL context... */
fgState.MajorVersion = majorVersion;
fgState.MinorVersion = minorVersion;
}
fgState.MajorVersion = majorVersion;
fgState.MinorVersion = minorVersion;
}
@@
-684,4
+682,4
@@
void FGAPIENTRY glutInitWarningFunc( void (* vfgWarning) ( const char *fmt, va_l
fgState.WarningFunc = vfgWarning;
}
fgState.WarningFunc = vfgWarning;
}
-/*** END OF FILE ***/
+/*** END OF FILE ***/
\ No newline at end of file