edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-19 17:14:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'auto' GPU identification and display

Browse source 
* Refactors the previous code segment
* Fixes 'auto' GPU identification and display in DDNet Graphics tab of
  the settings. The 'auto' GPU is the best one encountered in the VK
  physical device enumeration array until we encounter one that is
  at least "integrated" when accessing them in increasing order
* Selects the first GPU that matches a name when using one by user
  specified name
This commit is contained in:
DynamoFox 2024-07-23 21:31:32 +02:00
parent 5b81b292dc
commit 9365e1453f
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/engine/client/backend/vulkan/backend_vulkan.cpp
View file

@ -3730,12 +3730,12 @@ public:
m_pGpuList->m_vGpus.reserve(vDeviceList.size()); m_pGpuList->m_vGpus.reserve(vDeviceList.size());
size_t FoundDeviceIndex = 0; size_t FoundDeviceIndex = 0;
size_t FoundGpuType = STWGraphicGpu::ETWGraphicsGpuType::GRAPHICS_GPU_TYPE_INVALID;
STWGraphicGpu::ETWGraphicsGpuType AutoGpuType = STWGraphicGpu::ETWGraphicsGpuType::GRAPHICS_GPU_TYPE_INVALID; STWGraphicGpu::ETWGraphicsGpuType AutoGpuType = STWGraphicGpu::ETWGraphicsGpuType::GRAPHICS_GPU_TYPE_INVALID;
bool IsAutoGpu = str_comp(g_Config.m_GfxGpuName, "auto") == 0; bool IsAutoGpu = str_comp(g_Config.m_GfxGpuName, "auto") == 0;
bool UserSelectedGpuChosen = false;
for(auto &CurDevice : vDeviceList) for(auto &CurDevice : vDeviceList)
{ {
vkGetPhysicalDeviceProperties(CurDevice, &(vDevicePropList[Index])); vkGetPhysicalDeviceProperties(CurDevice, &(vDevicePropList[Index]));
@ -3754,18 +3754,24 @@ public:
NewGpu.m_GpuType = GPUType; NewGpu.m_GpuType = GPUType;
m_pGpuList->m_vGpus.push_back(NewGpu); m_pGpuList->m_vGpus.push_back(NewGpu);
if(GPUType < AutoGpuType) // We always decide what the 'auto' GPU would be, even if user is forcing a GPU by name in config
// Reminder: A worse GPU enumeration has a higher value than a better GPU enumeration, thus the '>'
if(AutoGpuType > STWGraphicGpu::ETWGraphicsGpuType::GRAPHICS_GPU_TYPE_INTEGRATED)
{ {
str_copy(m_pGpuList->m_AutoGpu.m_aName, DeviceProp.deviceName); str_copy(m_pGpuList->m_AutoGpu.m_aName, DeviceProp.deviceName);
m_pGpuList->m_AutoGpu.m_GpuType = GPUType; m_pGpuList->m_AutoGpu.m_GpuType = GPUType;
AutoGpuType = GPUType; AutoGpuType = GPUType;
}
if(((IsAutoGpu && (FoundGpuType > STWGraphicGpu::ETWGraphicsGpuType::GRAPHICS_GPU_TYPE_INTEGRATED && GPUType < FoundGpuType)) || str_comp(DeviceProp.deviceName, g_Config.m_GfxGpuName) == 0) && (DevAPIMajor > gs_BackendVulkanMajor || (DevAPIMajor == gs_BackendVulkanMajor && DevAPIMinor >= gs_BackendVulkanMinor))) if(IsAutoGpu)
FoundDeviceIndex = Index;
}
// We only select the first GPU that matches, because it comes first in the enumeration array, it's preferred by the system
// Reminder: We can't break the cycle here if the name matches because we need to choose the best GPU for 'auto' mode
if(!IsAutoGpu && !UserSelectedGpuChosen && str_comp(DeviceProp.deviceName, g_Config.m_GfxGpuName) == 0)
{ {
FoundDeviceIndex = Index; FoundDeviceIndex = Index;
FoundGpuType = GPUType; UserSelectedGpuChosen = true;
} }
} }
Index++; Index++;