mirror of
https://github.com/RPCSX/rpcsx.git
synced 2026-01-06 16:49:59 +01:00
fix merge errors
This commit is contained in:
parent
321e508616
commit
0277da0c0f
|
|
@ -13,11 +13,11 @@ namespace vk
|
|||
{
|
||||
VkSurfaceKHR result = VK_NULL_HANDLE;
|
||||
|
||||
VkWin32SurfaceCreateInfoKHR createInfo = {};
|
||||
VkAndroidSurfaceCreateInfoKHR createInfo = {};
|
||||
createInfo.sType = VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR;
|
||||
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;
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue