Merge branch 'development' into Atom/santorac/PortToMaterialPipeline

Signed-off-by: gadams3 <[email protected]>

# Conflicts:
#	Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_basic_deferredpipeline.png
#	Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_enhanced_deferredpipeline.png
#	Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_enhanced_pdo_deferredpipeline.png
#	Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_enhanced_tintedtransparent_lowendpipeline.png
#	Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_enhanced_transparent_lowendpipeline.png
#	Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_deferredpipeline.png
#	Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_pdo_deferredpipeline.png
#	Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_tintedtransparent_lowendpipeline.png
#	Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_transparent_deferredpipeline.png
#	Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_transparent_lowendpipeline.png

Gem/Code/Source/SampleComponentManager.cpp

@@ -1808,8 +1808,10 @@ namespace AtomSampleViewer
     {
         if (m_rpiScene)
         {
-            RPI::RPISystemInterface::Get()->UnregisterScene(m_rpiScene);
+            m_xrPipelines.clear();
+            m_renderPipeline = nullptr;
 
+            RPI::RPISystemInterface::Get()->UnregisterScene(m_rpiScene);
             auto sceneSystem = AzFramework::SceneSystemInterface::Get();
             AZ_Assert(sceneSystem, "Scene system was destroyed before SampleComponentManager was able to unregister the RPI scene.");
             AZStd::shared_ptr<AzFramework::Scene> scene = sceneSystem->GetScene(AzFramework::Scene::MainSceneName);
@@ -1817,7 +1819,6 @@ namespace AtomSampleViewer
             [[maybe_unused]] bool result = scene->UnsetSubsystem(m_rpiScene);
             AZ_Assert(result, "SampleComponentManager failed to unregister its RPI scene from the general scene.");
             
-            m_xrPipelines.clear();
             m_rpiScene = nullptr;
         }
     }

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_basic_deferredpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e9117ca1a5c88e9424d43099418d226e27713da1bd22b966432a6b64451408e
-size 905664
+oid sha256:82d64d9374ec3f619729efe1de9382a5997659e2229135469b31d917a3bf213e
+size 926124

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_basic_lowendpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8eaea4ad5b162e1eeb125075bc8cf8a15d679f36055f517b3e05b2ac001cd9c2
-size 890087
+oid sha256:89ce4e7142550663795c6c9f8c28cf7d425df55b039aba68361f80cd39fceacf
+size 890634

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_basic_mainpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b22f61fb685178ad4406b24326fbd2fa9cd9fe4a490929c44e3e120af92c0b1
-size 919921
+oid sha256:b9ef21188d9b019b713ce57d611e4e18e53d2d5a3766eecfeb1b6c0d97ffdb4a
+size 920640

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_enhanced_cutout_mainpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:48122ca9531d6d1c0b7fc18b729a78ae2d3e7cbfc6b9dcd38b7987845c315762
-size 862520
+oid sha256:29f44383c6567a5105a9854d2a27d7dab56277c36ce7363e2be5afb2e204bc7b
+size 881624

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_enhanced_deferredpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3cff2c984170a7a9c0e6f0b69bb224c8392240a8eea2d02282e6913d4f5d380f
-size 898747
+oid sha256:b390dda8522930f9069589dfe99c279c7f5e0cb63db5d82a9fed486b3915ba9f
+size 986670

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_enhanced_lowendpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed0228ee230c7bc8656d0e013908c912c3eed68337f860eea4a6342877b6dd62
-size 904115
+oid sha256:6003f4476133fd8ddf0d22684f88eaf9629262d66a3d1f8a0ab11607a872c595
+size 976230

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_enhanced_mainpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9751c238d79aea21f8d4eaac1edd7f64404aacf95d1d761ab5191838b97052db
-size 743132
+oid sha256:eab731738b4d33011f0e2df308b2bebb93b2ef405d54c80ed4c852cfc539234c
+size 775809

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_enhanced_pdo_deferredpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be2c398d46b9116be9c9683867e64019b2326fe13e7dff6fac1281c95521d396
-size 926207
+oid sha256:a119a051f0c1573c4b8d8956e08ef84a4ea3fb5e73f741be6f10a831bee35cd9
+size 971969

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_enhanced_pdo_lowendpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:72f0b742fb58ea1f2241a2c065937b639fc122fb792dd4d20cdfdb58e3da14e2
-size 927980
+oid sha256:1b8a885e5d2b28713e5a08189523a93f066bf17b3462f7bd68ae9dd81f291159
+size 969013

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_enhanced_pdo_mainpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aab56816cc12f9c64b3a95f75d91f09c697fd8dd14fd449a8dd13d5476e82246
-size 936598
+oid sha256:1a31cb040a017fc5291a8b099c589463b0b63ffc36bdc00c2230bb94a6640c39
+size 971845

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_enhanced_tintedtransparent_lowendpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b590b90ee55cd08bdea61943f562c116315cc7652d16de4d931d28c0b5d24706
-size 1005290
+oid sha256:423a0acd4789d43d2bc53b8e1a21fef87b4f6af78c32606e998aa8c36729d10b
+size 1127398

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_enhanced_tintedtransparent_mainpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e89ad4bd9cefb835f37356a76d19da9eaef9bae642a6915be95b58796a347eea
-size 1040615
+oid sha256:c42e20aec02da8c19bcf119cd350f7269cb957df935f5144429a802922c78cdd
+size 1110428

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_enhanced_transparent_lowendpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0e8175257391e9aa4d8b4015fbe85cb36b02f0a0ef7f271b6cca824d08b783f
-size 979318
+oid sha256:809601de9f668db783befdcc9d8058134d0f3b281890fdb8bf12ce7db607545e
+size 1093790

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_enhanced_transparent_mainpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:98cdfa1835da4655629d84b48662defbdc17ca2eda77a5128100a7a934a48df0
-size 1016292
+oid sha256:43f75c4354939a7e1f01787d7c23200abbce0a52171d0223b9a634f1996c0a82
+size 1077281

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_cutout_lowendpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee8030b2cc4c723d1006ba04119cb4b47455b8890be067348c395069a4662f8e
-size 1265995
+oid sha256:aeea89bee66dc4eca7456437fdcfc6441e071d0800cc144125830b92843bd6a9
+size 1308490

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_cutout_mainpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14308eb1a8251b29413a311d735629015892ddd503728966313abc4ceccbdaa7
-size 1251997
+oid sha256:7f795f327ac0dac99e89c1d6dcc63451596415cd7ea130e4e82dad07a49f4d05
+size 1289307

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_deferredpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4af1d92caffbfc7e8428e1fc01714579e3a9a670a10a66b206a08e10377cfd8f
-size 1303852
+oid sha256:2704ece7501280878cffe537e0141555d0259963edcf2263d470e0f13204bfa6
+size 1382253

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_lowendpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e74f52f901c6302095b5806e9d1296263a3aa794adf351f9ad7ba5cb0d8f855a
-size 1321213
+oid sha256:432fe68a0e8af0b599265d5e18c45261f6051d86808bfeca46bb7c9682e8842a
+size 1379110

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_mainpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f33ffffcb439006c13900291c53321d7065403a2ce4050c4fb9ef5dfe36abde
-size 1332549
+oid sha256:d527577c7e0666e37096faf56bbe8933afa86cb30a88eeacccbb3cbd9059f7c9
+size 1384728

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_pdo_deferredpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f507ecb3df6639a81287b2c0553d82f9d1eb9e050215833fbee634cefa4ee66
-size 1111500
+oid sha256:053c209b543328af7235d952a88c93850664410b6229c065b5e94d6cc385ed22
+size 1157107

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_pdo_lowendpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ebb5e11f1a4bdfc2ae791bfc4021f13acfa5516ff2e667a3fd470b0476cada1e
-size 1226081
+oid sha256:647a77c70c84f249a35c0a714b42af2d4ba5d80007835dd1954ce3a54dae396c
+size 1263772

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_pdo_mainpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:749554a1f9ce34e706b1c0c9cb5c8b54c315acdb3cbfba082d5bc4e0d95a522e
-size 1187522
+oid sha256:1e51203b94d468e2fb271eff548830dd78893d34bf40aba538e9b557f53de24b
+size 1223584

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_tintedtransparent_lowendpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9543945a5cb14a0ed7531abf097b004b0d9328d8e14e80c7d18af15dd7b11550
-size 1186358
+oid sha256:020456bffe69b1e9d80b3e2981e6541080dcd70aa34ff8ddd60718f2c1a5e798
+size 1234841

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_tintedtransparent_mainpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba8bc2cff19b8da637a28e52a6c6512677381d3f8bd89b2eb73670cbfb385937
-size 1187049
+oid sha256:87cb138ba5ada516180e7d8742dd12ba2e710d224fa560e8f23494dc7fa572b3
+size 1233801

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_transparent_deferredpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2cc9511e3a97cff03261af952afa1d731733e0f0c2ba22c8ac4323d76942c55
-size 1088002
+oid sha256:a13467615b6b71f11884a415f7d2b414eb180301db4031dced9ad9ee4c10f562
+size 1213175

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_transparent_lowendpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2c8246bca09c7290f35e87810fb2ef7fb26a1643678e29c16f34530a3707a54
-size 1087071
+oid sha256:ab76d5bd828b2cd166d00aea4e277bbc6ee84e24f98c58c59f3794736d893b0d
+size 1212153

Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_transparent_mainpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2cc9511e3a97cff03261af952afa1d731733e0f0c2ba22c8ac4323d76942c55
-size 1088002
+oid sha256:27478fcedbd2ca21aa617922e4bba4a9f8ed4697d63ddf72516000da831a36c7
+size 1120375

