Merge pull request #130 from Themaister/dxgi-interop-experiment

DXGI interop experiment

Author: Themaister

application/platforms/application_sdl3.cpp

@@ -259,6 +259,19 @@ struct WSIPlatformSDL : GraniteWSIPlatform
 		});
 	}
 
+	uintptr_t get_native_window() override
+	{
+#ifdef _WIN32
+		SDL_PropertiesID props = SDL_GetWindowProperties(window);
+		SDL_LockProperties(props);
+		auto hwnd = static_cast<HWND>(SDL_GetProperty(props, "SDL.window.win32.hwnd", nullptr));
+		SDL_UnlockProperties(props);
+		return reinterpret_cast<uintptr_t>(hwnd);
+#else
+		return 0;
+#endif
+	}
+
 	void toggle_fullscreen()
 	{
 		bool is_fullscreen = (SDL_GetWindowFlags(window) & SDL_WINDOW_FULLSCREEN) != 0;
@@ -389,25 +402,12 @@ struct WSIPlatformSDL : GraniteWSIPlatform
 
 	void notify_resize(unsigned width_, unsigned height_)
 	{
-		uint64_t current_resize_timestamp = swapchain_dimension_update_timestamp;
-
+		LOGI("Resize: %u x %u\n", width_, height_);
 		push_task_to_async_thread([=]() {
 			resize = true;
 			width = width_;
 			height = height_;
 		});
-
-		if (options.threaded)
-		{
-			// Give the async thread a chance to catch up with main thread so it can create a new swapchain before
-			// we invalidate the swapchain again.
-			// There is a gap when querying swapchain dimensions and when we create the swapchain.
-			// On most platforms, the query must match the swapchain,
-			// so if we keep processing OS events, things will get out of sync.
-			// Need to observe that the async thread updates the swapchain dimensions at least once.
-			while (current_resize_timestamp == swapchain_dimension_update_timestamp && async_loop_alive)
-				process_events_main_thread_blocking();
-		}
 	}
 
 	void notify_current_swapchain_dimensions(unsigned width_, unsigned height_) override

third_party/CMakeLists.txt

@@ -102,6 +102,7 @@ if ((NOT ANDROID) AND (${GRANITE_PLATFORM} MATCHES "SDL"))
     set(SDL_SHARED OFF CACHE BOOL "" FORCE)
     set(SDL_STATIC ON CACHE BOOL "" FORCE)
     set(SDL_TIMERS ON CACHE BOOL "" FORCE)
+    set(SDL_LIBC ON CACHE BOOL "" FORCE)
     set(SDL_TEST_LIBRARY OFF CACHE BOOL "" FORCE)
     set(SDL_DISABLE_INSTALL ON CACHE BOOL "" FORCE)
     # Disable everything we don't care about.

third_party/sdl3

@@ -24,6 +24,10 @@
 
 #ifdef __linux__
 #include <pthread.h>
+#else
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <string>
 #endif
 
 namespace Util
@@ -33,8 +37,21 @@ void set_current_thread_name(const char *name)
 #ifdef __linux__
 	pthread_setname_np(pthread_self(), name);
 #else
-	// TODO: Kinda messy.
-	(void)name;
+	using PFN_SetThreadDescription = HRESULT (WINAPI *)(HANDLE, PCWSTR);
+	auto module = GetModuleHandleA("kernel32.dll");
+	PFN_SetThreadDescription SetThreadDescription = module ? reinterpret_cast<PFN_SetThreadDescription>(
+	    (void *)GetProcAddress(module, "SetThreadDescription")) : nullptr;
+
+	if (SetThreadDescription)
+	{
+		std::wstring wname;
+		while (*name != '\0')
+		{
+			wname.push_back(*name);
+			name++;
+		}
+		SetThreadDescription(GetCurrentThread(), wname.c_str());
+	}
 #endif
 }
 }

util/thread_name.cpp

@@ -29,6 +29,10 @@ add_granite_internal_lib(granite-vulkan
         query_pool.cpp query_pool.hpp
         texture/texture_format.cpp texture/texture_format.hpp)
 
+if (WIN32)
+    target_sources(granite-vulkan PRIVATE wsi_dxgi.cpp wsi_dxgi.hpp)
+endif()
+
 target_include_directories(granite-vulkan PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 if (GRANITE_RENDERDOC_CAPTURE)