Cleanup compile parameters and prepare moving line demo

3 files changed, 74 insertions, 171 deletions

diff --git a/src/main.c b/src/main.c
index 88ca24e..993ca37 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,7 +11,7 @@ WITH REGARD TO THIS SOFTWARE.
 
 #include "gba/gba.h"
 
-#include "renderer_m4.c"
+#include "renderer_m0.c"
 
 //
 // Config parameters.
@@ -109,27 +109,14 @@ test_lines(void) {
     }
 }
 
-int main(void) {
-    // Adjust system wait times.
-    SYSTEM_WAIT = SYSTEM_WAIT_CARTRIDGE;
-
-    // Initialize renderer.
-    renderer_init();
-
-    // Register interrupts.
-    irq_init();
-    irs_set(IRQ_VBLANK, irs_stub);
-
-    // Main loop.
-    PROF_INIT();
+void
+test_moving_line(void) {
     int x = 0;
     int y = 0;
     int inc_x = 1;
     int inc_y = 0;
     while (true) {
-        bios_vblank_wait();
-
-        PROF(test_clear(), test_clear_cycles);
+        screen_fill(0);
         draw_line(x, y, 239 - x, 159 - y, 2);
         x += inc_x;
         y += inc_y;
@@ -143,68 +130,34 @@ int main(void) {
             inc_x = 1;
             inc_y = 0;
         }
+        bios_vblank_wait();
+        flip_buffer();
+    }
+}
+
+int main(void) {
+    // Adjust system wait times.
+    SYSTEM_WAIT = SYSTEM_WAIT_CARTRIDGE;
+
+    // Initialize renderer.
+    renderer_init();
 
-        // draw_line(x, 229 - x, y, 129 - y, 2);
-        // screen_fill(0);
-        // draw_pixel(0,  100 + 0, 5);
-        // draw_pixel(1,  100 + 0, 6);
-        // draw_pixel(2,  100 + 0, 5);
-        // draw_pixel(3,  100 + 0, 6);
-        // draw_pixel(4,  100 + 0, 5);
-        // draw_pixel(5,  100 + 0, 6);
-        // draw_pixel(6,  100 + 0, 5);
-        // draw_pixel(7,  100 + 0, 6);
-        // draw_pixel(8,  100 + 0, 5);
-        // draw_pixel(9,  100 + 0, 6);
-        // draw_pixel(10, 100 + 0, 5);
-        // draw_pixel(11, 100 + 0, 6);
-        // draw_pixel(12, 100 + 0, 5);
-        // draw_pixel(13, 100 + 0, 6);
-        // draw_pixel(14, 100 + 0, 5);
-        // draw_pixel(15, 100 + 0, 6);
-
-        // draw_hline(0, 10 + 4, 100 + 1, 2);
-        // draw_hline(0, 10 + 5, 100 + 2, 2);
-        // draw_hline(1, 10 + 4, 100 + 3, 5);
-        // draw_hline(1, 10 + 5, 100 + 4, 5);
-
-        // DX is bigger
-        // left -> right && top -> bot
-        // PROF(draw_line(0, 0, 64, 32, 1), test_lines_cycles);
-        // PROF(draw_line(0, 0, 239, 159, 1), test_lines_cycles);
-        ////// draw_line(10, 0, 229, 159, 1);
-        ////// left -> right && bot -> top
-        // draw_line(0, 159, 239, 0, 2);
-        ////// draw_line(10, 159, 229, 0, 2);
-        //////
-        ////draw_line(0, 0, 239, 159, 1);
-        ////draw_line(0, 129, 239, 40, 2);
-        ////// right -> left && top -> bot
-        //draw_line(239, 81, 0, 129, 3);
-        ////// right -> left && bot -> top
-        //draw_line(239, 129, 0, 40, 5);
-            // txt_render();
-            // txt_clear();
-
-        // draw_line(239, 149, 0, 10, 3);
-
-        // draw_line(0, 159, 239, 0, 2);
-        // draw_line(0, 0, 100, 50, 2);
-        // draw_line(0, 0, 100, 21, 5);
-        // draw_line(0, 0, 15, 7, 2);
-        // draw_line(0, 31, 100, 0, 5);
-        // draw_line(0, 159, 19, 0, 5);
-        // draw_line(0, 159, 19, 0, 5);
-        // draw_line(0, 0, 19, 159, 6);
-        // txt_render();
-        // txt_clear();
-        // PROF(test_lines(), test_lines_cycles);
-        // PROF(test_rect(), test_rect_cycles);
-        // PROF(test_fill_rect(), test_fill_rect_cycles);
-        // PROF(test_chr(), test_chr_cycles);
-        // PROF(test_icn(), test_icn_cycles);
-        // draw_filled_rect(0, 0, 140, 60, 0);
+    // Register interrupts.
+    irq_init();
+    irs_set(IRQ_VBLANK, irs_stub);
+
+    // Main loop.
+    PROF_INIT();
+    while (true) {
+        PROF(test_clear(), test_clear_cycles);
+        PROF(test_lines(), test_lines_cycles);
+        PROF(test_rect(), test_rect_cycles);
+        PROF(test_fill_rect(), test_fill_rect_cycles);
+        PROF(test_chr(), test_chr_cycles);
+        PROF(test_icn(), test_icn_cycles);
+        draw_filled_rect(0, 0, 140, 60, 0);
         PROF_SHOW();
+        bios_vblank_wait();
         PROF(flip_buffer(), flip_cycles);
     }
 
diff --git a/src/renderer_m0.c b/src/renderer_m0.c
index c9aa7ae..35e9ceb 100644
--- a/src/renderer_m0.c
+++ b/src/renderer_m0.c
@@ -8,6 +8,13 @@
 #include "renderer.h"
 #include "text.h"
 
+//
+// Parameters.
+//
+
+#define SUBPIXEL_LINES 0
+#define DEC_BIG_LUT 1
+
 // Front/back buffers for double buffering.
 #define BUF_0 ((u32*)(MEM_VRAM))
 #define BUF_1 ((u32*)(MEM_VRAM + KB(20)))
@@ -179,33 +186,7 @@ draw_line(size_t x0, size_t y0, size_t x1, size_t y1, u8 clr) {
             SWAP(y0, y1);
         }
 
-#if 0
-        int x_step = x0 > x1 ? -1 : 1;
-        int y_step = y0 > y1 ? -1 : 1;
-        if (dx >= dy) {
-            int diff = 2 * dy - dx;
-            for (int i = 0; i < dx + 1; i++) {
-                draw_pixel(x0, y0, clr);
-                if (diff >= 0) {
-                    diff -= 2 * dx;
-                    y0 += y_step;
-                }
-                diff += 2 * dy;
-                x0 += x_step;
-            }
-        } else {
-            int diff = 2 * dx - dy;
-            for (int i = 0; i < dy + 1; i++) {
-                draw_pixel(x0, y0, clr);
-                if (diff >= 0) {
-                    diff -= 2 * dy;
-                    x0 += x_step;
-                }
-                diff += 2 * dx;
-                y0 += y_step;
-            }
-        }
-#else
+#if SUBPIXEL_LINES == 1
         int dxf = (dx << fp_bit);
         int dyf = (dy << fp_bit);
         int frac_x = x0 > x1 ? FP_NUM(x0 - x1, fp_bit) : FP_NUM(x1 - x0, fp_bit);
@@ -259,6 +240,32 @@ draw_line(size_t x0, size_t y0, size_t x1, size_t y1, u8 clr) {
                 draw_vline(x0, y0, y0 + remaining, clr);
             }
         }
+#else
+        int x_step = x0 > x1 ? -1 : 1;
+        int y_step = y0 > y1 ? -1 : 1;
+        if (dx >= dy) {
+            int diff = 2 * dy - dx;
+            for (int i = 0; i < dx + 1; i++) {
+                draw_pixel(x0, y0, clr);
+                if (diff >= 0) {
+                    diff -= 2 * dx;
+                    y0 += y_step;
+                }
+                diff += 2 * dy;
+                x0 += x_step;
+            }
+        } else {
+            int diff = 2 * dx - dy;
+            for (int i = 0; i < dy + 1; i++) {
+                draw_pixel(x0, y0, clr);
+                if (diff >= 0) {
+                    diff -= 2 * dy;
+                    x0 += x_step;
+                }
+                diff += 2 * dx;
+                y0 += y_step;
+            }
+        }
 #endif
     }
 }
