fix merge errors

This commit is contained in:
DH 2025-03-12 18:42:14 +03:00
parent 321e508616
commit 0277da0c0f

View file

@ -13,11 +13,11 @@ namespace vk
{ {
VkSurfaceKHR result = VK_NULL_HANDLE; VkSurfaceKHR result = VK_NULL_HANDLE;
VkWin32SurfaceCreateInfoKHR createInfo = {}; VkAndroidSurfaceCreateInfoKHR createInfo = {};
createInfo.sType = VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR; createInfo.sType = VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR;
createInfo.window = std::get<ANativeWindow *>(window_handle); createInfo.window = std::get<ANativeWindow *>(window_handle);
CHECK_RESULT(vkCreateAndroidSurfaceKHR(this->m_instance, &createInfo, nullptr, &result)); CHECK_RESULT(vkCreateAndroidSurfaceKHR(vk_instance, &createInfo, nullptr, &result));
return result; return result;
} }
#endif #endif