Add support for LowEndRenderPipeline for mobile on ASV (by default) (#174)

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

Gem/Code/Source/AssetLoadTestComponent.cpp

@@ -234,7 +234,7 @@ namespace AtomSampleViewer
         }
         else
         {
-            return AZ::RPI::AssetUtils::GetAssetIdForProductPath("shaders/staticmesh.azmaterial", AZ::RPI::AssetUtils::TraceLevel::Error);
+            return AZ::RPI::AssetUtils::GetAssetIdForProductPath(DefaultPbrMaterialPath, AZ::RPI::AssetUtils::TraceLevel::Error);
         }
     }
 

Gem/Code/Source/DepthOfFieldExampleComponent.cpp

@@ -46,7 +46,7 @@ namespace AtomSampleViewer
 
         // Create the assets
         m_bunnyModelAsset = RPI::AssetUtils::GetAssetByProductPath<RPI::ModelAsset>("objects/bunny.azmodel", RPI::AssetUtils::TraceLevel::Assert);
-        m_materialAsset = RPI::AssetUtils::GetAssetByProductPath<RPI::MaterialAsset>("shaders/staticmesh.azmaterial", RPI::AssetUtils::TraceLevel::Assert);
+        m_materialAsset = RPI::AssetUtils::GetAssetByProductPath<RPI::MaterialAsset>(DefaultPbrMaterialPath, RPI::AssetUtils::TraceLevel::Assert);
 
         CreateMeshes();
         CreateLight();

Gem/Code/Source/Platform/Android/SampleComponentManager_Android.cpp

@@ -26,6 +26,11 @@ namespace AtomSampleViewer
 
     const char* SampleComponentManager::GetRootPassTemplateName()
     {
-        return "MainPipeline_Mobile";
+        return "LowEndPipelineTemplate";
+    }
+
+    int SampleComponentManager::GutNumMSAASamples()
+    {
+        return 1;
     }
 } // namespace AtomSampleViewer

Gem/Code/Source/Platform/Linux/SampleComponentManager_Linux.cpp

@@ -23,4 +23,9 @@ namespace AtomSampleViewer
     {
         return "MainPipeline";
     }
+    
+    int SampleComponentManager::GutNumMSAASamples()
+    {
+        return 4;
+    }
 } // namespace AtomSampleViewer

Gem/Code/Source/Platform/Mac/SampleComponentManager_Mac.cpp

@@ -23,4 +23,9 @@ namespace AtomSampleViewer
     {
         return "MainPipeline";
     }
+
+    int SampleComponentManager::GutNumMSAASamples()
+    {
+        return 4;
+    }
 } // namespace AtomSampleViewer

Gem/Code/Source/Platform/Windows/SampleComponentManager_Windows.cpp

@@ -23,4 +23,9 @@ namespace AtomSampleViewer
     {
         return "MainPipeline";
     }
+
+    int SampleComponentManager::GutNumMSAASamples()
+    {
+        return 4;
+    }
 } // namespace AtomSampleViewer

Gem/Code/Source/Platform/iOS/SSRExampleComponent_Traits_Platform.h

@@ -6,4 +6,4 @@
  *
  */
 
-#define ATOMSAMPLEVIEWER_TRAIT_SSR_SAMPLE_LUCY_MODEL_NAME                       "objects/lucy/lucy_high.azmodel"
+#define ATOMSAMPLEVIEWER_TRAIT_SSR_SAMPLE_LUCY_MODEL_NAME                       "objects/lucy/lucy_low.azmodel"

Gem/Code/Source/Platform/iOS/SampleComponentManager_iOS.cpp

@@ -26,6 +26,11 @@ namespace AtomSampleViewer
 
     const char* SampleComponentManager::GetRootPassTemplateName()
     {
-        return "MainPipeline_Mobile";
+        return "LowEndPipelineTemplate";
+    }
+
+    int SampleComponentManager::GutNumMSAASamples()
+    {
+        return 1;
     }
 } // namespace AtomSampleViewer

Gem/Code/Source/SampleComponentManager.cpp

@@ -1490,8 +1490,11 @@ namespace AtomSampleViewer
         pipelineDesc.m_name = "RPISamplePipeline";
         pipelineDesc.m_rootPassTemplate = GetRootPassTemplateName();
         pipelineDesc.m_mainViewTagName = "MainCamera";
-        pipelineDesc.m_renderSettings.m_multisampleState.m_samples = 4;
-        
+        pipelineDesc.m_renderSettings.m_multisampleState.m_samples = GutNumMSAASamples();
+        bool isNonMsaaPipeline = (pipelineDesc.m_renderSettings.m_multisampleState.m_samples == 1);
+        const char* supervariantName = isNonMsaaPipeline ? AZ::RPI::NoMsaaSupervariantName : "";
+        AZ::RPI::ShaderSystemInterface::Get()->SetSupervariantName(AZ::Name(supervariantName));
+
         RPI::RenderPipelinePtr renderPipeline = RPI::RenderPipeline::CreateRenderPipelineForWindow(pipelineDesc, *m_windowContext.get());
         m_rpiScene->AddRenderPipeline(renderPipeline);
 

Gem/Code/Source/SampleComponentManager.h

