Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve static initialization of vectors

Browse Source
This commit is contained in:
Vittorio Romeo 2022-10-06 19:27:50 +02:00
parent 0e475f3f50
commit e948a5f41e
3 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/SFML/Window/Unix/VulkanImplX11.cpp
View File

@ -184,14 +184,7 @@ VulkanFunctionPointer VulkanImplX11::getFunction(const char* name)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
const std::vector<const char*>& VulkanImplX11::getGraphicsRequiredInstanceExtensions() const std::vector<const char*>& VulkanImplX11::getGraphicsRequiredInstanceExtensions()
{ {
static std::vector<const char*> extensions; static const std::vector<const char*> extensions{VK_KHR_SURFACE_EXTENSION_NAME, VK_KHR_XLIB_SURFACE_EXTENSION_NAME};
if (extensions.empty())
{
extensions.push_back(VK_KHR_SURFACE_EXTENSION_NAME);
extensions.push_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME);
}
return extensions; return extensions;
} }

12
src/SFML/Window/VideoMode.cpp
View File

@ -59,14 +59,12 @@ VideoMode VideoMode::getDesktopMode()
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
const std::vector<VideoMode>& VideoMode::getFullscreenModes() const std::vector<VideoMode>& VideoMode::getFullscreenModes()
{ {
static std::vector<VideoMode> modes; static const auto modes = []
// Populate the array on first call
if (modes.empty())
{ {
modes = priv::VideoModeImpl::getFullscreenModes(); std::vector<VideoMode> result = priv::VideoModeImpl::getFullscreenModes();
std::sort(modes.begin(), modes.end(), std::greater<VideoMode>()); std::sort(result.begin(), result.end(), std::greater<VideoMode>());
} return result;
}();
return modes; return modes;
} }

9
src/SFML/Window/Win32/VulkanImplWin32.cpp
View File

@ -183,14 +183,7 @@ VulkanFunctionPointer VulkanImplWin32::getFunction(const char* name)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
const std::vector<const char*>& VulkanImplWin32::getGraphicsRequiredInstanceExtensions() const std::vector<const char*>& VulkanImplWin32::getGraphicsRequiredInstanceExtensions()
{ {
static std::vector<const char*> extensions; static const std::vector<const char*> extensions{VK_KHR_SURFACE_EXTENSION_NAME, VK_KHR_WIN32_SURFACE_EXTENSION_NAME};
if (extensions.empty())
{
extensions.push_back(VK_KHR_SURFACE_EXTENSION_NAME);
extensions.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME);
}
return extensions; return extensions;
} }