X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fsdl%2Fmain.c;h=c00bf7d4cc49b0869bfae8ca477cdd92a0a4a3bb;hb=a563d2f0efaa980af0f0b39cdf1c9115fed99d00;hp=48852f50b8d40aea05445fbe6317e17a80b010a6;hpb=aefd23e483457daa7eeb4987827e72df83886eaa;p=dosdemo

diff --git a/src/sdl/main.c b/src/sdl/main.c
index 48852f5..c00bf7d 100644
--- a/src/sdl/main.c
+++ b/src/sdl/main.c
@@ -3,12 +3,14 @@
 #include <limits.h>
 #include <SDL/SDL.h>
 #include "demo.h"
+#include "tinyfps.h"
+#include "timer.h"
+#include "cfgopt.h"
 
 static void handle_event(SDL_Event *ev);
 static void toggle_fullscreen(void);
 
 static int quit;
-static long start_time;
 static SDL_Surface *fbsurf;
 
 static int fbscale = 2;
@@ -29,7 +31,8 @@ int main(int argc, char **argv)
 	xsz = fb_width * fbscale;
 	ysz = fb_height * fbscale;
 
-	if(!(fb_pixels = malloc(fb_width * fb_height * fb_bpp / CHAR_BIT))) {
+	/* allocate 1 extra row as a guard band, until we fucking fix the rasterizer */
+	if(!(fb_pixels = malloc(fb_width * (fb_height + 1) * fb_bpp / CHAR_BIT))) {
 		fprintf(stderr, "failed to allocate virtual framebuffer\n");
 		return 1;
 	}
@@ -50,7 +53,7 @@ int main(int argc, char **argv)
 		SDL_Quit();
 		return 1;
 	}
-	start_time = SDL_GetTicks();
+	reset_timer();
 
 	while(!quit) {
 		SDL_Event ev;
@@ -59,8 +62,9 @@ int main(int argc, char **argv)
 			if(quit) goto break_evloop;
 		}
 
-		time_msec = SDL_GetTicks() - start_time;
+		time_msec = get_msec();
 		demo_draw();
+		drawFps(fb_pixels);
 
 		if(SDL_MUSTLOCK(fbsurf)) {
 			SDL_LockSurface(fbsurf);
@@ -100,9 +104,19 @@ void demo_quit(void)
 	quit = 1;
 }
 
+void wait_vsync(void)
+{
+	unsigned long start = SDL_GetTicks();
+	unsigned long until = (start | 0xf) + 1;
+	while(SDL_GetTicks() <= until);
+}
+
 void swap_buffers(void *pixels)
 {
 	/* do nothing, all pointers point to the same buffer */
+	if(opt.vsync) {
+		wait_vsync();
+	}
 }
 
 static void handle_event(SDL_Event *ev)