WIP: Support for multiple virtual connectors

layer/VkLayer_FROG_gamescope_wsi.cpp

@@ -394,6 +394,7 @@ namespace GamescopeWSILayer {
   struct GamescopeInstanceData {
     wl_display* display;
     uint32_t appId = 0;
+    std::string engineName;
     GamescopeLayerClient::Flags flags = 0;
   };
   VKROOTS_DEFINE_SYNCHRONIZED_MAP_TYPE(GamescopeInstance, VkInstance);
@@ -616,9 +617,14 @@ namespace GamescopeWSILayer {
       {
         uint32_t appId = clientAppId();
 
+        std::string engineName;
+        if (pCreateInfo->pApplicationInfo && pCreateInfo->pApplicationInfo->pEngineName)
+          engineName = pCreateInfo->pApplicationInfo->pEngineName;
+
         auto state = GamescopeInstance::create(*pInstance, GamescopeInstanceData {
           .display = display,
           .appId   = appId,
+          .engineName = engineName,
           .flags   = defaultLayerClientFlags(pCreateInfo->pApplicationInfo, appId),
         });
 
@@ -1251,7 +1257,8 @@ namespace GamescopeWSILayer {
         uint32_t(pCreateInfo->imageColorSpace),
         uint32_t(pCreateInfo->compositeAlpha),
         uint32_t(pCreateInfo->preTransform),
-        uint32_t(pCreateInfo->clipped));
+        uint32_t(pCreateInfo->clipped),
+        gamescopeInstance->engineName.c_str());
 
       return VK_SUCCESS;
     }

protocol/gamescope-swapchain.xml

@@ -89,6 +89,7 @@
       <arg name="vk_composite_alpha" type="uint" summary="VkCompositeAlphaFlagBitsKHR of swapchain"/>
       <arg name="vk_pre_transform" type="uint" summary="VkSurfaceTransformFlagBitsKHR of swapchain"/>
       <arg name="vk_clipped" type="uint" summary="clipped (VkBool32) of swapchain"/>
+      <arg name="vk_engine_name" type="string" summary="Engine name"/>
     </request>
 
     <request name="set_present_mode">

src/Backends/DRMBackend.cpp

@@ -72,8 +72,96 @@ gamescope::ConVar<bool> cv_drm_debug_disable_color_range( "drm_debug_disable_col
 gamescope::ConVar<bool> cv_drm_debug_disable_explicit_sync( "drm_debug_disable_explicit_sync", false, "Force disable explicit sync on the DRM backend." );
 gamescope::ConVar<bool> cv_drm_debug_disable_in_fence_fd( "drm_debug_disable_in_fence_fd", false, "Force disable IN_FENCE_FD being set to avoid over-synchronization on the DRM backend." );
 
+
+int HackyDRMPresent( const FrameInfo_t *pFrameInfo, bool bAsync );
+
+struct saved_mode {
+	int width;
+	int height;
+	int refresh;
+};
+
 namespace gamescope
 {
+	class CDRMPlane;
+	class CDRMCRTC;
+	class CDRMConnector;
+}
+
+struct drm_t {
+	bool bUseLiftoff;
+
+	int fd = -1;
+
+	int preferred_width, preferred_height, preferred_refresh;
+
+	uint64_t cursor_width, cursor_height;
+	bool allow_modifiers;
+	struct wlr_drm_format_set formats;
+
+	std::vector< std::unique_ptr< gamescope::CDRMPlane > > planes;
+	std::vector< std::unique_ptr< gamescope::CDRMCRTC > > crtcs;
+	std::unordered_map< uint32_t, gamescope::CDRMConnector > connectors;
+
+	gamescope::CDRMPlane *pPrimaryPlane;
+	gamescope::CDRMCRTC *pCRTC;
+	gamescope::CDRMConnector *pConnector;
+
+	struct wlr_drm_format_set primary_formats;
+
+	drmModeAtomicReq *req;
+	uint32_t flags;
+
+	struct liftoff_device *lo_device;
+	struct liftoff_output *lo_output;
+	struct liftoff_layer *lo_layers[ k_nMaxLayers ];
+
+	std::shared_ptr<gamescope::BackendBlob> sdr_static_metadata;
+
+	struct drm_state_t {
+		std::shared_ptr<gamescope::BackendBlob> mode_id;
+		uint32_t color_mgmt_serial;
+		std::shared_ptr<gamescope::BackendBlob> lut3d_id[ EOTF_Count ];
+		std::shared_ptr<gamescope::BackendBlob> shaperlut_id[ EOTF_Count ];
+		amdgpu_transfer_function output_tf = AMDGPU_TRANSFER_FUNCTION_DEFAULT;
+	} current, pending;
+
+	// FBs in the atomic request, but not yet submitted to KMS
+	// Accessed only on req thread
+	std::vector<gamescope::Rc<gamescope::IBackendFb>> m_FbIdsInRequest;
+
+	// FBs currently queued to go on screen.
+	// May be accessed by page flip handler thread and req thread, thus mutex.
+	std::mutex m_QueuedFbIdsMutex;
+	std::vector<gamescope::Rc<gamescope::IBackendFb>> m_QueuedFbIds;
+	// FBs currently on screen.
+	// Accessed only on page flip handler thread.
+	std::mutex m_mutVisibleFbIds;
+	std::vector<gamescope::Rc<gamescope::IBackendFb>> m_VisibleFbIds;
+
+	std::atomic < uint32_t > uPendingFlipCount = { 0 };
+
+	std::atomic < bool > paused = { false };
+	std::atomic < int > out_of_date = { false };
+	std::atomic < bool > needs_modeset = { false };
+
+	std::unordered_map< std::string, int > connector_priorities;
+
+	char *device_name = nullptr;
+};
+
+void drm_drop_fbid( struct drm_t *drm, uint32_t fbid );
+bool drm_set_mode( struct drm_t *drm, const drmModeModeInfo *mode );
+
+
+using namespace std::literals;
+
+struct drm_t g_DRM = {};
+
+namespace gamescope
+{
+	class CDRMBackend;
+
 	std::tuple<int32_t, int32_t, int32_t> GetKernelVersion()
 	{
 		utsname name;
@@ -259,10 +347,10 @@ namespace gamescope
 		CRTCProperties m_Props;
 	};
 
-	class CDRMConnector final : public IBackendConnector, public CDRMAtomicTypedObject<DRM_MODE_OBJECT_CONNECTOR>
+	class CDRMConnector final : public CBaseBackendConnector, public CDRMAtomicTypedObject<DRM_MODE_OBJECT_CONNECTOR>
 	{
 	public:
-		CDRMConnector( drmModeConnector *pConnector );
+		CDRMConnector( CDRMBackend *pBackend, drmModeConnector *pConnector );
 
 		void RefreshState();
 
@@ -343,6 +431,14 @@ namespace gamescope
 
 		const BackendConnectorHDRInfo &GetHDRInfo() const override { return m_Mutable.HDR; }
 
+		virtual bool IsVRRActive() const override
+		{
+			if ( !g_DRM.pCRTC || !g_DRM.pCRTC->GetProperties().VRR_ENABLED )
+				return false;
+
+			return !!g_DRM.pCRTC->GetProperties().VRR_ENABLED->GetCurrentValue();
+		}
+
 		virtual std::span<const BackendMode> GetModes() const override { return m_Mutable.BackendModes; }
 
 		bool SupportsVRR() const override
@@ -371,17 +467,20 @@ namespace gamescope
 			}
 		}
 
-		void UpdateEffectiveOrientation( const drmModeModeInfo *pMode );
+		virtual int Present( const FrameInfo_t *pFrameInfo, bool bAsync ) override;
 
 		using DRMModeGenerator = std::function<drmModeModeInfo(const drmModeModeInfo *, int)>;
 		const DRMModeGenerator &GetModeGenerator() const
 		{
 			return m_Mutable.fnDynamicModeGenerator;
 		}
+		void UpdateEffectiveOrientation( const drmModeModeInfo *pMode );
 
 	private:
 		void ParseEDID();
 
+
+		CDRMBackend *m_pBackend = nullptr;
 		CAutoDeletePtr<drmModeConnector> m_pConnector;
 
 		struct MutableConnectorState
@@ -393,8 +492,8 @@ namespace gamescope
 			char szMakePNP[4]{};
 			char szModel[16]{};
 			const char *pszMake = ""; // Not owned, no free. This is a pointer to pnp db or szMakePNP.
-			std::vector<uint32_t> ValidDynamicRefreshRates{};
 			DRMModeGenerator fnDynamicModeGenerator;
+			std::vector<uint32_t> ValidDynamicRefreshRates{};
 			std::vector<uint8_t> EdidData; // Raw, unmodified.
 			std::vector<BackendMode> BackendModes;
 
@@ -420,82 +519,6 @@ namespace gamescope
 	};
 }
 
