Merge branch 'metrics-rename' into 'release/v1.1'

rename some metrics for better readability

See merge request lightspeedrtx/dxvk-remix-nv!1588

Author: nv-enaselli

src/dxvk/rtx_render/rtx_context.cpp

@@ -766,8 +766,8 @@ namespace dxvk {
 
   void RtxContext::updateMetrics(const float frameTimeMilliseconds, const float gpuIdleTimeMilliseconds) const {
     ScopedCpuProfileZone();
-    Metrics::logRollingAverage(Metric::average_frame_time, frameTimeMilliseconds); // In milliseconds
-    Metrics::logRollingAverage(Metric::gpu_idle_ticks, gpuIdleTimeMilliseconds); // In milliseconds
+    Metrics::logRollingAverage(Metric::dxvk_average_frame_time_ms, frameTimeMilliseconds); // In milliseconds
+    Metrics::logRollingAverage(Metric::dxvk_gpu_idle_time_ms, gpuIdleTimeMilliseconds); // In milliseconds
     uint64_t vidUsageMib = 0;
     uint64_t sysUsageMib = 0;
     const VkPhysicalDeviceMemoryProperties memprops = m_device->adapter()->memoryProperties();
@@ -782,10 +782,10 @@ namespace dxvk {
         sysUsageMib += m_device->getMemoryStats(i).totalUsed() >> 20;
       }
     }
-    Metrics::logRollingAverage(Metric::vid_memory_usage, static_cast<float>(vidUsageMib)); // In MB
-    Metrics::logRollingAverage(Metric::sys_memory_usage, static_cast<float>(sysUsageMib)); // In MB
-    Metrics::logFloat(Metric::total_time, static_cast<float>(getCommonObjects()->getSceneManager().getRealTimeSinceStartMS()));
-    Metrics::logFloat(Metric::frame_count, static_cast<float>(m_device->getCurrentFrameId()));
+    Metrics::logRollingAverage(Metric::dxvk_vid_memory_usage_mb, static_cast<float>(vidUsageMib)); // In MB
+    Metrics::logRollingAverage(Metric::dxvk_sys_memory_usage_mb, static_cast<float>(sysUsageMib)); // In MB
+    Metrics::logFloat(Metric::dxvk_total_time_ms, static_cast<float>(getCommonObjects()->getSceneManager().getRealTimeSinceStartMS()));
+    Metrics::logFloat(Metric::dxvk_frame_count, static_cast<float>(m_device->getCurrentFrameId()));
   }
 
   void RtxContext::setConstantBuffers(const uint32_t vsFixedFunctionConstants, const uint32_t psSharedStateConstants, Rc<DxvkBuffer> vertexCaptureCB) {

src/util/log/metrics.h

@@ -32,12 +32,12 @@
 
 namespace dxvk {
   enum Metric {
-    average_frame_time = 0,  // In milliseconds
-    vid_memory_usage,        // In MB
-    sys_memory_usage,        // In MB
-    gpu_idle_ticks,          // In milliseconds
-    total_time,              // In milliseconds
-    frame_count,             // Count of rendered frames
+    dxvk_average_frame_time_ms = 0,  // In milliseconds
+    dxvk_vid_memory_usage_mb,        // In MB
+    dxvk_sys_memory_usage_mb,        // In MB
+    dxvk_gpu_idle_time_ms,           // In milliseconds
+    dxvk_total_time_ms,              // In milliseconds
+    dxvk_frame_count,                // Count of rendered frames
 
     kCount
   };
@@ -61,12 +61,12 @@ namespace dxvk {
 
   private:
     inline static const std::string m_metricNames[] = {
-      "average_frame_time",
-      "vid_memory_usage",
-      "sys_memory_usage",
-      "gpu_idle_ticks",
-      "total_time",
-      "frame_count",
+      "dxvk_average_frame_time_ms",
+      "dxvk_vid_memory_usage_mb",
+      "dxvk_sys_memory_usage_mb",
+      "dxvk_gpu_idle_time_ms",
+      "dxvk_total_time_ms",
+      "dxvk_frame_count",
     };
 
     static_assert(std::size(m_metricNames) == kCount, "m_metricNames must have an entry for every Metric enum value");