Scripts/MaterialScreenshotTests.bv.lua

@@ -272,37 +272,37 @@ Print('Saving screenshots to ' .. NormalizePath(g_screenshotOutputFolder .. g_te
 
 SetImguiValue('Use Low End Pipeline', false)
 SetImguiValue('Use Deferred Pipeline', false)
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Basic', {screenshotFilename="MaterialPipelineTest_Basic_MainPipeline"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Standard', {screenshotFilename="MaterialPipelineTest_Standard_MainPipeline"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Standard_Transparent', {screenshotFilename="MaterialPipelineTest_Standard_Transparent_MainPipeline"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Standard_TintedTransparent', {screenshotFilename="MaterialPipelineTest_Standard_TintedTransparent_MainPipeline"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Standard_Cutout', {screenshotFilename="MaterialPipelineTest_Standard_Cutout_MainPipeline"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Standard_PDO', {screenshotFilename="MaterialPipelineTest_Standard_PDO_MainPipeline", lighting="Test"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Enhanced', {screenshotFilename="MaterialPipelineTest_Enhanced_MainPipeline", lighting="Test"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Enhanced_Transparent', {screenshotFilename="MaterialPipelineTest_Enhanced_Transparent_MainPipeline", lighting="Test"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Enhanced_TintedTransparent', {screenshotFilename="MaterialPipelineTest_Enhanced_TintedTransparent_MainPipeline", lighting="Test"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Enhanced_Cutout', {screenshotFilename="MaterialPipelineTest_Enhanced_Cutout_MainPipeline", lighting="Test"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Enhanced_PDO', {screenshotFilename="MaterialPipelineTest_Enhanced_PDO_MainPipeline", lighting="Test"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Basic', {screenshotFilename="MaterialPipelineTest_Basic_MainPipeline"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Standard', {screenshotFilename="MaterialPipelineTest_Standard_MainPipeline"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Standard_Transparent', {screenshotFilename="MaterialPipelineTest_Standard_Transparent_MainPipeline"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Standard_TintedTransparent', {screenshotFilename="MaterialPipelineTest_Standard_TintedTransparent_MainPipeline"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Standard_Cutout', {screenshotFilename="MaterialPipelineTest_Standard_Cutout_MainPipeline"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Standard_PDO', {screenshotFilename="MaterialPipelineTest_Standard_PDO_MainPipeline", lighting="Test"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Enhanced', {screenshotFilename="MaterialPipelineTest_Enhanced_MainPipeline", lighting="Test"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Enhanced_Transparent', {screenshotFilename="MaterialPipelineTest_Enhanced_Transparent_MainPipeline", lighting="Test"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Enhanced_TintedTransparent', {screenshotFilename="MaterialPipelineTest_Enhanced_TintedTransparent_MainPipeline", lighting="Test"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Enhanced_Cutout', {screenshotFilename="MaterialPipelineTest_Enhanced_Cutout_MainPipeline", lighting="Test"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Enhanced_PDO', {screenshotFilename="MaterialPipelineTest_Enhanced_PDO_MainPipeline", lighting="Test"})
 
 SetImguiValue('Use Low End Pipeline', true)
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Basic', {screenshotFilename="MaterialPipelineTest_Basic_LowEndPipeline"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Standard', {screenshotFilename="MaterialPipelineTest_Standard_LowEndPipeline"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Standard_Transparent', {screenshotFilename="MaterialPipelineTest_Standard_Transparent_LowEndPipeline"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Standard_TintedTransparent', {screenshotFilename="MaterialPipelineTest_Standard_TintedTransparent_LowEndPipeline"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Standard_Cutout', {screenshotFilename="MaterialPipelineTest_Standard_Cutout_LowEndPipeline"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Standard_PDO', {screenshotFilename="MaterialPipelineTest_Standard_PDO_LowEndPipeline", lighting="Test"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Enhanced', {screenshotFilename="MaterialPipelineTest_Enhanced_LowEndPipeline", lighting="Test"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Enhanced_Transparent', {screenshotFilename="MaterialPipelineTest_Enhanced_Transparent_LowEndPipeline", lighting="Test"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Enhanced_TintedTransparent', {screenshotFilename="MaterialPipelineTest_Enhanced_TintedTransparent_LowEndPipeline", lighting="Test"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Enhanced_PDO', {screenshotFilename="MaterialPipelineTest_Enhanced_PDO_LowEndPipeline", lighting="Test"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Basic', {screenshotFilename="MaterialPipelineTest_Basic_LowEndPipeline"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Standard', {screenshotFilename="MaterialPipelineTest_Standard_LowEndPipeline"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Standard_Transparent', {screenshotFilename="MaterialPipelineTest_Standard_Transparent_LowEndPipeline"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Standard_TintedTransparent', {screenshotFilename="MaterialPipelineTest_Standard_TintedTransparent_LowEndPipeline"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Standard_Cutout', {screenshotFilename="MaterialPipelineTest_Standard_Cutout_LowEndPipeline"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Standard_PDO', {screenshotFilename="MaterialPipelineTest_Standard_PDO_LowEndPipeline", lighting="Test"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Enhanced', {screenshotFilename="MaterialPipelineTest_Enhanced_LowEndPipeline", lighting="Test"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Enhanced_Transparent', {screenshotFilename="MaterialPipelineTest_Enhanced_Transparent_LowEndPipeline", lighting="Test"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Enhanced_TintedTransparent', {screenshotFilename="MaterialPipelineTest_Enhanced_TintedTransparent_LowEndPipeline", lighting="Test"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Enhanced_PDO', {screenshotFilename="MaterialPipelineTest_Enhanced_PDO_LowEndPipeline", lighting="Test"})
 SetImguiValue('Use Low End Pipeline', false)
 
 SetImguiValue('Use Deferred Pipeline', true)
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Basic', {screenshotFilename="MaterialPipelineTest_Basic_DeferredPipeline"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Standard', {screenshotFilename="MaterialPipelineTest_Standard_DeferredPipeline"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Enhanced', {screenshotFilename="MaterialPipelineTest_Enhanced_DeferredPipeline", lighting="Test"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Standard_PDO', {screenshotFilename="MaterialPipelineTest_Standard_PDO_DeferredPipeline", lighting="Test"})
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Enhanced_PDO', {screenshotFilename="MaterialPipelineTest_Enhanced_PDO_DeferredPipeline", lighting="Test"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Basic', {screenshotFilename="MaterialPipelineTest_Basic_DeferredPipeline"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Standard', {screenshotFilename="MaterialPipelineTest_Standard_DeferredPipeline"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Enhanced', {screenshotFilename="MaterialPipelineTest_Enhanced_DeferredPipeline", lighting="Test"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Standard_PDO', {screenshotFilename="MaterialPipelineTest_Standard_PDO_DeferredPipeline", lighting="Test"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Enhanced_PDO', {screenshotFilename="MaterialPipelineTest_Enhanced_PDO_DeferredPipeline", lighting="Test"})
 -- There are several "transparent" materials but since none of them are supported in the deferred pipeline, just check one of them to make sure it's appropriately ignored.
-GenerateMaterialScreenshot('Level G', 'MaterialPipelineTest_Standard_Transparent', {screenshotFilename="MaterialPipelineTest_Standard_Transparent_DeferredPipeline"})
+GenerateMaterialScreenshot('Level H', 'MaterialPipelineTest_Standard_Transparent', {screenshotFilename="MaterialPipelineTest_Standard_Transparent_DeferredPipeline"})
 SetImguiValue('Use Deferred Pipeline', false)

Standalone/Platform/Common/AtomSampleViewerApplication.h

@@ -28,6 +28,7 @@ namespace AtomSampleViewer
         , public SampleComponentManagerNotificationBus::Handler
     {
     public:
+        AZ_CLASS_ALLOCATOR(AtomSampleViewerApplication, AZ::SystemAllocator)
         AtomSampleViewerApplication();
         AtomSampleViewerApplication(int* argc, char*** argv);
         ~AtomSampleViewerApplication() override;