X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fdemo.c;h=ce06a447c0e2ea589d60d660bd6caaa390f89087;hb=5d9ec41cc62ebddf5d406511714e561e88884987;hp=7d22dc4ea554f772580b5ea7d49dbde21581950e;hpb=6e4f1008ad81b6cc108c11736dbf9366a38092fc;p=dosdemo diff --git a/src/demo.c b/src/demo.c index 7d22dc4..ce06a44 100644 --- a/src/demo.c +++ b/src/demo.c @@ -6,11 +6,12 @@ #include #include "demo.h" #include "screen.h" +#include "3dgfx.h" int fb_width = 320; int fb_height = 240; int fb_bpp = 16; -void *fb_pixels; +uint16_t *fb_pixels, *vmem_back, *vmem_front; unsigned long time_msec; int mouse_x, mouse_y; unsigned int mouse_bmask; @@ -22,10 +23,16 @@ int demo_init(int argc, char **argv) { struct screen *scr; + start_scr_name = getenv("START_SCR"); if(argv[1]) { start_scr_name = argv[1]; } + if(g3d_init() == -1) { + return -1; + } + g3d_framebuffer(fb_width, fb_height, fb_pixels); + if(scr_init() == -1) { return -1; } @@ -48,6 +55,7 @@ int demo_init(int argc, char **argv) void demo_cleanup(void) { scr_shutdown(); + g3d_destroy(); if(time_msec) { float fps = (float)nframes / ((float)time_msec / 1000.0f);