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

gamemode-x11: fixed the conditions checking for XR&R >= 1.1, as it where they would match 1.0 too

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1380 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
jtsiomb 2012-07-31 14:33:26 +00:00
parent 01d00ef0d0
commit 4c740e0f35
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
freeglut/freeglut/src/x11/fg_gamemode_x11.c
View File

@ -46,7 +46,7 @@ static int xrandr_resize(int xsz, int ysz, int rate, int just_checking)
/* we only heed the rate if we CAN actually use it (Xrandr >= 1.1) and /* we only heed the rate if we CAN actually use it (Xrandr >= 1.1) and
* the user actually cares about it (rate > 0) * the user actually cares about it (rate > 0)
*/ */
use_rate = ( rate > 0 ) && ( ( ver_major >= 1 ) || use_rate = ( rate > 0 ) && ( ( ver_major > 1 ) ||
( ( ver_major == 1 ) && ( ver_minor >= 1 ) ) ); ( ( ver_major == 1 ) && ( ver_minor >= 1 ) ) );
/* this loop is only so that the whole thing will be repeated if someone /* this loop is only so that the whole thing will be repeated if someone
@ -93,7 +93,7 @@ static int xrandr_resize(int xsz, int ysz, int rate, int just_checking)
if(res_idx == -1) if(res_idx == -1)
break; /* no matching resolution */ break; /* no matching resolution */
#if ( RANDR_MAJOR >= 1 ) || ( ( RANDR_MAJOR == 1 ) && ( RANDR_MINOR >= 1 ) ) #if ( RANDR_MAJOR > 1 ) || ( ( RANDR_MAJOR == 1 ) && ( RANDR_MINOR >= 1 ) )
if(use_rate) { if(use_rate) {
rate = fgState.GameModeRefresh; rate = fgState.GameModeRefresh;
@ -118,7 +118,7 @@ static int xrandr_resize(int xsz, int ysz, int rate, int just_checking)
break; break;
} }
#if ( RANDR_MAJOR >= 1 ) || ( ( RANDR_MAJOR == 1 ) && ( RANDR_MINOR >= 1 ) ) #if ( RANDR_MAJOR > 1 ) || ( ( RANDR_MAJOR == 1 ) && ( RANDR_MINOR >= 1 ) )
if(use_rate) if(use_rate)
result = XRRSetScreenConfigAndRate(fgDisplay.pDisplay.Display, xrr_config, result = XRRSetScreenConfigAndRate(fgDisplay.pDisplay.Display, xrr_config,
fgDisplay.pDisplay.RootWindow, res_idx, rot, rate, timestamp); fgDisplay.pDisplay.RootWindow, res_idx, rot, rate, timestamp);
@ -176,7 +176,7 @@ void fgPlatformRememberState( void )
fgDisplay.pDisplay.prev_ysz = ssizes[curr].height; fgDisplay.pDisplay.prev_ysz = ssizes[curr].height;
fgDisplay.pDisplay.prev_refresh = -1; fgDisplay.pDisplay.prev_refresh = -1;
# if ( RANDR_MAJOR >= 1 ) || ( ( RANDR_MAJOR == 1 ) && ( RANDR_MINOR >= 1 ) ) # if ( RANDR_MAJOR > 1 ) || ( ( RANDR_MAJOR == 1 ) && ( RANDR_MINOR >= 1 ) )
if(fgState.GameModeRefresh != -1) { if(fgState.GameModeRefresh != -1) {
fgDisplay.pDisplay.prev_refresh = XRRConfigCurrentRate(xrr_config); fgDisplay.pDisplay.prev_refresh = XRRConfigCurrentRate(xrr_config);
} }