projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Uploading spaceball/set-window patch per e-mail from John Tsiombikas dated 1:34 PM...
[freeglut]
/
src
/
freeglut_init.c
diff --git
a/src/freeglut_init.c
b/src/freeglut_init.c
index
c9bd04d
..
5161c03
100644
(file)
--- a/
src/freeglut_init.c
+++ b/
src/freeglut_init.c
@@
-89,7
+89,8
@@
SFG_State fgState = { { -1, -1, GL_FALSE }, /* Position */
4, /* SampleNumber */
1, /* MajorVersion */
0, /* MajorVersion */
4, /* SampleNumber */
1, /* MajorVersion */
0, /* MajorVersion */
- 0 /* ContextFlags */
+ 0, /* ContextFlags */
+ 0 /* ContextProfile */
};
};
@@
-425,6
+426,7
@@
void fgDeinitialize( void )
fgState.MajorVersion = 1;
fgState.MinorVersion = 0;
fgState.ContextFlags = 0;
fgState.MajorVersion = 1;
fgState.MinorVersion = 0;
fgState.ContextFlags = 0;
+ fgState.ContextProfile = 0;
fgState.Initialised = GL_FALSE;
fgState.Initialised = GL_FALSE;
@@
-678,12
+680,6
@@
void FGAPIENTRY glutInit( int* pargc, char** argv )
char* geometry = NULL;
int i, j, argc = *pargc;
char* geometry = NULL;
int i, j, argc = *pargc;
- /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
- size_t sLen;
- errno_t err;
-#endif
-
if( fgState.Initialised )
fgError( "illegal glutInit() reinitialization attempt" );
if( fgState.Initialised )
fgError( "illegal glutInit() reinitialization attempt" );
@@
-703,15
+699,8
@@
void FGAPIENTRY glutInit( int* pargc, char** argv )
/* check if GLUT_FPS env var is set */
#ifndef _WIN32_WCE
{
/* check if GLUT_FPS env var is set */
#ifndef _WIN32_WCE
{
- /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
- char* fps = NULL;
- err = _dupenv_s( &fps, &sLen, "GLUT_FPS" );
- if (err)
- fgError("Error getting GLUT_FPS environment variable");
-#else
const char *fps = getenv( "GLUT_FPS" );
const char *fps = getenv( "GLUT_FPS" );
-#endif
+
if( fps )
{
int interval;
if( fps )
{
int interval;
@@
-722,20
+711,9
@@
void FGAPIENTRY glutInit( int* pargc, char** argv )
else
fgState.FPSInterval = interval;
}
else
fgState.FPSInterval = interval;
}
- /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
- free ( fps ); fps = NULL; /* dupenv_s allocates a string that we must free */
-#endif
}
}
- /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
- err = _dupenv_s( &displayName, &sLen, "DISPLAY" );
- if (err)
- fgError("Error getting DISPLAY environment variable");
-#else
displayName = getenv( "DISPLAY" );
displayName = getenv( "DISPLAY" );
-#endif
for( i = 1; i < argc; i++ )
{
for( i = 1; i < argc; i++ )
{
@@
-820,10
+798,6
@@
void FGAPIENTRY glutInit( int* pargc, char** argv )
* variable for opening the X display (see code above):
*/
fghInitialize( displayName );
* variable for opening the X display (see code above):
*/
fghInitialize( displayName );
- /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
- free ( displayName ); displayName = NULL; /* dupenv_s allocates a string that we must free */
-#endif
/*
* Geometry parsing deffered until here because we may need the screen
/*
* Geometry parsing deffered until here because we may need the screen
@@
-932,21
+906,13
@@
void FGAPIENTRY glutInitDisplayString( const char* displayMode )
* delimited by blanks or tabs.
*/
char *token ;
* delimited by blanks or tabs.
*/
char *token ;
- /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
- char *next_token = NULL;
-#endif
size_t len = strlen ( displayMode );
char *buffer = (char *)malloc ( (len+1) * sizeof(char) );
memcpy ( buffer, displayMode, len );
buffer[len] = '\0';
size_t len = strlen ( displayMode );
char *buffer = (char *)malloc ( (len+1) * sizeof(char) );
memcpy ( buffer, displayMode, len );
buffer[len] = '\0';
- /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
- token = strtok_s ( buffer, " \t", &next_token );
-#else
token = strtok ( buffer, " \t" );
token = strtok ( buffer, " \t" );
-#endif
+
while ( token )
{
/* Process this token */
while ( token )
{
/* Process this token */
@@
-1123,12
+1089,7
@@
void FGAPIENTRY glutInitDisplayString( const char* displayMode )
break ;
}
break ;
}
- /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
- token = strtok_s ( NULL, " \t", &next_token );
-#else
token = strtok ( NULL, " \t" );
token = strtok ( NULL, " \t" );
-#endif
}
free ( buffer );
}
free ( buffer );
@@
-1153,4
+1114,10
@@
void FGAPIENTRY glutInitContextFlags( int flags )
fgState.ContextFlags = flags;
}
fgState.ContextFlags = flags;
}
+void FGAPIENTRY glutInitContextProfile( int profile )
+{
+ /* We will make use of this value when creating a new OpenGL context... */
+ fgState.ContextProfile = profile;
+}
+
/*** END OF FILE ***/
/*** END OF FILE ***/