- renderer: nvrhi vulkan linux compilation, SDL window

Author: SoapyMan

core/materialsystem1/Renderers/NVRHI/NVRHILibraryD3D12.cpp

@@ -280,7 +280,7 @@ bool CNVRHIRenderLibD3D12::InitAPI(const ShaderAPIParams& params)
 	// create default swap chain
 	if (params.windowInfo.windowType != RHI_WINDOW_HANDLE_UNKNOWN)
 	{
-		HWND mainWindow = (HWND)params.windowInfo.get(params.windowInfo.userData, RenderWindowInfo::WINDOW);
+		HWND mainWindow = (HWND)params.windowInfo.get(RenderWindowInfo::WINDOW);
 
 		m_defaultSwapChain = CRefPtr<CNVRHISwapChainDXGI>(static_cast<CNVRHISwapChainDXGI*>(CNVRHIRenderLibDXGIBase::CreateSwapChain(params.windowInfo).Ptr()));
 
@@ -326,7 +326,7 @@ ISwapChainPtr CNVRHIRenderLibD3D12::CreateSwapChain(const RenderWindowInfo& wind
 
 	RefCountPtr<IDXGISwapChain1> pSwapChain1;
 	HRESULT hr = m_dxgiFactory->CreateSwapChainForHwnd(m_rhiGraphicsQueue,
-		(HWND)windowInfo.get(windowInfo.userData, RenderWindowInfo::WINDOW),
+		(HWND)windowInfo.get(RenderWindowInfo::WINDOW),
 		&swapChainImpl->m_dxgiSwapChainDesc, &m_dxgiFullScreenDesc, nullptr,
 		&pSwapChain1);
 

core/materialsystem1/Renderers/NVRHI/NVRHILibraryVK.cpp

@@ -135,10 +135,18 @@ bool CNVRHIRenderLibVK::InitAPI(const ShaderAPIParams& params)
 		// This is required for using the MoltenVK portability subset implementation on macOS
 		m_enabledExtensions.device.append(VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME);
 #endif
-
+		
 #ifdef VK_USE_PLATFORM_WIN32_KHR
 		m_enabledExtensions.instance.append(VK_KHR_SURFACE_EXTENSION_NAME);
 		m_enabledExtensions.instance.append(VK_KHR_WIN32_SURFACE_EXTENSION_NAME);
+#elif defined(VULKAN_USE_PLATFORM_SDL)
+		const RenderWindowInfo& windowInfo = params.windowInfo;
+		if(windowInfo.parent && windowInfo.parent->windowType == RHI_WINDOW_HANDLE_SDL)
+		{
+			Array<const char*>& instanceExts = *(Array<const char*>*)windowInfo.parent->get(RenderWindowInfo::EXTENSIONS);
+			for(const char* ext : instanceExts )
+				m_enabledExtensions.instance.insert(ext);
+		}
 #endif
 	}
 
@@ -901,13 +909,27 @@ ISwapChainPtr CNVRHIRenderLibVK::CreateSwapChain(const RenderWindowInfo& windowI
 	{
 		// Create the platform-specific surface
 #if defined( VULKAN_USE_PLATFORM_SDL )
+		VkResult surfaceCreateRes = VkResult::VK_ERROR_SURFACE_LOST_KHR;
+
 		// Support generic SDL platform for linux and macOS
-		auto res = vk::Result(CreateSDLWindowSurface((VkInstance)m_vkInstance, (VkSurfaceKHR*)&swapChain->m_vkWindowSurface));
+		if(windowInfo.parent && windowInfo.parent->windowType == RHI_WINDOW_HANDLE_SDL)
+		{
+			swapChain->m_vkWindowSurface = (vk::SurfaceKHR)windowInfo.parent->get(RenderWindowInfo::SURFACE, m_vkInstance);
+			if(swapChain->m_vkWindowSurface)
+			{
+				surfaceCreateRes = VkResult::VK_SUCCESS;
+			}
+		}
+		else
+		{
+			ASSERT_FAIL("Not supported window type");
+		}
+		auto res = vk::Result(surfaceCreateRes);
 
 #elif defined( VK_USE_PLATFORM_WIN32_KHR )
 		auto surfaceCreateInfo = vk::Win32SurfaceCreateInfoKHR()
-			.setHinstance((HINSTANCE)windowInfo.get(windowInfo.userData, RenderWindowInfo::TOPLEVEL))
-			.setHwnd((HWND)windowInfo.get(windowInfo.userData, RenderWindowInfo::WINDOW));
+			.setHinstance((HINSTANCE)windowInfo.get(RenderWindowInfo::TOPLEVEL))
+			.setHwnd((HWND)windowInfo.get(RenderWindowInfo::WINDOW));
 
 		auto res = m_vkInstance.createWin32SurfaceKHR(&surfaceCreateInfo, nullptr, &swapChain->m_vkWindowSurface);
 #endif

core/materialsystem1/Renderers/NVRHI/NVRHILibraryVK.h

@@ -12,6 +12,7 @@
 
 #include "../IRenderLibrary.h"
 #include "../RenderWorker.h"
+#include "NVRHISwapChainVK.h"
 
 class CNVRHISwapChainVK;
 

core/materialsystem1/Renderers/NVRHI/NVRHISwapChainVK.cpp

@@ -42,7 +42,7 @@ CNVRHISwapChainVK::CNVRHISwapChainVK(const RenderWindowInfo& windowInfo, ITextur
 
 void* CNVRHISwapChainVK::GetWindow() const
 {
-	return m_winInfo.get(m_winInfo.userData, RenderWindowInfo::WINDOW);
+	return m_winInfo.get(RenderWindowInfo::WINDOW);
 }
 
 ITexturePtr CNVRHISwapChainVK::GetBackbuffer() const

core/materialsystem1/Renderers/RenderManager.cpp

@@ -62,12 +62,13 @@ IRenderLibrary* CEqRenderManager::CreateRenderer(const ShaderAPIParams& params)
 
 #if PLAT_WIN
 	s_currentRenderLib = &s_NVRHIRenderLibD3D12;
-#endif
-
 	/*if (!backendName.CompareCaseIns("D3D11"))
 		s_currentRenderLib = &s_NVRHIRenderLibD3D11;
 	else*/ if (!backendName.CompareCaseIns("Vulkan"))
 		s_currentRenderLib = &s_NVRHIRenderLibVK;
+#else
+	s_currentRenderLib = &s_NVRHIRenderLibVK;
+#endif
 
 #elif RENDERER_TYPE == RHI_WGPU
 

core/materialsystem1/Renderers/WGPU/WGPUSwapChain.cpp

@@ -28,7 +28,7 @@ CWGPUSwapChain::~CWGPUSwapChain()
 
 void* CWGPUSwapChain::GetWindow() const
 {
-	return m_winInfo.get(m_winInfo.userData, RenderWindowInfo::WINDOW);
+	return m_winInfo.get(RenderWindowInfo::WINDOW);
 }
 
 ITexturePtr CWGPUSwapChain::GetBackbuffer() const
@@ -114,25 +114,25 @@ bool CWGPUSwapChain::UpdateResize()
 		{
 		case RHI_WINDOW_HANDLE_NATIVE_WINDOWS:
 			windowsSurfDesc.chain.sType = WGPUSType_SurfaceSourceWindowsHWND;
-			windowsSurfDesc.hinstance = m_winInfo.get(m_winInfo.userData, RenderWindowInfo::TOPLEVEL);
-			windowsSurfDesc.hwnd = m_winInfo.get(m_winInfo.userData, RenderWindowInfo::WINDOW);
+			windowsSurfDesc.hinstance = m_winInfo.get(RenderWindowInfo::TOPLEVEL);
+			windowsSurfDesc.hwnd = m_winInfo.get(RenderWindowInfo::WINDOW);
 			surfDesc.nextInChain = &windowsSurfDesc.chain;
 			break;
 		case RHI_WINDOW_HANDLE_NATIVE_X11:
 			x11SurfDesc.chain.sType = WGPUSType_SurfaceSourceXlibWindow;
-			x11SurfDesc.display = m_winInfo.get(m_winInfo.userData, RenderWindowInfo::DISPLAY);
-			x11SurfDesc.window = (uint64_t)m_winInfo.get(m_winInfo.userData, RenderWindowInfo::WINDOW);
+			x11SurfDesc.display = m_winInfo.get(RenderWindowInfo::DISPLAY);
+			x11SurfDesc.window = (uint64_t)m_winInfo.get(RenderWindowInfo::WINDOW);
 			surfDesc.nextInChain = &x11SurfDesc.chain;
 			break;
 		case RHI_WINDOW_HANDLE_NATIVE_WAYLAND:
 			waylandSurfDesc.chain.sType = WGPUSType_SurfaceSourceWaylandSurface;
-			waylandSurfDesc.display = m_winInfo.get(m_winInfo.userData, RenderWindowInfo::DISPLAY);
-			waylandSurfDesc.surface = m_winInfo.get(m_winInfo.userData, RenderWindowInfo::SURFACE);
+			waylandSurfDesc.display = m_winInfo.get(RenderWindowInfo::DISPLAY);
+			waylandSurfDesc.surface = m_winInfo.get(RenderWindowInfo::SURFACE);
 			surfDesc.nextInChain = &waylandSurfDesc.chain;
 			break;
 		case RHI_WINDOW_HANDLE_NATIVE_ANDROID:
 			androidWindowSurfDesc.chain.sType = WGPUSType_SurfaceSourceAndroidNativeWindow;
-			androidWindowSurfDesc.window = m_winInfo.get(m_winInfo.userData, RenderWindowInfo::WINDOW);
+			androidWindowSurfDesc.window = m_winInfo.get(RenderWindowInfo::WINDOW);
 			surfDesc.nextInChain = &androidWindowSurfDesc.chain;
 			break;
 		default:

core/premake5.lua

@@ -130,7 +130,6 @@ project "eqNVRHI"
 	defines{
 		"EQRHI_NVRHI",
 		"RENDERER_TYPE=1",
-		"VK_USE_PLATFORM_WIN32_KHR"
 	}
 	files {
 		"materialsystem1/Renderers/NVRHI/**.cpp",
@@ -143,7 +142,18 @@ project "eqNVRHI"
 		"materialsystem1/Renderers/NVRHI/**D3D*.h"
 	}
 
+	filter "system:Linux"
+		defines {
+			"VULKAN_USE_PLATFORM_SDL"
+			--"VK_USE_PLATFORM_XLIB_KHR",
+			--"VK_USE_PLATFORM_XCB_KHR",
+			--"VK_USE_PLATFORM_WAYLAND_KHR"
+		}
+
     filter "system:Windows"
+		defines {
+			"VK_USE_PLATFORM_WIN32_KHR"
+		}
 		files {
 			"materialsystem1/Renderers/NVRHI/**DXGI*.cpp",
 			"materialsystem1/Renderers/NVRHI/**DXGI*.h",

public/materialsystem1/renderers/ShaderAPI_defs.h

@@ -13,14 +13,17 @@
 enum ERHIWindowType : int
 {
 	RHI_WINDOW_HANDLE_UNKNOWN = -1,
-
+	
+	RHI_WINDOW_HANDLE_SDL,
 	RHI_WINDOW_HANDLE_NATIVE_WINDOWS,
 	RHI_WINDOW_HANDLE_NATIVE_X11,
 	RHI_WINDOW_HANDLE_NATIVE_WAYLAND,
 	RHI_WINDOW_HANDLE_NATIVE_COCOA,
 	RHI_WINDOW_HANDLE_NATIVE_ANDROID,
 };
 
+struct RenderWindowInfo;
+
 // designed to be sent as windowHandle param
 struct RenderWindowInfo
 {
@@ -29,13 +32,17 @@ struct RenderWindowInfo
 		DISPLAY,
 		WINDOW,
 		SURFACE,
-		TOPLEVEL
+		TOPLEVEL,
+		EXTENSIONS,
 	};
-	using GetterFunc = void*(*)(void* userData, Attribute attrib);
+	using GetterFunc = void*(RenderWindowInfo::*)(Attribute attrib, void* arg) const;
+
+	void*				get(Attribute attrib, void* arg = nullptr) const { return (this->*getFunc)(attrib, arg); }
 
-	ERHIWindowType	windowType{ RHI_WINDOW_HANDLE_UNKNOWN };
-	GetterFunc 		get{ nullptr };
-	void*			userData{ nullptr };
+	ERHIWindowType		windowType{ RHI_WINDOW_HANDLE_UNKNOWN };
+	GetterFunc 			getFunc{ nullptr };
+	RenderWindowInfo*	parent{ nullptr };
+	void*				userData{ nullptr };
 };
 
 //---------------------------------------

shared/sys/sys_host.cpp

@@ -7,6 +7,7 @@
 
 #include <SDL.h>
 #include <SDL_syswm.h>
+#include <SDL_vulkan.h>
 #undef far
 #undef near
 
@@ -346,7 +347,41 @@ void CGameHost::GetVideoModes(Array<SysVideoMode>& displayModes) const
 #endif
 }
 
-static void* Helper_GetWindowInfo(void* userData, RenderWindowInfo::Attribute attrib)
+struct HostRenderWindowInfoSDL : RenderWindowInfo
+{
+	void* GetWindowInfo(RenderWindowInfo::Attribute attrib, void* arg) const;
+	void* CreateVulkanSurface(RenderWindowInfo::Attribute attrib, void* arg) const;
+};
+
+void* HostRenderWindowInfoSDL::CreateVulkanSurface(RenderWindowInfo::Attribute attrib, void* arg) const
+{
+	SDL_Window* window = reinterpret_cast<SDL_Window*>(userData);
+	if(attrib == RenderWindowInfo::SURFACE)
+	{
+		VkSurfaceKHR surface = nullptr;
+		if(!SDL_Vulkan_CreateSurface( window, (VkInstance)arg, &surface ))
+		{
+			MsgError( "SDL_Vulkan_CreateSurface failed: %s\n", SDL_GetError() );
+			return nullptr;
+		}
+		return surface;
+	}
+	else if(attrib == RenderWindowInfo::EXTENSIONS)
+	{
+		uint32_t sdlCount = 0;
+		static Array<const char*> sdlInstanceExtensions(PP_SL);
+
+		SDL_Vulkan_GetInstanceExtensions( window, &sdlCount, nullptr );
+		sdlInstanceExtensions.setNum( sdlCount );
+		SDL_Vulkan_GetInstanceExtensions( window, &sdlCount, sdlInstanceExtensions.ptr() );
+
+		return &sdlInstanceExtensions;
+	}
+	ASSERT_FAIL("Unsupported attribute %d", attrib);
+	return nullptr;
+}
+
+void* HostRenderWindowInfoSDL::GetWindowInfo(RenderWindowInfo::Attribute attrib, void* arg) const
 {
 	// set window info
 	SDL_Window* window = reinterpret_cast<SDL_Window*>(userData);
@@ -405,7 +440,7 @@ static void* Helper_GetWindowInfo(void* userData, RenderWindowInfo::Attribute at
 			}
 #endif // PLAT_WIN
 		default:
-			ASSERT_FAIL("Not supported window type - %d", winfo.subsystem);
+			ASSERT_FAIL("Unsupported window type %d or attribute %d", winfo.subsystem, attrib);
 	}
 
 	return nullptr;
@@ -469,9 +504,15 @@ bool CGameHost::InitSystems()
 			else
 				rhiParams.screenFormat = FORMAT_RGB8;
 
+			RenderWindowInfo sdlWinInfo;
+			sdlWinInfo.getFunc = (RenderWindowInfo::GetterFunc)&HostRenderWindowInfoSDL::CreateVulkanSurface;
+			sdlWinInfo.userData = m_window;
+			sdlWinInfo.windowType = RHI_WINDOW_HANDLE_SDL;
+
 			RenderWindowInfo& winInfo = rhiParams.windowInfo;
+			winInfo.parent = &sdlWinInfo;
 			winInfo.userData = m_window;
-			winInfo.get = Helper_GetWindowInfo;
+			winInfo.getFunc = (RenderWindowInfo::GetterFunc)&HostRenderWindowInfoSDL::GetWindowInfo;
 
 			// needed for initialization
 			switch (winfo.subsystem)