sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Nz::ErrorFlags API and usage

This commit is contained in:
SirLynix 2024-01-28 15:03:24 +01:00
parent f06752b08d
commit 0191256493
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/VulkanRenderer/Wrapper/Device.inl
View File

@ -62,7 +62,7 @@ namespace Nz::Vk
{ {
PFN_vkVoidFunction func; PFN_vkVoidFunction func;
{ {
ErrorFlags errFlags({}, ~ErrorMode::ThrowException); ErrorFlags errFlags({}, ErrorMode::ThrowException);
func = m_instance.GetDeviceProcAddr(m_device, name); func = m_instance.GetDeviceProcAddr(m_device, name);
} }

2
plugins/Assimp/CustomStream.cpp
View File

@ -82,7 +82,7 @@ aiFile* StreamOpener(aiFileIO* fileIO, const char* filePath, const char* openMod
} }
else else
{ {
ErrorFlags errFlags({}, ~ErrorMode::ThrowException); ErrorFlags errFlags({}, ErrorMode::ThrowException);
Result<OpenModeFlags, std::string> openModes = File::DecodeOpenMode(openMode); Result<OpenModeFlags, std::string> openModes = File::DecodeOpenMode(openMode);

4
src/Nazara/Audio/OpenALLibrary.cpp
View File

@ -55,7 +55,7 @@ namespace Nz
for (const char* libname : libs) for (const char* libname : libs)
{ {
ErrorFlags disableError(ErrorMode::Silent, ~ErrorMode::ThrowException); ErrorFlags disableError(ErrorMode::Silent, ErrorMode::ThrowException);
if (!m_library.Load(Utf8Path(libname))) if (!m_library.Load(Utf8Path(libname)))
continue; continue;
@ -77,7 +77,7 @@ namespace Nz
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
ErrorFlags disableSilent({}, ~ErrorMode::Silent); ErrorFlags disableSilent({}, ErrorMode::Silent);
NazaraWarningFmt("failed to load {0}: {1}", libname, e.what()); NazaraWarningFmt("failed to load {0}: {1}", libname, e.what());
continue; continue;

2
src/Nazara/Core/Error.cpp
View File

@ -51,7 +51,7 @@ namespace Nz
ErrorModeFlags previousFlags = flags; ErrorModeFlags previousFlags = flags;
flags |= orFlags; flags |= orFlags;
flags &= andFlags; flags &= ~andFlags;
return previousFlags; return previousFlags;
} }

4
src/Nazara/VulkanRenderer/Wrapper/Loader.cpp
View File

@ -86,12 +86,12 @@ namespace Nz
for (const char* libname : libs) for (const char* libname : libs)
{ {
ErrorFlags errorFlags(ErrorMode::Silent, ~ErrorMode::ThrowException); ErrorFlags errorFlags(ErrorMode::Silent, ErrorMode::ThrowException);
if (!s_vulkanLib.Load(libname)) if (!s_vulkanLib.Load(libname))
continue; continue;
Error::ApplyFlags({}, ~ErrorMode::Silent); Error::ApplyFlags({}, ErrorMode::Silent);
// vkGetInstanceProcAddr is the only function that's guarantee to be exported // vkGetInstanceProcAddr is the only function that's guarantee to be exported
vkGetInstanceProcAddr = reinterpret_cast<PFN_vkGetInstanceProcAddr>(s_vulkanLib.GetSymbol("vkGetInstanceProcAddr")); vkGetInstanceProcAddr = reinterpret_cast<PFN_vkGetInstanceProcAddr>(s_vulkanLib.GetSymbol("vkGetInstanceProcAddr"));