integrated vo_svga by se7en

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@287 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi_esp 2001-04-05 19:01:27 +00:00
parent a16a2a378d
commit 8f61764117
2 changed files with 14 additions and 4 deletions

View File

@ -50,6 +50,7 @@ extern vo_functions_t video_out_pgm;
extern vo_functions_t video_out_md5;
extern vo_functions_t video_out_syncfb;
extern vo_functions_t video_out_fbdev;
extern vo_functions_t video_out_svga;
vo_functions_t* video_out_drivers[] =
{
@ -83,6 +84,9 @@ vo_functions_t* video_out_drivers[] =
#endif
#ifdef HAVE_FBDEV
&video_out_fbdev,
#endif
#ifdef HAVE_SVGALIB
&video_out_svga,
#endif
&video_out_null,
&video_out_odivx,

View File

@ -59,7 +59,7 @@ static uint8_t bpp;
static uint8_t checked = 0;
static checksupportedmodes() {
static void checksupportedmodes() {
int i;
checked = 1;
@ -101,14 +101,20 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width,
case 16: vid_mode = 18; break;
case 15: vid_mode = 17; break;
}
if (vga_setmode(vid_mode) == -1)
if (vga_setmode(vid_mode) == -1){
printf("vo_svga: vga_setmode(%d) failed.\n",vid_mode);
return(1); // error
if (gl_setcontextvga(vid_mode))
}
if (gl_setcontextvga(vid_mode)){
printf("vo_svga: gl_setcontextvga(%d) failed.\n",vid_mode);
return(1); // error
}
screen = gl_allocatecontext();
gl_getcontext(screen);
if (gl_setcontextvgavirtual(vid_mode))
if (gl_setcontextvgavirtual(vid_mode)){
printf("vo_svga: gl_setcontextvgavirtual(%d) failed.\n",vid_mode);
return(1); // error
}
virt = gl_allocatecontext();
gl_getcontext(virt);
gl_setcontext(virt);