scummvm random work
[patches.git] / SDL-1.2.9-6.8.patch
1 diff -Naur SDL-1.2.9_pre/src/video/fbcon/SDL_fbvideo.c SDL-1.2.9/src/video/fbcon/SDL_fbvideo.c
2 --- SDL-1.2.9_pre/src/video/fbcon/SDL_fbvideo.c 2006-05-20 16:54:59.000000000 +0800
3 +++ SDL-1.2.9/src/video/fbcon/SDL_fbvideo.c 2006-05-22 13:15:36.000000000 +0800
4 @@ -752,6 +752,24 @@
5 fprintf(stderr, "Printing original vinfo:\n");
6 print_vinfo(&vinfo);
7 #endif
8 +#if 1
9 + vinfo.accel_flags = 0;
10 + vinfo.bits_per_pixel = bpp;
11 + vinfo.xres = width;
12 + vinfo.xres_virtual = width;
13 + vinfo.yres = height;
14 + if ( flags & SDL_DOUBLEBUF ) {
15 + vinfo.yres_virtual = height*2;
16 + } else {
17 + vinfo.yres_virtual = height;
18 + }
19 + vinfo.xoffset = 0;
20 + vinfo.yoffset = 0;
21 + vinfo.red.length = vinfo.red.offset = 0;
22 + vinfo.green.length = vinfo.green.offset = 0;
23 + vinfo.blue.length = vinfo.blue.offset = 0;
24 + vinfo.transp.length = vinfo.transp.offset = 0;
25 +#else
26 if ( (vinfo.xres != width) || (vinfo.yres != height) ||
27 (vinfo.bits_per_pixel != bpp) || (flags & SDL_DOUBLEBUF) ) {
28 vinfo.activate = FB_ACTIVATE_NOW;
29 @@ -800,6 +818,7 @@
30 vinfo.yres_virtual = maxheight;
31 }
32 }
33 +#endif
34 cache_vinfo = vinfo;
35 #ifdef FBCON_DEBUG
36 fprintf(stderr, "Printing actual vinfo:\n");
37 @@ -1119,12 +1138,12 @@
38 FB_WaitBusySurfaces(this);
39 }
40 wait_vbl(this);
41 - #if 0 //lee 5-1
42 +
43 if ( ioctl(console_fd, FBIOPAN_DISPLAY, &cache_vinfo) < 0 ) {
44 - SDL_SetError("ioctl(FBIOPAN_DISPLAY) failed");
45 + //SDL_SetError("ioctl(FBIOPAN_DISPLAY) failed"); //lee:skip SDL error logout
46 return(-1);
47 }
48 - #endif
49 +
50 flip_page = !flip_page;
51
52 surface->pixels = flip_address[flip_page];