diff options
| author | Juan Linietsky <juan@godotengine.org> | 2020-03-03 22:51:12 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2020-03-26 15:49:38 +0100 |
| commit | 9e08742de81b062c30b7984900a55d5150a4bd17 (patch) | |
| tree | 6570bbc8bdcc17e0538d0361156f041b24c2614d /platform/linuxbsd/vulkan_context_x11.cpp | |
| parent | f8a79a97c7d12da43b111a756f09ee7ad5ea28e9 (diff) | |
| download | redot-engine-9e08742de81b062c30b7984900a55d5150a4bd17.tar.gz | |
Added a Window node, and made it the scene root.
Still a lot of work to do.
Diffstat (limited to 'platform/linuxbsd/vulkan_context_x11.cpp')
| -rw-r--r-- | platform/linuxbsd/vulkan_context_x11.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/linuxbsd/vulkan_context_x11.cpp b/platform/linuxbsd/vulkan_context_x11.cpp index 602dbc77a2..d0e1b1678c 100644 --- a/platform/linuxbsd/vulkan_context_x11.cpp +++ b/platform/linuxbsd/vulkan_context_x11.cpp @@ -35,7 +35,7 @@ const char *VulkanContextX11::_get_platform_surface_extension() const { return VK_KHR_XLIB_SURFACE_EXTENSION_NAME; } -int VulkanContextX11::window_create(::Window p_window, Display *p_display, int p_width, int p_height) { +Error VulkanContextX11::window_create(DisplayServer::WindowID p_window_id, ::Window p_window, Display *p_display, int p_width, int p_height) { VkXlibSurfaceCreateInfoKHR createInfo; createInfo.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR; @@ -46,8 +46,8 @@ int VulkanContextX11::window_create(::Window p_window, Display *p_display, int p VkSurfaceKHR surface; VkResult err = vkCreateXlibSurfaceKHR(_get_instance(), &createInfo, NULL, &surface); - ERR_FAIL_COND_V(err, -1); - return _window_create(surface, p_width, p_height); + ERR_FAIL_COND_V(err, ERR_CANT_CREATE); + return _window_create(p_window_id, surface, p_width, p_height); } VulkanContextX11::VulkanContextX11() { |