jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libobs-d3d11: Add monitor to HDR status cache 

Requesting HDR status is surprisingly expensive.
master
jpark37 2022-04-13 22:24:20 -07:00 committed by Jim
parent 2fa5ffe4df
commit d9d4b69a59
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,6 +72,12 @@ static bool screen_supports_hdr(gs_device_t *device, HMONITOR hMonitor)
if (!factory1->IsCurrent()) {
device->InitFactory();
factory1 = device->factory;
device->monitor_to_hdr.clear();
}
for (const std::pair<HMONITOR, bool> &pair : device->monitor_to_hdr) {
if (pair.first == hMonitor)
return pair.second;
}
ComPtr<IDXGIAdapter> adapter;
@ -86,9 +92,13 @@ static bool screen_supports_hdr(gs_device_t *device, HMONITOR hMonitor)
if (SUCCEEDED(output->QueryInterface(&output6))) {
DXGI_OUTPUT_DESC1 desc1;
if (SUCCEEDED(output6->GetDesc1(&desc1)) &&
desc1.Monitor == hMonitor) {
return desc1.ColorSpace ==
DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020;
(desc1.Monitor == hMonitor)) {
const bool hdr =
desc1.ColorSpace ==
DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020;
device->monitor_to_hdr.emplace_back(
hMonitor, hdr);
return hdr;
}
}
}

2
libobs-d3d11/d3d11-subsystem.hpp
View File

@ -1036,6 +1036,8 @@ struct gs_device {
vector<gs_device_loss> loss_callbacks;
gs_obj *first_obj = nullptr;
vector<std::pair<HMONITOR, bool>> monitor_to_hdr;
void InitCompiler();
void InitFactory();
void ReorderAdapters(uint32_t &adapterIdx);