From 7c9d2a8095cadbbb0f1b7cb82a43024f24f237a0 Mon Sep 17 00:00:00 2001 From: Mads Buvik Sandvei Date: Thu, 10 Dec 2020 21:27:54 +0100 Subject: [PATCH] Fix bad check for frame number. Fixed accidentally duplicated stereo settings section. --- apps/openmw/mwvr/vrsession.cpp | 4 ++-- files/settings-default.cfg | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/apps/openmw/mwvr/vrsession.cpp b/apps/openmw/mwvr/vrsession.cpp index b974f5148..366db2dcd 100644 --- a/apps/openmw/mwvr/vrsession.cpp +++ b/apps/openmw/mwvr/vrsession.cpp @@ -186,6 +186,7 @@ namespace MWVR mLastRenderedFrame = frameMeta->mFrameNo; getFrame(FramePhase::Swap) = nullptr; } + mCondition.notify_one(); } @@ -215,13 +216,12 @@ namespace MWVR throw std::logic_error("beginPhase called without a frame"); frame = std::move(getFrame(previousPhase)); } - if (phase == mXrSyncPhase && frame->mShouldSyncFrameLoop) { // We may reach this point before xrEndFrame of the previous frame // Must wait or openxr will interpret another call to xrBeginFrame() as skipping a frame std::unique_lock lock(mMutex); - while (mLastRenderedFrame != mFrames - 1) + while (mLastRenderedFrame != frame->mFrameNo - 1) { mCondition.wait(lock); } diff --git a/files/settings-default.cfg b/files/settings-default.cfg index 1bb7090bf..e1433fcb7 100644 --- a/files/settings-default.cfg +++ b/files/settings-default.cfg @@ -935,17 +935,6 @@ object shadows = false # Allow shadows indoors. Due to limitations with Morrowind's data, only actors can cast shadows indoors, which some might feel is distracting. enable indoor shadows = true -[Stereo] - -# Enable/disable stereo view. This setting is ignored in VR. -stereo enabled = false - -# Method used to render stereo if enabled -# Must be one of the following: BruteForce, GeometryShader -# BruteForce: Generates stereo using two cameras and two cull/render passes. Choose this if your game is GPU-bound. -# GeometryShader: Generates stereo in a single pass using automatically generated geometry shaders. May break custom shaders. Choose this if your game is CPU-bound. -stereo method = GeometryShader - [Physics] # Set the number of background threads used for physics. # If no background threads are used, physics calculations are processed in the main thread