glTFSample v1.4.1

.gitlab-ci.yml

@@ -1,7 +1,6 @@
 variables:
   SampleName: GLTFSample
   CMakeConfig: -G "Visual Studio 16 2019" -A x64
-  CaudronMediaUrl: http://isvgit.amd.com/raguaviv/cauldron-media/-/archive/master/cauldron-media-master.zip
   GIT_SUBMODULE_STRATEGY: normal
 
 stages:
@@ -42,7 +41,6 @@ package_sample:
     - build_vk
   script:
   - copy %VULKAN_SDK%\Bin\glslc.exe bin
-  - move NOTICES.txt %SampleName%
   - echo cd .\bin\ > %SampleName%_VK.bat
   - echo start %SampleName%_VK.exe >> %SampleName%_VK.bat
   - echo cd .\bin\ > %SampleName%_DX12.bat
@@ -51,7 +49,7 @@ package_sample:
       name: "%SampleName%-%CI_COMMIT_TAG%-%CI_COMMIT_REF_NAME%-%CI_COMMIT_SHORT_SHA%"
       paths:
       - "bin/"
-      - "NOTICES.txt"
+      - "license.txt"
       - "media/cauldron-media/"
       - "%SampleName%_VK.bat"
       - "%SampleName%_DX12.bat"

.gitmodules

@@ -3,4 +3,4 @@
 	url = ../Cauldron.git
 [submodule "media/Cauldron-Media"]
 	path = media/Cauldron-Media
-	url = ../../GPUOpen-LibrariesAndSDKs/Cauldron-Media
+	url = ../Cauldron-Media.git

license.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/DX12/GLTFSample.cpp

@@ -131,7 +131,7 @@ void GLTFSample::OnCreate()
     ImGUI_Init((void *)m_windowHwnd);
     m_UIState.Initialize();
 
-    OnResize();
+    OnResize(true);
     OnUpdateDisplay();
 
     // Init Camera, looking at the origin
@@ -196,15 +196,15 @@ bool GLTFSample::OnEvent(MSG msg)
 // OnResize
 //
 //--------------------------------------------------------------------------------------
-void GLTFSample::OnResize()
+void GLTFSample::OnResize(bool resizeRender)
 {
 	// Destroy resources (if we are not minimized)
-    if (m_Width && m_Height && m_pRenderer)
+    if (resizeRender && m_Width && m_Height && m_pRenderer)
     {
         m_pRenderer->OnDestroyWindowSizeDependentResources();
         m_pRenderer->OnCreateWindowSizeDependentResources(&m_swapChain, m_Width, m_Height);
     }
-	
+
     m_camera.SetFov(AMD_PI_OVER_4, m_Width, m_Height, 0.1f, 1000.0f);
 }
 
@@ -283,7 +283,7 @@ void GLTFSample::LoadScene(int sceneIndex)
 
         // Allocate shadow information (if any)
         m_pRenderer->AllocateShadowMaps(m_pGltfLoader);
-        
+
         // set default camera
         json camera = scene["camera"];
         m_activeCamera = scene.value("activeCamera", m_activeCamera);
@@ -322,14 +322,16 @@ void GLTFSample::OnUpdate()
         io.MouseDelta.y = 0;
         io.MouseWheel = 0;
     }
-    
+
     // Update Camera
     UpdateCamera(m_camera, io);
     if (m_UIState.bUseTAA)
     {
         static uint32_t Seed;
         m_camera.SetProjectionJitter(m_Width, m_Height, Seed);
     }
+    else
+        m_camera.SetProjectionJitter(0.f, 0.f);
 
     // Keyboard & Mouse
     HandleInput(io);
