Browse Source

many fixes for full test suite: (#610)

* many fixes for full test suite:
- lock simulation time fix.
- fixed full test suits errors from msaa sample 1
- partially fixed deferred pipeline
- update many screenshots failures which were caused by recent skybox color space change and no msaa change

Signed-off-by: Qing Tao <[email protected]>
Qing Tao 2 years ago
parent
commit
8b89f6ed11
46 changed files with 116 additions and 88 deletions
  1. 9 7
      Gem/Code/Source/Automation/ScriptManager.cpp
  2. 8 2
      Gem/Code/Source/MeshExampleComponent.cpp
  3. 4 1
      Gem/Code/Source/MultiSceneExampleComponent.cpp
  4. 4 1
      Gem/Code/Source/MultiViewSingleSceneAuxGeomExampleComponent.cpp
  5. 1 0
      Gem/Code/Source/SkinnedMeshContainer.cpp
  6. 1 1
      Gem/Code/Source/StreamingImageExampleComponent.cpp
  7. 5 1
      Passes/PrototypeDeferredPipeline/DeferredLighting.pass
  8. 7 0
      Passes/PrototypeDeferredPipeline/DeferredOpaqueParent.pass
  9. 2 2
      scripts/ExpectedScreenshots/AutoBrick/brick.png
  10. 2 2
      scripts/ExpectedScreenshots/AutoBrick/tile.png
  11. 2 2
      scripts/ExpectedScreenshots/CullingAndLod/screenshot_1.png
  12. 2 2
      scripts/ExpectedScreenshots/DynamicMaterialTest/01_defaultsetup_A.png
  13. 2 2
      scripts/ExpectedScreenshots/DynamicMaterialTest/01_defaultsetup_B.png
  14. 2 2
      scripts/ExpectedScreenshots/DynamicMaterialTest/02_manyentities_A.png
  15. 2 2
      scripts/ExpectedScreenshots/DynamicMaterialTest/02_manyentities_B.png
  16. 2 2
      scripts/ExpectedScreenshots/LowEndPipeline/004_metalmap_LowEndPipeline.png
  17. 2 2
      scripts/ExpectedScreenshots/LowEndPipeline/009_opacity_blended_LowEndPipeline.png
  18. 2 2
      scripts/ExpectedScreenshots/MinimalPBR/minimalpbr_default.png
  19. 2 2
      scripts/ExpectedScreenshots/MinimalPBR/minimalpbr_reddielectric.png
  20. 2 2
      scripts/ExpectedScreenshots/MultiScene/Start_MultiScene2.png
  21. 2 2
      scripts/ExpectedScreenshots/SceneReloadSoakTest/screenshot.png
  22. 2 2
      scripts/ExpectedScreenshots/Skin/001_hermanubis_regression_test.png
  23. 2 2
      scripts/ExpectedScreenshots/Skin/002_wrinkle_regression_test.png
  24. 2 2
      scripts/ExpectedScreenshots/SkinnedMotionVector/MotionVector1.png
  25. 2 2
      scripts/ExpectedScreenshots/SkinnedMotionVector/MotionVector2.png
  26. 2 2
      scripts/ExpectedScreenshots/SkinnedMotionVector/MotionVector3.png
  27. 2 2
      scripts/ExpectedScreenshots/StandardPBR/001_defaultwhite.png
  28. 2 2
      scripts/ExpectedScreenshots/StandardPBR/003_metalmatte.png
  29. 2 2
      scripts/ExpectedScreenshots/StandardPBR/004_metalmap.png
  30. 2 2
      scripts/ExpectedScreenshots/StandardPBR/005_roughnessmap.png
  31. 2 2
      scripts/ExpectedScreenshots/StandardPBR/006_specularf0map.png
  32. 2 2
      scripts/ExpectedScreenshots/StandardPBR/007_multiscatteringcompensationoff.png
  33. 2 2
      scripts/ExpectedScreenshots/StandardPBR/007_multiscatteringcompensationon.png
  34. 2 2
      scripts/ExpectedScreenshots/StandardPBR/008_normalmap_bevels.png
  35. 2 2
      scripts/ExpectedScreenshots/StandardPBR/009_opacity_blended.png
  36. 2 2
      scripts/ExpectedScreenshots/StandardPBR/009_opacity_blended_alpha_affects_specular.png
  37. 2 2
      scripts/ExpectedScreenshots/StandardPBR/009_opacity_tintedtransparent.png
  38. 2 2
      scripts/ExpectedScreenshots/StandardPBR/010_bothocclusion.png
  39. 2 2
      scripts/ExpectedScreenshots/StandardPBR/010_specularocclusion.png
  40. 2 2
      scripts/ExpectedScreenshots/StandardPBR/014_clearcoat_roughnessmap.png
  41. 2 2
      scripts/ExpectedScreenshots/StandardPBR/015_subsurfacescattering.png
  42. 2 2
      scripts/ExpectedScreenshots/StandardPBR/015_subsurfacescattering_transmission.png
  43. 2 2
      scripts/ExpectedScreenshots/StandardPBR/015_subsurfacescattering_transmission_thin.png
  44. 2 2
      scripts/ExpectedScreenshots/reflectionprobe/reflectionprobevisualization.png
  45. 2 1
      scripts/PassTree.bv.lua
  46. 3 2
      scripts/SkinnedMotionVector.bv.lua

+ 9 - 7
Gem/Code/Source/Automation/ScriptManager.cpp

@@ -27,6 +27,7 @@
 #include <AzCore/Script/ScriptAsset.h>
 #include <AzCore/Math/MathReflection.h>
 #include <AzCore/Console/IConsole.h>
+#include <AzCore/Time/ITime.h>
 
 #include <AzFramework/API/ApplicationAPI.h>
 #include <AzFramework/Components/ConsoleBus.h>
@@ -1253,9 +1254,10 @@ namespace AtomSampleViewer
         {
             AZ_DEBUG_STATIC_MEMEBER(instance, s_instance);
 
-            int milliseconds = static_cast<int>(seconds * 1000);
-
-            AZ::Interface<AZ::IConsole>::Get()->PerformCommand(AZStd::string::format("t_simulationTickDeltaOverride %d", milliseconds).c_str());
+            AZ::TimeUs us = AZ::SecondsToTimeUs(seconds);
+            
+            AZ::CVarFixedString commandString = AZ::CVarFixedString::format("t_simulationTickDeltaOverride %" PRId64, static_cast<int64_t>(us));
+            AZ::Interface<AZ::IConsole>::Get()->PerformCommand(commandString.c_str());
             s_instance->m_frameTimeIsLocked = true;
         };
 
@@ -1530,7 +1532,7 @@ namespace AtomSampleViewer
                 AZ::Render::FrameCaptureRequestBus::BroadcastResult(capOutcome, &AZ::Render::FrameCaptureRequestBus::Events::CaptureScreenshot, screenshotFilePath);
                 if (!capOutcome.IsSuccess())
                 {
-                    ReportScriptError(AZStd::string::format("Failed to initiate frame capture for '%s'", screenshotFilePath.c_str()));
+                    ReportScriptError(AZStd::string::format("Failed to initiate screenshot capture for '%s: %s'", screenshotFilePath.c_str(), capOutcome.GetError().m_errorMessage.c_str()));
                     s_instance->m_isCapturePending = false;
                     s_instance->m_frameCaptureId = AZ::Render::InvalidFrameCaptureId;
                     s_instance->ResumeScript();
@@ -1589,7 +1591,7 @@ namespace AtomSampleViewer
                 AZ::Render::FrameCaptureRequestBus::BroadcastResult(capOutcome, &AZ::Render::FrameCaptureRequestBus::Events::CaptureScreenshot, screenshotFilePath);
                 if (!capOutcome.IsSuccess())
                 {
-                    ReportScriptError(AZStd::string::format("Failed to initiate frame capture for '%s'", screenshotFilePath.c_str()));
+                    ReportScriptError(AZStd::string::format("Failed to initiate screenshot capture for '%s: %s'", screenshotFilePath.c_str(), capOutcome.GetError().m_errorMessage.c_str()));
                     s_instance->m_isCapturePending = false;
                     s_instance->m_frameCaptureId = AZ::Render::InvalidFrameCaptureId;
                     s_instance->ResumeScript();
@@ -1645,7 +1647,7 @@ namespace AtomSampleViewer
                 AZ::Render::FrameCaptureRequestBus::BroadcastResult(capOutcome, &AZ::Render::FrameCaptureRequestBus::Events::CaptureScreenshotWithPreview, screenshotFilePath);
                 if (!capOutcome.IsSuccess())
                 {
-                    ReportScriptError(AZStd::string::format("Failed to initiate frame capture for '%s'", screenshotFilePath.c_str()));
+                    ReportScriptError(AZStd::string::format("Failed to initiate screenshot capture for '%s: %s'", screenshotFilePath.c_str(), capOutcome.GetError().m_errorMessage.c_str()));
                     s_instance->m_isCapturePending = false;
                     s_instance->m_frameCaptureId = AZ::Render::InvalidFrameCaptureId;
                     s_instance->ResumeScript();
@@ -1768,7 +1770,7 @@ namespace AtomSampleViewer
                 AZ::Render::FrameCaptureRequestBus::BroadcastResult(capOutcome, &AZ::Render::FrameCaptureRequestBus::Events::CapturePassAttachment, screenshotFilePath, passHierarchy, slot, readbackOption);
                 if (!capOutcome.IsSuccess())
                 {
-                    ReportScriptError(AZStd::string::format("Failed to initiate frame capture for '%s'", screenshotFilePath.c_str()));
+                    ReportScriptError(AZStd::string::format("Failed to initiate screenshot capture for '%s: %s'", screenshotFilePath.c_str(), capOutcome.GetError().m_errorMessage.c_str()));
                     s_instance->m_isCapturePending = false;
                     s_instance->m_frameCaptureId = AZ::Render::InvalidFrameCaptureId;
                     s_instance->ResumeScript();

+ 8 - 2
Gem/Code/Source/MeshExampleComponent.cpp

@@ -89,7 +89,10 @@ namespace AtomSampleViewer
         pipelineDesc.m_name = "LowEndPipeline";
         pipelineDesc.m_materialPipelineTag = "LowEndPipeline";
         pipelineDesc.m_rootPassTemplate = "LowEndPipelineTemplate";
-        pipelineDesc.m_renderSettings.m_multisampleState.m_samples = 4;
+        pipelineDesc.m_renderSettings.m_multisampleState.m_samples = 1;
+        SampleComponentManagerRequestBus::BroadcastResult(
+            pipelineDesc.m_renderSettings.m_multisampleState.m_samples,
+            &SampleComponentManagerRequests::GetNumMSAASamples);
 
         m_lowEndPipeline = AZ::RPI::RenderPipeline::CreateRenderPipelineForWindow(pipelineDesc, *m_windowContext);
     }
@@ -106,7 +109,10 @@ namespace AtomSampleViewer
         pipelineDesc.m_name = "DeferredPipeline";
         pipelineDesc.m_materialPipelineTag = "DeferredPipeline";
         pipelineDesc.m_rootPassTemplate = "DeferredPipelineTemplate";
-        pipelineDesc.m_renderSettings.m_multisampleState.m_samples = 4;
+        pipelineDesc.m_renderSettings.m_multisampleState.m_samples = 1;
+        SampleComponentManagerRequestBus::BroadcastResult(
+            pipelineDesc.m_renderSettings.m_multisampleState.m_samples,
+            &SampleComponentManagerRequests::GetNumMSAASamples);
         pipelineDesc.m_allowModification = true; // MainPipeline allows modifications, so the DeferredPipeline must as well, to get a consistent result.
 
         m_deferredPipeline = AZ::RPI::RenderPipeline::CreateRenderPipelineForWindow(pipelineDesc, *m_windowContext);

+ 4 - 1
Gem/Code/Source/MultiSceneExampleComponent.cpp

@@ -96,7 +96,10 @@ namespace AtomSampleViewer
         pipelineDesc.m_mainViewTagName = "MainCamera";       // Surface shaders render to the "MainCamera" tag
         pipelineDesc.m_name = "SecondPipeline";              // Sets the debug name for this pipeline
         pipelineDesc.m_rootPassTemplate = "MainPipeline";    // References a template in AtomSampleViewer\Passes\MainPipeline.pass
-        pipelineDesc.m_renderSettings.m_multisampleState.m_samples = 4;
+        pipelineDesc.m_renderSettings.m_multisampleState.m_samples = 1;
+        SampleComponentManagerRequestBus::BroadcastResult(
+            pipelineDesc.m_renderSettings.m_multisampleState.m_samples,
+            &SampleComponentManagerRequests::GetNumMSAASamples);
         pipelineDesc.m_allowModification = true;
         m_pipeline = RPI::RenderPipeline::CreateRenderPipelineForWindow(pipelineDesc, *m_windowContext);
 

+ 4 - 1
Gem/Code/Source/MultiViewSingleSceneAuxGeomExampleComponent.cpp

@@ -75,7 +75,10 @@ namespace AtomSampleViewer
             pipelineDesc.m_mainViewTagName = "MainCamera";          //Surface shaders render to the "MainCamera" tag
             pipelineDesc.m_name = "SecondPipeline";                 //Sets the debug name for this pipeline
             pipelineDesc.m_rootPassTemplate = "MainPipeline";    //References a template in AtomSampleViewer\Passes\PassTemplates.azasset
-            pipelineDesc.m_renderSettings.m_multisampleState.m_samples = 4;
+            pipelineDesc.m_renderSettings.m_multisampleState.m_samples = 1;
+            SampleComponentManagerRequestBus::BroadcastResult(
+                pipelineDesc.m_renderSettings.m_multisampleState.m_samples,
+                &SampleComponentManagerRequests::GetNumMSAASamples);
             m_pipeline = AZ::RPI::RenderPipeline::CreateRenderPipelineForWindow(pipelineDesc, *m_windowContext);
 
             scene->AddRenderPipeline(m_pipeline);

+ 1 - 0
Gem/Code/Source/SkinnedMeshContainer.cpp

@@ -175,6 +175,7 @@ namespace AtomSampleViewer
                 AZ::Render::MeshHandleDescriptor meshDescriptor;
                 meshDescriptor.m_modelAsset = renderData.m_skinnedMeshInstance->m_model->GetModelAsset();
                 meshDescriptor.m_isRayTracingEnabled = false;
+                meshDescriptor.m_isAlwaysDynamic = true;
                 renderData.m_meshHandle =
                     AZStd::make_shared<AZ::Render::MeshFeatureProcessorInterface::MeshHandle>(m_meshFeatureProcessor->AcquireMesh(
                         meshDescriptor, materialOverrideInstance));

+ 1 - 1
Gem/Code/Source/StreamingImageExampleComponent.cpp

@@ -345,7 +345,7 @@ namespace AtomSampleViewer
         }
 
         // only need to set the image the first time all images were streamed
-        if (m_streamingImageEnd == 0 && numStreamed == m_numImageCreated && m_numImageCreated > 0)
+        if (m_streamingImageEnd == 0 && numStreamed == m_numImageCreated && m_numImageCreated > 0 && m_numImageAssetQueued == m_numImageCreated)
         {
             m_streamingImageEnd = AZStd::GetTimeUTCMilliSecond();
             for (auto& imageInfo : m_images)

+ 5 - 1
Passes/PrototypeDeferredPipeline/DeferredLighting.pass

@@ -183,7 +183,11 @@
                     },
                     "ImageDescriptor": {
                         "Format": "R16G16B16A16_FLOAT",
-                        "SharedQueueMask": "Graphics"
+                        "SharedQueueMask": "Graphics",
+                        "BindFlags": [
+                            "ShaderReadWrite",
+                            "Color"
+                        ]
                     }
                 },
                 {

+ 7 - 0
Passes/PrototypeDeferredPipeline/DeferredOpaqueParent.pass

@@ -246,6 +246,13 @@
                                 "Attachment": "DepthStencilInputOutput"
                             }
                         },
+                        {
+                            "LocalSlot": "DepthLinear",
+                            "AttachmentRef": {
+                                "Pass": "Parent",
+                                "Attachment": "DepthLinear"
+                            }
+                        },
                         {
                             "LocalSlot": "SpecularInputOutput",
                             "AttachmentRef": {

+ 2 - 2
scripts/ExpectedScreenshots/AutoBrick/brick.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c5e9a7762179cd606bcc7de11145eabca7c8bb170be38f9da0015fb20c839448
-size 519781
+oid sha256:48a08db7327138468c560bf2703d8f07fd5e66797abeff6447c80c7a3c25a09a
+size 518187

+ 2 - 2
scripts/ExpectedScreenshots/AutoBrick/tile.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eead082956eca7e0357fa41855088580dde6a0911812c5e0844d7414d49f386b
-size 407789
+oid sha256:9989e61d809f6dc828613de8460d5221b896793b08bdf8ccb729bdc18e31aa19
+size 406058

+ 2 - 2
scripts/ExpectedScreenshots/CullingAndLod/screenshot_1.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:edc17bda01574c8698fbe52f29f8860491100f549cbfcea30d8cc69f807f3dac
-size 93447
+oid sha256:da6cd283f9bace78e0d5e7f131c6d5d54a74cf48e20b8d88c7fd3da4e3fb6e31
+size 88224

+ 2 - 2
scripts/ExpectedScreenshots/DynamicMaterialTest/01_defaultsetup_A.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c0e5b212f7cbb5b9463d93527bf025ef76c519d5787aa4653c3d520e52af107
-size 1440579
+oid sha256:b819a91629e4fd09b3bcf5b9306dc1dcd9854d77d763b930ef58920bd22cbbe0
+size 1434534

+ 2 - 2
scripts/ExpectedScreenshots/DynamicMaterialTest/01_defaultsetup_B.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:653cd48aad01f0d40f13064d64ed4915a19fac749ac2d3eb8e14e544dc689066
-size 1442217
+oid sha256:3a7d614d86a43a19555b4d3c513488373b3ff77375ce7f72c56ab4f322ac9193
+size 1435965

+ 2 - 2
scripts/ExpectedScreenshots/DynamicMaterialTest/02_manyentities_A.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:43390a7d38fdfa310ca4e6e84bad064091f399fc2d72aec8fd3a41b6bd4e4988
-size 1596789
+oid sha256:99b8565a3154f8f59925d7a34822f97f3b18e29290b9e5eb366f11d72953b333
+size 1581598

+ 2 - 2
scripts/ExpectedScreenshots/DynamicMaterialTest/02_manyentities_B.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f7f2e95c029a19b3810c7d4cab5f96a662ad757d2b9e6604406ca0e22940f53
-size 1598881
+oid sha256:26abb923cbd0941930bc091f739633db1a3d8f01f63183d2b745b56cb303931e
+size 1584100

+ 2 - 2
scripts/ExpectedScreenshots/LowEndPipeline/004_metalmap_LowEndPipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:194afd9cfc62ebc9b6250900df928875606518cbee3ff3bcb8d40d1c4fcbd737
-size 593329
+oid sha256:37a104462a39d1aacbdd364ffa56553e27d8d3fef1b0768ac672fcc09b63d704
+size 586649

+ 2 - 2
scripts/ExpectedScreenshots/LowEndPipeline/009_opacity_blended_LowEndPipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a18459cd90b586a834c548bcfef40848f2ffeaeb5e7bc59c35bcea555a55b57
-size 1091433
+oid sha256:78b82d39cd790d6bc028f9af30348569051aacce5a1babf72cc1595529e748d6
+size 1073747

+ 2 - 2
scripts/ExpectedScreenshots/MinimalPBR/minimalpbr_default.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1741b9be431bbed90722402d40ec79caa3ffe8299c3ee8b23cc05e5f2132a988
-size 541478
+oid sha256:49b6083e075a51ca5d00f2b384e17336ac1609220284403126fa1edc3525e204
+size 533271

+ 2 - 2
scripts/ExpectedScreenshots/MinimalPBR/minimalpbr_reddielectric.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a88b35e2525f62eb013d08524a8785ccfc12ba162957c9a4213a62915e8c45a
-size 602864
+oid sha256:26646e718ebef49093fe4d7d1f7889854b68fe1a250b472441ad97c502b19de0
+size 592662

+ 2 - 2
scripts/ExpectedScreenshots/MultiScene/Start_MultiScene2.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:09bd1e5aa45393b1d600f1fa02c45fefa594ff11373326252f0a570c124385b3
-size 243854
+oid sha256:77e0949401ba2444aefdd5fd9bd356e2747f8db71ac300b4f87a900105db7f63
+size 244520

+ 2 - 2
scripts/ExpectedScreenshots/SceneReloadSoakTest/screenshot.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa4d30615e9b69e80721919d9bd82763b2ae282fa6af05c13265bd19c04ef168
-size 318225
+oid sha256:e66224d108d4bac2799eec88ce56b05efd39393a80036558e0498b491706c739
+size 306007

+ 2 - 2
scripts/ExpectedScreenshots/Skin/001_hermanubis_regression_test.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:215e391dd3dd85bf85ad85405d3ec6a1756e682543c0cc431164f35649a88595
-size 553612
+oid sha256:8369a7d2af98786fb308f2afab760242647838585dc7f239cf2c2300469d2794
+size 548563

+ 2 - 2
scripts/ExpectedScreenshots/Skin/002_wrinkle_regression_test.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bbdfb51d0751cf30e52e44aefaee35ecc6ab181cfb70af817e0bc29559f811e9
-size 945820
+oid sha256:6a844eb5b8e3fa43c7a346bf3a7e412a8a695068a4c023ba466dd7e48bbb314a
+size 936287

+ 2 - 2
scripts/ExpectedScreenshots/SkinnedMotionVector/MotionVector1.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a59007c0fe7961cab72173b488fd2ad176d8891435d16185c575c38f61abe5f8
-size 225546
+oid sha256:5404f12028f00afc6e1c94e8af703f8e5f30781d55f3c2f36d93c7dfbf08e485
+size 213637

+ 2 - 2
scripts/ExpectedScreenshots/SkinnedMotionVector/MotionVector2.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:015adb46eb3051f8d2d402cbe75b7b49ea10a6340a59e2cca009eb5be61dfa0f
-size 435106
+oid sha256:cd8b51471bd3de4075798973121c51111fbb9ca0d3117bb2ce1bb411f3edd845
+size 437300

+ 2 - 2
scripts/ExpectedScreenshots/SkinnedMotionVector/MotionVector3.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:411ea897c6cef2c75ad8c2a002584f2ffe18b1f8f91d971f9c77d4797b1bc112
-size 564558
+oid sha256:ba2a5f2f5aa4fcabe24f2c9c8d089183217c248f7e6314ad25f5d884c74fd790
+size 558993

+ 2 - 2
scripts/ExpectedScreenshots/StandardPBR/001_defaultwhite.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46330c971bc5a275a4c2f096055f56a35d2aad0b3b751a9c8410cf70d0aa4ba9
-size 542152
+oid sha256:f81112fec5320cf0e14227f5dd3e2a572fb85c0aa8813be031c8051a173336a8
+size 532946

+ 2 - 2
scripts/ExpectedScreenshots/StandardPBR/003_metalmatte.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eff85fdd7282e60cad8bfe40e8856125b7f9462fdfc523695806277e5cd2bb8d
-size 603562
+oid sha256:66909c24f4da80cb0f41cf4de2fc44a2feeda3fc8301db11309120f5ae52c386
+size 602208

+ 2 - 2
scripts/ExpectedScreenshots/StandardPBR/004_metalmap.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:67d4c33a739477231f18e5f87d11a8e3e166cddb970bb1ab2118d73056dc3122
-size 646748
+oid sha256:f877d4c40e2c79cfc4041f67d68032d4a4185d71080cf382fbb8bd06a8f6fdba
+size 645017

+ 2 - 2
scripts/ExpectedScreenshots/StandardPBR/005_roughnessmap.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a63867e7603597196bd52f6a3b79d1c17e26894936e8de21d7b00ecc8c366ee
-size 642528
+oid sha256:05ec0ca512117db48beef1fcae37e68fc5320d1d52eac636b356b4f80c278197
+size 640928

+ 2 - 2
scripts/ExpectedScreenshots/StandardPBR/006_specularf0map.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4cd167a21975b3456e1512eca39f286b39910f572aec39f1159cee1fa9079f4d
-size 666266
+oid sha256:e7d98423a7d595468fcd25454978f033f25a2a8f34bde4eadaf51c95ce1e53c4
+size 664824

+ 2 - 2
scripts/ExpectedScreenshots/StandardPBR/007_multiscatteringcompensationoff.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bebf849af693c34d24d3527d0756570ad4faed63ddfc39a8d8951f52fa84e8e3
-size 497649
+oid sha256:2c4d7ac7bb28bdfc47cd356b9163dec11941fff5a737cf9c4cf2959859d7e175
+size 486307

+ 2 - 2
scripts/ExpectedScreenshots/StandardPBR/007_multiscatteringcompensationon.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbf96232542b3a0a031d084d05641314a35e99ca0822f470b45b47e32b3de599
-size 557802
+oid sha256:f560a0cc9dbb78235449a52c06955ffc6215cc78d94b033b6da7a25e61215e25
+size 546205

+ 2 - 2
scripts/ExpectedScreenshots/StandardPBR/008_normalmap_bevels.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:054f6a4783f66bc4ab395bfca577aa6f917ca4201a8fbc660418227a2233ab90
-size 672110
+oid sha256:d1e34f64f1e0e844c14734c7aa0c1a107476fd6c957b4ee187bb8f5e1be1c9e5
+size 670352

+ 2 - 2
scripts/ExpectedScreenshots/StandardPBR/009_opacity_blended.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a18459cd90b586a834c548bcfef40848f2ffeaeb5e7bc59c35bcea555a55b57
-size 1091433
+oid sha256:78b82d39cd790d6bc028f9af30348569051aacce5a1babf72cc1595529e748d6
+size 1073747

+ 2 - 2
scripts/ExpectedScreenshots/StandardPBR/009_opacity_blended_alpha_affects_specular.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e8515ee8f66733f76148f517c07304e1ba43a5efb7d66c11fb97885454418a3
-size 1095943
+oid sha256:680a2c0a869bcfdb2cc24284dfc2454e46b386c39979c3fff7946fbeb2e10868
+size 1078106

+ 2 - 2
scripts/ExpectedScreenshots/StandardPBR/009_opacity_tintedtransparent.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5377d617e2d60dc8aa398ee7fc9a8b38a3a10d429d322ad27ca7d9e8a4a6668d
-size 955715
+oid sha256:3c5e213d363af5420911182d599dda01a53f00de40f893b12221c08740176653
+size 941602

+ 2 - 2
scripts/ExpectedScreenshots/StandardPBR/010_bothocclusion.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:270a109319af574970b7029605aec40c163e66b2ef46a99aaba625f1ef4fafee
-size 1153839
+oid sha256:8cca5719a4952f5e69b2f04311543aab91f5c7d283b32674875648e0066ae6c0
+size 1150643

+ 2 - 2
scripts/ExpectedScreenshots/StandardPBR/010_specularocclusion.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c7822e94b4427ea6b411d51b8907661100fc2bbf0d126dae69d9a449e422b486
-size 1113742
+oid sha256:ac27e8859b7dcf05fdcf53fb0c764fe79a49d515765c50d48af84c5d2fca4cb0
+size 1110465

+ 2 - 2
scripts/ExpectedScreenshots/StandardPBR/014_clearcoat_roughnessmap.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c965f186fa7b01752efecfcb95a6d30c510948007b48456d182447544d501c3f
-size 1133114
+oid sha256:02322fc1f677f3cf09282b40aa4883ebd8c155d6b1262f47ee3279525ee34db1
+size 1122574

+ 2 - 2
scripts/ExpectedScreenshots/StandardPBR/015_subsurfacescattering.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e05b226034138c5bd0323c6146c194db044fdc501949e46a422bdc31a7d24116
-size 745824
+oid sha256:e4985f57cb348f7ab07f17b94348b4799bc82f83e584b574d9cecb04dcc7c1a2
+size 735078

+ 2 - 2
scripts/ExpectedScreenshots/StandardPBR/015_subsurfacescattering_transmission.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de833a3e3729710fd05e55551a84ff98ff30dad560a51be1f9c46fc092862bcd
-size 792354
+oid sha256:af0d7018824a9cf8c1860bb2efca2f2915cc5ec867ef3716520eed2cf3e59804
+size 785639

+ 2 - 2
scripts/ExpectedScreenshots/StandardPBR/015_subsurfacescattering_transmission_thin.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab96a407acdb2c361c1d8442b6e1f93931842515190c9f3a55de006b3ab78c78
-size 650099
+oid sha256:731a17b298a657a0c2c83002dca829faa97db844e71a424f3cb1d01903f398c7
+size 545532

+ 2 - 2
scripts/ExpectedScreenshots/reflectionprobe/reflectionprobevisualization.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a526417abcc5d46d3226c07e4bae4cce605329ef39c7c203a4963c4522114718
-size 1252989
+oid sha256:9fa4559222459e5cddebebd0700136dc4efc6b5902c739a54b425961025ab96a
+size 1301241

+ 2 - 1
scripts/PassTree.bv.lua

@@ -48,10 +48,11 @@ SetImguiValue('Show Pass Attachments', true)
 SetImguiValue('Preview Attachment', true)
 
 SetShowImGui(false)
+
 -- capture image attachment previews and capture them for different formats
 TestAttachment('Forward/[InputOutput] [DepthStencilInputOutput] [Image] DepthStencil [D32_FLOAT_S8X24_UINT] [800x600]', 'depth.png')
 TestAttachment('Forward/[Output] [AlbedoOutput] [Image] AlbedoImage [R8G8B8A8_UNORM] [800x600]', 'albedo.png')
-TestAttachment('Forward/[Output] [Image] DiffuseOutput [R16G16B16A16_FLOAT] [800x600]', 'diffuse.png')
+TestAttachment('Forward/[Output] [DiffuseOutput] [Image] DiffuseImage [R16G16B16A16_FLOAT] [800x600]', 'diffuse.png')
 TestAttachment('DepthDownsample/[Input] [FullResDepth] [Image] LinearDepth [R32_FLOAT] [800x600]', 'linearDepth.png')
 TestAttachment('Forward/[Input] [BRDFTextureInput] [Image] BRDFTexture [R16G16_FLOAT] [256x256]', 'brdf.png')
 --Root/RPISamplePipeline/

+ 3 - 2
scripts/SkinnedMotionVector.bv.lua

@@ -36,11 +36,12 @@ SetImguiValue('MeshMotionVectorPass/[InputOutput] [MotionInputOutput] [Image] Ca
 IdleFrames(1) -- Wait one frame to apply imgui change
 
 -- We need to lock the frame time to get deterministic timing of the screenshots for consistency between runs
-LockFrameTime(1/30)
-IdleFrames(1)
+LockFrameTime(1/100)
 
 SetShowImGui(false)
 
+IdleFrames(1)
+
 -- capture image attachment previews at different points in the animation
 TestDelayedCapture(0.2, 'MotionVector1.png')
 TestDelayedCapture(1.5, 'MotionVector2.png')