HDR10Viewer2 1.0

Author: manoreken2

HDR10Viewer2/MLDX12App.cpp

@@ -91,7 +91,7 @@ MLDX12App::OnInit(void) {
 
     LoadAssets();
 
-    mDx12Imgui.Init(mDevice.Get());
+    mDx12Imgui.Init(mDevice.Get(), mBackBufferFmt);
     CreateImguiTexture();
 
     //OutputDebugString(L"OnInit end\n");
@@ -105,7 +105,7 @@ MLDX12App::ReInit(void)
 {
     LoadPipeline();
     LoadAssets();
-    mDx12Imgui.Init(mDevice.Get());
+    mDx12Imgui.Init(mDevice.Get(), mBackBufferFmt);
     CreateImguiTexture();
 }
 
@@ -387,7 +387,7 @@ MLDX12App::LoadAssets(void) {
     }
 
     mPipelineState.Reset();
-    MLDX12Common::SetupPSO(mDevice.Get(), mRootSignature.Get(), L"shaderVS.hlsl", L"shaderColorConvPS.hlsl", mPipelineState);
+    MLDX12Common::SetupPSO(mDevice.Get(), mBackBufferFmt, mRootSignature.Get(), L"shaderVS.hlsl", L"shaderColorConvPS.hlsl", mPipelineState);
     NAME_D3D12_OBJECT(mPipelineState);
 
     mCmdList.Reset();

HDR10Viewer2/MLDX12Common.cpp

@@ -6,7 +6,7 @@ std::wstring GetAssetFullPath(const std::wstring & assetsPath, const wchar_t * a
 }
 
 void
-MLDX12Common::SetupPSO(ID3D12Device *device, ID3D12RootSignature * rootSignature, const wchar_t* vsShaderName, const wchar_t *psShaderName, ComPtr<ID3D12PipelineState> & pso) {
+MLDX12Common::SetupPSO(ID3D12Device *device, DXGI_FORMAT rtvFormat, ID3D12RootSignature * rootSignature, const wchar_t* vsShaderName, const wchar_t *psShaderName, ComPtr<ID3D12PipelineState> & pso) {
     WCHAR s[512];
     GetAssetsPath(s, _countof(s));
     std::wstring assetsPath = assetsPath;
@@ -73,7 +73,7 @@ MLDX12Common::SetupPSO(ID3D12Device *device, ID3D12RootSignature * rootSignature
     psoDesc.SampleMask = UINT_MAX;
     psoDesc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE;
     psoDesc.NumRenderTargets = 1;
-    psoDesc.RTVFormats[0] = DXGI_FORMAT_R8G8B8A8_UNORM;
+    psoDesc.RTVFormats[0] = rtvFormat;
     psoDesc.SampleDesc.Count = 1;
     ThrowIfFailed(device->CreateGraphicsPipelineState(&psoDesc, IID_PPV_ARGS(&pso)));
 }

HDR10Viewer2/MLDX12Common.h

@@ -6,5 +6,5 @@ using Microsoft::WRL::ComPtr;
 
 class MLDX12Common {
 public:
-    static void SetupPSO(ID3D12Device *device, ID3D12RootSignature * rootSign, const wchar_t *vsShaderName, const wchar_t* psShaderName, ComPtr<ID3D12PipelineState> & pso);
+    static void SetupPSO(ID3D12Device *device, DXGI_FORMAT rtvFormat, ID3D12RootSignature * rootSign, const wchar_t *vsShaderName, const wchar_t* psShaderName, ComPtr<ID3D12PipelineState> & pso);
 };

HDR10Viewer2/MLDX12Imgui.cpp

@@ -16,9 +16,10 @@ struct VERTEX_CONSTANT_BUFFER
     float   mvp[4][4];
 };
 
-void MLDX12Imgui::Init(ID3D12Device *device)
+void MLDX12Imgui::Init(ID3D12Device *device, DXGI_FORMAT rtvFmt)
 {
     mDevice = device;
+    mRtvFmt = rtvFmt;
 
     IMGUI_CHECKVERSION();
     ImGui::CreateContext();
@@ -116,7 +117,7 @@ void MLDX12Imgui::SetupPso(void)
     psoDesc.pRootSignature = mRootSig.Get();
     psoDesc.SampleMask = UINT_MAX;
     psoDesc.NumRenderTargets = 1;
-    psoDesc.RTVFormats[0] = DXGI_FORMAT_R8G8B8A8_UNORM;
+    psoDesc.RTVFormats[0] = mRtvFmt;
     psoDesc.SampleDesc.Count = 1;
     psoDesc.Flags = D3D12_PIPELINE_STATE_FLAG_NONE;
 

HDR10Viewer2/MLDX12Imgui.h

@@ -8,7 +8,7 @@ struct ImDrawData;
 
 class MLDX12Imgui {
 public:
-    void Init(ID3D12Device *device);
+    void Init(ID3D12Device *device, DXGI_FORMAT rtvFmt);
     void Term(void);
 
     void Render(ImDrawData* draw_data, ID3D12GraphicsCommandList* ctx, int frameIdx);
@@ -23,6 +23,7 @@ class MLDX12Imgui {
 
     FrameResources mFrameResources[2];
     ID3D12Device * mDevice;
+    DXGI_FORMAT mRtvFmt;
     ComPtr<ID3D12RootSignature> mRootSig;
     ComPtr<ID3D12PipelineState> mPso;