From 0820d68f9e0d5d2a385097a73dc9af6607191de7 Mon Sep 17 00:00:00 2001 From: Eugene Golushkov Date: Mon, 15 Apr 2024 20:13:02 +0200 Subject: [PATCH] [Android] Workaround for crash in vkCreateInstance() on Android Emulator 35.1.4, macOS 14.4.1, M1 Pro. Note, the whole emulator is crashed, not only the Ogre process inside it. --- RenderSystems/Vulkan/src/OgreVulkanDevice.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/RenderSystems/Vulkan/src/OgreVulkanDevice.cpp b/RenderSystems/Vulkan/src/OgreVulkanDevice.cpp index 506db13d78d..a1c68ef9537 100644 --- a/RenderSystems/Vulkan/src/OgreVulkanDevice.cpp +++ b/RenderSystems/Vulkan/src/OgreVulkanDevice.cpp @@ -338,7 +338,9 @@ namespace Ogre createInfo.enabledExtensionCount = static_cast( extensions.size() ); createInfo.ppEnabledExtensionNames = extensions.begin(); -#if OGRE_DEBUG_MODE >= OGRE_DEBUG_HIGH +#if OGRE_DEBUG_MODE >= OGRE_DEBUG_HIGH && !defined OGRE_VULKAN_WINDOW_ANDROID + // Workaround: skip following code on Android as it causes crash in vkCreateInstance() on Android + // Emulator 35.1.4, macOS 14.4.1, M1 Pro, despite declared support for rev.10 VK_EXT_debug_report VkDebugReportCallbackCreateInfoEXT debugCb = addDebugCallback( debugCallback, renderSystem ); createInfo.pNext = &debugCb; #endif