X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fdos%2Fmain.c;h=aed12e98feaec4fe8b245b839ad12697828c8abb;hp=92f765da8589a9783b66e7906b3e881f17dd0f85;hb=772dfe62feafd0583e52326c7419ef01e04cac60;hpb=410d47f1459aa79505198d9d09462aeeaffc612a

diff --git a/src/dos/main.c b/src/dos/main.c
index 92f765d..aed12e9 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"
@@ -30,7 +31,7 @@ static quat_t rot = {0, 0, 0, 1};
 
 int main(int argc, char **argv)
 {
-	fbsize = fb_width * fb_height * fb_bpp / CHAR_BIT;
+	fbsize = fb_width * fb_height * fb_bpp / 8;
 
 	init_logger("demo.log");
 
@@ -40,20 +41,21 @@ int main(int argc, char **argv)
 #endif
 
 	if((use_mouse = have_mouse())) {
+		printf("initializing mouse input\n");
 		set_mouse_limits(0, 0, fb_width, fb_height);
 		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();
@@ -84,7 +86,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);
 			}
@@ -114,20 +115,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);
 }