Merge for GLTFSample v1.2 update

Author: Wilkinson, David

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "libs/cauldron"]
 	path = libs/cauldron
-	url = ../../GPUOpen-LibrariesAndSDKs/Cauldron.git
+	url = ../Cauldron.git
 [submodule "media/Cauldron-Media"]
 	path = media/Cauldron-Media
 	url = ../../GPUOpen-LibrariesAndSDKs/Cauldron-Media

CMakeLists.txt

@@ -15,8 +15,8 @@ add_subdirectory(libs/cauldron)
 
 set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${PROJECT_NAME})
 
-if(GFX_API STREQUAL DX12)        
-    add_subdirectory(src/DX12)   
+if(GFX_API STREQUAL DX12)
+    add_subdirectory(src/DX12)
 elseif(GFX_API STREQUAL VK)
     find_package(Vulkan REQUIRED)
     add_subdirectory(src/VK)

libs/cauldron

@@ -39,12 +39,14 @@
             {
               "time": 0,
               "from": [ 5.13694048, 1.89175785, -1.40289795 ],
-              "to": [ 0.703276634, 1.02280307, 0.218072295 ]
+              "to": [ 0.703276634, 1.02280307, 0.218072295 ],
+              "screenShotName": "camera1.jpg"
             },
             {
               "time": 1000,
               "from": [ -5.13694048, 1.89175785, -1.40289795 ],
-              "to": [ 0.703276634, 1.02280307, 0.218072295 ]
+              "to": [ 0.703276634, 1.02280307, 0.218072295 ],
+              "screenShotName": "camera2.jpg"
             }
           ]
         }

src/Common/GLTFSample.json

@@ -122,9 +122,11 @@ void GLTFSample::OnCreate(HWND hWnd)
     m_device.CreatePipelineCache();
 
     // set stable power state
-    m_device.GetDevice()->SetStablePowerState(m_stablePowerState);
+    if (m_stablePowerState)
+        m_device.GetDevice()->SetStablePowerState(TRUE);
 
     //init the shader compiler
+    InitDirectXCompiler();
     CreateShaderCache();
 
     // Create Swapchain
@@ -312,7 +314,6 @@ void GLTFSample::LoadScene(int sceneIndex)
         {
             tfNode n;
             n.m_tranform.LookAt(PolarToVector(XM_PI / 2.0f, 0.58f)*3.5f, XMVectorSet(0, 0, 0, 0));
-            int sourceIdx = m_pGltfLoader->AddNode(n);
 
             tfLight l;
             l.m_type = tfLight::LIGHT_SPOTLIGHT;
@@ -321,9 +322,8 @@ void GLTFSample::LoadScene(int sceneIndex)
             l.m_range = 15;
             l.m_outerConeAngle = XM_PI / 4.0f;
             l.m_innerConeAngle = (XM_PI / 4.0f) * 0.9f;
-            l.m_nodeIndex = sourceIdx;
 
-            m_pGltfLoader->AddLight(l);
+            m_pGltfLoader->AddLight(n, l);
         }
 
         // set default camera
@@ -341,7 +341,10 @@ void GLTFSample::LoadScene(int sceneIndex)
         //
         if (m_state.m_isBenchmarking)
         {
-            BenchmarkConfig(scene["BenchmarkSettings"], m_activeCamera, m_pGltfLoader);
+            std::string deviceName;
+            std::string driverVersion;
+            m_device.GetDeviceInfo(&deviceName, &driverVersion);
+            BenchmarkConfig(scene["BenchmarkSettings"], m_activeCamera, m_pGltfLoader, deviceName, driverVersion);
         } 
 
         // indicate the mainloop we started loading a GLTF and it needs to load the rest (textures and geometry)
@@ -416,33 +419,33 @@ void GLTFSample::BuildUI()
 
     if (ImGui::Button("Set spotlight 0"))
     {
-        int idx = m_pGltfLoader->m_lights[0].m_nodeIndex;
+        int idx = m_pGltfLoader->m_lightInstances[0].m_nodeIndex;
         m_pGltfLoader->m_nodes[idx].m_tranform.LookAt(m_state.camera.GetPosition(), m_state.camera.GetPosition() - m_state.camera.GetDirection());
         m_pGltfLoader->m_animatedMats[idx] = m_pGltfLoader->m_nodes[idx].m_tranform.GetWorldMat();
     }
 
-    // FreeSync2 display mode selector
+    // FreeSync HDR display mode selector
     // 