@@ -302,9 +309,7 @@ draw_filled_rect(size_t x0, size_t y0, size_t x1, size_t y1, u8 clr) {
 // Sprites (chr/icn).
 //
 
-#define DEC_BIG_LUT 1
-
-#if DEC_BIG_LUT
+#if DEC_BIG_LUT == 1
 static u32 dec_byte_flip_x[256] = {
     0x00000000, 0x00000001, 0x00000010, 0x00000011, 0x00000100,
     0x00000101, 0x00000110, 0x00000111, 0x00001000, 0x00001001,
diff --git a/src/renderer_m4.c b/src/renderer_m4.c
index de052df..2a5e9fe 100644
--- a/src/renderer_m4.c
+++ b/src/renderer_m4.c
@@ -1,6 +1,13 @@
 #include "renderer.h"
 #include "text.h"
 
+//
+// Parameters.
+//
+
+#define SUBPIXEL_LINES 0
+#define DEC_BIG_LUT 1
+
 // Front/back buffers for double buffering.
 #define BUF_0 ((u32*)(MEM_VRAM))
 #define BUF_1 ((u32*)(MEM_VRAM ^ 0x0A000))
@@ -118,7 +125,7 @@ draw_line(size_t x0, size_t y0, size_t x1, size_t y1, u8 clr) {
         MAYBE_SWAP(y0, y1);
         draw_vline(x0, y0, y1, clr);
     } else {
-#if 1
+#if SUBPIXEL_LINES == 1
         // Fixed Precision constants.
         const int fp_bit = 6;
         const int fp_one = FP_NUM(1, fp_bit);
@@ -144,66 +151,6 @@ draw_line(size_t x0, size_t y0, size_t x1, size_t y1, u8 clr) {
         u32 mask = x0 & 1 ? ~0xFF : 0xFF;
         u32 color = (clr & 0xFF) | ((clr & 0xFF) << 8);
         if (dx >= dy) {
-            // u64 *dst = ((u64*)addr);
-            // int step = dxf / dyf;
-            // int remaining = dx;
-            // int y_step = y0 > y1 ? -1 : 1;
-            // y_step /= 8;
-            // while (remaining > (step - 1)) {
-            //     distance += step * 2 * dyf;
-            //     size_t a = x0;
-            //     size_t b;
-            //     if (distance >= 0) {
-            //         b = a + step - 1;
-            //         x0 += step;
-            //         remaining -= step;
-            //     } else {
-            //         if (remaining < step) {
-            //             break;
-            //         }
-            //         b = a + step;
-            //         distance += 2 * dyf;
-            //         x0 += (step + 1);
-            //         remaining -= step + 1;
-            //     }
-            //     draw_hline(a, b, y0, 8); // DEBUG: reference
-
-            //     // size_t tile_x0 = a / 8;
-            //     // size_t tile_x1 = b / 8;
-            //     // size_t start_col = a % 8;
-            //     // size_t end_col = b % 8;
-            //     // size_t dtx = tile_x1 - tile_x0;
-            //     // size_t shift_left = start_col * 8;
-            //     // size_t shift_right = (7 - end_col) * 8;
-            //     // // size_t dtx = b/8 - a/8;
-            //     // u64 mask = 0xFFFFFFFFFFFFFFFF;
-            //     // u64 row = 0x0101010101010101 * clr;
-            //     // if (dtx < 1) {
-            //     //     mask = (mask >> shift_right) & (mask << shift_left);
-            //     //     *dst = (*dst & ~mask) | (row & mask);
-            //     // } else {
-            //     //     *dst = (*dst & ~(mask << shift_left)) | row << shift_left;
-            //     //     if (dtx != 1) {
-            //     //         dma_fill(&dst[1], 0x01010101 * clr, (dtx - 1) * 8, 3);
-            //     //     }
-            //     //     dst += dtx;
-            //     //     *dst = (*dst & ~(mask >> shift_right)) | row >> shift_right;
-            //     // }
-            //     // if (end_col == 7) {
-            //     //     dst++;
-            //     // }
-
-            //     dst += y_step;
-            //     distance -= 2 * dxf;
-            // }
-            // if (remaining >= 0) {
-            //     draw_hline(x0, x0 + remaining, y0, clr);
-            // }
-            // Subpixel accurate version.
-            // int distance = (frac_y - fp_half) * dx - (frac_x - fp_half) * dy;
-            // int distance = ( dx * ( frac_y - fp_half ) ) - ( dy * ( frac_x - fp_half ) );
-            // distance -= ( dx << ( fp_bit - 1 ) );
-            //
             int distance = (frac_y - fp_one) * dx - (frac_x - fp_half) * dy;
             int remaining = dx;
             while (distance <= 0  && remaining > 0) {
@@ -337,9 +284,7 @@ draw_filled_rect(size_t x0, size_t y0, size_t x1, size_t y1, u8 clr) {
 // Sprites (chr/icn).
 //
 
-#define DEC_BIG_LUT 1
-
-#if DEC_BIG_LUT
+#if DEC_BIG_LUT == 1
 
 static u64 dec_byte_flip_x[256] = {
     0x0000000000000000, 0x0000000000000001, 0x0000000000000100, 0x0000000000000101, 0x0000000000010000,