openvr: Improve frame pacing

Author: misyltoad

src/Backends/DeferredBackend.h

@@ -381,6 +381,15 @@ namespace gamescope
             return m_pChild->ShouldFitWindows();
         }
 
+        void OnEndFrame() override
+        {
+            {
+                std::shared_lock lock{ m_mutInit };
+                if ( m_bInittedChild )
+                    m_pChild->OnEndFrame();
+            }
+        }
+
 	protected:
 
 		virtual void OnBackendBlobDestroyed( BackendBlob *pBlob ) override

src/Backends/OpenVRBackend.cpp

@@ -427,9 +427,6 @@ namespace gamescope
 
                 GetVBlankTimer().MarkVBlank( ulNow, true );
 
-                // Nudge so that steamcompmgr releases commits.
-                nudge_steamcompmgr();
-
                 // Flush out any pending commits -> visible
                 // and any visible commits -> release.
                 {
@@ -455,6 +452,9 @@ namespace gamescope
                     m_pForwarderPlanesInFlight.clear();
                 }
 
+                // Nudge so that steamcompmgr releases commits.
+                nudge_steamcompmgr();
+
                 ProcessVRInput();
             }
         }
@@ -989,6 +989,18 @@ namespace gamescope
             return false;
         }
 
+        void OnEndFrame() override
+        {
+            GetVBlankTimer().UpdateWasCompositing( true );
+            GetVBlankTimer().UpdateLastDrawTime( get_time_in_nanos() - g_SteamCompMgrVBlankTime.ulWakeupTime );
+
+            int32_t nNewRefreshRate = (int32_t) ConvertHztomHz( roundf( vr::VRSystem()->GetFloatTrackedDeviceProperty( vr::k_unTrackedDeviceIndex_Hmd, vr::Prop_DisplayFrequency_Float ) ) );
+            if ( g_nOutputRefresh != nNewRefreshRate )
+                g_nOutputRefresh = nNewRefreshRate;
+
+            PollState();
+        }
+
         const char *GetOverlayKey() const { return m_szOverlayKey.c_str(); }
         const char *GetAppOverlayKey() const { return m_szAppOverlayKey.c_str(); }
         const char *GetOverlayName() const { return m_pchOverlayName; }
@@ -1650,16 +1662,6 @@ namespace gamescope
                 m_Planes[i].Present( nullptr );
         }
 
-
-        GetVBlankTimer().UpdateWasCompositing( true );
-        GetVBlankTimer().UpdateLastDrawTime( get_time_in_nanos() - g_SteamCompMgrVBlankTime.ulWakeupTime );
-
-        int32_t nNewRefreshRate = (int32_t) ConvertHztomHz( roundf( vr::VRSystem()->GetFloatTrackedDeviceProperty( vr::k_unTrackedDeviceIndex_Hmd, vr::Prop_DisplayFrequency_Float ) ) );
-        if ( g_nOutputRefresh != nNewRefreshRate )
-            g_nOutputRefresh = nNewRefreshRate;
-
-        m_pBackend->PollState();
-
         return 0;
     }
 

src/backend.h

@@ -394,6 +394,8 @@ namespace gamescope
 
         virtual bool ShouldFitWindows() = 0;
 
+        virtual void OnEndFrame() = 0;
+
         static IBackend *Get();
         template <typename T>
         static bool Set();
@@ -430,6 +432,8 @@ namespace gamescope
         virtual bool NewlyInitted() override { return false; }
 
         virtual bool ShouldFitWindows() override { return true; }
+
+        virtual void OnEndFrame() override {}
     };
 
     // This is a blob of data that may be associated with

src/steamcompmgr.cpp

@@ -131,6 +131,8 @@ LogScope g_WaitableLog("waitable");
 
 gamescope::ConVar<bool> cv_overlay_unmultiplied_alpha{ "overlay_unmultiplied_alpha", false };
 
+gamescope::ConVar<bool> cv_vr_show_forwarded_overlays{ "vr_show_forwarded_overlays", false };
+
 std::string *g_pVROverlayKey = nullptr;
 bool g_bWasPartialComposite = false;
 
@@ -2463,6 +2465,8 @@ static void ForwardVROverlayTargets()
 			}
 		}
 	}
+
+	gpuvis_trace_printf( "Forward VR Overlays" );
 }
 
 gamescope::ConVar<bool> cv_paint_primary_plane{ "paint_primary_plane", true };
@@ -3669,7 +3673,7 @@ found:;
 		}
 
 		// Skip overlay targets
-		if ( w->oulTargetVROverlay )
+		if ( w->oulTargetVROverlay && !cv_vr_show_forwarded_overlays )
 		{
 			continue;
 		}
@@ -4561,7 +4565,7 @@ handle_desktop_window(steamcompmgr_win_t *w)
 	if ( w->type != steamcompmgr_win_type_t::XWAYLAND )
 		return;
 
-	if ( w->xwayland().a.override_redirect || w->oulTargetVROverlay )
+	if ( w->xwayland().a.override_redirect || ( w->oulTargetVROverlay && !cv_vr_show_forwarded_overlays ) )
 		return;
 
 	if ( win_maybe_a_dropdown( w ) || win_is_useless( w ) )
@@ -5224,7 +5228,7 @@ damage_win(xwayland_ctx_t *ctx, XDamageNotifyEvent *de)
 	bool bCareAboutWindow = true;
 
 	if ( win_is_useless( w ) || w->IsAnyOverlay() ||
-	    w->oulTargetVROverlay || w->isSysTrayIcon ||
+	    ( w->oulTargetVROverlay && !cv_vr_show_forwarded_overlays ) || w->isSysTrayIcon ||
 		w->xwayland().a.map_state != IsViewable )
 	{
 		bCareAboutWindow = false;
@@ -8959,10 +8963,14 @@ steamcompmgr_main(int argc, char **argv)
 			ForwardVROverlayTargets();
 
 			g_bUpdateForwardedVROverlays = false;
+
+			bPainted = true;
 		}
 
 		if ( bPainted )
 		{
+			GetBackend()->OnEndFrame();
+
 			hasRepaint = false;
 			hasRepaintNonBasePlane = false;
 			nIgnoredOverlayRepaints = 0;