wip wayland backend

ValveSoftware · Mar 2, 2024 · 81ef1ac · 81ef1ac
1 parent 14a1db3
commit 81ef1ac
Show file tree

Hide file tree

Showing 9 changed files with 1,245 additions and 11 deletions.
diff --git a/protocol/meson.build b/protocol/meson.build
@@ -12,8 +12,11 @@ wl_protocol_dir = wayland_protos.get_variable('pkgdatadir')
 
 protocols = [
 	# Upstream protocols
+	wl_protocol_dir / 'stable/linux-dmabuf/linux-dmabuf-v1.xml',
+	wl_protocol_dir / 'stable/viewporter/viewporter.xml',
 	wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml',
 	wl_protocol_dir / 'stable/presentation-time/presentation-time.xml',
+	wl_protocol_dir / 'staging/single-pixel-buffer/single-pixel-buffer-v1.xml',
 
 	# Gamescope protocols
 	'gamescope-xwayland.xml',

diff --git a/src/backends.h b/src/backends.h
@@ -10,11 +10,13 @@ namespace gamescope
         SDL,
         OpenVR,
         Headless,
+        Wayland,
     };
 
     // Backend forward declarations.
     class CSDLBackend;
     class CDRMBackend;
     class COpenVRBackend;
     class CHeadlessBackend;
+    class CWaylandBackend;
 }
diff --git a/src/drm.cpp b/src/drm.cpp
@@ -3110,6 +3110,11 @@ namespace gamescope
 				if ( !SupportsColorManagement() )
 					bNeedsFullComposite |= ( pFrameInfo->layerCount > 1 || pFrameInfo->layers[0].colorspace != GAMESCOPE_APP_TEXTURE_COLORSPACE_HDR10_PQ );
 			}
+			else
+			{
+				if ( !SupportsColorManagement() )
+					bNeedsFullComposite |= ColorspaceIsHDR( pFrameInfo->layers[0].colorspace );
+			}
 
 			bNeedsFullComposite |= !!(g_uCompositeDebug & CompositeDebugFlag::Heatmap);
 
@@ -3238,7 +3243,7 @@ namespace gamescope
 
 				baseLayer->filter = GamescopeUpscaleFilter::NEAREST;
 				baseLayer->ctm = nullptr;
-				baseLayer->colorspace = g_bOutputHDREnabled ? GAMESCOPE_APP_TEXTURE_COLORSPACE_HDR10_PQ : GAMESCOPE_APP_TEXTURE_COLORSPACE_SRGB;
+				baseLayer->colorspace = pFrameInfo->outputEncodingEOTF == EOTF_PQ ? GAMESCOPE_APP_TEXTURE_COLORSPACE_HDR10_PQ : GAMESCOPE_APP_TEXTURE_COLORSPACE_SRGB;
 
 				m_bWasPartialCompsiting = false;
 			}

diff --git a/src/main.cpp b/src/main.cpp
@@ -776,6 +776,7 @@ int main(int argc, char **argv)
         }
 	}
 
+#if 0
 	switch ( eCurrentBackend )
 	{
 #if HAVE_DRM
@@ -799,6 +800,8 @@ int main(int argc, char **argv)
 		default:
 			abort();
 	}
+#endif
+	gamescope::IBackend::Set<gamescope::CWaylandBackend>();
 
 	if ( !GetBackend() )
 	{

diff --git a/src/meson.build b/src/meson.build
@@ -104,6 +104,7 @@ src = [
   'mangoapp.cpp',
   'reshade_effect_manager.cpp',
   'backend.cpp',
+  'wayland_backend.cpp',
 ]
 
 gamescope_cpp_args = []

diff --git a/src/rendervulkan.cpp b/src/rendervulkan.cpp
@@ -2853,23 +2853,25 @@ std::shared_ptr<CVulkanTexture> vulkan_get_hacky_blank_texture()
 	return g_output.temporaryHackyBlankImage;
 }
 
