Improve logging and some errors

Author: Crementif

src/rendering/openxr.cpp

@@ -11,7 +11,13 @@ OpenXR::OpenXR() {
     xrEnumerateInstanceExtensionProperties(NULL, 0, &xrExtensionCount, NULL);
     std::vector<XrExtensionProperties> instanceExtensions;
     instanceExtensions.resize(xrExtensionCount, { XR_TYPE_EXTENSION_PROPERTIES, NULL });
-    checkXRResult(xrEnumerateInstanceExtensionProperties(NULL, xrExtensionCount, &xrExtensionCount, instanceExtensions.data()), "Couldn't enumerate OpenXR extensions!");
+    {
+        XrResult result = xrEnumerateInstanceExtensionProperties(NULL, xrExtensionCount, &xrExtensionCount, instanceExtensions.data());
+        if (result == XR_ERROR_RUNTIME_FAILURE) {
+            Log::print<ERROR>("Couldn't enumerate OpenXR extensions! Is the OpenXR runtime installed and set to the correct runtime? Restarting might help, or going to SteamVR/Oculus Link's Settings and making sure OpenXR is enabled.");
+        }
+        checkXRResult(result, "Couldn't enumerate OpenXR extensions!");
+    }
 
     // Create instance with required extensions
     bool d3d12Supported = false;
@@ -63,7 +69,13 @@ OpenXR::OpenXR() {
     xrInstanceCreateInfo.enabledApiLayerCount = 0;
     xrInstanceCreateInfo.enabledApiLayerNames = NULL;
     xrInstanceCreateInfo.applicationInfo = { "BetterVR", 1, "Cemu", 1, XR_API_VERSION_1_0 };
-    checkXRResult(xrCreateInstance(&xrInstanceCreateInfo, &m_instance), "Failed to initialize the OpenXR instance!");
+    {
+        XrResult result = xrCreateInstance(&xrInstanceCreateInfo, &m_instance);
+        if (result == XR_ERROR_RUNTIME_FAILURE) {
+            Log::print<ERROR>("Failed to create OpenXR instance! Is the OpenXR runtime installed and set to the correct runtime? Restarting might help, or going to SteamVR/Oculus Link's Settings and making sure OpenXR is enabled.");
+        }
+        checkXRResult(result, "Failed to initialize the OpenXR instance!");
+    }
 
     // Load extension pointers for this XrInstance
     xrGetInstanceProcAddr(m_instance, "xrGetD3D12GraphicsRequirementsKHR", (PFN_xrVoidFunction*)&func_xrGetD3D12GraphicsRequirementsKHR);

src/rendering/vulkan.cpp

@@ -8,6 +8,21 @@ RND_Vulkan::RND_Vulkan(VkInstance vkInstance, VkPhysicalDevice vkPhysDevice, VkD
     m_deviceDispatch = vkroots::tables::LookupDeviceDispatch(vkDevice);
 
     m_physicalDeviceDispatch->GetPhysicalDeviceMemoryProperties2KHR(vkPhysDevice, &m_memoryProperties);
+
+    VkPhysicalDeviceProperties props{};
+    m_instanceDispatch->GetPhysicalDeviceProperties(vkPhysDevice, &props);
+
+    uint64_t localVramBytes = 0;
+    for (uint32_t i = 0; i < m_memoryProperties.memoryProperties.memoryHeapCount; ++i) {
+        if ((m_memoryProperties.memoryProperties.memoryHeaps[i].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) != 0) {
+            localVramBytes += m_memoryProperties.memoryProperties.memoryHeaps[i].size;
+        }
+    }
+
+    Log::print<INFO>("GPU: {} (vendor={:#06x}, device={:#06x}, driver={})", props.deviceName, props.vendorID, props.deviceID, props.driverVersion);
+    if (localVramBytes > 0) {
+        Log::print<INFO>("GPU VRAM (device local): {:.2f} GiB", double(localVramBytes) / (1024.0 * 1024.0 * 1024.0));
+    }
 }
 
 RND_Vulkan::~RND_Vulkan() {

src/utils/logger.cpp

@@ -1,16 +1,47 @@
+#include "logger.h"
+
 HANDLE Log::consoleHandle = NULL;
 double Log::timeFrequency = 0.0f;
 std::ofstream Log::logFile;
+std::mutex Log::logMutex;
+
+static void LogSystemHardwareInfo() {
+    int cpuInfo[4] = {0, 0, 0, 0};
+    __cpuid(cpuInfo, 0x80000000);
+    const unsigned int maxExId = static_cast<unsigned int>(cpuInfo[0]);
+
+    std::string cpuBrand;
+    if (maxExId >= 0x80000004) {
+        char brand[49] = {};
+        __cpuid(reinterpret_cast<int*>(brand + 0), 0x80000002);
+        __cpuid(reinterpret_cast<int*>(brand + 16), 0x80000003);
+        __cpuid(reinterpret_cast<int*>(brand + 32), 0x80000004);
+        cpuBrand = brand;
+        while (!cpuBrand.empty() && cpuBrand.front() == ' ') cpuBrand.erase(cpuBrand.begin());
+        while (!cpuBrand.empty() && cpuBrand.back() == ' ') cpuBrand.pop_back();
+        if (!cpuBrand.empty()) {
+            Log::print<INFO>("CPU: {}", cpuBrand.c_str());
+        }
+    }
+
+    MEMORYSTATUSEX statex{};
+    statex.dwLength = sizeof(statex);
+    if (GlobalMemoryStatusEx(&statex)) {
+        const double totalGiB = double(statex.ullTotalPhys) / (1024.0 * 1024.0 * 1024.0);
+        Log::print<INFO>("RAM: {:.2f} GiB", totalGiB);
+    }
+}
 
 Log::Log() {
     AllocConsole();
     SetConsoleTitleA("BetterVR Debugging Console");
     consoleHandle = GetStdHandle(STD_OUTPUT_HANDLE);
-#ifdef _DEBUG
-#else
-    logFile.open("BetterVR.txt", std::ios::out | std::ios::trunc);
+#ifndef _DEBUG
+    logFile.open("BetterVR_log.txt", std::ios::out | std::ios::trunc);
 #endif
     Log::print<INFO>("Successfully started BetterVR!");
+    LogSystemHardwareInfo();
+
     LARGE_INTEGER timeLI;
     QueryPerformanceFrequency(&timeLI);
     timeFrequency = double(timeLI.QuadPart) / 1000.0;
@@ -19,8 +50,7 @@ Log::Log() {
 Log::~Log() {
     Log::print<INFO>("Shutting down BetterVR debugging console...");
     FreeConsole();
-#ifdef _DEBUG
-#else
+#ifndef _DEBUG
     if (logFile.is_open()) {
         logFile.close();
     }

src/utils/logger.h

@@ -1,3 +1,4 @@
+#pragma once
 #include "vkroots.h"
 #include <fstream>
 
@@ -255,8 +256,9 @@ class Log {
         if constexpr (!isLogTypeEnabled<L>()) {
             return;
         }
+        std::lock_guard<std::mutex> lock(logMutex);
         std::string messageStr = std::string(message) + "\n";
-        
+
 #ifndef _DEBUG
         if (logFile.is_open()) {
             logFile << messageStr;
@@ -290,6 +292,7 @@ class Log {
     static HANDLE consoleHandle;
     static double timeFrequency;
     static std::ofstream logFile;
+    static std::mutex logMutex;
 };
 
 static void checkXRResult(const XrResult result, const char* errorMessage) {