mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-05-03 12:55:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

libobs-d3d11: Log display ids

Browse Source
This commit is contained in:
jpark37
2023-02-04 11:03:18 -08:00
committed by Jim
parent a0b5c1b3f5
commit 35ee1b2ed1
1 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libobs-d3d11/d3d11-subsystem.cpp
View File

@@ -1192,6 +1192,22 @@ static ULONG GetSdrWhiteNits(HMONITOR monitor)
return nits;
}
static void PopulateMonitorIds(HMONITOR handle, char *id, char *alt_id,
size_t capacity)
{
MONITORINFOEXA mi;
mi.cbSize = sizeof(mi);
if (GetMonitorInfoA(handle, (LPMONITORINFO)&mi)) {
strcpy_s(alt_id, capacity, mi.szDevice);
DISPLAY_DEVICEA device;
device.cb = sizeof(device);
if (EnumDisplayDevicesA(mi.szDevice, 0, &device,
EDD_GET_DEVICE_INTERFACE_NAME)) {
strcpy_s(id, capacity, device.DeviceID);
}
}
}
static inline void LogAdapterMonitors(IDXGIAdapter1 *adapter)
{
UINT i;
@@ -1207,6 +1223,11 @@ static inline void LogAdapterMonitors(IDXGIAdapter1 *adapter)
bool target_found = false;
DISPLAYCONFIG_TARGET_DEVICE_NAME target;
constexpr size_t id_capacity = 128;
char id[id_capacity]{};
char alt_id[id_capacity]{};
PopulateMonitorIds(desc.Monitor, id, alt_id, id_capacity);
MONITORINFOEX info;
info.cbSize = sizeof(info);
if (GetMonitorInfo(desc.Monitor, &info)) {
@@ -1277,12 +1298,14 @@ static inline void LogAdapterMonitors(IDXGIAdapter1 *adapter)
"\t space=%s\n"
"\t sdr_white_nits=%lu\n"
"\t nit_range=[min=%f, max=%f, max_full_frame=%f]\n"
"\t dpi=%u (%u%%)",
"\t dpi=%u (%u%%)\n"
"\t id=%s\n"
"\t alt_id=%s",
i, target.monitorFriendlyDeviceName, rect.left, rect.top,
rect.right - rect.left, rect.bottom - rect.top,
desc.AttachedToDesktop ? "true" : "false", refresh,
bits_per_color, space, nits, min_luminance, max_luminance,
max_full_frame_luminance, dpiX, scaling);
max_full_frame_luminance, dpiX, scaling, id, alt_id);
}
}