Enabled exceptions on android
This commit is contained in:
parent
9fd56e489c
commit
0588108e64
1 changed files with 0 additions and 14 deletions
|
|
@ -141,14 +141,6 @@ namespace vks
|
||||||
typeBits >>= 1;
|
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)
|
if (memTypeFound)
|
||||||
{
|
{
|
||||||
*memTypeFound = false;
|
*memTypeFound = false;
|
||||||
|
|
@ -158,7 +150,6 @@ namespace vks
|
||||||
{
|
{
|
||||||
throw std::runtime_error("Could not find a matching memory type");
|
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");
|
throw std::runtime_error("Could not find a matching queue family index");
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue