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

Merge pull request #8575 from DynamoFox/fix-dgpu-selection

Browse source 
Fix  'auto' GPU identification on hybrid GPU systems
This commit is contained in:
Jupeyy 2024-07-23 20:29:28 +00:00 committed by GitHub
parent 5b81b292dc 9365e1453f
commit c7bcdc3f63
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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++;