Skip to content

Commit

Permalink
HDR monitor colorspace support in Windows 10
Browse files Browse the repository at this point in the history 
Co-Authored-By: Keks1 <30904997+lucifer602288@users.noreply.github.com>
  • Loading branch information
@SaiyansKing @lucifer602288
SaiyansKing and lucifer602288 committed Nov 10, 2021
1 parent 1d670ac commit 8fc887a
Show file tree
Hide file tree
Showing 6 changed files with 271 additions and 13 deletions.
191 changes: 180 additions & 11 deletions D3D11Engine/D3D11GraphicsEngine.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ D3D11GraphicsEngine::D3D11GraphicsEngine() {
m_FrameLimiter = std::make_unique<FpsLimiter>();
m_LastFrameLimit = 0;
m_flipWithTearing = false;
m_HDR = false;
m_isWindowActive = true;

// Match the resolution with the current desktop resolution
Expand Down Expand Up @@ -487,7 +488,13 @@ DXGI_FORMAT D3D11GraphicsEngine::GetBackBufferFormat() {
XRESULT D3D11GraphicsEngine::OnResize( INT2 newSize ) {
HRESULT hr;

if ( dxgi_1_3 ) {
if ( dxgi_1_5 ) {
if ( memcmp( &Resolution, &newSize, sizeof( newSize ) ) == 0 && SwapChain4.Get() )
return XR_SUCCESS; // Don't resize if we don't have to
} else if ( dxgi_1_4 ) {
if ( memcmp( &Resolution, &newSize, sizeof( newSize ) ) == 0 && SwapChain3.Get() )
return XR_SUCCESS; // Don't resize if we don't have to
} else if ( dxgi_1_3 ) {
if ( memcmp( &Resolution, &newSize, sizeof( newSize ) ) == 0 && SwapChain2.Get() )
return XR_SUCCESS; // Don't resize if we don't have to
} else {
Expand All @@ -506,7 +513,11 @@ XRESULT D3D11GraphicsEngine::OnResize( INT2 newSize ) {

#ifndef BUILD_SPACER
BOOL isFullscreen = 0;
if ( dxgi_1_3 ) {
if ( dxgi_1_5 ) {
if ( SwapChain4.Get() ) LE( SwapChain4->GetFullscreenState( &isFullscreen, nullptr ) );
} else if ( dxgi_1_4 ) {
if ( SwapChain3.Get() ) LE( SwapChain3->GetFullscreenState( &isFullscreen, nullptr ) );
} else if ( dxgi_1_3 ) {
if ( SwapChain2.Get() ) LE( SwapChain2->GetFullscreenState( &isFullscreen, nullptr ) );
} else {
if ( SwapChain.Get() ) LE( SwapChain->GetFullscreenState( &isFullscreen, nullptr ) );
Expand Down Expand Up @@ -546,26 +557,41 @@ XRESULT D3D11GraphicsEngine::OnResize( INT2 newSize ) {

Microsoft::WRL::ComPtr<IDXGIDevice2> pDXGIDevice;
Microsoft::WRL::ComPtr<IDXGIDevice3> pDXGIDevice3;
Microsoft::WRL::ComPtr<IDXGIDevice4> pDXGIDevice4;
Microsoft::WRL::ComPtr<IDXGIAdapter> adapter11;
Microsoft::WRL::ComPtr<IDXGIAdapter2> adapter;
Microsoft::WRL::ComPtr<IDXGIAdapter3> adapter3;
Microsoft::WRL::ComPtr<IDXGIFactory2> factory2;
Microsoft::WRL::ComPtr<IDXGIFactory4> factory4;

if ( SUCCEEDED( Device.As( &pDXGIDevice3 ) ) ) dxgi_1_3 = true;
if ( SUCCEEDED( Device.As( &pDXGIDevice4 ) ) ) dxgi_1_5 = true;
else if ( SUCCEEDED( Device.As( &pDXGIDevice3 ) ) ) dxgi_1_3 = true;
else LE( Device.As( &pDXGIDevice ) );

if ( dxgi_1_3 ) {
if ( dxgi_1_5 ) {
LE( pDXGIDevice4->GetAdapter( &adapter11 ) );
LogInfo() << "Device: DXGI 1.5";
} else if ( dxgi_1_3 ) {
LE( pDXGIDevice3->GetAdapter( &adapter11 ) );
LogInfo() << "Device: DXGI 1.3";
} else LE( pDXGIDevice->GetAdapter( &adapter11 ) );
} else {
LE( pDXGIDevice->GetAdapter( &adapter11 ) );
LogInfo() << "Device: DXGI 1.2";
}

LE( adapter11.As( &adapter ) );
LE( adapter->GetParent( IID_PPV_ARGS( &factory2 ) ) );

if ( SUCCEEDED( factory2.As( &factory4 ) ) ) {
LE( adapter11.As( &adapter3 ) );
LE( adapter3->GetParent( IID_PPV_ARGS( &factory4 ) ) );
dxgi_1_4 = true;
}

DXGI_SWAP_EFFECT swapEffect = DXGI_SWAP_EFFECT::DXGI_SWAP_EFFECT_DISCARD;

DXGI_SWAP_CHAIN_DESC1 scd = {};
if ( m_swapchainflip ) {
Microsoft::WRL::ComPtr<IDXGIFactory4> factory4;
Microsoft::WRL::ComPtr<IDXGIFactory5> factory5;

if ( SUCCEEDED( factory2.As( &factory5 ) ) ) {
Expand All @@ -575,7 +601,7 @@ XRESULT D3D11GraphicsEngine::OnResize( INT2 newSize ) {
m_swapchainflip = m_flipWithTearing;
}
}
if ( SUCCEEDED( factory2.As( &factory4 ) ) ) {
if ( dxgi_1_4 ) {
swapEffect = DXGI_SWAP_EFFECT::DXGI_SWAP_EFFECT_FLIP_DISCARD;
} else {
swapEffect = DXGI_SWAP_EFFECT::DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL;
Expand All @@ -596,7 +622,7 @@ XRESULT D3D11GraphicsEngine::OnResize( INT2 newSize ) {
} else scd.BufferCount = 1;

m_lowlatency = Engine::GAPI->GetRendererState().RendererSettings.LowLatency;
if ( m_lowlatency && dxgi_1_3 ) scflags |= DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT;
if ( m_lowlatency && (dxgi_1_3 || dxgi_1_5) && (swapEffect > 1) ) scflags |= DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT; else m_lowlatency = 0;

scd.SwapEffect = swapEffect;
scd.Flags = scflags;
Expand Down Expand Up @@ -637,7 +663,19 @@ XRESULT D3D11GraphicsEngine::OnResize( INT2 newSize ) {
XLE( Engine::AntTweakBar->Init() );
} else {
LogInfo() << "Resizing swapchain (Format: DXGI_FORMAT_R8G8B8A8_UNORM)";
if ( dxgi_1_3 ) {
if ( dxgi_1_5 ) {
//if (FAILED(SwapChain4->SetSourceSize(bbres.x, bbres.y))) { //crashes when scd.Scaling = DXGI_SCALING_STRETCH is not set;
if ( FAILED( SwapChain4->ResizeBuffers( 0, bbres.x, bbres.y, DXGI_FORMAT_B8G8R8A8_UNORM, scflags ) ) ) {
LogError() << "Failed to resize swapchain!";
return XR_FAILED;
}
} else if ( dxgi_1_4 ) {
//if (FAILED(SwapChain3->SetSourceSize(bbres.x, bbres.y))) { //crashes when scd.Scaling = DXGI_SCALING_STRETCH is not set;
if ( FAILED( SwapChain3->ResizeBuffers( 0, bbres.x, bbres.y, DXGI_FORMAT_B8G8R8A8_UNORM, scflags ) ) ) {
LogError() << "Failed to resize swapchain!";
return XR_FAILED;
}
} else if ( dxgi_1_3 ) {
//if (FAILED(SwapChain2->SetSourceSize(bbres.x, bbres.y))) { //crashes when scd.Scaling = DXGI_SCALING_STRETCH is not set;
if ( FAILED( SwapChain2->ResizeBuffers( 0, bbres.x, bbres.y, DXGI_FORMAT_B8G8R8A8_UNORM, scflags ) ) ) {
LogError() << "Failed to resize swapchain!";
Expand All @@ -652,7 +690,33 @@ XRESULT D3D11GraphicsEngine::OnResize( INT2 newSize ) {
// Successfully resized swapchain, re-get buffers
wrl::ComPtr<ID3D11Texture2D> backbuffer;
// Successfully resized swapchain, re-get buffers
if ( dxgi_1_3 ) {
if ( dxgi_1_5 ) {
LE( SwapChain.As( &SwapChain4 ) );
LogInfo() << "SwapChain: DXGI 1.5";
if ( m_lowlatency ) {
HANDLE frameLatencyWaitableObject = SwapChain4->GetFrameLatencyWaitableObject();
WaitForSingleObjectEx( frameLatencyWaitableObject, INFINITE, true );
LogInfo() << "SwapChain Mode: DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT";
}
m_HDR = Engine::GAPI->GetRendererState().RendererSettings.HDR_Monitor;
if ( m_HDR && m_swapchainflip ) {
UpdateColorSpace_SwapChain4();
}
SwapChain4->GetBuffer( 0, __uuidof(ID3D11Texture2D), &backbuffer );
} else if ( dxgi_1_4 ) {
LE( SwapChain.As( &SwapChain3 ) );
LogInfo() << "SwapChain: DXGI 1.4";
if ( m_lowlatency ) {
HANDLE frameLatencyWaitableObject = SwapChain3->GetFrameLatencyWaitableObject();
WaitForSingleObjectEx( frameLatencyWaitableObject, INFINITE, true );
LogInfo() << "SwapChain Mode: DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT";
}
m_HDR = Engine::GAPI->GetRendererState().RendererSettings.HDR_Monitor;
if ( m_HDR && m_swapchainflip ) {
UpdateColorSpace_SwapChain3();
}
SwapChain3->GetBuffer( 0, __uuidof(ID3D11Texture2D), &backbuffer );
} else if ( dxgi_1_3 ) {
LE( SwapChain.As( &SwapChain2 ) );
LogInfo() << "SwapChain: DXGI 1.3";
if ( m_lowlatency ) {
Expand Down Expand Up @@ -1019,7 +1083,19 @@ XRESULT D3D11GraphicsEngine::Present() {
bool vsync = Engine::GAPI->GetRendererState().RendererSettings.EnableVSync;

HRESULT hr;
if ( dxgi_1_3 ) {
if ( dxgi_1_5 ) {
if ( m_flipWithTearing ) {
hr = SwapChain4->Present( vsync ? 1 : 0, vsync ? 0 : DXGI_PRESENT_ALLOW_TEARING );
} else {
hr = SwapChain4->Present( vsync ? 1 : 0, 0 );
}
} else if ( dxgi_1_4 ) {
if ( m_flipWithTearing ) {
hr = SwapChain3->Present( vsync ? 1 : 0, vsync ? 0 : DXGI_PRESENT_ALLOW_TEARING );
} else {
hr = SwapChain3->Present( vsync ? 1 : 0, 0 );
}
} else if ( dxgi_1_3 ) {
if ( m_flipWithTearing ) {
hr = SwapChain2->Present( vsync ? 1 : 0, vsync ? 0 : DXGI_PRESENT_ALLOW_TEARING );
} else {
Expand Down Expand Up @@ -1992,6 +2068,99 @@ void D3D11GraphicsEngine::TestDrawWorldMesh() {
}
}

// Sets the color space for the swap chain in order to handle HDR output.
void D3D11GraphicsEngine::UpdateColorSpace_SwapChain3()
{
DXGI_COLOR_SPACE_TYPE colorSpace = DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709;

bool isDisplayHDR10 = false;

Microsoft::WRL::ComPtr<IDXGIOutput> output;
if ( SUCCEEDED( SwapChain3->GetContainingOutput( output.GetAddressOf() ) ) ) {
Microsoft::WRL::ComPtr<IDXGIOutput6> output6;
if ( SUCCEEDED( output.As( &output6 ) ) ) {
DXGI_OUTPUT_DESC1 desc;
output6->GetDesc1( &desc );
if ( desc.ColorSpace == DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020 ) {
// Display output is HDR10.
isDisplayHDR10 = true;
}
}
}

if ( isDisplayHDR10 ) {
switch ( GetBackBufferFormat() ) {
case DXGI_FORMAT_R11G11B10_FLOAT: //origial DXGI_FORMAT_R10G10B10A2_UNORM
// The application creates the HDR10 signal.
colorSpace = DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020;
break;

case DXGI_FORMAT_R16G16B16A16_FLOAT:
// The system creates the HDR10 signal; application uses linear values.
colorSpace = DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709;
break;

default:
break;
}
}

//m_colorSpace = colorSpace; //only used when access from other function required

UINT colorSpaceSupport = 0;
if ( SUCCEEDED( SwapChain3->CheckColorSpaceSupport( colorSpace, &colorSpaceSupport ) )
&& (colorSpaceSupport & DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_PRESENT) ) {
SwapChain3->SetColorSpace1( colorSpace );
LogInfo() << "Using HDR Monitor ColorSpace";
}
}

void D3D11GraphicsEngine::UpdateColorSpace_SwapChain4()
{
DXGI_COLOR_SPACE_TYPE colorSpace = DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709;

bool isDisplayHDR10 = false;

Microsoft::WRL::ComPtr<IDXGIOutput> output;
if ( SUCCEEDED( SwapChain4->GetContainingOutput( output.GetAddressOf() ) ) ) {
Microsoft::WRL::ComPtr<IDXGIOutput6> output6;
if ( SUCCEEDED( output.As( &output6 ) ) ) {
DXGI_OUTPUT_DESC1 desc;
output6->GetDesc1( &desc );
if ( desc.ColorSpace == DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020 ) {
// Display output is HDR10.
isDisplayHDR10 = true;
}
}
}

if ( isDisplayHDR10 ) {
switch ( GetBackBufferFormat() ) {
case DXGI_FORMAT_R11G11B10_FLOAT: //origial DXGI_FORMAT_R10G10B10A2_UNORM
// The application creates the HDR10 signal.
colorSpace = DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020;
break;

case DXGI_FORMAT_R16G16B16A16_FLOAT:
// The system creates the HDR10 signal; application uses linear values.
colorSpace = DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709;
break;

default:
break;
}
}

//m_colorSpace = colorSpace; //only used when access from other function required

UINT colorSpaceSupport = 0;
if ( SUCCEEDED( SwapChain4->CheckColorSpaceSupport( colorSpace, &colorSpaceSupport ) )
&& (colorSpaceSupport & DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_PRESENT) ) {
SwapChain4->SetColorSpace1( colorSpace );
LogInfo() << "Using HDR Monitor ColorSpace";
}
}

/** Draws a list of mesh infos */
XRESULT D3D11GraphicsEngine::DrawMeshInfoListAlphablended(
const std::vector<std::pair<MeshKey, MeshInfo*>>& list ) {
Expand Down
9 changes: 9 additions & 0 deletions D3D11Engine/D3D11GraphicsEngine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,14 @@ class D3D11GraphicsEngine : public D3D11GraphicsEngineBase {
/** Puts the current world matrix into a CB and binds it to the given slot */
void SetupPerInstanceConstantBuffer( int slot = 1 );

/**Colorspace for HDR-Monitors on Windows 10 */
/** HDR Support */
//DXGI_COLOR_SPACE_TYPE m_colorSpace; //only used when access from other function required
//DXGI_COLOR_SPACE_TYPE GetColorSpace() const noexcept { return m_colorSpace; } //only used when access from other function required

void UpdateColorSpace_SwapChain3();
void UpdateColorSpace_SwapChain4();

enum EPNAENRenderMode {
PNAEN_Default,
PNAEN_Instanced,
Expand Down Expand Up @@ -409,6 +417,7 @@ class D3D11GraphicsEngine : public D3D11GraphicsEngineBase {
bool m_flipWithTearing;
bool m_swapchainflip;
bool m_lowlatency;
bool m_HDR;
int m_previousFpsLimit;
bool m_isWindowActive;
};
76 changes: 74 additions & 2 deletions D3D11Engine/D3D11GraphicsEngineBase.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,79 @@ XRESULT D3D11GraphicsEngineBase::Present() {
Engine::AntTweakBar->Draw();

bool vsync = Engine::GAPI->GetRendererState().RendererSettings.EnableVSync;
if ( dxgi_1_3 ) {
if ( dxgi_1_5 ) {
if ( SwapChain4->Present( vsync ? 1 : 0, 0 ) == DXGI_ERROR_DEVICE_REMOVED ) {
switch ( GetDevice()->GetDeviceRemovedReason() ) {
case DXGI_ERROR_DEVICE_HUNG:
LogErrorBox() << "Device Removed! (DXGI_ERROR_DEVICE_HUNG)";
exit( 0 );
break;

case DXGI_ERROR_DEVICE_REMOVED:
LogErrorBox() << "Device Removed! (DXGI_ERROR_DEVICE_REMOVED)";
exit( 0 );
break;

case DXGI_ERROR_DEVICE_RESET:
LogErrorBox() << "Device Removed! (DXGI_ERROR_DEVICE_RESET)";
exit( 0 );
break;

case DXGI_ERROR_DRIVER_INTERNAL_ERROR:
LogErrorBox() << "Device Removed! (DXGI_ERROR_DRIVER_INTERNAL_ERROR)";
exit( 0 );
break;

case DXGI_ERROR_INVALID_CALL:
LogErrorBox() << "Device Removed! (DXGI_ERROR_INVALID_CALL)";
exit( 0 );
break;

case S_OK:
LogInfo() << "Device removed, but we're fine!";
break;

default:
LogWarnBox() << "Device Removed! (Unknown reason)";
}
}
} else if ( dxgi_1_4 ) {
if ( SwapChain3->Present( vsync ? 1 : 0, 0 ) == DXGI_ERROR_DEVICE_REMOVED ) {
switch ( GetDevice()->GetDeviceRemovedReason() ) {
case DXGI_ERROR_DEVICE_HUNG:
LogErrorBox() << "Device Removed! (DXGI_ERROR_DEVICE_HUNG)";
exit( 0 );
break;

case DXGI_ERROR_DEVICE_REMOVED:
LogErrorBox() << "Device Removed! (DXGI_ERROR_DEVICE_REMOVED)";
exit( 0 );
break;

case DXGI_ERROR_DEVICE_RESET:
LogErrorBox() << "Device Removed! (DXGI_ERROR_DEVICE_RESET)";
exit( 0 );
break;

case DXGI_ERROR_DRIVER_INTERNAL_ERROR:
LogErrorBox() << "Device Removed! (DXGI_ERROR_DRIVER_INTERNAL_ERROR)";
exit( 0 );
break;

case DXGI_ERROR_INVALID_CALL:
LogErrorBox() << "Device Removed! (DXGI_ERROR_INVALID_CALL)";
exit( 0 );
break;

case S_OK:
LogInfo() << "Device removed, but we're fine!";
break;

default:
LogWarnBox() << "Device Removed! (Unknown reason)";
}
}
} else if ( dxgi_1_3 ) {
if ( SwapChain2->Present( vsync ? 1 : 0, 0 ) == DXGI_ERROR_DEVICE_REMOVED ) {
switch ( GetDevice()->GetDeviceRemovedReason() ) {
case DXGI_ERROR_DEVICE_HUNG:
Expand Down Expand Up @@ -510,4 +582,4 @@ XRESULT D3D11GraphicsEngineBase::BindViewportInformation( const std::string& sha
/** Returns the graphics-device this is running on */
std::string D3D11GraphicsEngineBase::GetGraphicsDeviceName() {
return DeviceDescription;
}
}
4 changes: 4 additions & 0 deletions D3D11Engine/D3D11GraphicsEngineBase.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,11 @@ class D3D11GraphicsEngineBase : public BaseGraphicsEngine {
/** Swapchain and resources */
Microsoft::WRL::ComPtr<IDXGISwapChain1> SwapChain;
Microsoft::WRL::ComPtr<IDXGISwapChain2> SwapChain2;
Microsoft::WRL::ComPtr<IDXGISwapChain3> SwapChain3;
Microsoft::WRL::ComPtr<IDXGISwapChain4> SwapChain4;
bool dxgi_1_3 = false;
bool dxgi_1_4 = false;
bool dxgi_1_5 = false;
std::unique_ptr<RenderToTextureBuffer> Backbuffer;
std::unique_ptr<RenderToDepthStencilBuffer> DepthStencilBuffer;
std::unique_ptr<RenderToTextureBuffer> HDRBackBuffer;
Expand Down
Loading

0 comments on commit 8fc887a

Please sign in to comment.