pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed DGA mode sorting and eliminated doublescan and interlaced modes

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401744
This commit is contained in:
Sam Lantinga 2006-05-09 06:14:11 +00:00
parent 52c114a331
commit f210611d6f
1 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/video/dga/SDL_dgavideo.c
View file

@ -41,6 +41,8 @@
/* get function pointers... */ /* get function pointers... */
#include "../x11/SDL_x11dyn.h" #include "../x11/SDL_x11dyn.h"
/*#define DGA_DEBUG*/
/* Heheh we're using X11 event code */ /* Heheh we're using X11 event code */
extern void X11_SaveScreenSaver(Display *display, int *saved_timeout, BOOL *dpms); extern void X11_SaveScreenSaver(Display *display, int *saved_timeout, BOOL *dpms);
extern void X11_DisableScreenSaver(Display *display); extern void X11_DisableScreenSaver(Display *display);
@ -182,8 +184,8 @@ static int DGA_AddMode(_THIS, int bpp, int w, int h)
return(0); return(0);
} }
index = ((bpp+7)/8)-1; index = ((bpp+7)/8)-1;
for ( i=0; i<SDL_nummodes[index]; ++i ) { if ( SDL_nummodes[index] > 0 ) {
mode = SDL_modelist[index][i]; mode = SDL_modelist[index][SDL_nummodes[index]-1];
if ( (mode->w == w) && (mode->h == h) ) { if ( (mode->w == w) && (mode->h == h) ) {
return(0); return(0);
} }
@ -286,14 +288,21 @@ static int cmpmodes(const void *va, const void *vb)
const SDL_NAME(XDGAMode) *a = (const SDL_NAME(XDGAMode) *)va; const SDL_NAME(XDGAMode) *a = (const SDL_NAME(XDGAMode) *)va;
const SDL_NAME(XDGAMode) *b = (const SDL_NAME(XDGAMode) *)vb; const SDL_NAME(XDGAMode) *b = (const SDL_NAME(XDGAMode) *)vb;
/* Prefer DirectColor visuals for otherwise equal modes */
if ( (a->viewportWidth == b->viewportWidth) && if ( (a->viewportWidth == b->viewportWidth) &&
(b->viewportHeight == a->viewportHeight) ) { (b->viewportHeight == a->viewportHeight) ) {
if ( a->visualClass == DirectColor ) /* Prefer 32 bpp over 24 bpp, 16 bpp over 15 bpp */
int a_bpp = a->depth == 24 ? a->bitsPerPixel : a->depth;
int b_bpp = b->depth == 24 ? b->bitsPerPixel : b->depth;
if ( a_bpp != b_bpp ) {
return b_bpp - a_bpp;
}
/* Prefer DirectColor visuals, for gamma support */
if ( a->visualClass == DirectColor && b->visualClass != DirectColor )
return -1; return -1;
if ( b->visualClass == DirectColor ) if ( b->visualClass == DirectColor && a->visualClass != DirectColor )
return 1; return 1;
return 0; /* Maintain server refresh rate sorting */
return a->num - b->num;
} else if ( a->viewportWidth == b->viewportWidth ) { } else if ( a->viewportWidth == b->viewportWidth ) {
return b->viewportHeight - a->viewportHeight; return b->viewportHeight - a->viewportHeight;
} else { } else {
@ -400,12 +409,13 @@ static int DGA_VideoInit(_THIS, SDL_PixelFormat *vformat)
modes = SDL_NAME(XDGAQueryModes)(DGA_Display, DGA_Screen, &num_modes); modes = SDL_NAME(XDGAQueryModes)(DGA_Display, DGA_Screen, &num_modes);
SDL_qsort(modes, num_modes, sizeof *modes, cmpmodes); SDL_qsort(modes, num_modes, sizeof *modes, cmpmodes);
for ( i=0; i<num_modes; ++i ) { for ( i=0; i<num_modes; ++i ) {
if ( ((modes[i].visualClass == PseudoColor) ||
(modes[i].visualClass == DirectColor) ||
(modes[i].visualClass == TrueColor)) &&
!(modes[i].flags & (XDGAInterlaced|XDGADoublescan)) ) {
#ifdef DGA_DEBUG #ifdef DGA_DEBUG
PrintMode(&modes[i]); PrintMode(&modes[i]);
#endif #endif
if ( (modes[i].visualClass == PseudoColor) ||
(modes[i].visualClass == DirectColor) ||
(modes[i].visualClass == TrueColor) ) {
DGA_AddMode(this, modes[i].bitsPerPixel, DGA_AddMode(this, modes[i].bitsPerPixel,
modes[i].viewportWidth, modes[i].viewportWidth,
modes[i].viewportHeight); modes[i].viewportHeight);
@ -461,7 +471,6 @@ SDL_Surface *DGA_SetVideoMode(_THIS, SDL_Surface *current,
for ( i=0; i<num_modes; ++i ) { for ( i=0; i<num_modes; ++i ) {
int depth; int depth;
depth = modes[i].depth; depth = modes[i].depth;
if ( depth == 24 ) { /* Distinguish between 24 and 32 bpp */ if ( depth == 24 ) { /* Distinguish between 24 and 32 bpp */
depth = modes[i].bitsPerPixel; depth = modes[i].bitsPerPixel;
@ -471,7 +480,8 @@ SDL_Surface *DGA_SetVideoMode(_THIS, SDL_Surface *current,
(modes[i].viewportHeight == height) && (modes[i].viewportHeight == height) &&
((modes[i].visualClass == PseudoColor) || ((modes[i].visualClass == PseudoColor) ||
(modes[i].visualClass == DirectColor) || (modes[i].visualClass == DirectColor) ||
(modes[i].visualClass == TrueColor)) ) { (modes[i].visualClass == TrueColor)) &&
!(modes[i].flags & (XDGAInterlaced|XDGADoublescan)) ) {
break; break;
} }
} }
@ -479,6 +489,9 @@ SDL_Surface *DGA_SetVideoMode(_THIS, SDL_Surface *current,
SDL_SetError("No matching video mode found"); SDL_SetError("No matching video mode found");
return(NULL); return(NULL);
} }
#ifdef DGA_DEBUG
PrintMode(&modes[i]);
#endif
/* Set the video mode */ /* Set the video mode */
mode = SDL_NAME(XDGASetMode)(DGA_Display, DGA_Screen, modes[i].num); mode = SDL_NAME(XDGASetMode)(DGA_Display, DGA_Screen, modes[i].num);