-    if (ImGui::Button("FreeSync2"))
+    if (ImGui::Button("FreeSync HDR"))
     {
-        ImGui::OpenPopup("FreeSync2");
+        ImGui::OpenPopup("FreeSync HDR");
         m_swapChain.EnumerateDisplayModes(&m_displayModesAvailable, &m_displayModesNamesAvailable);
     }
 
-    if (ImGui::BeginPopupModal("FreeSync2", NULL, ImGuiWindowFlags_AlwaysAutoResize))
+    if (ImGui::BeginPopupModal("FreeSync HDR", NULL, ImGuiWindowFlags_AlwaysAutoResize))
     {
         if (m_displayModesAvailable.size() == 1)
         {
-            ImGui::Text("\nOpps! This window is not on a FreeSync2 monitor so the only available mode is SDR.\n\n");
-            ImGui::Text("If you have a FreeSync2 monitor move this window to that monitor and try again\n\n");
+            ImGui::Text("\nOpps! This window is not on a FreeSync HDR monitor so the only available mode is SDR.\n\n");
+            ImGui::Text("If you have a FreeSync HDR monitor move this window to that monitor and try again\n\n");
             if (ImGui::Button("Cancel", ImVec2(120, 0))) { ImGui::CloseCurrentPopup(); }
             ImGui::EndPopup();
         }
         else
         {
             if (m_swapChain.IsFullScreen() == false)
             {
-                ImGui::Text("\nFreeSync2 modes are only available in in fullscreen mode, please press ALT + ENTER for fun!\n\n");
+                ImGui::Text("\nFreeSync HDR modes are only available in in fullscreen mode, please press ALT + ENTER for fun!\n\n");
                 if (ImGui::Button("Cancel", ImVec2(120, 0))) { ImGui::CloseCurrentPopup(); }
                 ImGui::EndPopup();
             }
@@ -570,7 +573,7 @@ void GLTFSample::OnRender()
         // benchmarking takes control of the time, and exits the app when the animation is done
         std::vector<TimeStamp> timeStamps = m_Node->GetTimingValues();
 
-        m_time = BenchmarkLoop(timeStamps, &m_state.camera);
+        m_time = BenchmarkLoop(timeStamps, &m_state.camera, &m_state.m_pScreenShotName);
     }
     else
     {

src/DX12/GLTFSample.cpp

@@ -20,6 +20,8 @@
 #include "stdafx.h"
 
 #include "SampleRenderer.h"
+#include "base\\SaveTexture.h"
+
 
 //--------------------------------------------------------------------------------------
 //
@@ -33,7 +35,7 @@ void SampleRenderer::OnCreate(Device* pDevice, SwapChain *pSwapChain)
     // Initialize helpers
 
     // Create all the heaps for the resources views
-    const uint32_t cbvDescriptorCount = 2000;
+    const uint32_t cbvDescriptorCount = 4000;
     const uint32_t srvDescriptorCount = 8000;
     const uint32_t uavDescriptorCount = 10;
     const uint32_t dsvDescriptorCount = 10;
@@ -46,7 +48,7 @@ void SampleRenderer::OnCreate(Device* pDevice, SwapChain *pSwapChain)
     m_CommandListRing.OnCreate(pDevice, backBufferCount, commandListsPerBackBuffer, pDevice->GetGraphicsQueue()->GetDesc());
 
     // Create a 'dynamic' constant buffer
-    const uint32_t constantBuffersMemSize = 20 * 1024 * 1024;
+    const uint32_t constantBuffersMemSize = 200 * 1024 * 1024;
     m_ConstantBufferRing.OnCreate(pDevice, backBufferCount, constantBuffersMemSize, &m_resourceViewHeaps);
 
     // Create a 'static' pool for vertices, indices and constant buffers
@@ -294,6 +296,9 @@ int SampleRenderer::LoadScene(GLTFCommon *pGLTFCommon, int stage)
         ImGui::EndPopup();
     }
 
+    // use multithreading
+    AsyncPool *pAsyncPool = &m_asyncPool;
+
     // Loading stages
     //
     if (stage == 0)
@@ -312,7 +317,7 @@ int SampleRenderer::LoadScene(GLTFCommon *pGLTFCommon, int stage)
 
         // here we are loading onto the GPU all the textures and the inverse matrices
         // this data will be used to create the PBR and Depth passes       
-        m_pGLTFTexturesAndBuffers->LoadTextures();
+        m_pGLTFTexturesAndBuffers->LoadTextures(pAsyncPool);
     }
     else if (stage == 7)
     {
@@ -326,7 +331,8 @@ int SampleRenderer::LoadScene(GLTFCommon *pGLTFCommon, int stage)
             &m_resourceViewHeaps,
             &m_ConstantBufferRing,
             &m_VidMemBufferPool,
-            m_pGLTFTexturesAndBuffers
+            m_pGLTFTexturesAndBuffers,
+            pAsyncPool
         );
     }
     else if (stage == 8)
@@ -342,7 +348,8 @@ int SampleRenderer::LoadScene(GLTFCommon *pGLTFCommon, int stage)
             &m_VidMemBufferPool,
             m_pGLTFTexturesAndBuffers,
             m_MotionVectors.GetFormat(),
-            m_NormalBuffer.GetFormat()
+            m_NormalBuffer.GetFormat(),
+            pAsyncPool
         );
     }
     else if (stage == 9)
@@ -359,13 +366,16 @@ int SampleRenderer::LoadScene(GLTFCommon *pGLTFCommon, int stage)
             &m_VidMemBufferPool,
             m_pGLTFTexturesAndBuffers,
             &m_skyDome,
+            false,                  // use a SSAO mask
             USE_SHADOWMASK,
             m_HDRMSAA.GetFormat(), // forward pass channel
             DXGI_FORMAT_UNKNOWN,   // specular-roughness channel
             DXGI_FORMAT_UNKNOWN,   // diffuse channel
             DXGI_FORMAT_UNKNOWN,   // normal channel
-            4
+            4,
+            pAsyncPool
         );
+
     }
     else if (stage == 10)
     {
@@ -466,6 +476,7 @@ void SampleRenderer::OnRender(State *pState, SwapChain *pSwapChain)
 
     // Let our resource managers do some house keeping
     //
+    m_CommandListRing.OnBeginFrame();
     m_ConstantBufferRing.OnBeginFrame();
     m_GPUTimer.OnBeginFrame(gpuTicksPerSecond, &m_TimeStamps);
 
@@ -481,13 +492,15 @@ void SampleRenderer::OnRender(State *pState, SwapChain *pSwapChain)
     //
     per_frame *pPerFrame = NULL;
     if (m_pGLTFTexturesAndBuffers)
-    {        
+    {
         // fill as much as possible using the GLTF (camera, lights, ...)
         pPerFrame = m_pGLTFTexturesAndBuffers->m_pGLTFCommon->SetPerFrameData(pState->camera);
 
         // Set some lighting factors
         pPerFrame->iblFactor = pState->iblFactor;
         pPerFrame->emmisiveFactor = pState->emmisiveFactor;
+        pPerFrame->invScreenResolution[0] = 1.0f / ((float)m_Width);
+        pPerFrame->invScreenResolution[1] = 1.0f / ((float)m_Height);
 
         // Set shadowmaps bias and an index that indicates the rectangle of the atlas in which depth will be rendered
         uint32_t shadowMapIndex = 0;
@@ -562,6 +575,7 @@ void SampleRenderer::OnRender(State *pState, SwapChain *pSwapChain)
             shadowMapIndex++;
         }
     }
+
     pCmdLst1->ResourceBarrier(1, &CD3DX12_RESOURCE_BARRIER::Transition(m_shadowMap.GetResource(), D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE));
 
     // Motion vectors ---------------------------------------------------------------------------
@@ -781,7 +795,7 @@ void SampleRenderer::OnRender(State *pState, SwapChain *pSwapChain)
         pCmdLst1->ResourceBarrier(ARRAYSIZE(postSharpen), postSharpen);
     }
 
-    // If using FreeSync2 we need to to the tonemapping in-place and then apply the GUI, later we'll apply the color conversion into the swapchain
+    // If using FreeSync HDR we need to to the tonemapping in-place and then apply the GUI, later we'll apply the color conversion into the swapchain
     //
     if (pSwapChain->GetDisplayMode() != DISPLAYMODE_SDR)
     {
@@ -813,8 +827,7 @@ void SampleRenderer::OnRender(State *pState, SwapChain *pSwapChain)
         }
     }
 
-    // submit command buffer
-
+    // submit command buffer #1
     ThrowIfFailed(pCmdLst1->Close());
     ID3D12CommandList* CmdListList1[] = { pCmdLst1 };
     m_pDevice->GetGraphicsQueue()->ExecuteCommandLists(1, CmdListList1);
