ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-19 22:37:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Tidy tidy

Browse source
This commit is contained in:
goat 2026-02-12 20:45:23 +01:00 • committed by GitHub
parent 73447f205d
commit abe27891c3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

32
DalamudCrashHandler/DalamudCrashHandler.cpp
View file

@ -473,20 +473,17 @@ void open_folder_and_select_items(HWND hwndOpener, const std::wstring& path) {
ILFree(piid); ILFree(piid);
} }
std::vector <IDXGIAdapter1*> EnumerateAdapters(void) std::vector<IDXGIAdapter1*> enum_dxgi_adapters()
{ {
IDXGIAdapter1* pAdapter; std::vector<IDXGIAdapter1*> vAdapters;
std::vector <IDXGIAdapter1*> vAdapters;
IDXGIFactory1* pFactory = NULL; IDXGIFactory1* pFactory = NULL;
// Create a DXGIFactory object.
if (FAILED(CreateDXGIFactory1(__uuidof(IDXGIFactory1), (void**)&pFactory))) if (FAILED(CreateDXGIFactory1(__uuidof(IDXGIFactory1), (void**)&pFactory)))
{ {
return vAdapters; return vAdapters;
} }
IDXGIAdapter1* pAdapter;
for (UINT i = 0; for (UINT i = 0;
pFactory->EnumAdapters1(i, &pAdapter) != DXGI_ERROR_NOT_FOUND; pFactory->EnumAdapters1(i, &pAdapter) != DXGI_ERROR_NOT_FOUND;
++i) ++i)
@ -501,7 +498,6 @@ std::vector <IDXGIAdapter1*> EnumerateAdapters(void)
} }
return vAdapters; return vAdapters;
} }
void export_tspack(HWND hWndParent, const std::filesystem::path& logDir, const std::string& crashLog, const std::string& troubleshootingPackData) { void export_tspack(HWND hWndParent, const std::filesystem::path& logDir, const std::string& crashLog, const std::string& troubleshootingPackData) {
@ -1057,26 +1053,12 @@ int main() {
log << std::format(L"CPU Vendor: {}", vendor) << std::endl; log << std::format(L"CPU Vendor: {}", vendor) << std::endl;
log << std::format(L"CPU Brand: {}", brand) << std::endl; log << std::format(L"CPU Brand: {}", brand) << std::endl;
std::vector <IDXGIAdapter1*> availableAdapters = EnumerateAdapters(); for (IDXGIAdapter1* adapter : enum_dxgi_adapters()) {
DXGI_ADAPTER_DESC1 adapterDescription{};
for (int i = 0; i < availableAdapters.size(); i++) { myAdapter->GetDesc1(&adapterDescription);
auto& myAdapter = *availableAdapters[i];
auto adapterDescription = DXGI_ADAPTER_DESC1();
myAdapter.GetDesc1(&adapterDescription);
// Print description to console here
log << std::format(L"GPU Desc: {}", adapterDescription.Description) << std::endl; log << std::format(L"GPU Desc: {}", adapterDescription.Description) << std::endl;
} }
/*
for_each(availableAdapters.begin(), availableAdapters.end(), [](IDXGIAdapter1* adapter, , std::wostream log) {
auto& myAdapter = *adapter;
auto adapterDescription = DXGI_ADAPTER_DESC1();
myAdapter.GetDesc1(&adapterDescription);
// Print description to console here
log << std::format(L"GPU Desc: {}", adapterDescription.Description) << std::endl;
});
*/
log << L"\n" << stackTrace << std::endl; log << L"\n" << stackTrace << std::endl;
if (pProgressDialog) if (pProgressDialog)