-struct saved_mode {
-	int width;
-	int height;
-	int refresh;
-};
-
-struct drm_t {
-	bool bUseLiftoff;
-
-	int fd = -1;
-
-	int preferred_width, preferred_height, preferred_refresh;
-
-	uint64_t cursor_width, cursor_height;
-	bool allow_modifiers;
-	struct wlr_drm_format_set formats;
-
-	std::vector< std::unique_ptr< gamescope::CDRMPlane > > planes;
-	std::vector< std::unique_ptr< gamescope::CDRMCRTC > > crtcs;
-	std::unordered_map< uint32_t, gamescope::CDRMConnector > connectors;
-
-	gamescope::CDRMPlane *pPrimaryPlane;
-	gamescope::CDRMCRTC *pCRTC;
-	gamescope::CDRMConnector *pConnector;
-
-	struct wlr_drm_format_set primary_formats;
-
-	drmModeAtomicReq *req;
-	uint32_t flags;
-
-	struct liftoff_device *lo_device;
-	struct liftoff_output *lo_output;
-	struct liftoff_layer *lo_layers[ k_nMaxLayers ];
-
-	std::shared_ptr<gamescope::BackendBlob> sdr_static_metadata;
-
-	struct drm_state_t {
-		std::shared_ptr<gamescope::BackendBlob> mode_id;
-		uint32_t color_mgmt_serial;
-		std::shared_ptr<gamescope::BackendBlob> lut3d_id[ EOTF_Count ];
-		std::shared_ptr<gamescope::BackendBlob> shaperlut_id[ EOTF_Count ];
-		amdgpu_transfer_function output_tf = AMDGPU_TRANSFER_FUNCTION_DEFAULT;
-	} current, pending;
-
-	// FBs in the atomic request, but not yet submitted to KMS
-	// Accessed only on req thread
-	std::vector<gamescope::Rc<gamescope::IBackendFb>> m_FbIdsInRequest;
-
-	// FBs currently queued to go on screen.
-	// May be accessed by page flip handler thread and req thread, thus mutex.
-	std::mutex m_QueuedFbIdsMutex;
-	std::vector<gamescope::Rc<gamescope::IBackendFb>> m_QueuedFbIds;
-	// FBs currently on screen.
-	// Accessed only on page flip handler thread.
-	std::mutex m_mutVisibleFbIds;
-	std::vector<gamescope::Rc<gamescope::IBackendFb>> m_VisibleFbIds;
-
-	std::atomic < uint32_t > uPendingFlipCount = { 0 };
-
-	std::atomic < bool > paused = { false };
-	std::atomic < int > out_of_date = { false };
-	std::atomic < bool > needs_modeset = { false };
-
-	std::unordered_map< std::string, int > connector_priorities;
-
-	char *device_name = nullptr;
-};
-
-void drm_drop_fbid( struct drm_t *drm, uint32_t fbid );
-bool drm_set_mode( struct drm_t *drm, const drmModeModeInfo *mode );
-
-
-using namespace std::literals;
-
-struct drm_t g_DRM = {};
-
 uint32_t g_nDRMFormat = DRM_FORMAT_INVALID;
 uint32_t g_nDRMFormatOverlay = DRM_FORMAT_INVALID; // for partial composition, we may have more limited formats than base planes + alpha.
 bool g_bRotated = false;