@@ -823,13 +836,11 @@ void SampleRenderer::OnRender(State *pState, SwapChain *pSwapChain)
     //
     pSwapChain->WaitForSwapChain();
 
-    m_CommandListRing.OnBeginFrame();
-
     ID3D12GraphicsCommandList* pCmdLst2 = m_CommandListRing.GetNewCommandList();
 
     if (pSwapChain->GetDisplayMode() != DISPLAYMODE_SDR)
     {
-        // FS2 mode! Apply color conversion now.
+        // FS HDR mode! Apply color conversion now.
         //
         pCmdLst2->RSSetViewports(1, &m_viewport);
         pCmdLst2->RSSetScissorRects(1, &m_rectScissor);
@@ -842,7 +853,7 @@ void SampleRenderer::OnRender(State *pState, SwapChain *pSwapChain)
     }
     else
     {
-        // non FS2 mode, that is SDR, here we apply the tonemapping from the HDR into the swapchain and then we render the GUI
+        // non FS HDR mode, that is SDR, here we apply the tonemapping from the HDR into the swapchain and then we render the GUI
         //
 
         // Tonemapping ------------------------------------------------------------------------
@@ -871,6 +882,11 @@ void SampleRenderer::OnRender(State *pState, SwapChain *pSwapChain)
         }
     }
 
+    if (pState->m_pScreenShotName != NULL)
+    {
+        m_saveTexture.CopyRenderTargetIntoStagingTexture(m_pDevice->GetDevice(), pCmdLst2, pSwapChain->GetCurrentBackBufferResource(), D3D12_RESOURCE_STATE_RENDER_TARGET);
+    }
+
     // Transition swapchain into present mode
 
     pCmdLst2->ResourceBarrier(1, &CD3DX12_RESOURCE_BARRIER::Transition(pSwapChain->GetCurrentBackBufferResource(), D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PRESENT));
@@ -879,13 +895,19 @@ void SampleRenderer::OnRender(State *pState, SwapChain *pSwapChain)
 
     m_GPUTimer.CollectTimings(pCmdLst2);
 
-    // Close & Submit the command list ----------------------------------------------------
+    // Close & Submit the command list #2 -------------------------------------------------
     //
     ThrowIfFailed(pCmdLst2->Close());
 
     ID3D12CommandList* CmdListList2[] = { pCmdLst2 };
     m_pDevice->GetGraphicsQueue()->ExecuteCommandLists(1, CmdListList2);
 
+    if (pState->m_pScreenShotName != NULL)
+    {
+        m_saveTexture.SaveStagingTextureAsJpeg(m_pDevice->GetDevice(), m_pDevice->GetGraphicsQueue(), pState->m_pScreenShotName->c_str());
+        pState->m_pScreenShotName = NULL;
+    }
+
     // Update previous camera matrices
     //
     pState->camera.UpdatePreviousMatrices();

src/DX12/SampleRenderer.cpp

@@ -57,6 +57,8 @@ class SampleRenderer
         bool  m_isBenchmarking;
 
         bool  bDrawLightFrustum;
+
+        const std::string *m_pScreenShotName = NULL;
     };
 
     void OnCreate(Device* pDevice, SwapChain *pSwapChain);
@@ -169,4 +171,7 @@ class SampleRenderer
     WireframeBox                    m_wireframeBox;
 
     std::vector<TimeStamp>          m_TimeStamps;
+
+    SaveTexture                     m_saveTexture;
+    AsyncPool                       m_asyncPool;
 };

src/DX12/SampleRenderer.h

@@ -29,15 +29,17 @@ using namespace DirectX;
 #include "Base/Helper.h"
 #include "Base/Device.h"
 #include "Base/Texture.h"
-#include "Base/FreeSync2.h"
+#include "Base/FreeSyncHDR.h"
 #include "Base/SwapChain.h"
 #include "Base/UploadHeap.h"
+#include "Base/SaveTexture.h"
 #include "Base/UserMarkers.h"
 #include "Base/GPUTimestamps.h"
 #include "Base/CommandListRing.h"
 #include "Base/StaticBufferPool.h"
 #include "Base/DynamicBufferRing.h"
 #include "Base/ResourceViewHeaps.h"
+#include "Base/ShaderCompilerCache.h"
 #include "Base/ShaderCompilerHelper.h"
 #include "Base/StaticConstantBufferPool.h"