From 7582b86237238b2d9a8cc0bf1779a2ffbb69e9b8 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Thu, 15 Sep 2011 17:05:00 +0000
Subject: [PATCH] Add high-resolution timers C API for profiling. The functions
 are called uint64_t gethiticks() and gethitickspersec().  For SDL 1.2, the
 timer has the same resolution as getticks (1000 Hz). For Windows and SDL 1.3,
 the resolution of the underlying perf-timers is used.  The only user of these
 functions right now is some TROR on-screen debugging code.

Revert an earlier change regarding r_preview_mouseaim.  We can't do the
check because editstatus is set later.

git-svn-id: https://svn.eduke32.com/eduke32@2026 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/include/baselayer.h |  2 ++
 polymer/eduke32/build/src/engine.c        | 30 ++++++++++++++++-------
 polymer/eduke32/build/src/polymost.c      |  5 ++--
 polymer/eduke32/build/src/sdlayer.c       | 22 +++++++++++++++++
 polymer/eduke32/build/src/winlayer.c      | 13 ++++++++++
 5 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/polymer/eduke32/build/include/baselayer.h b/polymer/eduke32/build/include/baselayer.h
index e935b0e04..8edb8eaf7 100644
--- a/polymer/eduke32/build/include/baselayer.h
+++ b/polymer/eduke32/build/include/baselayer.h
@@ -141,6 +141,8 @@ void uninittimer(void);
 void sampletimer(void);
 uint32_t getticks(void);
 int32_t gettimerfreq(void);
+uint64_t gethiticks(void);
+uint64_t gethitickspersec(void);
 void (*installusertimercallback(void (*callback)(void)))(void);
 
 int32_t checkvideomode(int32_t *x, int32_t *y, int32_t c, int32_t fs, int32_t forced);
diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c
index 581d140c7..f0d625b50 100644
--- a/polymer/eduke32/build/src/engine.c
+++ b/polymer/eduke32/build/src/engine.c
@@ -194,6 +194,9 @@ uint8_t graysectbitmap[MAXSECTORS>>3];
 uint8_t graywallbitmap[MAXWALLS>>3];
 int32_t autogray = 0, showinnergray = 1;
 
+#ifdef YAX_DEBUG
+double hitickspersec;
+#endif
 #ifdef ENGINE_SCREENSHOT_DEBUG
 int32_t engine_screenshot = 0;
 #endif
