mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-20 23:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaces choosedDeviceIt by chosenDeviceIt

Browse Source 
(cherry picked from commit c0ea17f06e)
Signed-off-by: phosit <phosit@autistici.org>
This commit is contained in:
Vladislav Belov
2025-11-11 01:51:16 +01:00
committed by phosit
parent 8420377789
commit e590a7cd4e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/renderer/backend/vulkan/Device.cpp
+7 -7
View File
@@ -393,35 +393,35 @@ std::unique_ptr<CDevice> CDevice::Create(SDL_Window* window)
}
const int deviceIndexOverride{g_ConfigDB.Get("renderer.backend.vulkan.deviceindexoverride", -1)};
auto choosedDeviceIt = device->m_AvailablePhysicalDevices.end();
auto chosenDeviceIt = device->m_AvailablePhysicalDevices.end();
if (deviceIndexOverride >= 0)
{
choosedDeviceIt = std::find_if(
chosenDeviceIt = std::find_if(
device->m_AvailablePhysicalDevices.begin(), device->m_AvailablePhysicalDevices.end(),
[deviceIndexOverride](const SAvailablePhysicalDevice& availableDevice)
{
return availableDevice.index == static_cast<uint32_t>(deviceIndexOverride);
});
if (choosedDeviceIt == device->m_AvailablePhysicalDevices.end())
if (chosenDeviceIt == device->m_AvailablePhysicalDevices.end())
LOGWARNING("Device with override index %d not found.", deviceIndexOverride);
}
if (choosedDeviceIt == device->m_AvailablePhysicalDevices.end())
if (chosenDeviceIt == device->m_AvailablePhysicalDevices.end())
{
const bool chooseBestDevice{g_ConfigDB.Get("renderer.backend.vulkan.choosebestdevice", false)};
if (chooseBestDevice)
{
// We need to choose the best available device fits our needs.
choosedDeviceIt = min_element(
chosenDeviceIt = min_element(
availablePhyscialDevices.begin(), availablePhyscialDevices.end(),
ComparePhysicalDevices);
}
else
{
// By default we assume that the Vulkan driver provides a decent default.
choosedDeviceIt = availablePhyscialDevices.begin();
chosenDeviceIt = availablePhyscialDevices.begin();
}
}
device->m_ChoosenDevice = *choosedDeviceIt;
device->m_ChoosenDevice = *chosenDeviceIt;
const SAvailablePhysicalDevice& choosenDevice = device->m_ChoosenDevice;
device->m_AvailablePhysicalDevices.erase(std::remove_if(
device->m_AvailablePhysicalDevices.begin(), device->m_AvailablePhysicalDevices.end(),