projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed "trying to match" debug prints
[dosdemo]
/
src
/
dos
/
main.c
diff --git
a/src/dos/main.c
b/src/dos/main.c
index
018ed51
..
6d83027
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 <math.h>
#include <string.h>
#include <limits.h>
+#include <assert.h>
#include <conio.h>
#include "demo.h"
#include "keyb.h"
#include <conio.h>
#include "demo.h"
#include "keyb.h"
@@
-50,11
+51,9
@@
int main(int argc, char **argv)
return 1;
}
return 1;
}
- if(!(vmem_front = set_video_mode(fb_width, fb_height, fb_bpp))) {
+ if(!(vmem = set_video_mode(fb_width, fb_height, fb_bpp))) {
return 1;
}
return 1;
}
- /* TODO implement multiple video memory pages for flipping */
- vmem_back = vmem_front;
if(demo_init(argc, argv) == -1) {
set_text_mode();
if(demo_init(argc, argv) == -1) {
set_text_mode();
@@
-85,7
+84,6
@@
int main(int argc, char **argv)
}
if(use_sball && sball_pending()) {
sball_event ev;
}
if(use_sball && sball_pending()) {
sball_event ev;
- printf("got sball event\n");
while(sball_getevent(&ev)) {
handle_sball_event(&ev);
}
while(sball_getevent(&ev)) {
handle_sball_event(&ev);
}
@@
-115,20
+113,16
@@
void demo_quit(void)
void swap_buffers(void *pixels)
{
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);
}
}