projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of goat:git/dosdemo
[dosdemo]
/
src
/
demo.c
diff --git
a/src/demo.c
b/src/demo.c
index
7d22dc4
..
64bb965
100644
(file)
--- a/
src/demo.c
+++ b/
src/demo.c
@@
-6,6
+6,7
@@
#include <limits.h>
#include "demo.h"
#include "screen.h"
#include <limits.h>
#include "demo.h"
#include "screen.h"
+#include "3dgfx.h"
int fb_width = 320;
int fb_height = 240;
int fb_width = 320;
int fb_height = 240;
@@
-22,10
+23,16
@@
int demo_init(int argc, char **argv)
{
struct screen *scr;
{
struct screen *scr;
+ start_scr_name = getenv("START_SCR");
if(argv[1]) {
start_scr_name = argv[1];
}
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;
}
if(scr_init() == -1) {
return -1;
}
@@
-48,6
+55,7
@@
int demo_init(int argc, char **argv)
void demo_cleanup(void)
{
scr_shutdown();
void demo_cleanup(void)
{
scr_shutdown();
+ g3d_destroy();
if(time_msec) {
float fps = (float)nframes / ((float)time_msec / 1000.0f);
if(time_msec) {
float fps = (float)nframes / ((float)time_msec / 1000.0f);