mirror of
https://github.com/doitsujin/dxvk.git
synced 2025-02-08 01:54:15 +01:00
22c2abb9b7
HDR in Control (a patch released by a developer post-launch, not actually in the game sadly) tries to set a video mode with DXGI_FORMAT_R16G16B16A16_FLOAT. This seemingly works on Windows, and based on FindClosestMode etc documentaton, this seems required to work for any format that scanout it supported for. It's really not like the bpp is meaningful on Windows with the distinction of 8bit and 10bit not working in GDI modes at all. Nor does it end up actually setting anything on Linux/Deck where modesets are emulated. So, treat DXGI_FORMAT_R16G16B16A16_FLOAT as 32bpp so the FindClosestMatchingMode and EnterFullscreenMode calls succeed.
124 lines
3.3 KiB
C++
124 lines
3.3 KiB
C++
#include "dxgi_monitor.h"
|
|
|
|
namespace dxvk {
|
|
|
|
DxgiMonitorInfo::DxgiMonitorInfo(IUnknown* pParent, const DxgiOptions& options)
|
|
: m_parent(pParent)
|
|
, m_options(options)
|
|
, m_globalColorSpace(DefaultColorSpace()) {
|
|
|
|
}
|
|
|
|
|
|
DxgiMonitorInfo::~DxgiMonitorInfo() {
|
|
|
|
}
|
|
|
|
|
|
ULONG STDMETHODCALLTYPE DxgiMonitorInfo::AddRef() {
|
|
return m_parent->AddRef();
|
|
}
|
|
|
|
|
|
ULONG STDMETHODCALLTYPE DxgiMonitorInfo::Release() {
|
|
return m_parent->Release();
|
|
}
|
|
|
|
|
|
HRESULT STDMETHODCALLTYPE DxgiMonitorInfo::QueryInterface(
|
|
REFIID riid,
|
|
void** ppvObject) {
|
|
return m_parent->QueryInterface(riid, ppvObject);
|
|
}
|
|
|
|
|
|
HRESULT STDMETHODCALLTYPE DxgiMonitorInfo::InitMonitorData(
|
|
HMONITOR hMonitor,
|
|
const DXGI_VK_MONITOR_DATA* pData) {
|
|
if (!hMonitor || !pData)
|
|
return E_INVALIDARG;
|
|
|
|
std::lock_guard<dxvk::mutex> lock(m_monitorMutex);
|
|
auto result = m_monitorData.insert({ hMonitor, *pData });
|
|
|
|
return result.second ? S_OK : E_INVALIDARG;
|
|
}
|
|
|
|
|
|
HRESULT STDMETHODCALLTYPE DxgiMonitorInfo::AcquireMonitorData(
|
|
HMONITOR hMonitor,
|
|
DXGI_VK_MONITOR_DATA** ppData) {
|
|
InitReturnPtr(ppData);
|
|
|
|
if (!hMonitor || !ppData)
|
|
return E_INVALIDARG;
|
|
|
|
m_monitorMutex.lock();
|
|
|
|
auto entry = m_monitorData.find(hMonitor);
|
|
if (entry == m_monitorData.end()) {
|
|
m_monitorMutex.unlock();
|
|
return DXGI_ERROR_NOT_FOUND;
|
|
}
|
|
|
|
*ppData = &entry->second;
|
|
return S_OK;
|
|
}
|
|
|
|
|
|
void STDMETHODCALLTYPE DxgiMonitorInfo::ReleaseMonitorData() {
|
|
m_monitorMutex.unlock();
|
|
}
|
|
|
|
|
|
void STDMETHODCALLTYPE DxgiMonitorInfo::PuntColorSpace(DXGI_COLOR_SPACE_TYPE ColorSpace) {
|
|
// Only allow punting if we started from sRGB.
|
|
// That way we can go from sRGB -> HDR10 or HDR10 -> sRGB if we started in sRGB.
|
|
// But if we started off by advertising HDR10 to the game, don't allow us to go back.
|
|
// This mirrors the behaviour of the global Windows HDR toggle more closely.
|
|
if (DefaultColorSpace() != DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709)
|
|
return;
|
|
|
|
m_globalColorSpace = ColorSpace;
|
|
}
|
|
|
|
|
|
DXGI_COLOR_SPACE_TYPE STDMETHODCALLTYPE DxgiMonitorInfo::CurrentColorSpace() const {
|
|
return m_globalColorSpace;
|
|
}
|
|
|
|
|
|
DXGI_COLOR_SPACE_TYPE DxgiMonitorInfo::DefaultColorSpace() const {
|
|
return m_options.enableHDR
|
|
? DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020
|
|
: DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709;
|
|
}
|
|
|
|
|
|
uint32_t GetMonitorFormatBpp(DXGI_FORMAT Format) {
|
|
switch (Format) {
|
|
case DXGI_FORMAT_R8G8B8A8_UNORM:
|
|
case DXGI_FORMAT_B8G8R8A8_UNORM:
|
|
case DXGI_FORMAT_B8G8R8X8_UNORM:
|
|
case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
|
|
case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
|
|
case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
|
|
case DXGI_FORMAT_R10G10B10A2_UNORM:
|
|
return 32;
|
|
|
|
case DXGI_FORMAT_R16G16B16A16_FLOAT:
|
|
// Floating point output doesn't really make sense.
|
|
// This seemingly works on Windows, and based on FindClosestMode etc documentaton,
|
|
// this seems required to work for any format that scanout it supported for.
|
|
// Treat as 10-bit -> 32.
|
|
return 32;
|
|
|
|
default:
|
|
Logger::warn(str::format(
|
|
"GetMonitorFormatBpp: Unknown format: ",
|
|
Format));
|
|
return 32;
|
|
}
|
|
}
|
|
|
|
} |