nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1892650 Opened - Remove DeviceManagerDx::GetOutputDescs() r=gfx-reviewers,aosmond

Browse source 
By Bug 1885197, DeviceManagerDx::EnumerateOutputs() could be used instead of DeviceManagerDx::GetOutputDescs().

Differential Revision: https://phabricator.services.mozilla.com/D208093
This commit is contained in:
sotaro 2024-04-22 03:57:30 +00:00
parent 3d61127c80
commit ee9fd5e2df
2 changed files with 1 additions and 69 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

68
gfx/thebes/DeviceManagerDx.cpp
View file

@ -264,7 +264,7 @@ void DeviceManagerDx::UpdateMonitorInfo() {
bool systemHdrEnabled = false;
std::set<HMONITOR> hdrMonitors;
for (const auto& desc : GetOutputDescs()) {
for (const auto desc : EnumerateOutputs()) {
if (ColorSpaceIsHDR(desc)) {
systemHdrEnabled = true;
hdrMonitors.emplace(desc.Monitor);
@ -279,72 +279,6 @@ void DeviceManagerDx::UpdateMonitorInfo() {
}
}
std::vector<DXGI_OUTPUT_DESC1> DeviceManagerDx::GetOutputDescs() {
std::vector<DXGI_OUTPUT_DESC1> outputDescs;
nsModuleHandle dxgiModule(LoadLibrarySystem32(L"dxgi.dll"));
decltype(CreateDXGIFactory1)* createDXGIFactory1 =
(decltype(CreateDXGIFactory1)*)GetProcAddress(dxgiModule,
"CreateDXGIFactory1");
if (!createDXGIFactory1) {
return outputDescs;
}
RefPtr<IDXGIFactory1> dxgiFactory;
HRESULT hr =
createDXGIFactory1(__uuidof(IDXGIFactory1), getter_AddRefs(dxgiFactory));
if (FAILED(hr)) {
gfxCriticalNoteOnce << "Failed to create DXGI factory: " << gfx::hexa(hr);
return outputDescs;
}
for (UINT adapterIndex = 0;; adapterIndex++) {
RefPtr<IDXGIAdapter> adapter;
hr = dxgiFactory->EnumAdapters(adapterIndex, getter_AddRefs(adapter));
if (hr == DXGI_ERROR_NOT_FOUND) {
break;
}
if (FAILED(hr)) {
MOZ_ASSERT_UNREACHABLE("unexpected to be called");
gfxCriticalNoteOnce << "Failed to enumerate DXGI adapter: "
<< gfx::hexa(hr);
break;
}
for (UINT outputIndex = 0;; ++outputIndex) {
RefPtr<IDXGIOutput> output;
hr = adapter->EnumOutputs(outputIndex, getter_AddRefs(output));
if (hr == DXGI_ERROR_NOT_FOUND) {
break;
}
if (FAILED(hr)) {
MOZ_ASSERT_UNREACHABLE("unexpected to be called");
gfxCriticalNoteOnce << "Failed to enumulate DXGI output: "
<< gfx::hexa(hr);
break;
}
RefPtr<IDXGIOutput6> output6;
hr = output->QueryInterface(__uuidof(IDXGIOutput6),
getter_AddRefs(output6));
if (FAILED(hr)) {
continue;
}
DXGI_OUTPUT_DESC1 desc;
if (FAILED(output6->GetDesc1(&desc))) {
MOZ_ASSERT_UNREACHABLE("unexpected to be called");
gfxCriticalNoteOnce << "Failed to get DXGI output descriptor";
continue;
}
outputDescs.push_back(std::move(desc));
}
}
return outputDescs;
}
bool DeviceManagerDx::SystemHDREnabled() {
{
MutexAutoLock lock(mDeviceLock);

2
gfx/thebes/DeviceManagerDx.h
View file

@ -186,8 +186,6 @@ class DeviceManagerDx final {
bool GetAnyDeviceRemovedReason(DeviceResetReason* aOutReason)
MOZ_REQUIRES(mDeviceLock);
std::vector<DXGI_OUTPUT_DESC1> GetOutputDescs();
private:
static StaticAutoPtr<DeviceManagerDx> sInstance;