-std::shared_ptr<CVulkanTexture> vulkan_create_debug_blank_texture()
+std::shared_ptr<CVulkanTexture> vulkan_create_flat_texture( uint32_t width, uint32_t height, uint8_t r, uint8_t g, uint8_t b, uint8_t a )
 {
 	CVulkanTexture::createFlags flags;
 	flags.bFlippable = true;
 	flags.bSampled = true;
 	flags.bTransferDst = true;
 
-	// To match Steam's scaling, which is capped at 1080p
-	int width = std::min<int>( g_nOutputWidth, 1920 );
-	int height = std::min<int>( g_nOutputHeight, 1080 );
-
 	auto texture = std::make_shared<CVulkanTexture>();
 	bool bRes = texture->BInit( width, height, 1u, VulkanFormatToDRM( VK_FORMAT_B8G8R8A8_UNORM ), flags );
 	assert( bRes );
 
-	void* dst = g_device.uploadBufferData( width * height * 4 );
-	memset( dst, 0x0, width * height * 4 );
+	uint8_t* dst = (uint8_t *)g_device.uploadBufferData( width * height * 4 );
+	for ( uint32_t i = 0; i < width * height; i += 4 )
+	{
+		dst[i + 0] = b;
+		dst[i + 1] = g;
+		dst[i + 2] = r;
+		dst[i + 3] = a;
+	}
 
 	auto cmdBuffer = g_device.commandBuffer();
 	cmdBuffer->copyBufferToImage(g_device.uploadBuffer(), 0, 0, texture);
@@ -2879,6 +2881,15 @@ std::shared_ptr<CVulkanTexture> vulkan_create_debug_blank_texture()
 	return texture;
 }
 
+std::shared_ptr<CVulkanTexture> vulkan_create_debug_blank_texture()
+{
+	// To match Steam's scaling, which is capped at 1080p
+	int width = std::min<int>( g_nOutputWidth, 1920 );
+	int height = std::min<int>( g_nOutputHeight, 1080 );
+
+	return vulkan_create_flat_texture( width, height, 0, 0, 0, 0 );
+}
+
 bool vulkan_supports_hdr10()
 {
 	for ( auto& format : g_output.surfaceFormats )

diff --git a/src/rendervulkan.hpp b/src/rendervulkan.hpp
@@ -257,6 +257,8 @@ inline bool close_enough(float a, float b, float epsilon = 0.001f)
 	return fabsf(a - b) <= epsilon;
 }
 
+bool DRMFormatHasAlpha( uint32_t nDRMFormat );
+
 struct FrameInfo_t
 {
 	bool useFSRLayer0;
@@ -301,6 +303,14 @@ struct FrameInfo_t
 			return tex->isYcbcr();
 		}
 
+		bool hasAlpha() const
+		{
+			if ( !tex )
+				return false;
+
+			return DRMFormatHasAlpha( tex->drmFormat() );
+		}
+
 		bool isScreenSize() const {
 			return close_enough(scale.x, 1.0f) &&
 			       close_enough(scale.y, 1.0f) &&
@@ -910,6 +920,8 @@ VkFormat DRMFormatToVulkan( uint32_t nDRMFormat, bool bSrgb );
 bool DRMFormatHasAlpha( uint32_t nDRMFormat );
 uint32_t DRMFormatGetBPP( uint32_t nDRMFormat );
 
+std::shared_ptr<CVulkanTexture> vulkan_create_flat_texture( uint32_t width, uint32_t height, uint8_t r, uint8_t g, uint8_t b, uint8_t a );
+
 bool vulkan_supports_hdr10();
 
 void vulkan_wait_idle();

diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp
@@ -2578,10 +2578,10 @@ paint_all(bool async)
 		if ( overlay == global_focus.inputFocusWindow )
 			update_touch_scaling( &frameInfo );
 	}
-	else
+	else if ( !GetBackend()->UsesVulkanSwapchain() && GetBackend()->IsSessionBased() )
 	{
 		auto tex = vulkan_get_hacky_blank_texture();
-		if ( !GetBackend()->UsesVulkanSwapchain() && tex != nullptr )
+		if ( tex != nullptr )
 		{
 			// HACK! HACK HACK HACK
 			// To avoid stutter when toggling the overlay on 
@@ -7573,7 +7573,8 @@ steamcompmgr_main(int argc, char **argv)
 	update_mode_atoms(root_ctx);
 	XFlush(root_ctx->dpy);
 
-	GetBackend()->PostInit();
+	if ( !GetBackend()->PostInit() )
+		return;
 
 	update_edid_prop();