From 0588108e64c0df2ceae3059ca2a1b3e12b6bd2cb Mon Sep 17 00:00:00 2001 From: saschawillems Date: Fri, 10 Nov 2017 22:17:03 +0100 Subject: [PATCH] Enabled exceptions on android --- base/VulkanDevice.hpp | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/base/VulkanDevice.hpp b/base/VulkanDevice.hpp index a6d3b205..3aec4091 100644 --- a/base/VulkanDevice.hpp +++ b/base/VulkanDevice.hpp @@ -141,14 +141,6 @@ namespace vks typeBits >>= 1; } -#if defined(__ANDROID__) - //todo : Exceptions are disabled by default on Android (need to add LOCAL_CPP_FEATURES += exceptions to Android.mk), so for now just return zero - if (memTypeFound) - { - *memTypeFound = false; - } - return 0; -#else if (memTypeFound) { *memTypeFound = false; @@ -158,7 +150,6 @@ namespace vks { throw std::runtime_error("Could not find a matching memory type"); } -#endif } /** @@ -210,12 +201,7 @@ namespace vks } } -#if defined(__ANDROID__) - //todo : Exceptions are disabled by default on Android (need to add LOCAL_CPP_FEATURES += exceptions to Android.mk), so for now just return zero - return 0; -#else throw std::runtime_error("Could not find a matching queue family index"); -#endif } /**