1 files changed, 42 insertions, 24 deletions

diff --git a/src/profiling.c b/src/profiling.c
index e1f4feb..5f5c871 100644
--- a/src/profiling.c
+++ b/src/profiling.c
@@ -3,8 +3,7 @@
 //
 
 // NOTE: Profiling uses the last two timers to count cycles, and thus can't be
-//       used for measuring applications that
-
+//       used for measuring applications that use them.
 
 static u32 frame_time = 0;
 
@@ -31,6 +30,7 @@ typedef enum ProfType {
     PROF_TXTREND,
     PROF_TXTCLEAR,
     PROF_NUM,
+    PROF_END,
 } ProfType;
 
 char *prof_type_str[PROF_NUM] = {
@@ -50,17 +50,18 @@ u32 prof_frame_time  = 0;
 u32 prof_frame_count = 0;
 u32 prof_frame_avg  = 0;
 u32 prof_frame_time_max  = 0;
-u32 prof_times[PROF_NUM] = {0};
-u32 prof_count[PROF_NUM] = {0};
-u32 prof_avg[PROF_NUM] = {0};
-u32 prof_max[PROF_NUM] = {0};
-u32 prof_min[PROF_NUM] = {0};
+u32 prof_times[PROF_END] = {0};
+u32 prof_count[PROF_END] = {0};
+u32 prof_avg[PROF_END] = {0};
+u32 prof_max[PROF_END] = {0};
+u32 prof_min[PROF_END] = {0};
 
 bool prof_reset_minmax = PROF_RESET_MINMAX;
 bool prof_show = true;
+u8 prof_detail_level = 2;
 
 #define PROF_INIT() do { \
-    for (size_t i = 0; i < PROF_NUM; i++) { \
+    for (size_t i = 0; i < PROF_END; i++) { \
         prof_min[i] = -1; \
     } \
 } while(0);
@@ -80,34 +81,46 @@ bool prof_show = true;
     profile_start();\
 } while(0)
 
-
 #define FRAME_END() do { \
         prof_frame_count++;\
         frame_time = profile_measure();\
         prof_frame_time_max = MAX(prof_frame_time_max, frame_time);\
         prof_frame_time += profile_stop();\
         if (prof_show) { \
-            draw_filled_rect(0, 0, SCREEN_WIDTH - 1, 8 * (PROF_NUM + 1), 2); \
             u32 fps = (u64)280896 * 60 / (prof_frame_avg + 1); \
             if (prof_frame_avg == 0) { \
                 fps = 0; \
             } \
-            txt_drawf_small("FRAME TIME/FPS: %.9l/%.2l", 0, 0, COL_FG, \
-                    prof_frame_avg, fps);\
-            txt_drawf_small("MAX: %.9l/%l", 8 * 19, 0, COL_FG, \
-                    prof_frame_time_max, 280896);\
+            if (prof_detail_level > 0) {\
+                draw_filled_rect(0, 0, SCREEN_WIDTH - 1, 8, 2); \
+                txt_drawf_small("AVG/MAX/VDRAW: %.9l/%.9l/%l FPS: %.3l CPU: %.3l", 0, 0, COL_FG, \
+                        prof_frame_avg, prof_frame_time_max, 280896, fps, (u64)prof_frame_avg * 100 / 280896);\
+            } else { \
+                draw_filled_rect(8 * 25 + 4, 0, SCREEN_WIDTH - 1, 8, 2); \
+                txt_drawf_small("CPU: %.3l", 8 * 25 + 4, 0, COL_FG, \
+                        (u64)prof_frame_avg * 100 / 280896);\
+            } \
+            if (prof_detail_level >= 3) {\
+                draw_filled_rect(0, 8, SCREEN_WIDTH - 1, 8 * (PROF_NUM + 1), 2); \
+            } else if (prof_detail_level >= 2) {\
+                draw_filled_rect(0, 8, 8 * 15, 8 * (PROF_NUM + 1), 2); \
+            } \
             for (size_t idx = 0; idx < PROF_NUM; idx++) { \
-                txt_drawf_small("%s %.9l (%.9l %.9l) %08x:%08x", 0, 8 * (idx + 1), COL_FG, \
-                        prof_type_str[idx], \
-                        prof_avg[idx], \
-                        prof_min[idx], \
-                        prof_max[idx], \
-                        prof_avg[idx], \
-                        prof_max[idx]);\
+                if (prof_detail_level >= 3) {\
+                    txt_drawf_small("%s %.9l (%.9l %.9l) %08x:%08x", 0, 8 * (idx + 1), COL_FG, \
+                            prof_type_str[idx], \
+                            prof_avg[idx], \
+                            prof_min[idx], \
+                            prof_max[idx], \
+                            prof_avg[idx], \
+                            prof_max[idx]);\
+                } else if (prof_detail_level >= 2) {\
+                    txt_drawf_small("%s %.9l/%.9l", 0, 8 * (idx + 1), COL_FG, \
+                            prof_type_str[idx], \
+                            prof_avg[idx], \
+                            prof_max[idx]);\
+                }\
             }; \
-            draw_filled_rect(0, SCREEN_HEIGHT - 9, 58, SCREEN_HEIGHT - 1, 2); \
-            txt_drawf_small("CPU USAGE: %.3l", 0, SCREEN_HEIGHT - 9, COL_FG, \
-                    (u64)prof_frame_avg * 100 / 280896);\
         } \
         if (prof_frame_count >= PROF_ENABLE) { \
             for (size_t idx = 0; idx < PROF_NUM; idx++) { \
@@ -129,6 +142,10 @@ bool prof_show = true;
     prof_show ^= 1; \
 } while(0)
 
+#define PROF_DETAIL(N) do { \
+    prof_detail_level = (N); \
+} while(0)
+
 #else
 
 // No profiling.
@@ -141,4 +158,5 @@ bool prof_show = true;
     frame_time = profile_stop();\
 } while(0)
 #define PROF_SHOW()
+#define PROF_DETAIL(N)
 #endif