diff --git a/src/gui/rhi/qrhid3d11.cpp b/src/gui/rhi/qrhid3d11.cpp index f20c1f4072e..e1f422ce02e 100644 --- a/src/gui/rhi/qrhid3d11.cpp +++ b/src/gui/rhi/qrhid3d11.cpp @@ -4915,7 +4915,7 @@ bool QD3D11SwapChain::isFormatSupported(Format f) QRhiSwapChainHdrInfo QD3D11SwapChain::hdrInfo() { QRhiSwapChainHdrInfo info = QRhiSwapChain::hdrInfo(); - if (m_format != QRhiSwapChain::SDR && m_window) { + if (m_window) { QRHI_RES_RHI(QRhiD3D11); DXGI_OUTPUT_DESC1 hdrOutputDesc; if (outputDesc1ForWindow(m_window, rhiD->activeAdapter, &hdrOutputDesc)) { diff --git a/src/gui/rhi/qrhid3d12.cpp b/src/gui/rhi/qrhid3d12.cpp index 19843ed82bc..e954d16d1a1 100644 --- a/src/gui/rhi/qrhid3d12.cpp +++ b/src/gui/rhi/qrhid3d12.cpp @@ -5801,7 +5801,7 @@ bool QD3D12SwapChain::isFormatSupported(Format f) QRhiSwapChainHdrInfo QD3D12SwapChain::hdrInfo() { QRhiSwapChainHdrInfo info = QRhiSwapChain::hdrInfo(); - if (m_format != QRhiSwapChain::SDR && m_window) { + if (m_window) { QRHI_RES_RHI(QRhiD3D12); DXGI_OUTPUT_DESC1 hdrOutputDesc; if (outputDesc1ForWindow(m_window, rhiD->activeAdapter, &hdrOutputDesc)) { diff --git a/src/gui/rhi/qrhimetal.mm b/src/gui/rhi/qrhimetal.mm index 537f63418da..bbdd48318fb 100644 --- a/src/gui/rhi/qrhimetal.mm +++ b/src/gui/rhi/qrhimetal.mm @@ -6107,7 +6107,7 @@ bool QMetalSwapChain::isFormatSupported(Format f) { if (f == HDRExtendedSrgbLinear) { if (@available(macOS 10.11, iOS 16.0, *)) - return hdrInfoForScreen().limits.colorComponentValue.maxPotentialColorComponentValue > 1.0f; + return hdrInfo().limits.colorComponentValue.maxPotentialColorComponentValue > 1.0f; else return false; } @@ -6328,18 +6328,6 @@ bool QMetalSwapChain::createOrResize() } QRhiSwapChainHdrInfo QMetalSwapChain::hdrInfo() -{ - if (m_format == SDR) { - QRhiSwapChainHdrInfo info; - info.limitsType = QRhiSwapChainHdrInfo::ColorComponentValue; - info.limits.colorComponentValue.maxColorComponentValue = 1; - info.isHardCodedDefaults = true; - } else { - return hdrInfoForScreen(); - } -} - -QRhiSwapChainHdrInfo QMetalSwapChain::hdrInfoForScreen() { QRhiSwapChainHdrInfo info; info.limitsType = QRhiSwapChainHdrInfo::ColorComponentValue; diff --git a/src/gui/rhi/qrhimetal_p.h b/src/gui/rhi/qrhimetal_p.h index 3cc8f89ca7d..8fb2ce84b0c 100644 --- a/src/gui/rhi/qrhimetal_p.h +++ b/src/gui/rhi/qrhimetal_p.h @@ -318,9 +318,6 @@ struct QMetalSwapChain : public QRhiSwapChain QMetalCommandBuffer cbWrapper; QMetalRenderBuffer *ds = nullptr; QMetalSwapChainData *d = nullptr; - -private: - QRhiSwapChainHdrInfo hdrInfoForScreen(); }; struct QRhiMetalData;