godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

Display Server support

Browse Source
This commit is contained in:
PouleyKetchoupp
2020-03-27 17:30:18 +01:00
parent af424b1c7c
commit e167af3737
14 changed files with 953 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform/android/vulkan/vulkan_context_android.cpp
View File

@@ -33,7 +33,7 @@
#define VMA_IMPLEMENTATION
#ifdef DEBUG_ENABLED
#ifndef _MSC_VER
#ifndef _DEBUG
#define _DEBUG
#endif
#endif
@@ -46,17 +46,17 @@ const char *VulkanContextAndroid::_get_platform_surface_extension() const {
int VulkanContextAndroid::window_create(ANativeWindow *p_window, int p_width, int p_height) {
VkAndroidSurfaceCreateInfoKHR createInfo;
createInfo.sType = VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR;
createInfo.pNext = NULL;
createInfo.pNext = nullptr;
createInfo.flags = 0;
createInfo.window = p_window;
VkSurfaceKHR surface;
VkResult err = vkCreateAndroidSurfaceKHR(_get_instance(), &createInfo, NULL, &surface);
VkResult err = vkCreateAndroidSurfaceKHR(_get_instance(), &createInfo, nullptr, &surface);
if (err != VK_SUCCESS) {
ERR_FAIL_V_MSG(-1, "vkCreateAndroidSurfaceKHR failed with error " + itos(err));
}
return _window_create(surface, p_width, p_height);
return _window_create(DisplayServer::MAIN_WINDOW_ID, surface, p_width, p_height);
}
VulkanContextAndroid::VulkanContextAndroid() {