teambeef
/
ioq3quest
mirror of https://github.com/DrBeef/ioq3quest.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Fix to GLimp_DetectAvailableModes not sorting the first returned mode

This commit is contained in:
Tim Angus 2009-11-05 20:29:26 +00:00
parent eee9770fbf
commit 568cf2732a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
code/sdl/sdl_glimp.c
View File

@ -117,8 +117,12 @@ static int GLimp_CompareModes( const void *a, const void *b )
const float ASPECT_EPSILON = 0.001f; const float ASPECT_EPSILON = 0.001f;
SDL_Rect *modeA = *(SDL_Rect **)a; SDL_Rect *modeA = *(SDL_Rect **)a;
SDL_Rect *modeB = *(SDL_Rect **)b; SDL_Rect *modeB = *(SDL_Rect **)b;
float aspectDiffA = fabs( ( (float)modeA->w / (float)modeA->h ) - displayAspect ); float aspectA = (float)modeA->w / (float)modeA->h;
float aspectDiffB = fabs( ( (float)modeB->w / (float)modeB->h ) - displayAspect ); float aspectB = (float)modeB->w / (float)modeB->h;
int areaA = modeA->w * modeA->h;
int areaB = modeB->w * modeB->h;
float aspectDiffA = fabs( aspectA - displayAspect );
float aspectDiffB = fabs( aspectB - displayAspect );
float aspectDiffsDiff = aspectDiffA - aspectDiffB; float aspectDiffsDiff = aspectDiffA - aspectDiffB;
if( aspectDiffsDiff > ASPECT_EPSILON ) if( aspectDiffsDiff > ASPECT_EPSILON )
@ -126,14 +130,10 @@ static int GLimp_CompareModes( const void *a, const void *b )
else if( aspectDiffsDiff < -ASPECT_EPSILON ) else if( aspectDiffsDiff < -ASPECT_EPSILON )
return -1; return -1;
else else
{ return areaA - areaB;
if( modeA->w == modeB->w )
return modeA->h - modeB->h;
else
return modeA->w - modeB->w;
}
} }
/* /*
=============== ===============
GLimp_DetectAvailableModes GLimp_DetectAvailableModes
@ -162,8 +162,8 @@ static void GLimp_DetectAvailableModes(void)
for( numModes = 0; modes[ numModes ]; numModes++ ); for( numModes = 0; modes[ numModes ]; numModes++ );
if(numModes > 1) if( numModes > 1 )
qsort( modes+1, numModes-1, sizeof( SDL_Rect* ), GLimp_CompareModes ); qsort( modes, numModes, sizeof( SDL_Rect* ), GLimp_CompareModes );
for( i = 0; i < numModes; i++ ) for( i = 0; i < numModes; i++ )
{ {