@@ -560,7 +583,7 @@ static constexpr uint32_t s_kSteamDeckOLEDRates[] =
 	90, 
 };
 
-static void update_connector_display_info_wl(struct drm_t *drm)
+void update_connector_display_info_wl(struct drm_t *drm)
 {
 	wlserver_lock();
 	for ( const auto &control : wlserver.gamescope_controls )
@@ -682,7 +705,7 @@ static void page_flip_handler(int fd, unsigned int frame, unsigned int sec, unsi
 	DRMPresentCtx *pCtx = reinterpret_cast<DRMPresentCtx *>( data );
 
 	// Make this const when we move into CDRMBackend.
-	GetBackend()->PresentationFeedback().m_uCompletedPresents = pCtx->ulPendingFlipCount;
+	GetBackend()->GetCurrentConnector()->PresentationFeedback().m_uCompletedPresents = pCtx->ulPendingFlipCount;
 
 	if ( !g_DRM.pCRTC )
 		return;
@@ -768,7 +791,7 @@ static bool refresh_state( drm_t *drm )
 			drm->connectors.emplace(
 				std::piecewise_construct,
 				std::forward_as_tuple( uConnectorId ),
-				std::forward_as_tuple( pConnector ) );
+				std::forward_as_tuple( reinterpret_cast<gamescope::CDRMBackend *>( GetBackend() ), pConnector ) );
 		}
 	}
 
@@ -1963,8 +1986,9 @@ namespace gamescope
 	/////////////////////////
 	// CDRMConnector
 	/////////////////////////
