Skip to content

L
libSDL
Commit 5c6b5227 authored by Patrice Mandin's avatar Patrice Mandin
Browse files
Options

Dynamically create list of video modes, easier to add new ones 

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401043
parent ef3a6ed1
Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 120 deletions
README.MiNT
View file @ 5c6b5227
...@@ -156,6 +156,7 @@ Xbios video: ...@@ -156,6 +156,7 @@ Xbios video:
320x480x8 and 320x240x8 (software double-lined mode). 320x480x8 and 320x240x8 (software double-lined mode).
Falcon: Falcon:
All modes supported by the current monitor (RVB or VGA). All modes supported by the current monitor (RVB or VGA).
BlowUp extended modes, ScreenBlaster 3 current mode.
Clones and any machine with monochrome monitor: Clones and any machine with monochrome monitor:
Not supported. Not supported.
......
src/video/xbios/SDL_xbios.c
View file @ 5c6b5227
...@@ -60,7 +60,17 @@ static char rcsid = ...@@ -60,7 +60,17 @@ static char rcsid =
#define XBIOS_VID_DRIVER_NAME "xbios" #define XBIOS_VID_DRIVER_NAME "xbios"
/* Debug print info */
#if 1
#define DEBUG_PRINT(what) \
{ \
printf what; \
}
/*#define DEBUG_VIDEO_XBIOS 1*/ /*#define DEBUG_VIDEO_XBIOS 1*/
#else
#define DEBUG_PRINT(what)
#undef DEBUG_VIDEO_XBIOS
#endif
/* Initialization/Query functions */ /* Initialization/Query functions */
static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat); static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat);
...@@ -82,55 +92,6 @@ static void XBIOS_UpdateRects(_THIS, int numrects, SDL_Rect *rects); ...@@ -82,55 +92,6 @@ static void XBIOS_UpdateRects(_THIS, int numrects, SDL_Rect *rects);
static void XBIOS_GL_SwapBuffers(_THIS); static void XBIOS_GL_SwapBuffers(_THIS);
#endif #endif
/* List of video modes */
/* ST modes */
static int xbiosnummodes_st=1;
static xbiosmode_t xbiosmodelist_st[]={
{ST_LOW>>8,320,200,4,SDL_FALSE}
};
/* TT modes */
static int xbiosnummodes_tt=2;
static xbiosmode_t xbiosmodelist_tt[]={
{TT_LOW,320,480,8,SDL_FALSE},
{TT_LOW,320,240,8,SDL_TRUE} /* Software double-lined mode */
};
/* Falcon RVB modes */
static int xbiosnummodes_f30rvb=16;
static xbiosmode_t xbiosmodelist_f30rvb[]={
{BPS16|COL80|OVERSCAN|VERTFLAG,768,480,16,SDL_FALSE},
{BPS16|COL80|OVERSCAN,768,240,16,SDL_FALSE},
{BPS16|COL80|VERTFLAG,640,400,16,SDL_FALSE},
{BPS16|COL80,640,200,16,SDL_FALSE},
{BPS16|OVERSCAN|VERTFLAG,384,480,16,SDL_FALSE},
{BPS16|OVERSCAN,384,240,16,SDL_FALSE},
{BPS16|VERTFLAG,320,400,16,SDL_FALSE},
{BPS16,320,200,16,SDL_FALSE},
{BPS8|COL80|OVERSCAN|VERTFLAG,768,480,8,SDL_FALSE},
{BPS8|COL80|OVERSCAN,768,240,8,SDL_FALSE},
{BPS8|COL80|VERTFLAG,640,400,8,SDL_FALSE},
{BPS8|COL80,640,200,8,SDL_FALSE},
{BPS8|OVERSCAN|VERTFLAG,384,480,8,SDL_FALSE},
{BPS8|OVERSCAN,384,240,8,SDL_FALSE},
{BPS8|VERTFLAG,320,400,8,SDL_FALSE},
{BPS8,320,200,8,SDL_FALSE}
};
/* Falcon VGA modes */
static int xbiosnummodes_f30vga=6;
static xbiosmode_t xbiosmodelist_f30vga[]={
{BPS16,320,480,16,SDL_FALSE},
{BPS16|VERTFLAG,320,240,16,SDL_FALSE},
{BPS8|COL80,640,480,8,SDL_FALSE},
{BPS8|COL80|VERTFLAG,640,240,8,SDL_FALSE},
{BPS8,320,480,8,SDL_FALSE},
{BPS8|VERTFLAG,320,240,8,SDL_FALSE}
};
/* To setup palette */ /* To setup palette */
static unsigned short TT_palette[256]; static unsigned short TT_palette[256];
...@@ -245,6 +206,57 @@ VideoBootStrap XBIOS_bootstrap = { ...@@ -245,6 +206,57 @@ VideoBootStrap XBIOS_bootstrap = {
XBIOS_Available, XBIOS_CreateDevice XBIOS_Available, XBIOS_CreateDevice
}; };
void SDL_XBIOS_AddMode(_THIS, Uint16 modecode, Uint16 width, Uint16 height,
Uint16 depth, SDL_bool flags)
{
int i, curpos;
xbiosmode_t *current_mode;
/* Check if mode already exists */
if (XBIOS_modelist) {
current_mode = XBIOS_modelist;
for (i=0;i<XBIOS_nummodes; i++, current_mode++) {
if (current_mode->width != width)
continue;
if (current_mode->height != height)
continue;
if (current_mode->depth != depth)
continue;
return;
}
}
++XBIOS_nummodes;
XBIOS_modelist = (xbiosmode_t *) realloc(XBIOS_modelist, XBIOS_nummodes * sizeof(xbiosmode_t));
/* Keep the list sorted: bpp, width, height */
curpos=0;
for(i=0; i<XBIOS_nummodes-1; i++) {
if (XBIOS_modelist[i].depth <= depth) {
if (XBIOS_modelist[i].width < width) {
break;
} else if (XBIOS_modelist[i].width == width) {
if (XBIOS_modelist[i].height <= height) {
break;
}
}
}
curpos++;
}
/* Push remaining modes further */
for(i=XBIOS_nummodes-1; i>curpos; i--) {
memcpy(&XBIOS_modelist[i], &XBIOS_modelist[i-1], sizeof(xbiosmode_t));
}
XBIOS_modelist[curpos].number = modecode;
XBIOS_modelist[curpos].width = width;
XBIOS_modelist[curpos].height = height;
XBIOS_modelist[curpos].depth = depth;
XBIOS_modelist[curpos].doubleline = flags;
}
static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat) static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat)
{ {
int i,j8,j16; int i,j8,j16;
...@@ -268,6 +280,8 @@ static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat) ...@@ -268,6 +280,8 @@ static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat)
/* Initialize video mode list */ /* Initialize video mode list */
/* and save current screen status (palette, screen address, video mode) */ /* and save current screen status (palette, screen address, video mode) */
XBIOS_nummodes = 0;
XBIOS_modelist = NULL;
switch (XBIOS_cvdo >>16) { switch (XBIOS_cvdo >>16) {
case VDO_ST: case VDO_ST:
...@@ -275,8 +289,7 @@ static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat) ...@@ -275,8 +289,7 @@ static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat)
{ {
short *oldpalette; short *oldpalette;
XBIOS_nummodes=xbiosnummodes_st; SDL_XBIOS_AddMode(this, ST_LOW>>8,320,200,4,SDL_FALSE);
XBIOS_modelist=xbiosmodelist_st;
XBIOS_oldvbase=Physbase(); XBIOS_oldvbase=Physbase();
XBIOS_oldvmode=Getrez(); XBIOS_oldvmode=Getrez();
...@@ -304,8 +317,10 @@ static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat) ...@@ -304,8 +317,10 @@ static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat)
} }
break; break;
case VDO_TT: case VDO_TT:
XBIOS_nummodes=xbiosnummodes_tt;
XBIOS_modelist=xbiosmodelist_tt; SDL_XBIOS_AddMode(this, TT_LOW,320,480,8,SDL_FALSE);
/* Software double-lined mode */
SDL_XBIOS_AddMode(this, TT_LOW,320,240,8,SDL_TRUE);
XBIOS_oldvbase=Logbase(); XBIOS_oldvbase=Logbase();
XBIOS_oldvmode=EgetShift(); XBIOS_oldvmode=EgetShift();
...@@ -343,12 +358,30 @@ static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat) ...@@ -343,12 +358,30 @@ static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat)
break; break;
case MONITOR_RGB: case MONITOR_RGB:
case MONITOR_TV: case MONITOR_TV:
XBIOS_nummodes = xbiosnummodes_f30rvb; SDL_XBIOS_AddMode(this, BPS16|COL80|OVERSCAN|VERTFLAG,768,480,16,SDL_FALSE);
XBIOS_modelist = xbiosmodelist_f30rvb; SDL_XBIOS_AddMode(this, BPS16|COL80|OVERSCAN,768,240,16,SDL_FALSE);
SDL_XBIOS_AddMode(this, BPS16|COL80|VERTFLAG,640,400,16,SDL_FALSE);
SDL_XBIOS_AddMode(this, BPS16|COL80,640,200,16,SDL_FALSE);
SDL_XBIOS_AddMode(this, BPS16|OVERSCAN|VERTFLAG,384,480,16,SDL_FALSE);
SDL_XBIOS_AddMode(this, BPS16|OVERSCAN,384,240,16,SDL_FALSE);
SDL_XBIOS_AddMode(this, BPS16|VERTFLAG,320,400,16,SDL_FALSE);
SDL_XBIOS_AddMode(this, BPS16,320,200,16,SDL_FALSE);
SDL_XBIOS_AddMode(this, BPS8|COL80|OVERSCAN|VERTFLAG,768,480,8,SDL_FALSE);
SDL_XBIOS_AddMode(this, BPS8|COL80|OVERSCAN,768,240,8,SDL_FALSE);
SDL_XBIOS_AddMode(this, BPS8|COL80|VERTFLAG,640,400,8,SDL_FALSE);
SDL_XBIOS_AddMode(this, BPS8|COL80,640,200,8,SDL_FALSE);
SDL_XBIOS_AddMode(this, BPS8|OVERSCAN|VERTFLAG,384,480,8,SDL_FALSE);
SDL_XBIOS_AddMode(this, BPS8|OVERSCAN,384,240,8,SDL_FALSE);
SDL_XBIOS_AddMode(this, BPS8|VERTFLAG,320,400,8,SDL_FALSE);
SDL_XBIOS_AddMode(this, BPS8,320,200,8,SDL_FALSE);
break; break;
case MONITOR_VGA: case MONITOR_VGA:
XBIOS_nummodes = xbiosnummodes_f30vga; SDL_XBIOS_AddMode(this, BPS16,320,480,16,SDL_FALSE);
XBIOS_modelist = xbiosmodelist_f30vga; SDL_XBIOS_AddMode(this, BPS16|VERTFLAG,320,240,16,SDL_FALSE);
SDL_XBIOS_AddMode(this, BPS8|COL80,640,480,8,SDL_FALSE);
SDL_XBIOS_AddMode(this, BPS8|COL80|VERTFLAG,640,240,8,SDL_FALSE);
SDL_XBIOS_AddMode(this, BPS8,320,480,8,SDL_FALSE);
SDL_XBIOS_AddMode(this, BPS8|VERTFLAG,320,240,8,SDL_FALSE);
break; break;
} }
XBIOS_oldvbase=Logbase(); XBIOS_oldvbase=Logbase();
...@@ -386,10 +419,10 @@ static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat) ...@@ -386,10 +419,10 @@ static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat)
break; break;
} }
current_mode = XBIOS_modelist; current_mode = XBIOS_modelist;
j8 = j16 = 0; j8 = j16 = 0;
for (i=0;i<XBIOS_nummodes;i++) { for (i=0; i<XBIOS_nummodes; i++, current_mode++) {
switch (current_mode->depth) { switch (current_mode->depth) {
case 4: case 4:
case 8: case 8:
...@@ -398,7 +431,6 @@ static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat) ...@@ -398,7 +431,6 @@ static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat)
SDL_modelist[0][j8]->w = current_mode->width; SDL_modelist[0][j8]->w = current_mode->width;
SDL_modelist[0][j8]->h = current_mode->height; SDL_modelist[0][j8]->h = current_mode->height;
XBIOS_videomodes[0][j8]=current_mode; XBIOS_videomodes[0][j8]=current_mode;
current_mode++;
j8++; j8++;
break; break;
case 16: case 16:
...@@ -407,7 +439,6 @@ static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat) ...@@ -407,7 +439,6 @@ static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat)
SDL_modelist[1][j16]->w = current_mode->width; SDL_modelist[1][j16]->w = current_mode->width;
SDL_modelist[1][j16]->h = current_mode->height; SDL_modelist[1][j16]->h = current_mode->height;
XBIOS_videomodes[1][j16]=current_mode; XBIOS_videomodes[1][j16]=current_mode;
current_mode++;
j16++; j16++;
break; break;
} }
...@@ -891,6 +922,12 @@ static void XBIOS_VideoQuit(_THIS) ...@@ -891,6 +922,12 @@ static void XBIOS_VideoQuit(_THIS)
} }
} }
if (XBIOS_modelist) {
free(XBIOS_modelist);
XBIOS_nummodes=0;
XBIOS_modelist=NULL;
}
this->screen->pixels = NULL; this->screen->pixels = NULL;
} }
......
src/video/xbios/SDL_xbios.h
View file @ 5c6b5227
...@@ -124,4 +124,9 @@ enum { ...@@ -124,4 +124,9 @@ enum {
#define XBIOS_width (this->hidden->width) #define XBIOS_width (this->hidden->width)
#define XBIOS_height (this->hidden->height) #define XBIOS_height (this->hidden->height)
/*--- Functions prototypes ---*/
void SDL_XBIOS_AddMode(_THIS, Uint16 modecode, Uint16 width, Uint16 height,
Uint16 depth, SDL_bool flags);
#endif /* _SDL_xbios_h */ #endif /* _SDL_xbios_h */
src/video/xbios/SDL_xbios_blowup.c
View file @ 5c6b5227
...@@ -26,68 +26,44 @@ ...@@ -26,68 +26,44 @@
Patrice Mandin Patrice Mandin
*/ */
#include <mint/falcon.h>
#include "SDL_xbios.h" #include "SDL_xbios.h"
#include "SDL_xbios_blowup.h" #include "SDL_xbios_blowup.h"
void SDL_XBIOS_BlowupInit(_THIS, blow_cookie_t *cookie_blow) void SDL_XBIOS_BlowupInit(_THIS, blow_cookie_t *cookie_blow)
{ {
int i, num_mode, bank, keep_old; int i, num_mode, bank;
xbiosmode_t *current_mode;
blow_mode_t *blow_mode; blow_mode_t *blow_mode;
current_mode = XBIOS_modelist; /* Add bit 15 for old modes */
for (i=0;i<XBIOS_nummodes;i++) { for (i=0;i<XBIOS_nummodes;i++) {
keep_old=1; /* use default mode */ XBIOS_modelist[i].number |= 1<<15;
blow_mode = NULL; }
switch (current_mode->depth) {
case 1:
num_mode=0;
break;
case 2:
num_mode=1;
break;
case 4:
num_mode=2;
break;
case 8:
num_mode=3;
break;
case 16:
num_mode=4;
break;
default:
num_mode=-1;
break;
}
/* Check which bank of modes to use */ /* Add Blowup modes for 8 and 16 bpp */
if (num_mode>=0) { for (num_mode=3; num_mode<5; num_mode++) {
bank = cookie_blow->num_mode[num_mode]; bank = cookie_blow->num_mode[num_mode];
blow_mode = &(cookie_blow->blowup_modes[num_mode+(bank*5)]); blow_mode = &(cookie_blow->blowup_modes[num_mode+(bank*5)]);
/* Check extended mode enabled */
if (blow_mode->enabled == 0) {
/* Check monitor needed for this mode */
if ((blow_mode->monitor == cookie_blow->montype)
|| ((blow_mode->monitor == MONITOR_TV)
&& (cookie_blow->montype == MONITOR_RGB))
|| ((blow_mode->monitor == MONITOR_RGB)
&& (cookie_blow->montype == MONITOR_TV)))
{
keep_old = 0; /* we can use this extended mode */
}
}
}
if (keep_old) { /* Check extended mode enabled */
/* disable blowup for this mode */ if (blow_mode->enabled == 0) {
current_mode->number |= (1<<15); /* Check monitor needed for this mode */
} else { if ((blow_mode->monitor == cookie_blow->montype)
/* Update mode size */ || ((blow_mode->monitor == MONITOR_TV)
current_mode->width = blow_mode->width +1; && (cookie_blow->montype == MONITOR_RGB))
current_mode->height = blow_mode->height +1; || ((blow_mode->monitor == MONITOR_RGB)
&& (cookie_blow->montype == MONITOR_TV)))
{
/* we can use this extended mode */
SDL_XBIOS_AddMode(this,
num_mode == 3 ? BPS8 : BPS16,
blow_mode->width + 1,
blow_mode->height + 1,
num_mode == 3 ? 8 : 16,
SDL_FALSE
);
}
} }
current_mode++;
} }
} }
src/video/xbios/SDL_xbios_sb3.c
View file @ 5c6b5227
...@@ -67,14 +67,19 @@ void SDL_XBIOS_SB3Init(_THIS, scpn_cookie_t *cookie_scpn) ...@@ -67,14 +67,19 @@ void SDL_XBIOS_SB3Init(_THIS, scpn_cookie_t *cookie_scpn)
scpn_screeninfo_t *scrinfo; scpn_screeninfo_t *scrinfo;
/* SB3 prevent changing video modes, we can only use current one */ /* SB3 prevent changing video modes, we can only use current one */
if (XBIOS_modelist) {
XBIOS_nummodes = 1; free(XBIOS_modelist);
current_mode = XBIOS_modelist; XBIOS_nummodes = 0;
current_mode->number = -1; XBIOS_modelist = NULL;
}
scrinfo = cookie_scpn->screen_info; scrinfo = cookie_scpn->screen_info;
current_mode->width = scrinfo->virtual_width;
current_mode->height = scrinfo->virtual_height;
current_mode->depth = 1<<(SDL_XBIOS_scpn_planes_device[scrinfo->device]);
scrinfo->h_pos = scrinfo->v_pos = 0; scrinfo->h_pos = scrinfo->v_pos = 0;
SDL_XBIOS_AddMode(this,
-1,
scrinfo->virtual_width, scrinfo->virtual_height,
1<<(SDL_XBIOS_scpn_planes_device[scrinfo->device]),
SDL_FALSE
);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment