fixed the physical to virtual translation issues with DJGPP, watcom just

[dosdemo] / src / dos / main.c

diff --git a/src/dos/main.c b/src/dos/main.c
index 3ac7616..70ea449 100644 (file)
--- a/src/dos/main.c
+++ b/src/dos/main.c
@@ -15,6 +15,7 @@
 #include "cfgopt.h"
 #include "logger.h"
 #include "tinyfps.h"
+#include "cdpmi.h"
 
 #undef NOKEYB
 
@@ -31,7 +32,11 @@ static quat_t rot = {0, 0, 0, 1};
 
 int main(int argc, char **argv)
 {
-       fbsize = fb_width * fb_height * fb_bpp / CHAR_BIT;
+#ifdef __DJGPP__
+       __djgpp_nearptr_enable();
+#endif
+
+       fbsize = fb_width * fb_height * fb_bpp / 8;
 
        init_logger("demo.log");
 
@@ -46,20 +51,16 @@ int main(int argc, char **argv)
                set_mouse(fb_width / 2, fb_height / 2);
        }
 
-       if(!(fb_pixels = malloc(fbsize))) {
+       /* allocate a couple extra rows as a guard band, until we fucking fix the rasterizer */
+       if(!(fb_pixels = malloc(fbsize + (fb_width * fb_bpp / 8) * 2))) {
                fprintf(stderr, "failed to allocate backbuffer\n");
                return 1;
        }
+       fb_pixels += fb_width;
 
-       if(!(vmem_back = set_video_mode(fb_width, fb_height, fb_bpp))) {
+       if(!(vmem = set_video_mode(fb_width, fb_height, fb_bpp, 1))) {
                return 1;
        }
-       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();
@@ -90,7 +91,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);
                        }
@@ -120,32 +120,16 @@ void demo_quit(void)
 
 void swap_buffers(void *pixels)
 {
-       if(pixels) {
-               /* just memcpy to the front buffer */
-               if(opt.vsync) {
-                       wait_vsync();
-               }
-               drawFps(pixels);
-               memcpy(vmem_front, pixels, fbsize);
-
-       } else {
-               /* attempt page flipping */
-               void *next;
-
-               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();
-                       }
-               }
+       if(!pixels) {
+               pixels = fb_pixels;
+       }
+
+       /* just memcpy to the front buffer */
+       if(opt.vsync) {
+               wait_vsync();
        }
+       drawFps(pixels);
+       memcpy(vmem, pixels, fbsize);
 }