rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-01-31 05:52:11 +01:00
Code Issues Projects Releases Wiki Activity

Revert "[dxgi] Support multiple outputs per adapter"

Browse Source 
This reverts commit 1c86ed8c93e0cca3006c7702012cb5db8e9ca860.

Causes build issues on 32-bit platforms.
This commit is contained in:
Philip Rebohle 2018-07-16 19:07:32 +02:00
parent 1c86ed8c93
commit 6848b45c7a
2 changed files with 6 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/dxgi/dxgi_adapter.cpp
View File

@ -81,18 +81,14 @@ namespace dxvk {
if (ppOutput == nullptr) if (ppOutput == nullptr)
return DXGI_ERROR_INVALID_CALL; return DXGI_ERROR_INVALID_CALL;
MonitorEnumInfo info; if (Output > 0) {
info.iMonitorId = Output; *ppOutput = nullptr;
info.oMonitor = nullptr;
::EnumDisplayMonitors(
nullptr, nullptr, &MonitorEnumProc,
reinterpret_cast<LPARAM>(&info));
if (info.oMonitor == nullptr)
return DXGI_ERROR_NOT_FOUND; return DXGI_ERROR_NOT_FOUND;
}
*ppOutput = ref(new DxgiOutput(this, info.oMonitor)); // TODO support multiple monitors
HMONITOR monitor = ::MonitorFromPoint({ 0, 0 }, MONITOR_DEFAULTTOPRIMARY);
*ppOutput = ref(new DxgiOutput(this, monitor));
return S_OK; return S_OK;
} }
@ -288,19 +284,4 @@ namespace dxvk {
return S_OK; return S_OK;
} }
BOOL DxgiAdapter::MonitorEnumProc(
HMONITOR hmon,
HDC hdc,
LPRECT rect,
LPARAM lp) {
auto data = reinterpret_cast<MonitorEnumInfo*>(lp);
if (data->iMonitorId--)
return TRUE; /* continue */
data->oMonitor = hmon;
return FALSE; /* stop */
}
} }

11
src/dxgi/dxgi_adapter.h
View File

@ -85,17 +85,6 @@ namespace dxvk {
std::mutex m_outputMutex; std::mutex m_outputMutex;
OutputMap m_outputData; OutputMap m_outputData;
struct MonitorEnumInfo {
UINT iMonitorId;
HMONITOR oMonitor;
};
static BOOL MonitorEnumProc(
HMONITOR hmon,
HDC hdc,
LPRECT rect,
LPARAM lp);
}; };
} }