X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fdos%2Fmain.c;h=4d2f7facee112df05911823b57b363f113c279bd;hp=018ed515fad7e54cd1cabda6f81889b10fce9fcd;hb=7cffbf057545fb303ad8f53e432ef42f7708e16d;hpb=5d599e487cdc3b172c8c7cd8fc2f91d6af8bd049

diff --git a/src/dos/main.c b/src/dos/main.c
index 018ed51..4d2f7fa 100644
--- 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,21 @@ int main(int argc, char **argv)
 		set_mouse(fb_width / 2, fb_height / 2);
 	}
 
-	if(!(fb_pixels = malloc(fbsize))) {
+	/* now start_loadscr sets up fb_pixels to the space used by the loading image,
+	 * so no need to allocate another framebuffer
+	 */
+#if 0
+	/* 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;
+#endif
 
-	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 +96,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 +125,17 @@ 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();
-		}
+	demo_post_draw(pixels);
+
+	/* just memcpy to the front buffer */
+	if(opt.vsync) {
+		wait_vsync();
 	}
+	memcpy(vmem, pixels, fbsize);
 }