X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fdos%2Fmain.c;h=aed4e8aa90fa9af01b51bc038fd1abbe1faed5a2;hp=018ed515fad7e54cd1cabda6f81889b10fce9fcd;hb=9ecf7c26db456b3cef34a7d6d79ffb164cad17c5;hpb=5d599e487cdc3b172c8c7cd8fc2f91d6af8bd049 diff --git a/src/dos/main.c b/src/dos/main.c index 018ed51..aed4e8a 100644 --- a/src/dos/main.c +++ b/src/dos/main.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include "demo.h" #include "keyb.h" @@ -50,11 +51,15 @@ int main(int argc, char **argv) return 1; } - if(!(vmem_front = set_video_mode(fb_width, fb_height, fb_bpp))) { + if(!(vmem_back = set_video_mode(fb_width, fb_height, fb_bpp))) { return 1; } - /* TODO implement multiple video memory pages for flipping */ - vmem_back = vmem_front; + if(!(vmem_front = page_flip(FLIP_NOW))) { + fprintf(stderr, "page flipping not supported. falling back to double buffering\n"); + vmem_front = vmem_back; + } else { + assert(vmem_back != vmem_front); + } if(demo_init(argc, argv) == -1) { set_text_mode(); @@ -85,7 +90,6 @@ int main(int argc, char **argv) } if(use_sball && sball_pending()) { sball_event ev; - printf("got sball event\n"); while(sball_getevent(&ev)) { handle_sball_event(&ev); } @@ -115,18 +119,30 @@ void demo_quit(void) void swap_buffers(void *pixels) { - /* TODO implement page flipping */ if(pixels) { + /* just memcpy to the front buffer */ if(opt.vsync) { wait_vsync(); } drawFps(pixels); memcpy(vmem_front, pixels, fbsize); + } else { - drawFps(vmem_back); + /* attempt page flipping */ + void *next; - if(opt.vsync) { - wait_vsync(); + drawFps(vmem_back); + if((next = page_flip(opt.vsync ? FLIP_VBLANK_WAIT : FLIP_NOW))) { + assert(next == vmem_back); + vmem_back = vmem_front; + vmem_front = next; + } else { + /* failed to page flip, assume we drew in the front buffer then + * and just wait for vsync if necessary + */ + if(opt.vsync) { + wait_vsync(); + } } } }