@@ -347,7 +349,7 @@ void GLTFSample::OnUpdate()
 void GLTFSample::HandleInput(const ImGuiIO& io)
 {
     auto fnIsKeyTriggered = [&io](char key) { return io.KeysDown[key] && io.KeysDownDuration[key] == 0.0f; };
-    
+
     // Handle Keyboard/Mouse input here
 
     /* MAGNIFIER CONTROLS */
@@ -375,6 +377,10 @@ void GLTFSample::UpdateCamera(Camera& cam, const ImGuiIO& io)
     // Choose camera movement depending on setting
     if (m_activeCamera == 0)
     {
+        // If nothing has changed, don't calculate an update (we are getting micro changes in view causing bugs)
+        if (!io.MouseWheel && (!io.MouseDown[0] || (!io.MouseDelta.x && !io.MouseDelta.y) ))
+            return;
+
         //  Orbiting
         distance -= (float)io.MouseWheel / 3.0f;
         distance = std::max<float>(distance, 0.1f);
@@ -452,7 +458,7 @@ int WINAPI WinMain(HINSTANCE hInstance,
     LPSTR lpCmdLine,
     int nCmdShow)
 {
-    LPCSTR Name = "SampleDX12 v1.4";
+    LPCSTR Name = "SampleDX12 v1.4.1";
 
     // create new DX sample
     return RunFramework(hInstance, lpCmdLine, nCmdShow, new GLTFSample(Name));

src/DX12/GLTFSample.h

@@ -34,7 +34,7 @@ class GLTFSample : public FrameworkWindows
     void OnDestroy() override;
     void OnRender() override;
     bool OnEvent(MSG msg) override;
-    void OnResize() override;
+    void OnResize(bool resizeRender) override;
     void OnUpdateDisplay() override;
 
     void BuildUI();

src/DX12/Renderer.cpp

@@ -443,7 +443,7 @@ void Renderer::OnRender(const UIState* pState, const Camera& Cam, SwapChain* pSw
         pPerFrame->wireframeOptions.setY(pState->WireframeColor[1]);
         pPerFrame->wireframeOptions.setZ(pState->WireframeColor[2]);
         pPerFrame->wireframeOptions.setW(pState->WireframeMode == UIState::WireframeMode::WIREFRAME_MODE_SOLID_COLOR ? 1.0f : 0.0f);
-
+        pPerFrame->lodBias = 0.0f;
         m_pGLTFTexturesAndBuffers->SetPerFrameConstants();
         m_pGLTFTexturesAndBuffers->SetSkinningMatricesForSkeletons();
     }
@@ -475,8 +475,9 @@ void Renderer::OnRender(const UIState* pState, const Camera& Cam, SwapChain* pSw
             SetViewportAndScissor(pCmdLst1, 0, 0, ShadowMap->ShadowResolution, ShadowMap->ShadowResolution);
             pCmdLst1->OMSetRenderTargets(0, NULL, false, &m_ShadowMapPoolDSV.GetCPU(ShadowMap->ShadowIndex));
 
-            GltfDepthPass::per_frame* cbDepthPerFrame = m_GLTFDepth->SetPerFrameConstants();
-            cbDepthPerFrame->mViewProj = pPerFrame->lights[ShadowMap->LightIndex].mLightViewProj;
+            per_frame* cbDepthPerFrame = m_GLTFDepth->SetPerFrameConstants();
+            cbDepthPerFrame->mCameraCurrViewProj = pPerFrame->lights[ShadowMap->LightIndex].mLightViewProj;
+            cbDepthPerFrame->lodBias = 0.0f;
 
             m_GLTFDepth->Draw(pCmdLst1);
 

src/DX12/UI.cpp

@@ -234,15 +234,15 @@ void GLTFSample::BuildUI()
             {
                 if (m_fullscreenMode != PRESENTATIONMODE_WINDOWED)
                 {
-                    UpdateDisplay(m_displayModesAvailable[m_currentDisplayModeNamesIndex], m_disableLocalDimming);
+                    UpdateDisplay(m_disableLocalDimming);
                     m_previousDisplayModeNamesIndex = m_currentDisplayModeNamesIndex;
                 }
                 else if (CheckIfWindowModeHdrOn() &&
                     (m_displayModesAvailable[m_currentDisplayModeNamesIndex] == DISPLAYMODE_SDR ||
                         m_displayModesAvailable[m_currentDisplayModeNamesIndex] == DISPLAYMODE_HDR10_2084 ||
                         m_displayModesAvailable[m_currentDisplayModeNamesIndex] == DISPLAYMODE_HDR10_SCRGB))
                 {
-                    UpdateDisplay(m_displayModesAvailable[m_currentDisplayModeNamesIndex], m_disableLocalDimming);
+                    UpdateDisplay(m_disableLocalDimming);
                     m_previousDisplayModeNamesIndex = m_currentDisplayModeNamesIndex;
                 }
                 else
@@ -266,7 +266,7 @@ void GLTFSample::BuildUI()
             {
                 static bool selectedDisableLocaldimmingSetting = false;
                 if (ImGui::Checkbox("Disable Local Dimming", &selectedDisableLocaldimmingSetting))
-                    UpdateDisplay(m_displayModesAvailable[m_currentDisplayModeNamesIndex], selectedDisableLocaldimmingSetting);
+                    UpdateDisplay(selectedDisableLocaldimmingSetting);
             }
         }
 

src/VK/GLTFSample.cpp

@@ -125,7 +125,7 @@ void GLTFSample::OnCreate()
     ImGUI_Init((void *)m_windowHwnd);
     m_UIState.Initialize();
 
-    OnResize();
+    OnResize(true);
     OnUpdateDisplay();
 
     // Init Camera, looking at the origin
@@ -190,10 +190,10 @@ bool GLTFSample::OnEvent(MSG msg)
 // OnResize
 //
 //--------------------------------------------------------------------------------------
-void GLTFSample::OnResize()
+void GLTFSample::OnResize(bool resizeRender)
 {
     // destroy resources (if we are not minimized)
-    if (m_Width && m_Height && m_pRenderer)
+    if (resizeRender && m_Width && m_Height && m_pRenderer)
     {
         m_pRenderer->OnDestroyWindowSizeDependentResources();
         m_pRenderer->OnCreateWindowSizeDependentResources(&m_swapChain, m_Width, m_Height);
@@ -326,6 +326,8 @@ void GLTFSample::OnUpdate()
         static uint32_t Seed;
         m_camera.SetProjectionJitter(m_Width, m_Height, Seed);
     }
+    else
+        m_camera.SetProjectionJitter(0.f, 0.f);
 
     // Keyboard & Mouse
     HandleInput(io);
@@ -381,6 +383,10 @@ void GLTFSample::UpdateCamera(Camera& cam, const ImGuiIO& io)
     // Choose camera movement depending on setting
     if (m_activeCamera == 0)
     {
+        // If nothing has changed, don't calculate an update (we are getting micro changes in view causing bugs)
+        if (!io.MouseWheel && (!io.MouseDown[0] || (!io.MouseDelta.x && !io.MouseDelta.y)))
+            return;
+
         //  Orbiting
         distance -= (float)io.MouseWheel / 3.0f;
         distance = std::max<float>(distance, 0.1f);
@@ -459,8 +465,8 @@ int WINAPI WinMain(HINSTANCE hInstance,
     LPSTR lpCmdLine,
     int nCmdShow)
 {
-    LPCSTR Name = "SampleVK v1.4";
+    LPCSTR Name = "SampleVK v1.4.1";
 
     // create new Vulkan sample
     return RunFramework(hInstance, lpCmdLine, nCmdShow, new GLTFSample(Name));
-}
+}

src/VK/GLTFSample.h

@@ -34,7 +34,7 @@ class GLTFSample : public FrameworkWindows
     void OnDestroy() override;
     void OnRender() override;
     bool OnEvent(MSG msg) override;
-    void OnResize() override;
+    void OnResize(bool resizeRender) override;
     void OnUpdateDisplay() override;
 
     void BuildUI();

src/VK/Renderer.cpp

@@ -505,7 +505,7 @@ void Renderer::OnRender(const UIState* pState, const Camera& Cam, SwapChain* pSw
         pPerFrame->wireframeOptions.setY(pState->WireframeColor[1]);
         pPerFrame->wireframeOptions.setZ(pState->WireframeColor[2]);
         pPerFrame->wireframeOptions.setW(pState->WireframeMode == UIState::WireframeMode::WIREFRAME_MODE_SOLID_COLOR ? 1.0f : 0.0f);
-
+        pPerFrame->lodBias = 0.0f;
         m_pGLTFTexturesAndBuffers->SetPerFrameConstants();
         m_pGLTFTexturesAndBuffers->SetSkinningMatricesForSkeletons();
     }

src/VK/UI.cpp

@@ -240,15 +240,15 @@ void GLTFSample::BuildUI()
             {
                 if (m_fullscreenMode != PRESENTATIONMODE_WINDOWED)
                 {
-                    UpdateDisplay(m_displayModesAvailable[m_currentDisplayModeNamesIndex]);
+                    UpdateDisplay();
                     m_previousDisplayModeNamesIndex = m_currentDisplayModeNamesIndex;
                 }
                 else if (CheckIfWindowModeHdrOn() &&
                     (m_displayModesAvailable[m_currentDisplayModeNamesIndex] == DISPLAYMODE_SDR ||
                         m_displayModesAvailable[m_currentDisplayModeNamesIndex] == DISPLAYMODE_HDR10_2084 ||
                         m_displayModesAvailable[m_currentDisplayModeNamesIndex] == DISPLAYMODE_HDR10_SCRGB))
                 {
-                    UpdateDisplay(m_displayModesAvailable[m_currentDisplayModeNamesIndex]);
+                    UpdateDisplay();
                     m_previousDisplayModeNamesIndex = m_currentDisplayModeNamesIndex;
                 }
                 else