@@ -766,7 +769,7 @@ void yax_drawrooms(void (*ExtAnalyzeSprites)(void), int32_t horiz, int16_t sectn
     // original (1st-draw) and accumulated ('per-level') gotsector bitmaps
     static uint8_t ogotsector[MAXSECTORS>>3], lgotsector[MAXSECTORS>>3];
 #ifdef YAX_DEBUG
-    int32_t t;
+    uint64_t t;
 #endif
 
     if (getrendermode()==4 || numyaxbunches==0)
@@ -846,7 +849,7 @@ void yax_drawrooms(void (*ExtAnalyzeSprites)(void), int32_t horiz, int16_t sectn
                     j = bunches[cf][bnchcnt];  // the actual bunchnum...
                     yax_globalbunch = j;
 #ifdef YAX_DEBUG
-                    t=getticks();
+                    t=gethiticks();
 #endif
                     k = bunchsec[j];
 
@@ -864,9 +867,10 @@ void yax_drawrooms(void (*ExtAnalyzeSprites)(void), int32_t horiz, int16_t sectn
                             for (i=0; i<(numsectors+7)>>3; i++)
                                 lgotsector[i] |= gotsector[i];
 
-                        yaxdebug("l%d: faked sec %3d (bunch %2d),%3d dspr, ob=[%2d,%2d], sn=%3d,%3d ms",
+                        yaxdebug("l%d: faked sec %3d (bunch %2d),%3d dspr, ob=[%2d,%2d], sn=%3d, %.3f ms",
                                  yax_globallev-YAX_MAXDRAWS, k, j, yax_spritesortcnt[yax_globallev],
-                                 ourbunch[0],ourbunch[1],sectnum,getticks()-t);
+                                 ourbunch[0],ourbunch[1],sectnum,
+                                 (double)(1000*(gethiticks()-t))/hitickspersec);
                     }
 
                     if (ourbunch[cf]==j)
@@ -934,7 +938,7 @@ void yax_drawrooms(void (*ExtAnalyzeSprites)(void), int32_t horiz, int16_t sectn
                 k = bunchsec[j];  // best start-drawing sector
                 yax_globalbunch = j;
 #ifdef YAX_DEBUG
-                t=getticks();
+                t=gethiticks();
 #endif
                 yax_tweakpicnums(j, cf, 0);
                 if (k < 0)
@@ -946,8 +950,9 @@ void yax_drawrooms(void (*ExtAnalyzeSprites)(void), int32_t horiz, int16_t sectn
                     yax_nomaskpass = nmp;
                     drawrooms(globalposx,globalposy,globalposz,globalang,horiz,k+MAXSECTORS);  // +MAXSECTORS: force
 
-                    yaxdebug("l%d nm%d: DRAWN sec %3d (bn %2d),%3d tspr,%3d ms",
-                             yax_globallev-YAX_MAXDRAWS, nmp, k, j, spritesortcnt, getticks()-t);
+                    yaxdebug("l%d nm%d: DRAWN sec %3d (bn %2d),%3d tspr, %.3f ms",
+                             yax_globallev-YAX_MAXDRAWS, nmp, k, j, spritesortcnt,
+                             (double)(1000*(gethiticks()-t))/hitickspersec);
 
                     if (nmp==1)
                     {
@@ -973,7 +978,7 @@ void yax_drawrooms(void (*ExtAnalyzeSprites)(void), int32_t horiz, int16_t sectn
     }
 
 #ifdef YAX_DEBUG
-    t=getticks();
+    t=gethiticks();
 #endif
     yax_globalcf = -1;
     yax_globalbunch = -1;
@@ -982,7 +987,8 @@ void yax_drawrooms(void (*ExtAnalyzeSprites)(void), int32_t horiz, int16_t sectn
 
     // draw base level
     drawrooms(globalposx,globalposy,globalposz,globalang,horiz,osectnum);
-    yaxdebug("DRAWN base level sec %d, %2d ms", osectnum, getticks()-t);
+    yaxdebug("DRAWN base level sec %d, %.3f ms", osectnum,
+             (double)(1000*(gethiticks()-t))/hitickspersec);
 
     yax_copytsprite(-1, scansector_collectsprites);
     scansector_collectsprites = 1;
@@ -7674,6 +7680,12 @@ int32_t initengine(void)
         if (i) return i;
     }
 
+#ifdef YAX_DEBUG
+    hitickspersec = (double)gethitickspersec();
+    if (hitickspersec==0.0)
+        hitickspersec = 1.0;
+#endif
+
     if (loadtables()) return 1;
 
     xyaspect = -1;
diff --git a/polymer/eduke32/build/src/polymost.c b/polymer/eduke32/build/src/polymost.c
index 03d92d908..bd5d1f742 100644
--- a/polymer/eduke32/build/src/polymost.c
+++ b/polymer/eduke32/build/src/polymost.c
@@ -6398,8 +6398,9 @@ void polymost_initosdfuncs(void)
 
     for (i=0; i<sizeof(cvars_polymost)/sizeof(cvars_polymost[0]); i++)
     {
-        if (editstatus==0 && !Bstrcmp(cvars_polymost[i].name, "r_preview_mouseaim"))
-            continue;
+        // can't do this: editstatus is set after this function
+//        if (editstatus==0 && !Bstrcmp(cvars_polymost[i].name, "r_preview_mouseaim"))
+//            continue;
 
         if (OSD_RegisterCvar(&cvars_polymost[i]))
             continue;
diff --git a/polymer/eduke32/build/src/sdlayer.c b/polymer/eduke32/build/src/sdlayer.c
index 0418643ad..b1b4b4658 100644
--- a/polymer/eduke32/build/src/sdlayer.c
+++ b/polymer/eduke32/build/src/sdlayer.c
@@ -712,6 +712,28 @@ uint32_t getticks(void)
     return (uint32_t)SDL_GetTicks();
 }
 
+// high-resolution timers for profiling
+#if (SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION < 3) // SDL 1.2
+uint64_t gethiticks(void)
+{
+    return SDL_GetTicks();
+}
+
+uint64_t gethitickspersec(void)
+{
+    return 1000;
+}
+#else  // SDL 1.3
+uint64_t gethiticks(void)
+{
+    return SDL_GetPerformanceCounter();
+}
+
+uint64_t gethitickspersec(void)
+{
+    return SDL_GetPerformanceFrequency();
+}
+#endif
 
 //
 // gettimerfreq() -- returns the number of ticks per second the timer is configured to generate
diff --git a/polymer/eduke32/build/src/winlayer.c b/polymer/eduke32/build/src/winlayer.c
index f71c302a1..cdf184d97 100644
--- a/polymer/eduke32/build/src/winlayer.c
+++ b/polymer/eduke32/build/src/winlayer.c
@@ -1574,6 +1574,19 @@ uint32_t getticks(void)
     return (uint32_t)(i*longlong(1000)/timerfreq);
 }
 
+// high-resolution timers for profiling
+uint64_t gethiticks(void)
+{
+    uint64_t i;
+    if (timerfreq == 0) return 0;
+    QueryPerformanceCounter((LARGE_INTEGER *)&i);
+    return i;
+}
+
+uint64_t gethitickspersec(void)
+{
+    return timerfreq;
+}
 
 //
 // gettimerfreq() -- returns the number of ticks per second the timer is configured to generate