glTFSample v1.3

GPUOpen-LibrariesAndSDKs · Nov 24, 2020 · 11f4bc7 · 11f4bc7
1 parent e055500
commit 11f4bc7
Show file tree

Hide file tree

Showing 14 changed files with 369 additions and 635 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,4 +4,3 @@
 [submodule "media/Cauldron-Media"]
 	path = media/Cauldron-Media
 	url = ../../GPUOpen-LibrariesAndSDKs/Cauldron-Media
-
diff --git a/libs/cauldron b/libs/cauldron
diff --git a/media/Cauldron-Media b/media/Cauldron-Media
diff --git a/src/Common/GLTFSample.json b/src/Common/GLTFSample.json
@@ -10,7 +10,7 @@
     "stablePowerState": false
   },
   "scenes": [
-    {
+  {
       "name": "Sponza",
       "directory": "..\\media\\cauldron-media\\sponza\\GLTF\\",
       "filename": "sponza.gltf",

diff --git a/src/DX12/GLTFSample.cpp b/src/DX12/GLTFSample.cpp
@@ -1,6 +1,6 @@
 // AMD SampleDX12 sample code
 // 
-// Copyright(c) 2018 Advanced Micro Devices, Inc.All rights reserved.
+// Copyright(c) 2020 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
 // in the Software without restriction, including without limitation the rights
@@ -238,7 +238,7 @@ void GLTFSample::OnResize(uint32_t width, uint32_t height, DisplayModes displayM
         //
         m_device.GPUFlush();
 
-        // destroy resources (if were not minimized)
+        // destroy resources (if we are not minimized)
         //
         if (m_Width > 0 && m_Height > 0)
         {
@@ -395,7 +395,7 @@ void GLTFSample::BuildUI()
     }
 
     ImGui::SliderFloat("exposure", &m_state.exposure, 0.0f, 4.0f);
-    ImGui::SliderFloat("emmisive", &m_state.emmisiveFactor, 1.0f, 1000.0f, NULL, 1.0f);
+    ImGui::SliderFloat("emissive", &m_state.emmisiveFactor, 1.0f, 1000.0f, NULL, 1.0f);
     ImGui::SliderFloat("iblFactor", &m_state.iblFactor, 0.0f, 3.0f);
     for (int i = 0; i < m_pGltfLoader->m_lights.size(); i++)
     {
@@ -616,7 +616,7 @@ int WINAPI WinMain(HINSTANCE hInstance,
     LPSTR lpCmdLine,
     int nCmdShow)
 {
-    LPCSTR Name = "SampleDX12 v1.0";
+    LPCSTR Name = "SampleDX12 v1.3";
 
     // create new DX sample
     return RunFramework(hInstance, lpCmdLine, nCmdShow, new GLTFSample(Name));

diff --git a/src/DX12/GLTFSample.h b/src/DX12/GLTFSample.h
@@ -1,6 +1,6 @@
 // AMD SampleDX12 sample code
 // 
-// Copyright(c) 2017 Advanced Micro Devices, Inc.All rights reserved.
+// Copyright(c) 2020 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
 // in the Software without restriction, including without limitation the rights

diff --git a/src/DX12/SampleRenderer.cpp b/src/DX12/SampleRenderer.cpp
diff --git a/src/DX12/SampleRenderer.h b/src/DX12/SampleRenderer.h
@@ -1,6 +1,6 @@
 // AMD SampleDX12 sample code
 // 
-// Copyright(c) 2018 Advanced Micro Devices, Inc.All rights reserved.
+// Copyright(c) 2020 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
 // in the Software without restriction, including without limitation the rights
@@ -17,6 +17,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 #pragma once
+#include "base/GBuffer.h"
 
 // We are queuing (backBufferCount + 0.5) frames, so we need to triple buffer the resources that get modified each frame
 static const int backBufferCount = 3;
@@ -98,7 +99,6 @@ class SampleRenderer
     GltfPbrPass                    *m_gltfPBR;
     GltfBBoxPass                   *m_gltfBBox;
     GltfDepthPass                  *m_gltfDepth;
-    GltfMotionVectorsPass          *m_gltfMotionVectors;
     GLTFTexturesAndBuffers         *m_pGLTFTexturesAndBuffers;
 
     // effects
@@ -109,39 +109,19 @@ class SampleRenderer
     ToneMapping                     m_toneMappingPS;
     ToneMappingCS                   m_toneMappingCS;
     ColorConversionPS               m_colorConversionPS;
-    Sharpen                         m_sharpen;
-    TAA                             m_taa;
+    TAA                             m_TAA;
 
     // GUI
     ImGUI                           m_ImGUI;
 
     // Temporary render targets
+    GBuffer                         m_GBuffer;
+    GBufferRenderPass               m_renderPassFullGBuffer;
+    GBufferRenderPass               m_renderPassJustDepthAndHdr;
 
-    // depth buffer
-    Texture                         m_depthBuffer;
-    DSV                             m_depthBufferDSV;
-
-    // Motion Vectors resources
     Texture                         m_MotionVectorsDepthMap;
     DSV                             m_MotionVectorsDepthMapDSV;
     CBV_SRV_UAV                     m_MotionVectorsDepthMapSRV;
-    Texture                         m_MotionVectors;
-    RTV                             m_MotionVectorsRTV;
-    CBV_SRV_UAV                     m_MotionVectorsSRV;
-    CBV_SRV_UAV                     m_MotionVectorsInputsSRV;
-
-    // TAA buffer
-    Texture                         m_TAABuffer;
-    CBV_SRV_UAV                     m_TAABufferSRV;
-    CBV_SRV_UAV                     m_TAABufferUAV;
-    CBV_SRV_UAV                     m_TAAInputsSRV;
-    Texture                         m_HistoryBuffer;
-    RTV                             m_HistoryBufferRTV;
-
-    // Normal buffer
-    Texture                         m_NormalBuffer;
-    RTV                             m_NormalBufferRTV;
-    CBV_SRV_UAV                     m_NormalBufferSRV;
 
 #if USE_SHADOWMASK
     // shadow mask
@@ -156,16 +136,6 @@ class SampleRenderer
     DSV                             m_ShadowMapDSV;
     CBV_SRV_UAV                     m_ShadowMapSRV;
 
-    // MSAA RT
-    Texture                         m_HDRMSAA;
-    RTV                             m_HDRRTVMSAA;
-
-    // Resolved RT
-    Texture                         m_HDR;
-    CBV_SRV_UAV                     m_HDRSRV;
-    CBV_SRV_UAV                     m_HDRUAV;
-    RTV                             m_HDRRTV;
-
     // widgets
     Wireframe                       m_wireframe;
     WireframeBox                    m_wireframeBox;

diff --git a/src/DX12/stdafx.h b/src/DX12/stdafx.h
@@ -56,7 +56,6 @@ using namespace DirectX;
 #include "PostProc/TAA.h"
 #include "PostProc/Bloom.h"
 #include "PostProc/BlurPS.h"
-#include "PostProc/Sharpen.h"
 #include "PostProc/SkyDome.h"
 #include "PostProc/SkyDomeProc.h"
 #include "PostProc/PostProcCS.h"

diff --git a/src/VK/GLTFSample.cpp b/src/VK/GLTFSample.cpp
@@ -1,6 +1,6 @@
 // AMD SampleVK sample code
 // 
-// Copyright(c) 2018 Advanced Micro Devices, Inc.All rights reserved.
+// Copyright(c) 2020 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
 // in the Software without restriction, including without limitation the rights
@@ -144,7 +144,7 @@ void GLTFSample::OnCreate(HWND hWnd)
 
     // init GUI state
     m_state.toneMapper = 0;
-    m_state.m_useTAA = false; // no TAA in VK
+    m_state.m_useTAA = true;
     m_state.skyDomeType = 0;
     m_state.exposure = 1.0f;
     m_state.iblFactor = 2.0f;
@@ -391,7 +391,7 @@ void GLTFSample::BuildUI()
     }
 
     ImGui::SliderFloat("exposure", &m_state.exposure, 0.0f, 4.0f);
-    ImGui::SliderFloat("emmisive", &m_state.emmisiveFactor, 1.0f, 1000.0f, NULL, 1.0f);
+    ImGui::SliderFloat("emissive", &m_state.emmisiveFactor, 1.0f, 1000.0f, NULL, 1.0f);
     ImGui::SliderFloat("iblFactor", &m_state.iblFactor, 0.0f, 3.0f);
     for (int i = 0; i < m_pGltfLoader->m_lights.size(); i++)
     {
@@ -409,6 +409,7 @@ void GLTFSample::BuildUI()
         m_activeCamera = 0;
     ImGui::Combo("Camera", &m_activeCamera, cameraControl, min((int)(m_pGltfLoader->m_cameras.size() + 2), _countof(cameraControl)));
 
+    ImGui::Checkbox("TAA", &m_state.m_useTAA);
     ImGui::Checkbox("Show Bounding Boxes", &m_state.bDrawBoundingBoxes);
     ImGui::Checkbox("Show Light Frustum", &m_state.bDrawLightFrustum);
 
@@ -419,7 +420,7 @@ void GLTFSample::BuildUI()
         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("FreeSync HDR"))
     {
@@ -631,7 +632,7 @@ int WINAPI WinMain(HINSTANCE hInstance,
     LPSTR lpCmdLine,
     int nCmdShow)
 {
-    LPCSTR Name = "SampleVK v1.0";
+    LPCSTR Name = "SampleVK v1.3";
 
     // create new Vulkan sample
     return RunFramework(hInstance, lpCmdLine, nCmdShow, new GLTFSample(Name));

diff --git a/src/VK/GLTFSample.h b/src/VK/GLTFSample.h
@@ -1,6 +1,6 @@
 // AMD SampleVK sample code
 // 
-// Copyright(c) 2018 Advanced Micro Devices, Inc.All rights reserved.
+// Copyright(c) 2020 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
 // in the Software without restriction, including without limitation the rights
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,3 @@
		[submodule "media/Cauldron-Media"]
		path = media/Cauldron-Media
		url = ../../GPUOpen-LibrariesAndSDKs/Cauldron-Media