Forráskód Böngészése

Removing unused passes

Signed-off-by: antonmic <[email protected]>
antonmic 3 éve
szülő
commit
e23e86d7d4

+ 0 - 16
Passes/ASV/PassTemplates.azasset

@@ -12,14 +12,6 @@
                 "Name": "ImGuiNoInputPassTemplate",
                 "Path": "Passes/ImGuiNoInput.pass"
             },
-            {
-                "Name": "ColorBlindPassTemplate",
-                "Path": "Passes/ColorblindnessSimulation.pass"
-            },
-            {
-                "Name": "ComplexPipeline",
-                "Path": "Passes/ComplexPipeline.pass"
-            },
             {
                 "Name": "CheckerboardResolveColorTemplate",
                 "Path": "Passes/CheckerboardResolveColor.pass"
@@ -40,14 +32,6 @@
                 "Name": "CheckerboardPipeline",
                 "Path": "Passes/CheckerboardPipeline.pass"
             },
-            {
-                "Name": "MonochromeTemplate",
-                "Path": "Passes/Monochrome.pass"
-            },
-            {
-                "Name": "ColorInvertCS",
-                "Path": "Passes/ColorInvertCS.pass"
-            },
             {
                 "Name": "RenderTextureTemplate",
                 "Path": "Passes/RenderTexture.pass"

+ 11 - 11
Passes/CheckerboardPipeline.pass

@@ -231,7 +231,7 @@
                     ]
                 },
                 {
-                    "Name": "ForwardMSAAPass",
+                    "Name": "Forward",
                     "TemplateName": "ForwardCheckerboardPassTemplate",
                     "Connections": [
                         {
@@ -300,28 +300,28 @@
                         {
                             "LocalSlot": "DiffuseInputOutput",
                             "AttachmentRef": {
-                                "Pass": "ForwardMSAAPass",
+                                "Pass": "Forward",
                                 "Attachment": "DiffuseOutput"
                             }
                         },
                         {
                             "LocalSlot": "AlbedoInput",
                             "AttachmentRef": {
-                                "Pass": "ForwardMSAAPass",
+                                "Pass": "Forward",
                                 "Attachment": "AlbedoOutput"
                             }
                         },
                         {
                             "LocalSlot": "NormalInput",
                             "AttachmentRef": {
-                                "Pass": "ForwardMSAAPass",
+                                "Pass": "Forward",
                                 "Attachment": "NormalOutput"
                             }
                         },
                         {
                             "LocalSlot": "DepthStencilInputOutput",
                             "AttachmentRef": {
-                                "Pass": "ForwardMSAAPass",
+                                "Pass": "Forward",
                                 "Attachment": "DepthStencilInputOutput"
                             }
                         }
@@ -335,35 +335,35 @@
                         {
                             "LocalSlot": "NormalInput",
                             "AttachmentRef": {
-                                "Pass": "ForwardMSAAPass",
+                                "Pass": "Forward",
                                 "Attachment": "NormalOutput"
                             }
                         },
                         {
                             "LocalSlot": "SpecularF0Input",
                             "AttachmentRef": {
-                                "Pass": "ForwardMSAAPass",
+                                "Pass": "Forward",
                                 "Attachment": "SpecularF0Output"
                             }
                         },
                         {
                             "LocalSlot": "AlbedoInput",
                             "AttachmentRef": {
-                                "Pass": "ForwardMSAAPass",
+                                "Pass": "Forward",
                                 "Attachment": "AlbedoOutput"
                             }
                         },
                         {
                             "LocalSlot": "DepthStencilInputOutput",
                             "AttachmentRef": {
-                                "Pass": "ForwardMSAAPass",
+                                "Pass": "Forward",
                                 "Attachment": "DepthStencilInputOutput"
                             }
                         },
                         {
                             "LocalSlot": "SpecularInputOutput",
                             "AttachmentRef": {
-                                "Pass": "ForwardMSAAPass",
+                                "Pass": "Forward",
                                 "Attachment": "SpecularOutput"
                             }
                         }
@@ -460,7 +460,7 @@
                         {
                             "LocalSlot": "InputColor2_curr",
                             "AttachmentRef": {
-                                "Pass": "ForwardMSAAPass",
+                                "Pass": "Forward",
                                 "Attachment": "ScatterDistanceOutput"
                             }
                         }

+ 0 - 65
Passes/ColorInvertCS.pass

@@ -1,65 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "PassAsset",
-    "ClassData": {
-        "PassTemplate": {
-            "Name": "ColorInvertCS",
-            "PassClass": "ComputePass",
-            "Slots": [
-                {
-                    "Name": "Input",
-                    "SlotType": "Input",
-                    "ScopeAttachmentUsage": "Shader"
-                },
-                {
-                    "Name": "Output",
-                    "SlotType": "Output",
-                    "ScopeAttachmentUsage": "Shader",
-                    "LoadStoreAction": {
-                        "LoadAction": "Clear"
-                    }
-                }
-            ],
-            "ImageAttachments": [
-                {
-                    "Name": "InvertedColor",
-                    "SizeSource": {
-                        "Source": {
-                            "Pass": "This",
-                            "Attachment": "Input"
-                        }
-                    },
-                    "FormatSource": {
-                        "Pass": "This",
-                        "Attachment": "Input"
-                    },
-                    "ImageDescriptor": {
-                        "BindFlags": [
-                            "CopyRead",
-                            "ShaderReadWrite",
-                            "ShaderWrite",
-                            "ShaderRead"
-                        ]
-                    }
-                }
-            ],
-            "Connections": [
-                {
-                    "LocalSlot": "Output",
-                    "AttachmentRef": {
-                        "Pass": "This",
-                        "Attachment": "InvertedColor"
-                    }
-                }
-            ],
-            "PassData": {
-                "$type": "ComputePassData",
-                "ShaderAsset": {
-                    "FilePath": "Shaders/PostProcessing/ColorInvertCS.shader"
-                },
-                "Make Fullscreen Pass": true
-            }
-        }
-    }
-}

+ 0 - 62
Passes/ColorblindnessSimulation.pass

@@ -1,62 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "PassAsset",
-    "ClassData": {
-        "PassTemplate": {
-            "Name": "ColorBlindPassTemplate",
-            "PassClass": "FullScreenTriangle",
-            "Slots": [
-                {
-                    "Name": "Input",
-                    "SlotType": "Input",
-                    "ScopeAttachmentUsage": "Shader"
-                },
-                {
-                    "Name": "Output",
-                    "SlotType": "Output",
-                    "ScopeAttachmentUsage": "RenderTarget"
-                }
-            ],
-            "ImageAttachments": [
-                {
-                    "Name": "ColorCorrectedImage",
-                    "SizeSource": {
-                        "Source": {
-                            "Pass": "This",
-                            "Attachment": "Input"
-                        }
-                    },
-                    "FormatSource": {
-                        "Pass": "This",
-                        "Attachment": "Input"
-                    },
-                    "ImageDescriptor": {
-                        "BindFlags": [
-                            "CopyRead",
-                            "Color",
-                            "ShaderReadWrite",
-                            "ShaderWrite",
-                            "ShaderRead"
-                        ]
-                    }
-                }
-            ],
-            "Connections": [
-                {
-                    "LocalSlot": "Output",
-                    "AttachmentRef": {
-                        "Pass": "This",
-                        "Attachment": "ColorCorrectedImage"
-                    }
-                }
-            ],
-            "PassData": {
-                "$type": "FullscreenTrianglePassData",
-                "ShaderAsset": {
-                    "FilePath": "Shaders/PostProcessing/ColorblindnessSimulation.shader"
-                }
-            }
-        }
-    }
-}

+ 0 - 313
Passes/ComplexPipeline.pass

@@ -1,313 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "PassAsset",
-    "ClassData": {
-        "PassTemplate": {
-            "Name": "ComplexPipeline",
-            "PassClass": "ParentPass",
-            "Slots": [
-                {
-                    "Name": "PipelineOutput",
-                    "SlotType": "InputOutput"
-                }
-            ],
-            "PassData": {
-                "$type": "PassData",
-                "PipelineGlobalConnections": [
-                    {
-                        "GlobalName": "PipelineOutput",
-                        "Slot": "PipelineOutput"
-                    }
-                ]
-            },
-            "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": "DepthMSAAPass",
-                    "TemplateName": "DepthMSAA4xPassTemplate",
-                    "PassData": {
-                        "$type": "RasterPassData",
-                        "DrawListTag": "depth",
-                        "PipelineViewTag": "MainCamera"
-                    },
-                    "Connections": [
-                        {
-                            "LocalSlot": "SkinnedMeshes",
-                            "AttachmentRef": {
-                                "Pass": "SkinningPass",
-                                "Attachment": "SkinnedMeshOutputStream"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "LightCullingTilePreparePass",
-                    "TemplateName": "LightCullingTilePrepareMSAATemplate",
-                    "Connections": [
-                        {
-                            "LocalSlot": "Depth",
-                            "AttachmentRef": {
-                                "Pass": "DepthMSAAPass",
-                                "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": "ForwardMSAAPass",
-                    "TemplateName": "ForwardMSAAPassTemplate",
-                    "Connections": [
-                        {
-                            "LocalSlot": "DirectionalLightShadowmap",
-                            "AttachmentRef": {
-                                "Pass": "CascadedShadowmapsPass",
-                                "Attachment": "Shadowmap"
-                            }
-                        },
-                        {
-                            "LocalSlot": "ExponentialShadowmapDirectional",
-                            "AttachmentRef": {
-                                "Pass": "EsmShadowmapsPassDirectional",
-                                "Attachment": "EsmShadowmaps"
-                            }
-                        },
-                        {
-                            "LocalSlot": "ProjectedLightShadowmap",
-                            "AttachmentRef": {
-                                "Pass": "ProjectedShadowmapsPass",
-                                "Attachment": "Shadowmap"
-                            }
-                        },
-                        {
-                            "LocalSlot": "ExponentialShadowmapProjected",
-                            "AttachmentRef": {
-                                "Pass": "EsmShadowmapsPassProjected",
-                                "Attachment": "EsmShadowmaps"
-                            }
-                        },
-                        {
-                            "LocalSlot": "DepthStencilInputOutput",
-                            "AttachmentRef": {
-                                "Pass": "DepthMSAAPass",
-                                "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": "MSAAResolveColorPass",
-                    "TemplateName": "MSAAResolveColorTemplate",
-                    "Connections": [
-                        {
-                            "LocalSlot": "Input",
-                            "AttachmentRef": {
-                                "Pass": "ForwardMSAAPass",
-                                "Attachment": "DiffuseOutput"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "MeshMotionVectorPass",
-                    "TemplateName": "MeshMotionVectorPassTemplate",
-                    "PassData": {
-                        "$type": "RasterPassData",
-                        "DrawListTag": "motion",
-                        "PipelineViewTag": "MainCamera"
-                    },
-                    "Connections": [
-                        {
-                            "LocalSlot": "SkinnedMeshes",
-                            "AttachmentRef": {
-                                "Pass": "SkinningPass",
-                                "Attachment": "SkinnedMeshOutputStream"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "MonochromePass",
-                    "TemplateName": "MonochromeTemplate",
-                    "Connections": [
-                        {
-                            "LocalSlot": "Input",
-                            "AttachmentRef": {
-                                "Pass": "MSAAResolveColorPass",
-                                "Attachment": "Output"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "Name": "CopyToSwapChain",
-                    "TemplateName": "FullscreenCopyTemplate",
-                    "Connections": [
-                        {
-                            "LocalSlot": "Input",
-                            "AttachmentRef": {
-                                "Pass": "MonochromePass",
-                                "Attachment": "Output"
-                            }
-                        },
-                        {
-                            "LocalSlot": "Output",
-                            "AttachmentRef": {
-                                "Pass": "Parent",
-                                "Attachment": "PipelineOutput"
-                            }
-                        }
-                    ]
-                }
-            ]
-        }
-    }
-}

+ 0 - 75
Passes/Monochrome.pass

@@ -1,75 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "PassAsset",
-    "ClassData": {
-        "PassTemplate": {
-            "Name": "MonochromeTemplate",
-            "PassClass": "FullScreenTriangle",
-            "Slots": [
-                {
-                    "Name": "Input",
-                    "SlotType": "Input",
-                    "ScopeAttachmentUsage": "Shader"
-                },
-                {
-                    "Name": "Output",
-                    "SlotType": "Output",
-                    "ScopeAttachmentUsage": "RenderTarget"
-                }
-            ],
-            "ImageAttachments": [
-                {
-                    "Name": "MonochromeImage",
-                    "SizeSource": {
-                        "Source": {
-                            "Pass": "This",
-                            "Attachment": "Input"
-                        }
-                    },
-                    "FormatSource": {
-                        "Pass": "This",
-                        "Attachment": "Input"
-                    },
-                    "ImageDescriptor": {
-                        "BindFlags": [
-                            "CopyRead",
-                            "Color",
-                            "ShaderReadWrite",
-                            "ShaderWrite",
-                            "ShaderRead"
-                        ]
-                    }
-                }
-            ],
-            "Connections": [
-                {
-                    "LocalSlot": "Output",
-                    "AttachmentRef": {
-                        "Pass": "This",
-                        "Attachment": "MonochromeImage"
-                    }
-                }
-            ],
-            "PassData": {
-                "$type": "FullscreenTrianglePassData",
-                "ShaderDataMappings": {
-                    "ColorMappings": [
-                        {
-                            "Name": "m_colorTint",
-                            "Value": [
-                                1.0,
-                                1.0,
-                                0.0,
-                                1.0
-                            ]
-                        }
-                    ]
-                },
-                "ShaderAsset": {
-                    "FilePath": "Shaders/PostProcessing/Monochrome.shader"
-                }
-            }
-        }
-    }
-}

+ 5 - 5
Passes/SsaoPipeline.pass

@@ -45,7 +45,7 @@
                 },
                 {
                     "Name": "DepthPrePass",
-                    "TemplateName": "DepthMSAAParentTemplate",
+                    "TemplateName": "DepthParentTemplate",
                     "Connections": [
                         {
                             "LocalSlot": "SkinnedMeshes",
@@ -118,8 +118,8 @@
                     ]
                 },
                 {
-                    "Name": "ForwardMSAAPass",
-                    "TemplateName": "ForwardMSAAPassTemplate",
+                    "Name": "Forward",
+                    "TemplateName": "ForwardPassTemplate",
                     "Connections": [
                         // Inputs...
                         {
@@ -189,14 +189,14 @@
                         {
                             "LocalSlot": "InputDepth",
                             "AttachmentRef": {
-                                "Pass": "ForwardMSAAPass",
+                                "Pass": "Forward",
                                 "Attachment": "DepthStencilInputOutput"
                             }
                         },
                         {
                             "LocalSlot": "WorldNormal",
                             "AttachmentRef": {
-                                "Pass": "ForwardMSAAPass",
+                                "Pass": "Forward",
                                 "Attachment": "NormalOutput"
                             }
                         }

+ 0 - 75
Shaders/PostProcessing/ColorblindnessSimulation.azsl

@@ -1,75 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <Atom/Features/SrgSemantics.azsli>
-
-#include <Atom/Features/PostProcessing/FullscreenPixelInfo.azsli>
-#include <Atom/Features/PostProcessing/FullscreenVertex.azsli>
-#include <Atom/Features/PostProcessing/PostProcessUtil.azsli>
-
-ShaderResourceGroup PassSrg : SRG_PerPass
-{
-    Texture2D<float4> m_framebuffer;
-    Sampler LinearSampler
-    {
-        MinFilter = Linear;
-        MagFilter = Linear;
-        MipFilter = Linear;
-        AddressU = Clamp;
-        AddressV = Clamp;
-        AddressW = Clamp;
-    };
-
-    //float4x4 m_simulationMatrix;
-    //float4 m_simulationParams;
-}
-
-#define BLINDNESS_STRENGTH 1.0h //PassSrg.m_simulationParams.x
-
-PSOutput MainPS(VSOutput IN)
-{
-    float3x4 simulationMatrix = float3x4(0, 1.05118294, -0.05116099, 0,
-                                         0, 1, 0, 0,
-                                         0, 0, 1, 0);
-
-    PSOutput OUT;
-
-    // This texture sample will be in sRGB since HDR post process should happen before this
-    half3 srgbColor = half3(PassSrg::m_framebuffer.Sample(PassSrg::LinearSampler, IN.m_texCoord).rgb);
-
-    half3 linearColor = half3(SRGBToLinear(srgbColor));
-
-    // LMS Transformation matrix and inverse described in http://ixora.io/projects/colorblindness/color-blindness-simulation-research/
-    half3x3 lmsTransformation = half3x3(0.31399022, 0.63951294, 0.04649755,
-                                        0.15537241, 0.75789446, 0.08670142,
-                                        0.01775239, 0.10944209, 0.87256922);
-
-    half3x3 inverseLmsTransformation = half3x3(5.47221206, -4.6419601, 0.16963708,
-                                               -1.1252419, 2.29317094, -0.1678952,
-                                               0.02980165, -0.19318073, 1.16364789);
-    
-    // Linear to LMS
-    half3 lmsColor = mul(lmsTransformation, linearColor);
-
-    // Apply given simulation matrix to adjust colors to be what a colorblind person would see
-    lmsColor = half3(mul(simulationMatrix, float4(lmsColor, 1.000)).rgb);
-
-    // LMS back into Linear
-    half3 simulatedLinearColor = mul(inverseLmsTransformation, lmsColor);
-
-    // Linear interpolation between true color and color blindness based on blindness strength
-    simulatedLinearColor = lerp(linearColor, simulatedLinearColor, BLINDNESS_STRENGTH);
-
-    // Linear to sRGB
-    float3 simulatedsRGBColor = LinearToSRGB(simulatedLinearColor);
-
-    OUT.m_color.rgb = simulatedsRGBColor;
-    OUT.m_color.w = 1;
-
-    return OUT;
-}

+ 0 - 22
Shaders/PostProcessing/ColorblindnessSimulation.shader

@@ -1,22 +0,0 @@
-{ 
-    "Source" : "ColorblindnessSimulation.azsl",
-
-    "DepthStencilState" : {
-        "Depth" : { "Enable" : false }
-    },
-
-    "ProgramSettings":
-    {
-      "EntryPoints":
-      [
-        {
-          "name": "MainVS",
-          "type": "Vertex"
-        },
-        {
-          "name": "MainPS",
-          "type": "Fragment"
-        }
-      ]
-    }   
-}

+ 0 - 46
Shaders/PostProcessing/Monochrome.azsl

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <Atom/Features/SrgSemantics.azsli>
-
-#include <Atom/Features/PostProcessing/FullscreenPixelInfo.azsli>
-#include <Atom/Features/PostProcessing/FullscreenVertex.azsli>
-#include <Atom/Features/PostProcessing/PostProcessUtil.azsli>
-
-ShaderResourceGroup PassSrg : SRG_PerPass
-{
-    Texture2D<float4> m_framebuffer;
-    Sampler LinearSampler
-    {
-        MinFilter = Linear;
-        MagFilter = Linear;
-        MipFilter = Linear;
-        AddressU = Clamp;
-        AddressV = Clamp;
-        AddressW = Clamp;
-    };
-    
-    float4 m_colorTint;
-}
-
-PSOutput MainPS(VSOutput IN)
-{
-    PSOutput OUT;
-
-    float3 color = PassSrg::m_framebuffer.Sample(PassSrg::LinearSampler, IN.m_texCoord).rgb;
-
-    float average = color.r + color.g + color.b;
-    average /= 3.0f;
-
-    OUT.m_color.rgb = float3(average, average, average);
-    OUT.m_color.w = 1;
-
-    OUT.m_color.rgb *= PassSrg::m_colorTint.rgb;
-
-    return OUT;
-}

+ 0 - 22
Shaders/PostProcessing/Monochrome.shader

@@ -1,22 +0,0 @@
-{ 
-    "Source" : "Monochrome.azsl",
-
-    "DepthStencilState" : {
-        "Depth" : { "Enable" : false }
-    },
-
-    "ProgramSettings":
-    {
-      "EntryPoints":
-      [
-        {
-          "name": "MainVS",
-          "type": "Vertex"
-        },
-        {
-          "name": "MainPS",
-          "type": "Fragment"
-        }
-      ]
-    }
-}

+ 0 - 8
atomsampleviewer_asset_files.cmake

@@ -15,14 +15,10 @@ set(FILES
     Materials/Types/MinimalMultilayerPBR_ForwardPass.azsl
     Materials/Types/MinimalMultilayerPBR_ForwardPass.shader
     Passes/CheckerboardPipeline.pass
-    Passes/ColorblindnessSimulation.pass
-    Passes/ColorInvertCS.pass
-    Passes/ComplexPipeline.pass
     Passes/Fullscreen.pass
     Passes/FullscreenPipeline.pass
     Passes/ImGuiNoInput.pass
     Passes/ImGuiOnlyPipeline.pass
-    Passes/Monochrome.pass
     Passes/RayTracingAmbientOcclusion.pass
     Passes/ReadbackFiller.pass
     Passes/ReadbackPipeline.pass
@@ -76,12 +72,8 @@ set(FILES
     Shaders/DynamicDraw/DynamicDrawExample.shader
     Shaders/OptimizationTests/DummyTransformColor.azsl
     Shaders/OptimizationTests/DummyTransformColor.shader
-    Shaders/PostProcessing/ColorblindnessSimulation.azsl
-    Shaders/PostProcessing/ColorblindnessSimulation.shader
     Shaders/PostProcessing/ColorInvertCS.azsl
     Shaders/PostProcessing/ColorInvertCS.shader
-    Shaders/PostProcessing/Monochrome.azsl
-    Shaders/PostProcessing/Monochrome.shader
     Shaders/RayTracing/RTAOClosestHit.azsl
     Shaders/RayTracing/RTAOClosestHit.shader
     Shaders/RayTracing/RTAODefines.azsli