1 files changed, 31 insertions, 45 deletions

diff --git a/src/main.c b/src/main.c
index 2f9d023..86a9376 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,9 +28,9 @@
 //
 
 #if !defined(TEXT_MODE) || TEXT_MODE == 0
-#define TEXT_LAYER ppu.fg
+#define TEXT_LAYER FG_BACK
 #else
-#define TEXT_LAYER ppu.bg
+#define TEXT_LAYER BG_BACK
 #endif
 
 #ifndef CONTROL_METHODS
@@ -46,6 +46,12 @@
 #elif PROF_ENABLE == 1
 #define TEXT_ENABLE 1
 #define PROF(F,VAR) (profile_start(),(F),(VAR) = MAX(profile_stop(), (VAR)))
+#elif PROF_ENABLE == 2
+#define TEXT_ENABLE 1
+// TODO: allow measuring inside a PROF function using profile_measure to store
+// temporary values and calcualting the difference.
+// TODO: allow per frame or per 60 second averaging of cycle measurement.
+// TODO: calculate fps based on frame timing.
 #endif
 #ifndef PROF_SHOW_X
 #define PROF_SHOW_X 0
@@ -53,45 +59,26 @@
 #ifndef PROF_SHOW_Y
 #define PROF_SHOW_Y 0
 #endif
-/*
-// #define PROF_SHOW() \
-//     do { \
-//         txt_position((PROF_SHOW_X), (PROF_SHOW_Y));\
-//         txt_printf("INPUT: %lu    ", input_cycles);\
-//         txt_position((PROF_SHOW_X), (PROF_SHOW_Y)+1);\
-//         txt_printf("EVAL:  %lu    ", eval_cycles);\
-//         txt_position((PROF_SHOW_X), (PROF_SHOW_Y)+2);\
-//         txt_printf("FLIP:  %lu    ", flip_cycles);\
-//         txt_position((PROF_SHOW_X), (PROF_SHOW_Y)+3);\
-//         txt_printf("MIX:   %lu    ", mix_cycles);\
-//     } while (0)
-// #define PROF_SHOW() \
-//     do { \
-//         txt_position((PROF_SHOW_X), (PROF_SHOW_Y));\
-//         txt_printf("PIX:   %lu    ", ppu_pixel_cycles);\
-//         txt_position((PROF_SHOW_X), (PROF_SHOW_Y)+1);\
-//         txt_printf("1BPP:  %lu    ", ppu_icn_cycles);\
-//         txt_position((PROF_SHOW_X), (PROF_SHOW_Y)+2);\
-//         txt_printf("2BPP:  %lu    ", ppu_chr_cycles);\
-//         txt_position((PROF_SHOW_X), (PROF_SHOW_Y)+3);\
-//         txt_printf("FLIP:  %lu    ", flip_cycles);\
-//     } while (0)
-//     */
 #define PROF_SHOW() \
     do { \
         txt_position((PROF_SHOW_X), (PROF_SHOW_Y));\
-        txt_printf("1BPP: %.8lu\n2BPP: %.8lu\nFILL: %.8lu", ppu_icn_cycles, ppu_chr_cycles, ppu_fill_cycles);\
+        txt_printf("FLIP: %.8lu\n", flip_cycles);\
+        txt_printf("EVAL: %.8lu\n", eval_cycles);\
+        screen_fill(BG_BACK, 0, 0, 15 * 8, 2 * 8, 0);\
+        flipbuf();\
     } while (0)
 
-static u32 ppu_pixel_cycles = 0;
-static u32 ppu_fill_cycles = 0;
-static u32 ppu_chr_cycles = 0;
-static u32 ppu_icn_cycles = 0;
+
+// static u32 ppu_pixel_cycles = 0;
+// static u32 ppu_fill_cycles = 0;
+// static u32 ppu_chr_cycles = 0;
+// static u32 ppu_icn_cycles = 0;
 static u32 flip_cycles = 0;
 static u32 eval_cycles = 0;
 static u32 input_cycles = 0;
 static u32 mix_cycles = 0;
