Revision: 1419
http://freeglut.svn.sourceforge.net/freeglut/?rev=1419&view=rev
Author: dcnieho
Date: 2012-11-19 06:23:11 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
backporting r1198
Revision Links:
--------------
http://freeglut.svn.sourceforge.net/freeglut/?rev=1198&view=rev
Modified Paths:
--------------
tags/FG_2_8_1_RC1/freeglut/src/freeglut_window.c
Modified: tags/FG_2_8_1_RC1/freeglut/src/freeglut_window.c
===================================================================
--- tags/FG_2_8_1_RC1/freeglut/src/freeglut_window.c 2012-11-19 06:04:03 UTC (rev 1418)
+++ tags/FG_2_8_1_RC1/freeglut/src/freeglut_window.c 2012-11-19 06:23:11 UTC (rev 1419)
@@ -175,18 +175,11 @@
/* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
-static int fghIsLegacyContextVersionRequested( void )
+static int fghIsLegacyContextRequested( void )
{
return fgState.MajorVersion < 2 || (fgState.MajorVersion == 2 && fgState.MinorVersion <= 1);
}
-static int fghIsLegacyContextRequested( void )
-{
- return fghIsLegacyContextVersionRequested() &&
- fgState.ContextFlags == 0 &&
- fgState.ContextProfile == 0;
-}
-
static int fghNumberOfAuxBuffersRequested( void )
{
if ( fgState.DisplayMode & GLUT_AUX4 ) {
@@ -401,10 +394,8 @@
static void fghFillContextAttributes( int *attributes ) {
int where = 0, contextFlags, contextProfile;
- if ( !fghIsLegacyContextVersionRequested() ) {
- ATTRIB_VAL( GLX_CONTEXT_MAJOR_VERSION_ARB, fgState.MajorVersion );
- ATTRIB_VAL( GLX_CONTEXT_MINOR_VERSION_ARB, fgState.MinorVersion );
- }
+ ATTRIB_VAL( GLX_CONTEXT_MAJOR_VERSION_ARB, fgState.MajorVersion );
+ ATTRIB_VAL( GLX_CONTEXT_MINOR_VERSION_ARB, fgState.MinorVersion );
contextFlags =
fghMapBit( fgState.ContextFlags, GLUT_DEBUG, GLX_CONTEXT_DEBUG_BIT_ARB ) |
@@ -573,10 +564,8 @@
static void fghFillContextAttributes( int *attributes ) {
int where = 0, contextFlags, contextProfile;
- if ( !fghIsLegacyContextVersionRequested() ) {
- ATTRIB_VAL( WGL_CONTEXT_MAJOR_VERSION_ARB, fgState.MajorVersion );
- ATTRIB_VAL( WGL_CONTEXT_MINOR_VERSION_ARB, fgState.MinorVersion );
- }
+ ATTRIB_VAL( WGL_CONTEXT_MAJOR_VERSION_ARB, fgState.MajorVersion );
+ ATTRIB_VAL( WGL_CONTEXT_MINOR_VERSION_ARB, fgState.MinorVersion );
contextFlags =
fghMapBit( fgState.ContextFlags, GLUT_DEBUG, WGL_CONTEXT_DEBUG_BIT_ARB ) |
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|