diff options
| author | PouleyKetchoupp <pouleyketchoup@gmail.com> | 2020-03-27 17:30:18 +0100 |
|---|---|---|
| committer | PouleyKetchoupp <pouleyketchoup@gmail.com> | 2020-04-08 01:47:09 +0200 |
| commit | e167af37373dd14e9d1fe888bcc482d0bd071951 (patch) | |
| tree | 5a2f9ec90dd07e9485ae24b086f56ee251cfd1a5 /platform/android/vulkan | |
| parent | af424b1c7ca5e09156d3e5b9bd914848ee0fed86 (diff) | |
Display Server support
Diffstat (limited to 'platform/android/vulkan')
| -rw-r--r-- | platform/android/vulkan/vulkan_context_android.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/android/vulkan/vulkan_context_android.cpp b/platform/android/vulkan/vulkan_context_android.cpp index 4c255340da..b238f849fc 100644 --- a/platform/android/vulkan/vulkan_context_android.cpp +++ b/platform/android/vulkan/vulkan_context_android.cpp @@ -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() { |