-
+#define FRAME_START() ; // TODO
+#define FRAME_END()   ; // TODO
 #else
 #define PROF(F,VAR) (F)
 #define PROF_SHOW()
@@ -120,7 +107,6 @@ EWRAM_BSS
 static u8 umem[0x10300];
 
 static Uxn u;
-static Ppu ppu;
 
 static Mouse mouse = {SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2};
 
@@ -155,17 +141,15 @@ screen_deo(u8 *ram, u8 *d, u8 port) {
             u8 color = ctrl & 0x3;
             u16 x0 = PEEK2(d + 0x8);
             u16 y0 = PEEK2(d + 0xa);
-            u8 *layer = (ctrl & 0x40) ? ppu.fg : ppu.bg;
+            u8 *layer = (ctrl & 0x40) ? FG_BACK : BG_BACK;
             if(ctrl & 0x80) {
                 u16 x1 = SCREEN_WIDTH - 1;
                 u16 y1 = SCREEN_HEIGHT - 1;
                 if(ctrl & 0x10) x1 = x0, x0 = 0;
                 if(ctrl & 0x20) y1 = y0, y0 = 0;
-                PROF(screen_fill(layer, x0, y0, x1, y1, color), ppu_fill_cycles);
+                screen_fill(layer, x0, y0, x1, y1, color);
             } else {
-                u16 width = SCREEN_WIDTH;
-                u16 height = SCREEN_HEIGHT;
-                PROF(ppu_pixel(layer, x0, y0, color), ppu_pixel_cycles);
+                ppu_pixel(layer, x0, y0, color);
                 if(d[0x6] & 0x1) POKE2(d + 0x8, x0 + 1); /* auto x+1 */
                 if(d[0x6] & 0x2) POKE2(d + 0xa, y0 + 1); /* auto y+1 */
             }
@@ -183,16 +167,16 @@ screen_deo(u8 *ram, u8 *d, u8 port) {
             if(addr > 0x10000 - ((n + 1) << (3 + twobpp))) {
                 return;
             }
-            u8 *layer = (d[0xf] & 0x40) ? ppu.fg : ppu.bg;
+            u8 *layer = (d[0xf] & 0x40) ? FG_BACK : BG_BACK;
             u8 color = d[0xf] & 0xf;
             u8 flipx = d[0xf] & 0x10;
             u8 flipy = d[0xf] & 0x20;
             for(size_t i = 0; i <= n; i++) {
                 u8 *sprite = &ram[addr];
                 if (twobpp) {
-                    PROF(ppu_2bpp(layer, x + dy * i, y + dx * i, sprite, color, flipx, flipy), ppu_chr_cycles);
+                    ppu_2bpp(layer, x + dy * i, y + dx * i, sprite, color, flipx, flipy);
                 } else {
-                    PROF(ppu_1bpp(layer, x + dy * i, y + dx * i, sprite, color, flipx, flipy), ppu_icn_cycles);
+                    ppu_1bpp(layer, x + dy * i, y + dx * i, sprite, color, flipx, flipy);
                 }
                 addr += (d[0x6] & 0x04) << (1 + twobpp);
             }
@@ -614,7 +598,7 @@ main(void) {
     irs_set(IRQ_VBLANK, sound_vsync);
 
     // Initialize PPU.
-    initppu(&ppu, 30, 20);
+    video_init();
 
     // Initialize text engine.
 #ifdef TEXT_ENABLE
@@ -632,17 +616,19 @@ main(void) {
     uxn_eval(&u, PAGE_PROGRAM);
     u8 frame_counter = 0;
     while(true) {
-        bios_vblank_wait();
+        FRAME_START();
         PROF(handle_input(&u), input_cycles);
         PROF(uxn_eval(&u, PEEK2(&u.dev[0x20])), eval_cycles);
         PROF(sound_mix(), mix_cycles);
-        PROF_SHOW();
-        PROF(flipbuf(&ppu), flip_cycles);
+        bios_vblank_wait();
+        PROF(flipbuf(), flip_cycles);
         frame_counter++;
         if (frame_counter == 60) {
             seconds++;
             frame_counter = 0;
         }
+        PROF_SHOW();
+        FRAME_END();
     }
 
     return 0;