Commit 005106826a94b0783f682c5803d3aafc38b73ced - DiligentCore

+6

-6

Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp less more

68	68	VkIOSSurfaceCreateInfoMVK surfaceCreateInfo = {};
69	69
70	70	surfaceCreateInfo.sType = VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK;
71		surfaceCreateInfo.pView = Window.pNSWindow;
	71	surfaceCreateInfo.pView = Window.pNSView;
72	72
73	73	auto err = vkCreateIOSSurfaceMVK(m_VulkanInstance->GetVkInstance(), &surfaceCreateInfo, nullptr, &m_VkSurface);
74	74	#elif defined(VK_USE_PLATFORM_MACOS_MVK)
75	75	VkMacOSSurfaceCreateInfoMVK surfaceCreateInfo = {};
76	76
77	77	surfaceCreateInfo.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK;
78		surfaceCreateInfo.pView = Window.pNSView;
	78	surfaceCreateInfo.pView = Window.pNSWindow;
79	79
80	80	auto err = vkCreateMacOSSurfaceMVK(m_VulkanInstance->GetVkInstance(), &surfaceCreateInfo, NULL, &m_VkSurface);
81	81	#elif defined(VK_USE_PLATFORM_WAYLAND_KHR)
82	82	VkWaylandSurfaceCreateInfoKHR surfaceCreateInfo = {};
83	83
84	84	surfaceCreateInfo.sType = VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR;
85		surfaceCreateInfo.display = Window.pDisplay;
86		surfaceCreatem_VkSurface = Window.pWindow;
	85	surfaceCreateInfo.display = reinterpret_cast<struct wl_display*>(Window.pDisplay);
	86	surfaceCreateInfo.Surface = reinterpret_cast<struct wl_surface*>(Window.pWindow);
87	87
88	88	err = vkCreateWaylandSurfaceKHR(m_VulkanInstance->GetVkInstance(), &surfaceCreateInfo, nullptr, &m_VkSurface);
89	89	#elif defined(VK_USE_PLATFORM_XCB_KHR)
90	90	VkXcbSurfaceCreateInfoKHR surfaceCreateInfo = {};
91	91
92	92	surfaceCreateInfo.sType = VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR;
93		surfaceCreateInfo.connection = Window.pXCBConnection;
94		surfaceCreateInfo.window = Window.pWindow;
	93	surfaceCreateInfo.connection = reinterpret_cast<xcb_connection_t*>(Window.pXCBConnection);
	94	surfaceCreateInfo.window = (xcb_window_t)Window.pWindow;
95	95
96	96	auto err = vkCreateXcbSurfaceKHR(m_VulkanInstance->GetVkInstance(), &surfaceCreateInfo, nullptr, &m_VkSurface);
97	97	#endif

+9

-0

Platforms/Win32/interface/Win32NativeWindow.h less more

33	33	struct Win32NativeWindow
34	34	{
35	35	void* hWnd DEFAULT_INITIALIZER(nullptr);
	36
	37	#if DILIGENT_CPP_INTERFACE
	38	Win32NativeWindow() noexcept
	39	{}
	40
	41	explicit Win32NativeWindow(void* _hWnd) noexcept :
	42	hWnd(hWnd)
	43	{}
	44	#endif
36	45	};
37	46
38	47	DILIGENT_END_NAMESPACE // namespace Diligent

+2

-5

Tests/DiligentCoreAPITest/src/Win32/TestingEnvironmentWin32.cpp less more

37	37	namespace Testing
38	38	{
39	39
40		NativeWindow TestingEnvironment::CreateNativeWindow()
	40	Win32NativeWindow TestingEnvironment::CreateNativeWindow()
41	41	{
42	42	#ifdef UNICODE
43	43	const auto* const WindowClassName = L"SampleApp";

61	61	if (wnd == NULL)
62	62	LOG_ERROR_AND_THROW("Unable to create a window");
63	63
64		NativeWindow Window;
65		Window.hWnd = wnd;
66
67		return Window;
	64	return Win32NativeWindow{wnd};
68	65	}
69	66
70	67	} // namespace Testing