Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add deviceUUID filter with DXVK_FILTER_DEVICE_UUID #2408

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Add deviceUUID filter with DXVK_FILTER_DEVICE_UUID #2408

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fb93290
Add deviceUUID filter with DXVK_FILTER_DEVICE_UUID
meladath Dec 22, 2021
9081561
Merge branch 'doitsujin:master' into filter-uuid
meladath Mar 20, 2022
04fc623
Switch convertUUID to char
meladath Mar 20, 2022
51aad4e
Simpler convert
meladath Mar 20, 2022
2a6bf03
Correct conversion to uint32_t
meladath Mar 20, 2022
03aa0d2
Merge branch 'doitsujin:master' into filter-uuid
meladath Mar 28, 2022
dfce81b
Merge branch 'doitsujin:master' into filter-uuid
meladath Apr 2, 2022
870fe3c
Merge branch 'doitsujin:master' into filter-uuid
meladath Apr 8, 2022
85d6ea3
Merge branch 'doitsujin:master' into filter-uuid
meladath Apr 29, 2022
492f402
Merge branch 'doitsujin:master' into filter-uuid
meladath May 5, 2022
8e11705
Merge branch 'master' into filter-uuid
meladath Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into filter-uuid
  • Loading branch information
@meladath
meladath committed Sep 1, 2023
commit 8e117058f0b07de3f656a4b01d9048c56ac90702
10 changes: 8 additions & 2 deletions src/dxvk/dxvk_instance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,16 @@ namespace dxvk {
uint32_t numIGPU = 0;

for (uint32_t i = 0; i < numAdapters; i++) {
if (filter.testAdapter(deviceProperties[i])) {
if (filter.testAdapter(deviceProperties[i]))
result.push_back(new DxvkAdapter(m_vki, adapters[i]));
if(!filter.testCreatedAdapter(result.back()->devicePropertiesExt()))
if (!filter.testCreatedAdapter(result.back()->devicePropertiesExt())) {
result.pop_back();
} else {
if (deviceProperties[i].deviceType == VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU)
numDGPU += 1;
else if (deviceProperties[i].deviceType == VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU)
numIGPU += 1;
}
}

std::stable_sort(result.begin(), result.end(),
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.