Merge branch 'praydog:pd-upscaler' into pd-upscaler

src/mods/VR.cpp

@@ -1554,24 +1554,16 @@ void VR::update_hmd_state() {
     // Update the poses used for the game
     // If we used the data directly from the WaitGetPoses call, we would have to lock a different mutex and wait a long time
     // This is because the WaitGetPoses call is blocking, and we don't want to block any game logic
-    {
-        if (runtime->wants_reset_origin && runtime->ready()) {
-            std::unique_lock _{ runtime->pose_mtx };
+    if (runtime->wants_reset_origin && runtime->ready() && runtime->got_first_valid_poses) {
+        std::unique_lock _{ runtime->pose_mtx };
+        set_rotation_offset(glm::identity<glm::quat>());
+        m_standing_origin = get_position_unsafe(vr::k_unTrackedDeviceIndex_Hmd);
 
-            set_rotation_offset(glm::identity<glm::quat>());
-            m_standing_origin = get_position_unsafe(vr::k_unTrackedDeviceIndex_Hmd);
-
-            runtime->wants_reset_origin = false;
-        }
+        runtime->wants_reset_origin = false;
     }
 
     runtime->update_matrices(m_nearz, m_farz);
 
-    // On first run, set the standing origin to the headset position
-    if (!runtime->got_first_poses) {
-        m_standing_origin = get_position(vr::k_unTrackedDeviceIndex_Hmd);
-    }
-
     runtime->got_first_poses = true;
 
     // Forcefully update the camera transform after submitting the frame

src/mods/vr/runtimes/OpenVR.cpp

@@ -16,6 +16,7 @@ VRRuntime::Error OpenVR::synchronize_frame() {
     auto ret = vr::VRCompositor()->WaitGetPoses(this->real_render_poses.data(), vr::k_unMaxTrackedDeviceCount, this->real_game_poses.data(), vr::k_unMaxTrackedDeviceCount);
 
     if (ret == vr::VRCompositorError_None) {
+        this->got_first_valid_poses = true;
         this->got_first_sync = true;
         this->frame_synced = true;
     }

src/mods/vr/runtimes/OpenXR.cpp

@@ -63,7 +63,7 @@ VRRuntime::Error OpenXR::update_poses() {
 
     const auto display_time = this->frame_state.predictedDisplayTime + (XrDuration)(this->frame_state.predictedDisplayPeriod * this->prediction_scale);
 
-    if (display_time == 0) {
+    if (display_time <= 1000) {
         return VRRuntime::Error::SUCCESS;
     }
 
@@ -108,6 +108,10 @@ VRRuntime::Error OpenXR::update_poses() {
         }
     }
 
+    if (!this->got_first_valid_poses) {
+        this->got_first_valid_poses = (this->view_space_location.locationFlags & (XR_SPACE_LOCATION_POSITION_VALID_BIT | XR_SPACE_LOCATION_ORIENTATION_VALID_BIT)) != 0;
+    }
+
     this->needs_pose_update = false;
     this->got_first_poses = true;
     return VRRuntime::Error::SUCCESS;

src/mods/vr/runtimes/VRRuntime.hpp

@@ -119,6 +119,7 @@ struct VRRuntime {
     // will return VRCompositorError_DoNotHaveFocus
     bool needs_pose_update{true};
     bool got_first_poses{false};
+    bool got_first_valid_poses{false};
     bool got_first_sync{false};
     bool frame_synced{false};
     bool handle_pause{false};