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 018ed51..70ea449 100644 (file)
--- a/src/dos/main.c
+++ b/src/dos/main.c
@@ -3,6 +3,7 @@
 #include <math.h>
 #include <string.h>
 #include <limits.h>
+#include <assert.h>
 #include <conio.h>
 #include "demo.h"
 #include "keyb.h"
@@ -14,6 +15,7 @@
 #include "cfgopt.h"
 #include "logger.h"
 #include "tinyfps.h"
+#include "cdpmi.h"
 
 #undef NOKEYB
 
@@ -30,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");
 
@@ -45,16 +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_front = set_video_mode(fb_width, fb_height, fb_bpp))) {
+       if(!(vmem = set_video_mode(fb_width, fb_height, fb_bpp, 1))) {
                return 1;
        }
-       /* TODO implement multiple video memory pages for flipping */
-       vmem_back = vmem_front;
 
        if(demo_init(argc, argv) == -1) {
                set_text_mode();
@@ -85,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);
                        }
@@ -115,20 +120,16 @@ void demo_quit(void)
 
 void swap_buffers(void *pixels)
 {
-       /* TODO implement page flipping */
-       if(pixels) {
-               if(opt.vsync) {
-                       wait_vsync();
-               }
-               drawFps(pixels);
-               memcpy(vmem_front, pixels, fbsize);
-       } else {
-               drawFps(vmem_back);
+       if(!pixels) {
+               pixels = fb_pixels;
+       }
 
-               if(opt.vsync) {
-                       wait_vsync();
-               }
+       /* just memcpy to the front buffer */
+       if(opt.vsync) {
+               wait_vsync();
        }
+       drawFps(pixels);
+       memcpy(vmem, pixels, fbsize);
 }