-	CDRMConnector::CDRMConnector( drmModeConnector *pConnector )
+	CDRMConnector::CDRMConnector( CDRMBackend *pBackend, drmModeConnector *pConnector )
 		: CDRMAtomicTypedObject<DRM_MODE_OBJECT_CONNECTOR>( pConnector->connector_id )
+		, m_pBackend{ pBackend }
 		, m_pConnector{ pConnector, []( drmModeConnector *pConnector ){ drmModeFreeConnector( pConnector ); } }
 	{
 		RefreshState();
@@ -2043,6 +2067,11 @@ namespace gamescope
 		ParseEDID();
 	}
 
+	int CDRMConnector::Present( const FrameInfo_t *pFrameInfo, bool bAsync )
+	{
+		return HackyDRMPresent( pFrameInfo, bAsync );
+	}
+
 	void CDRMConnector::UpdateEffectiveOrientation( const drmModeModeInfo *pMode )
 	{
 		if ( this->GetScreenType() == GAMESCOPE_SCREEN_TYPE_INTERNAL && g_DesiredInternalOrientation != GAMESCOPE_PANEL_ORIENTATION_AUTO )
@@ -3230,8 +3259,13 @@ namespace gamescope
 			return true;
 		}
 
-		virtual int Present( const FrameInfo_t *pFrameInfo, bool bAsync ) override
+		virtual int Present( const FrameInfo_t *pFrameInfo, bool bAsync )
 		{
+			static uint64_t s_ulLastTime = get_time_in_nanos();
+			uint64_t ulNow = get_time_in_nanos();
+			drm_log.debugf( "CDRMBackend::Present Begin: %lu -> delta: %lu", ulNow, ulNow - s_ulLastTime );
+			s_ulLastTime = ulNow;
+
 			bool bWantsPartialComposite = pFrameInfo->layerCount >= 3 && !kDisablePartialComposition;
 
 			static bool s_bWasFirstFrame = true;
@@ -3584,14 +3618,6 @@ namespace gamescope
 			return nullptr;
 		}
 
-		virtual bool IsVRRActive() const override
-		{
-			if ( !g_DRM.pCRTC || !g_DRM.pCRTC->GetProperties().VRR_ENABLED )
-				return false;
-
-			return !!g_DRM.pCRTC->GetProperties().VRR_ENABLED->GetCurrentValue();
-		}
-
 		virtual bool SupportsPlaneHardwareCursor() const override
 		{
 			return true;
@@ -3702,14 +3728,14 @@ namespace gamescope
 				drm->m_QueuedFbIds.swap( drm->m_FbIdsInRequest );
 			}
 
-			m_PresentFeedback.m_uQueuedPresents++;
+			GetCurrentConnector()->PresentationFeedback().m_uQueuedPresents++;
 
 			uint32_t uCurrentPresentCtx = m_uNextPresentCtx;
 			m_uNextPresentCtx = ( m_uNextPresentCtx + 1 ) % 3;
-			m_PresentCtxs[uCurrentPresentCtx].ulPendingFlipCount = m_PresentFeedback.m_uQueuedPresents;
+			m_PresentCtxs[uCurrentPresentCtx].ulPendingFlipCount = GetCurrentConnector()->PresentationFeedback().m_uQueuedPresents;
 
-			drm_log.debugf("flip commit %" PRIu64, (uint64_t)m_PresentFeedback.m_uQueuedPresents);
-			gpuvis_trace_printf( "flip commit %" PRIu64, (uint64_t)m_PresentFeedback.m_uQueuedPresents );
+			drm_log.debugf("flip commit %" PRIu64, (uint64_t)GetCurrentConnector()->PresentationFeedback().m_uQueuedPresents);
+			gpuvis_trace_printf( "flip commit %" PRIu64, (uint64_t)GetCurrentConnector()->PresentationFeedback().m_uQueuedPresents );
 
 			ret = drmModeAtomicCommit(drm->fd, drm->req, drm->flags, &m_PresentCtxs[uCurrentPresentCtx] );
 			if ( ret != 0 )
@@ -3735,7 +3761,7 @@ namespace gamescope
 				// Clear our refs.
 				drm->m_FbIdsInRequest.clear();
 
-				m_PresentFeedback.m_uQueuedPresents--;
+				GetCurrentConnector()->PresentationFeedback().m_uQueuedPresents--;
 
 				if ( isPageFlip )
 					drm->uPendingFlipCount--;
@@ -3806,3 +3832,9 @@ namespace gamescope
 		return Set( new CDRMBackend{} );
 	}
 }
+
+int HackyDRMPresent( const FrameInfo_t *pFrameInfo, bool bAsync )
+{
+	return static_cast<gamescope::CDRMBackend *>( GetBackend() )->Present( pFrameInfo, bAsync );
+}
+