@@ -165,6 +165,7 @@ namespace AtomSampleViewer
         static bool IsMultiViewportSwapchainSampleSupported();
         void AdjustImGuiFontScale();
         const char* GetRootPassTemplateName();
+        int GutNumMSAASamples();
         
         // ---------- variables -----------------
 

Gem/Code/Source/ShadingExampleComponent.cpp

@@ -59,6 +59,8 @@ namespace AtomSampleViewer
 
         UseArcBallCameraController();
 
+        InitLightingPresets(true);
+        
         // Add an Image based light.
         m_defaultIbl.Init(AZ::RPI::RPISystemInterface::Get()->GetDefaultScene().get());
 

Passes/ASV/PassTemplates.azasset

@@ -4,10 +4,6 @@
     "ClassName": "AssetAliasesSourceData",
     "ClassData": {
         "AssetPaths": [
-            {
-                "Name": "MainPipeline_Mobile",
-                "Path": "Passes/MainPipeline_Mobile.pass"
-            },
             {
                 "Name": "ImGuiOnlyPipeline",
                 "Path": "Passes/ImGuiOnlyPipeline.pass"
@@ -60,14 +56,6 @@
                 "Name": "RenderTextureTemplate",
                 "Path": "Passes/RenderTexture.pass"
             },
-            {
-                "Name": "ReflectionsParentPass_nomsaaTemplate",
-                "Path": "Passes/Reflections_nomsaa.pass"
-            },
-            {
-                "Name": "ReflectionGlobalFullscreenPass_nomsaaTemplate",
-                "Path": "Passes/ReflectionGlobalFullscreen_nomsaa.pass"
-            },
             {
                 "Name": "RHISamplePassTemplate",
                 "Path": "Passes/RHISamplePass.pass"
@@ -80,10 +68,6 @@
                 "Name": "SsaoPipeline",
                 "Path": "Passes/SsaoPipeline.pass"
             },
-            {
-                "Name": "DiffuseGlobalFullscreenPass_nomsaaTemplate",
-                "Path": "Passes/DiffuseGlobalFullscreen_nomsaa.pass"
-            },
             {
                 "Name": "RayTracingAmbientOcclusionPassTemplate",
                 "Path": "Passes/RayTracingAmbientOcclusion.pass"

Passes/MainPipeline_Mobile.pass

@@ -1,912 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "PassAsset",
-    "ClassData": {
-        "PassTemplate": {
-            "Name": "MainPipeline_Mobile",
-            "PassClass": "ParentPass",
-            "Slots": [
-                {
-                    "Name": "SwapChainOutput",
-                    "SlotType": "InputOutput",
-                    "ScopeAttachmentUsage": "RenderTarget"
-                }
-            ],
-            "PassRequests": [
-                {
-                    "Name": "MorphTargetPass",
-                    "TemplateName": "MorphTargetPassTemplate"
-                },
-                {
-                    "Name": "SkinningPass",
-                    "TemplateName": "SkinningPassTemplate",
-                    "Connections": [
-                        {
-                            "LocalSlot": "SkinnedMeshOutputStream",
-                            "AttachmentRef": {
-                                "Pass": "MorphTargetPass",
-                                "Attachment": "MorphTargetDeltaOutput"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "CascadedShadowmapsPass",
-                    "TemplateName": "CascadedShadowmapsTemplate",
-                    "PassData": {
-                        "$type": "RasterPassData",
-                        "DrawListTag": "shadow",
-                        "PipelineViewTag": "DirectionalLightView"
-                    },
-                    "Connections": [
-                        {
-                            "LocalSlot": "SkinnedMeshes",
-                            "AttachmentRef": {
-                                "Pass": "SkinningPass",
-                                "Attachment": "SkinnedMeshOutputStream"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "ProjectedShadowmapsPass",
-                    "TemplateName": "ProjectedShadowmapsTemplate",
-                    "PassData": {
-                        "$type": "RasterPassData",
-                        "DrawListTag": "shadow",
-                        "PipelineViewTag": "ProjectedShadowView"
-                    },
-                    "Connections": [
-                        {
-                            "LocalSlot": "SkinnedMeshes",
-                            "AttachmentRef": {
-                                "Pass": "SkinningPass",
-                                "Attachment": "SkinnedMeshOutputStream"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "EsmShadowmapsPassDirectional",
-                    "TemplateName": "EsmShadowmapsTemplate",
-                    "PassData": {
-                        "$type": "EsmShadowmapsPassData",
-                        "LightType": "directional"
-                    },
-                    "Connections": [
-                        {
-                            "LocalSlot": "DepthShadowmaps",
-                            "AttachmentRef": {
-                                "Pass": "CascadedShadowmapsPass",
-                                "Attachment": "Shadowmap"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "EsmShadowmapsPassProjected",
-                    "TemplateName": "EsmShadowmapsTemplate",
-                    "PassData": {
-                        "$type": "EsmShadowmapsPassData",
-                        "LightType": "projected"
-                    },
-                    "Connections": [
-                        {
-                            "LocalSlot": "DepthShadowmaps",
-                            "AttachmentRef": {
-                                "Pass": "ProjectedShadowmapsPass",
-                                "Attachment": "Shadowmap"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "DepthPass",
-                    "TemplateName": "DepthPassTemplate",
-                    "PassData": {
-                        "$type": "RasterPassData",
-                        "DrawListTag": "depth",
-                        "PipelineViewTag": "MainCamera"
-                    },
-                    "Connections": [
-                        {
-                            "LocalSlot": "SkinnedMeshes",
-                            "AttachmentRef": {
-                                "Pass": "SkinningPass",
-                                "Attachment": "SkinnedMeshOutputStream"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "LightCullingTilePreparePass",
-                    "TemplateName": "LightCullingTilePrepareTemplate",
-                    "Connections": [
-                        {
-                            "LocalSlot": "Depth",
-                            "AttachmentRef": {
-                                "Pass": "DepthPass",
-                                "Attachment": "Output"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "LightCullingPass",
-                    "TemplateName": "LightCullingTemplate",
-                    "Connections": [
-                        {
-                            "LocalSlot": "TileLightData",
-                            "AttachmentRef": {
-                                "Pass": "LightCullingTilePreparePass",
-                                "Attachment": "TileLightData"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "LightCullingRemapPass",
-                    "TemplateName": "LightCullingRemapTemplate",
-                    "Connections": [
-                        {
-                            "LocalSlot": "TileLightData",
-                            "AttachmentRef": {
-                                "Pass": "LightCullingTilePreparePass",
-                                "Attachment": "TileLightData"
-                            }
-                        },
-                        {
-                            "LocalSlot": "LightCount",
-                            "AttachmentRef": {
-                                "Pass": "LightCullingPass",
-                                "Attachment": "LightCount"
-                            }
-                        },
-                        {
-                            "LocalSlot": "LightList",
-                            "AttachmentRef": {
-                                "Pass": "LightCullingPass",
-                                "Attachment": "LightList"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "ForwardPass",
-                    "TemplateName": "ForwardPassTemplate",
-                    "Connections": [
-                        {
-                            "LocalSlot": "DirectionalLightShadowmap",
-                            "AttachmentRef": {
-                                "Pass": "CascadedShadowmapsPass",
-                                "Attachment": "Shadowmap"
-                            }
-                        },
-                        {
-                            "LocalSlot": "ExponentialShadowmapDirectional",
-                            "AttachmentRef": {
-                                "Pass": "EsmShadowmapsPassDirectional",
-                                "Attachment": "EsmShadowmaps"
-                            }
-                        },
-                        {
-                            "LocalSlot": "ProjectedShadowmap",
-                            "AttachmentRef": {
-                                "Pass": "ProjectedShadowmapsPass",
-                                "Attachment": "Shadowmap"
-                            }
-                        },
-                        {
-                            "LocalSlot": "ExponentialShadowmapProjected",
-                            "AttachmentRef": {
-                                "Pass": "EsmShadowmapsPassProjected",
-                                "Attachment": "EsmShadowmaps"
-                            }
-                        },
-                        {
-                            "LocalSlot": "DepthStencilInputOutput",
-                            "AttachmentRef": {
-                                "Pass": "DepthPass",
-                                "Attachment": "Output"
-                            }
-                        },
-                        {
-                            "LocalSlot": "TileLightData",
-                            "AttachmentRef": {
-                                "Pass": "LightCullingTilePreparePass",
-                                "Attachment": "TileLightData"
-                            }
-                        },
-                        {
-                            "LocalSlot": "LightListRemapped",
-                            "AttachmentRef": {
-                                "Pass": "LightCullingRemapPass",
-                                "Attachment": "LightListRemapped"
-                            }
-                        }
-                    ],
-                    "PassData": {
-                        "$type": "RasterPassData",
-                        "DrawListTag": "forward",
-                        "PipelineViewTag": "MainCamera",
-                        "PassSrgShaderAsset": {
-                            "FilePath": "Shaders/ForwardPassSrg.shader"
-                        }
-                    }
-                },
-                {
-                    "Name": "DiffuseGlobalFullscreenPass",
-                    "TemplateName": "DiffuseGlobalFullscreenPass_nomsaaTemplate",
-                    "Connections": [
-                        {
-                            "LocalSlot": "DiffuseInputOutput",
-                            "AttachmentRef": {
-                                "Pass": "ForwardPass",
-                                "Attachment": "DiffuseOutput"
-                            }
-                        },
-                        {
-                            "LocalSlot": "AlbedoInput",
-                            "AttachmentRef": {
-                                "Pass": "ForwardPass",
-                                "Attachment": "AlbedoOutput"
-                            }
-                        }, 
-                        {
-                            "LocalSlot": "NormalInput",
-                            "AttachmentRef": {
-                                "Pass": "ForwardPass",
-                                "Attachment": "NormalOutput"
-                            }
-                        },                        
-                        {
-                            "LocalSlot": "DepthStencilInputOutput",
-                            "AttachmentRef": {
-                                "Pass": "ForwardPass",
-                                "Attachment": "DepthStencilInputOutput"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "ReflectionsPass",
-                    "TemplateName": "ReflectionsParentPass_nomsaaTemplate",
-                    "Enabled": true,
-                    "Connections": [
-                        {
-                            "LocalSlot": "NormalInput",
-                            "AttachmentRef": {
-                                "Pass": "ForwardPass",
-                                "Attachment": "NormalOutput"
-                            }
-                        },
-                        {
-                            "LocalSlot": "SpecularF0Input",
-                            "AttachmentRef": {
-                                "Pass": "ForwardPass",
-                                "Attachment": "SpecularF0Output"
-                            }
-                        },
-                        {
-                            "LocalSlot": "AlbedoInput",
-                            "AttachmentRef": {
-                                "Pass": "ForwardPass",
-                                "Attachment": "AlbedoOutput"
-                            }
-                        },
-                        {
-                            "LocalSlot": "DepthStencilInputOutput",
-                            "AttachmentRef": {
-                                "Pass": "ForwardPass",
-                                "Attachment": "DepthStencilInputOutput"
-                            }
-                        },
-                        {
-                            "LocalSlot": "SpecularInputOutput",
-                            "AttachmentRef": {
-                                "Pass": "ForwardPass",
-                                "Attachment": "SpecularOutput"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "SkyBoxPass",
-                    "TemplateName": "SkyBoxTemplate",
-                    "Enabled": true,
-                    "Connections": [
-                        {
-                            "LocalSlot": "SpecularInputOutput",
-                            "AttachmentRef": {
-                                "Pass": "ReflectionsPass",
-                                "Attachment": "SpecularInputOutput"
-                            }
-                        },
-                        {
-                            "LocalSlot": "ReflectionInputOutput",
-                            "AttachmentRef": {
-                                "Pass": "ReflectionsPass",
-                                "Attachment": "ReflectionOutput"
-                            }
-                        },
-                        {
-                            "LocalSlot": "SkyBoxDepth",
-                            "AttachmentRef": {
-                                "Pass": "ReflectionsPass",
-                                "Attachment": "DepthStencilInputOutput"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "ReflectionCompositePass",
-                    "TemplateName": "ReflectionCompositePassTemplate",
-                    "Connections": [
-                        {
-                            "LocalSlot": "ReflectionInput",
-                            "AttachmentRef": {
-                                "Pass": "SkyBoxPass",
-                                "Attachment": "ReflectionInputOutput"
-                            }
-                        },
-                        {
-                            "LocalSlot": "SpecularInputOutput",
-                            "AttachmentRef": {
-                                "Pass": "SkyBoxPass",
-                                "Attachment": "SpecularInputOutput"
-                            }
-                        },
-                        {
-                            "LocalSlot": "DepthStencilInputOutput",
-                            "AttachmentRef": {
-                                "Pass": "SkyBoxPass",
-                                "Attachment": "SkyBoxDepth"
-                            }
-                        }
-                    ],
-                    "PassData": {
-                        "$type": "FullscreenTrianglePassData",
-                        "ShaderAsset": {
-                            "FilePath": "Shaders/Reflections/ReflectionComposite_nomsaa.shader"
-                        },
-                        "StencilRef": 1,
-                        "PipelineViewTag": "MainCamera"
-                    }
-                },
-                {
-                    "Name": "DepthToLinearDepthPass",
-                    "TemplateName": "DepthToLinearTemplate",
-                    "Connections": [
-                        {
-                            "LocalSlot": "Input",
-                            "AttachmentRef": {
-                                "Pass": "ReflectionsPass",
-                                "Attachment": "DepthStencilInputOutput"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "SubsurfaceScatteringPass",
-                    "TemplateName": "SubsurfaceScatteringPassTemplate",
-                    "Enabled": true,
-                    "Connections": [
-                        {
-                            "LocalSlot": "InputDiffuse",
-                            "AttachmentRef": {
-                                "Pass": "DiffuseGlobalFullscreenPass",
-                                "Attachment": "DiffuseInputOutput"
-                            }
-                        },
-                        {
-                            "LocalSlot": "InputLinearDepth",
-                            "AttachmentRef": {
-                                "Pass": "DepthToLinearDepthPass",
-                                "Attachment": "Output"
-                            }
-                        },
-                        {
-                            "LocalSlot": "InputScatterDistance",
-                            "AttachmentRef": {
-                                "Pass": "ForwardPass",
-                                "Attachment": "ScatterDistanceOutput"
-                            }
-                        }
-                    ],
-                    "PassData": {
-                        "$type": "ComputePassData",
-                        "ShaderAsset": {
-                            "FilePath": "Shaders/PostProcessing/ScreenSpaceSubsurfaceScatteringCS.shader"
-                        },
-                        "Make Fullscreen Pass": true,
-                        "PipelineViewTag": "MainCamera"
-                    }
-                },
-                {
-                    "Name": "Ssao",
-                    "TemplateName": "SsaoParentTemplate",
-                    "Connections": [
-                        {
-                            "LocalSlot": "LinearDepth",
-                            "AttachmentRef": {
-                                "Pass": "DepthToLinearDepthPass",
-                                "Attachment": "Output"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "ModulateWithSsao",
-                    "TemplateName": "ModulateTextureTemplate",
-                    "Enabled": true,
-                    "Connections": [
-                        {
-                            "LocalSlot": "Input",
-                            "AttachmentRef": {
-                                "Pass": "Ssao",
-                                "Attachment": "Output"
-                            }
-                        },
-                        {
-                            "LocalSlot": "InputOutput",
-                            "AttachmentRef": {
-                                "Pass": "SubsurfaceScatteringPass",
-                                "Attachment": "Output"
-                            }
-                        }
-                    ],
-                    "PassData": {
-                        "$type": "ComputePassData",
-                        "ShaderAsset": {
-                            "FilePath": "Shaders/PostProcessing/ModulateTexture.shader"
-                        },
-                        "Make Fullscreen Pass": true
-                    }
-                },
-                {
-                    "Name": "DiffuseSpecularMergePass",
-                    "TemplateName": "DiffuseSpecularMergeTemplate",
-                    "Connections": [
-                        {
-                            "LocalSlot": "InputDiffuse",
-                            "AttachmentRef": {
-                                "Pass": "ModulateWithSsao",
-                                "Attachment": "InputOutput"
-                            }
-                        },
-                        {
-                            "LocalSlot": "InputSpecular",
-                            "AttachmentRef": {
-                                "Pass": "ReflectionCompositePass",
-                                "Attachment": "SpecularInputOutput"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "TransparentPass",
-                    "TemplateName": "TransparentPassTemplate",
-                    "Enabled": true,
-                    "Connections": [
-                        {
-                            "LocalSlot": "InputOutput",
-                            "AttachmentRef": {
-                                "Pass": "DiffuseSpecularMergePass",
-                                "Attachment": "Output"
-                            }
-                        },
-                        {
-                            "LocalSlot": "DirectionalLightShadowmap",
-                            "AttachmentRef": {
-                                "Pass": "CascadedShadowmapsPass",
-                                "Attachment": "Shadowmap"
-                            }
-                        },
-                        {
-                            "LocalSlot": "ExponentialShadowmapDirectional",
-                            "AttachmentRef": {
-                                "Pass": "EsmShadowmapsPassDirectional",
-                                "Attachment": "EsmShadowmaps"
-                            }
-                        },
-                        {
-                            "LocalSlot": "ProjectedShadowmap",
-                            "AttachmentRef": {
-                                "Pass": "ProjectedShadowmapsPass",
-                                "Attachment": "Shadowmap"
-                            }
-                        },
-                        {
-                            "LocalSlot": "ExponentialShadowmapProjected",
-                            "AttachmentRef": {
-                                "Pass": "EsmShadowmapsPassProjected",
-                                "Attachment": "EsmShadowmaps"
-                            }
-                        },
-                        {
-                            "LocalSlot": "DepthStencil",
-                            "AttachmentRef": {
-                                "Pass": "ReflectionsPass",
-                                "Attachment": "DepthStencilInputOutput"
-                            }
-                        },
-                        {
-                            "LocalSlot": "TileLightData",
-                            "AttachmentRef": {
-                                "Pass": "LightCullingRemapPass",
-                                "Attachment": "TileLightData"
-                            }
-                        },
-                        {
-                            "LocalSlot": "LightListRemapped",
-                            "AttachmentRef": {
-                                "Pass": "LightCullingRemapPass",
-                                "Attachment": "LightListRemapped"
-                            }
-                        }
-                    ],
-                    "PassData": {
-                        "$type": "RasterPassData",
-                        "DrawListTag": "transparent",
-                        "DrawListSortType": "KeyThenReverseDepth",
-                        "PipelineViewTag": "MainCamera",
-                        "PassSrgShaderAsset": {
-                            "FilePath": "Shaders/ForwardPassSrg.shader"
-                        }
-                    }
-                },
-                {
-                    "Name": "DeferredFogPass",
-                    "TemplateName": "DeferredFogPassTemplate",
-                    "Enabled": false,
-                    "Connections": [
-                        {
-                            "LocalSlot": "InputLinearDepth",
-                            "AttachmentRef": {
-                                "Pass": "DepthToLinearDepthPass",
-                                "Attachment": "Output"
-                            }
-                        },
-                        {
-                            "LocalSlot": "InputDepthStencil",
-                            "AttachmentRef": {
-                                "Pass": "ReflectionsPass",
-                                "Attachment": "DepthStencilInputOutput"
-                            }
-                        },
-                        {
-                            "LocalSlot": "RenderTargetInputOutput",
-                            "AttachmentRef": {
-                                "Pass": "TransparentPass",
-                                "Attachment": "InputOutput"
-                            }
-                        }
-                    ],
-                    "PassData": {
-                        "$type": "FullscreenTrianglePassData",
-                        "ShaderAsset": {
-                            "FilePath": "Shaders/ScreenSpace/DeferredFog.shader"
-                        },
-                        "PipelineViewTag": "MainCamera"
-                    }
-                },
-                {
-                    "Name": "SMAA1xApplyLinearHDRColorPass",
-                    "TemplateName": "SMAA1xApplyLinearHDRColorTemplate",
-                    "Connections": [
-                        {
-                            "LocalSlot": "InputColor",
-                            "AttachmentRef": {
-                                "Pass": "DeferredFogPass",
-                                "Attachment": "RenderTargetInputOutput"
-                            }
-                        },
-                        {
-                            "LocalSlot": "InputDepth",
-                            "AttachmentRef": {
-                                "Pass": "ReflectionsPass",
-                                "Attachment": "DepthStencilInputOutput"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "DepthOfFieldPass",
-                    "TemplateName": "DepthOfFieldTemplate",
-                    "Enabled": true,
-                    "Connections": [
-                        {
-                            "LocalSlot": "DoFColorInput",
-                            "AttachmentRef": {
-                                "Pass": "SMAA1xApplyLinearHDRColorPass",
-                                "Attachment": "OutputColor"
-                            }
-                        },
-                        {
-                            "LocalSlot": "DoFDepthInput",
-                            "AttachmentRef": {
-                                "Pass": "ReflectionsPass",
-                                "Attachment": "DepthStencilInputOutput"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "BloomPass",
-                    "TemplateName": "BloomPassTemplate",
-                    "Enabled": false,
-                    "Connections": [
-                        {
-                            "LocalSlot": "InputOutput",
-                            "AttachmentRef": {
-                                "Pass": "DepthOfFieldPass",
-                                "Attachment": "DoFOutput"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "DownsampleLuminanceMinAvgMax",
-                    "TemplateName": "DownsampleLuminanceMinAvgMaxCS",
-                    "Connections": [
-                        {
-                            "LocalSlot": "Input",
-                            "AttachmentRef": {
-                                "Pass": "BloomPass",
-                                "Attachment": "InputOutput"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "DownsampleLuminanceMipChain",
-                    "TemplateName": "DownsampleMipChainTemplate",
-                    "Connections": [
-                        {
-                            "LocalSlot": "MipChainInputOutput",
-                            "AttachmentRef": {
-                                "Pass": "DownsampleLuminanceMinAvgMax",
-                                "Attachment": "Output"
-                            }
-                        }
-                    ],
-                    "PassData": {
-                        "$type": "DownsampleMipChainPassData",
-                        "ShaderAsset": {
-                            "FilePath": "Shaders/PostProcessing/DownsampleMinAvgMaxCS.shader"
-                        }
-                    }
-                },                 
-                {
-                    "Name": "EyeAdaptationPass",
-                    "TemplateName": "EyeAdaptationTemplate",
-                    "Enabled": false,
-                    "Connections": [
-                        {
-                            "LocalSlot": "SceneLuminanceInput",
-                            "AttachmentRef": {
-                                "Pass": "DownsampleLuminanceMipChain",
-                                "Attachment": "MipChainInputOutput"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "LookModificationTransformPass",
-                    "TemplateName": "LookModificationTransformTemplate",
-                    "Enabled": true,
-                    "Connections": [
-                        {
-                            "LocalSlot": "Input",
-                            "AttachmentRef": {
-                                "Pass": "BloomPass",
-                                "Attachment": "InputOutput"
-                            }
-                        },
-                        {
-                            "LocalSlot": "EyeAdaptationDataInput",
-                            "AttachmentRef": {
-                                "Pass": "EyeAdaptationPass",
-                                "Attachment": "EyeAdaptationDataInputOutput"
-                            }
-                        },
-                        {
-                            "LocalSlot": "SwapChainOutput",
-                            "AttachmentRef": {
-                                "Pass": "Parent",
-                                "Attachment": "SwapChainOutput"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "DisplayMapperPass",
-                    "TemplateName": "DisplayMapperTemplate",
-                    "Enabled": true,
-                    "Connections": [
-                        {
-                            "LocalSlot": "Input",
-                            "AttachmentRef": {
-                                "Pass": "LookModificationTransformPass",
-                                "Attachment": "Output"
-                            }
-                        },
-                        {
-                            "LocalSlot": "SwapChainOutput",
-                            "AttachmentRef": {
-                                "Pass": "Parent",
-                                "Attachment": "SwapChainOutput"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "AuxGeomPass",
-                    "TemplateName": "AuxGeomPassTemplate",
-                    "Enabled": true,
-                    "Connections": [
-                        {
-                            "LocalSlot": "ColorInputOutput",
-                            "AttachmentRef": {
-                                "Pass": "DisplayMapperPass",
-                                "Attachment": "Output"
-                            }
-                        },
-                        {
-                            "LocalSlot": "DepthInputOutput",
-                            "AttachmentRef": {
-                                "Pass": "ReflectionsPass",
-                                "Attachment": "DepthStencilInputOutput"
-                            }
-                        }
-                    ],
-                    "PassData": {
-                        "$type": "RasterPassData",
-                        "DrawListTag": "auxgeom",
-                        "PipelineViewTag": "MainCamera"
-                    }
-                },
-                {
-                    "Name": "LightCullingHeatmapPass",
-                    "TemplateName": "LightCullingHeatmapTemplate",
-                    "Enabled": false,
-                    "Connections": [
-                        {
-                            "LocalSlot": "ColorInputOutput",
-                            "AttachmentRef": {
-                                "Pass": "AuxGeomPass",
-                                "Attachment": "ColorInputOutput"
-                            }
-                        },
-                        {
-                            "LocalSlot": "TileLightData",
-                            "AttachmentRef": {
-                                "Pass": "LightCullingRemapPass",
-                                "Attachment": "TileLightData"
-                            }
-                        }
-                    ],
-                    "PassData": {
-                        "$type": "RasterPassData",
-                        "PipelineViewTag": "MainCamera"
-                    }
-                },
-                {
-                    "Name": "LuminanceHistogramGenerator",
-                    "TemplateName": "LuminanceHistogramGeneratorTemplate",
-                    "Enabled": false,
-                    "Connections": [
-                        {
-                            "LocalSlot": "ColorInput",
-                            "AttachmentRef": {
-                                "Pass": "BloomPass",
-                                "Attachment": "InputOutput"
-                            } 
-                        }                
-                    ],
-                    "PassData": {
-                        "$type": "RasterPassData",
-                        "PipelineViewTag": "MainCamera"
-                    }
-                },     
-                {
-                    "Name": "LuminanceHeatmap",
-                    "TemplateName": "LuminanceHeatmapTemplate",
-                    "Enabled": false,
-                    "Connections": [
-                        {
-                            "LocalSlot": "InputOutput",
-                            "AttachmentRef": {
-                                "Pass": "LightCullingHeatmapPass",
-                                "Attachment": "ColorInputOutput"
-                            }
-                        },
-                        {
-                            "LocalSlot": "ColorInput",
-                            "AttachmentRef": {
-                                "Pass": "BloomPass",
-                                "Attachment": "InputOutput"
-                            }
-                        },
-                        {
-                            "LocalSlot": "SceneLuminanceInput",
-                            "AttachmentRef": {
-                                "Pass": "DownsampleLuminanceMipChain",
-                                "Attachment": "MipChainInputOutput"
-                            }
-                        },
-                        {
-                            "LocalSlot": "Histogram",
-                            "AttachmentRef": {
-                                "Pass": "LuminanceHistogramGenerator",
-                                "Attachment": "Output"
-                            }
-                        }                           
-                    ],
-                    "PassData": {
-                        "$type": "RasterPassData",
-                        "PipelineViewTag": "MainCamera"
-                    }
-                },                   
-                {
-                    "Name": "2DPass",
-                    "TemplateName": "UIPassTemplate",
-                    "Enabled": true,
-                    "Connections": [
-                        {
-                            "LocalSlot": "InputOutput",
-                            "AttachmentRef": {
-                                "Pass": "LuminanceHeatmap",
-                                "Attachment": "InputOutput"
-                            }
-                        }
-                    ],
-                    "PassData": {
-                        "$type": "RasterPassData",
-                        "DrawListTag": "2dpass",
-                        "PipelineViewTag": "MainCamera"
-                    }
-                },
-                {
-                    "Name": "ImGuiPass",
-                    "TemplateName": "ImGuiPassTemplate",
-                    "Enabled": true,
-                    "Connections": [
-                        {
-                            "LocalSlot": "InputOutput",
-                            "AttachmentRef": {
-                                "Pass": "AuxGeomPass",
-                                "Attachment": "ColorInputOutput"
-                            }
-                        }
-                    ],
-                    "PassData": {
-                        "$type": "ImGuiPassData",
-                        "IsDefaultImGui": true
-                    }
-                },
-                {
-                    "Name": "CopyToSwapChain",
-                    "TemplateName": "FullscreenCopyTemplate",
-                    "Connections": [
-                        {
-                            "LocalSlot": "Input",
-                            "AttachmentRef": {
-                                "Pass": "2DPass",
-                                "Attachment": "InputOutput"
-                            }
-                        },
-                        {
-                            "LocalSlot": "Output",
-                            "AttachmentRef": {
-                                "Pass": "Parent",
-                                "Attachment": "SwapChainOutput"
-                            }
-                        }
-                    ]
-                }
-            ]
-        }
-    }
-}

Passes/SsaoPipeline.pass

@@ -125,7 +125,7 @@
                 },
                 {
                     "Name": "LightCullingTilePreparePass",
-                    "TemplateName": "LightCullingTilePrepareTemplate",
+                    "TemplateName": "LightCullingTilePrepareMSAATemplate",
                     "Connections": [
                         {
                             "LocalSlot": "Depth",

Shaders/StaticMesh.material

@@ -1,3 +0,0 @@
-{
-    "materialType": "StaticMesh.materialtype"
-}

Shaders/StaticMesh.materialtype

@@ -1,64 +0,0 @@
-{
-    "description": "A simple default base material for Atom testing.",
-    "propertyLayout": {
-        "version": 1,
-        "properties": {
-            "general": [
-                {
-                    "id": "DiffuseColor",
-                    "type": "color",
-                    "connection": {
-                        "type": "shaderInput",
-                        "id": "m_diffuseColor"
-                    }
-                },
-                {
-                    "id": "DiffuseMap",
-                    "type": "image",
-                    "defaultValue": "Textures/Default/default_basecolor.tif",
-                    "connection": {
-                        "type": "shaderInput",
-                        "id": "m_diffuseMap"
-                    }
-                },
-                {
-                    "id": "NormalMap",
-                    "type": "image",
-                    "defaultValue": "Textures/Default/default_normal.tif",
-                    "connection": {
-                        "type": "shaderInput",
-                        "id": "m_normalMap"
-                    }
-                },
-                {
-                    "id": "SpecularMap",
-                    "type": "image",
-                    "defaultValue": "Textures/Default/default_roughness.tif",
-                    "connection": {
-                        "type": "shaderInput",
-                        "id": "m_specularMap"
-                    }
-                },
-                {
-                    "id": "EnvironmentMap",
-                    "type": "image",
-                    "connection": {
-                        "type": "shaderInput",
-                        "id": "m_environmentMap"
-                    }
-                }
-            ]
-        }
-    },
-    "shaders": [
-        {
-            "file": "Shaders/StaticMesh.shader"
-        },
-        {
-            "file": "Shaders/Shadow/Shadowmap.shader"
-        },
-        {
-            "file": "Shaders/Depth/DepthPass.shader"
-        }            
-    ]
-}

Shaders/StaticMesh.shader

@@ -1,29 +0,0 @@
-{
-    "Source" : "StaticMesh",
-
-    "DepthStencilState" : { 
-        "Depth" : { "Enable" : true, "CompareFunc" : "Equal" }
-    },
-
-    "DrawList" : "forward",
-    
-    "CompilerHints" : {
-        "AzslcWarningLevel" : 0,
-        "AzslcWarningAsError" : false
-    },
-
-    "ProgramSettings":
-    {
-      "EntryPoints":
-      [
-        {
-          "name": "MainVS",
-          "type": "Vertex"
-        },
-        {
-          "name": "MainPS",
-          "type": "Fragment"
-        }
-      ]
-    }
-}

Shaders/StaticMesh_colorB.material

@@ -1,9 +0,0 @@
-{
-    "materialType": "StaticMesh.materialtype",
-    "propertyLayoutVersion": 1,
-    "properties": {
-        "general": {
-            "DiffuseColor": [ 0.5, 0.5, 1.0, 1.0 ]
-        }
-    }
-}

Shaders/StaticMesh_colorG.material

@@ -1,9 +0,0 @@
-{
-    "materialType": "StaticMesh.materialtype",
-    "propertyLayoutVersion": 1,
-    "properties": {
-        "general": {
-            "DiffuseColor": [ 0.5, 1.0, 0.5, 1.0 ]
-        }
-    }
-}

Shaders/StaticMesh_colorR.material

@@ -1,9 +0,0 @@
-{
-    "materialType": "StaticMesh.materialtype",
-    "propertyLayoutVersion": 1,
-    "properties": {
-        "general": {
-            "DiffuseColor": [ 1.0, 0.5, 0.5, 1.0 ]
-        }
-    }
-}

Shaders/StaticMesh_pebbles.material

@@ -1,11 +0,0 @@
-{
-    "materialType": "StaticMesh.materialtype",
-    "propertyLayoutVersion": 1,
-    "properties": {
-        "general": {
-            "DiffuseMap": "Textures/Streaming/streaming12.dds",
-            "NormalMap": "Textures/left_mask.png",
-            "SpecularMap": "Textures/left_mask.png"
-        }
-    }
-}

Shaders/StaticMesh_pebblesB.material

@@ -1,10 +0,0 @@
-{
-    "materialType": "StaticMesh.materialtype",
-    "parentMaterial": "StaticMesh_pebbles.material",
-    "propertyLayoutVersion": 1,
-    "properties": {
-        "general": {
-            "DiffuseColor": [ 0.5, 0.5, 1.0, 1.0 ]
-        }
-    }
-}

Shaders/StaticMesh_pebblesG.material

@@ -1,10 +0,0 @@
-{
-    "materialType": "StaticMesh.materialtype",
-    "parentMaterial": "StaticMesh_pebbles.material",
-    "propertyLayoutVersion": 1,
-    "properties": {
-        "general": {
-            "DiffuseColor": [ 0.5, 1.0, 0.5, 1.0 ]
-        }
-    }
-}

Shaders/StaticMesh_pebblesR.material

@@ -1,10 +0,0 @@
-{
-    "materialType": "StaticMesh.materialtype",
-    "parentMaterial": "StaticMesh_pebbles.material",
-    "propertyLayoutVersion": 1,
-    "properties": {
-        "general": {
-            "DiffuseColor": [ 1.0, 0.5, 0.5, 1.0 ]
-        }
-    }
-}

atomsampleviewer_asset_files.cmake

@@ -19,7 +19,6 @@ set(FILES
     Passes/ImGuiNoInput.pass
     Passes/ImGuiOnlyPipeline.pass
     Passes/LuxCoreTexture.pass
-    Passes/MainPipeline_Mobile.pass
     Passes/Monochrome.pass
     Passes/RayTracingAmbientOcclusion.pass
     Passes/RenderTexture.pass
@@ -54,10 +53,7 @@ set(FILES
     Shaders/DebugVertexNormals.materialtype
     Shaders/DebugVertexNormals.shader
     Shaders/Instanced.azsl
-    Shaders/MaterialEditorTest.materialtype
-    Shaders/StaticMesh.azsl
-    Shaders/StaticMesh.materialtype
-    Shaders/StaticMesh.shader
+    Shaders/MaterialEditorTest.materialtype    
     Shaders/ComprehensiveTestMaterial/Comprehensive.materialtype
     Shaders/ComprehensiveTestMaterial/Stacks.azsl
     Shaders/ComprehensiveTestMaterial/Stacks.shader