Add retry count to OpenXR init wait

Also show initialization errors in Windows message boxes.

Author: Detegr

CMakeLists.txt

@@ -37,8 +37,8 @@ set(HEADERS
 set(openRBRVR_Major 0)
 set(openRBRVR_Minor 5)
 set(openRBRVR_Patch 0)
-set(openRBRVR_Tweak 0)
-# set(openRBRVR_TweakStr "-beta${openRBRVR_Tweak}")
+set(openRBRVR_Tweak 2)
+set(openRBRVR_TweakStr "-rc${openRBRVR_Tweak}")
 
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/version.rc.in

OpenXR.cpp

@@ -299,7 +299,8 @@ void OpenXR::Init(IDirect3DDevice9* dev, const Config& cfg, IDirect3DVR9** vrdev
         .type = XR_TYPE_EVENT_DATA_BUFFER,
         .next = nullptr,
     };
-    while (true) {
+    auto retries = 10;
+    while (retries-- > 0) {
         if (auto res = xrPollEvent(instance, &eventData); res == XR_SUCCESS) {
             if (eventData.type == XR_TYPE_EVENT_DATA_SESSION_STATE_CHANGED) {
                 const XrEventDataSessionStateChanged* sessionStateChangedEvent = reinterpret_cast<const XrEventDataSessionStateChanged*>(&eventData);
@@ -314,12 +315,25 @@ void OpenXR::Init(IDirect3DDevice9* dev, const Config& cfg, IDirect3DVR9** vrdev
                     if (auto res = xrBeginSession(session, &sessionBeginInfo); res != XR_SUCCESS) {
                         throw std::runtime_error(std::format("Failed to initialize OpenXR. xrBeginSession: {}", XrResultToString(instance, res)));
                     }
+
                     break;
                 }
             }
         }
     }
 
+    if (retries == 0) {
+        Dbg("Did not receive XR_SESSION_STATE_READY event, launching the session anyway...");
+        XrSessionBeginInfo sessionBeginInfo = {
+            .type = XR_TYPE_SESSION_BEGIN_INFO,
+            .next = nullptr,
+            .primaryViewConfigurationType = XR_VIEW_CONFIGURATION_TYPE_PRIMARY_STEREO,
+        };
+        if (auto res = xrBeginSession(session, &sessionBeginInfo); res != XR_SUCCESS) {
+            throw std::runtime_error(std::format("Failed to initialize OpenXR. xrBeginSession: {}", XrResultToString(instance, res)));
+        }
+    }
+
     eyePos[LeftEye] = glm::identity<glm::mat4x4>();
     eyePos[RightEye] = glm::identity<glm::mat4x4>();
 }

openRBRVR.cpp

@@ -629,6 +629,7 @@ HRESULT __stdcall DXHook_CreateDevice(
         hooks::drawindexedprimitive = Hook(devvtbl->DrawIndexedPrimitive, DXHook_DrawIndexedPrimitive);
     } catch (const std::runtime_error& e) {
         Dbg(e.what());
+        MessageBoxA(hFocusWindow, e.what(), "Hooking failed", MB_OK);
     }
 
     gD3Ddev = dev;
@@ -643,7 +644,7 @@ HRESULT __stdcall DXHook_CreateDevice(
             gVR = std::make_unique<OpenVR>(dev, gCfg, &gD3DVR, winBounds.right, winBounds.bottom);
         }
     } catch (const std::runtime_error& e) {
-        Dbg(std::format("VR init failed: {}", e.what()));
+        MessageBoxA(hFocusWindow, std::format("VR init failed: {}", e.what()).c_str(), "VR init failed", MB_OK);
     }
     // Initialize this pointer here, as it's too early to do this in openRBRVR constructor
     auto rxHandle = GetModuleHandle("Plugins\\rbr_rx.dll");
@@ -656,6 +657,7 @@ HRESULT __stdcall DXHook_CreateDevice(
             hooks::btbsetrendertarget = Hook(rbrrxdev->SetRenderTarget, BTB_SetRenderTarget);
         } catch (const std::runtime_error& e) {
             Dbg(e.what());
+            MessageBoxA(hFocusWindow, e.what(), "Hooking failed", MB_OK);
         }
     }