Merge pull request #6681 from aws-lumberyard-dev/rgba16f/revertAddingPassClass

Revert "added pass class (#6244)"

Gems/Atom/Feature/Common/Assets/Passes/DiffuseComposite.pass

@@ -5,7 +5,7 @@
     "ClassData": {
         "PassTemplate": {
             "Name": "DiffuseCompositePassTemplate",
-            "PassClass": "DiffuseCompositePass",
+            "PassClass": "FullScreenTriangle",
             "Slots": [
                 {
                     "Name": "DownsampledIrradianceInput",

Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.cpp

@@ -96,7 +96,6 @@
 #include <DiffuseGlobalIllumination/DiffuseProbeGridRenderPass.h>
 #include <DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.h>
 #include <DiffuseGlobalIllumination/DiffuseGlobalIlluminationFeatureProcessor.h>
-#include <DiffuseGlobalIllumination/DiffuseCompositePass.h>
 #include <ReflectionScreenSpace/ReflectionScreenSpaceTracePass.h>
 #include <ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.h>
 #include <ReflectionScreenSpace/ReflectionScreenSpaceBlurChildPass.h>
@@ -279,7 +278,6 @@ namespace AZ
             passSystem->AddPassCreator(Name("DiffuseProbeGridClassificationPass"), &Render::DiffuseProbeGridClassificationPass::Create);
             passSystem->AddPassCreator(Name("DiffuseProbeGridDownsamplePass"), &Render::DiffuseProbeGridDownsamplePass::Create);
             passSystem->AddPassCreator(Name("DiffuseProbeGridRenderPass"), &Render::DiffuseProbeGridRenderPass::Create);
-            passSystem->AddPassCreator(Name("DiffuseCompositePass"), &Render::DiffuseCompositePass::Create);
 
             passSystem->AddPassCreator(Name("LuminanceHistogramGeneratorPass"), &LuminanceHistogramGeneratorPass::Create);
 

Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseCompositePass.cpp

@@ -1,45 +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 <DiffuseGlobalIllumination/DiffuseCompositePass.h>
-#include <DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.h>
-
-namespace AZ
-{
-    namespace Render
-    {
-        // --- Dedicated class for disabling ---
-
-        RPI::Ptr<DiffuseCompositePass> DiffuseCompositePass::Create(const RPI::PassDescriptor& descriptor)
-        {
-            RPI::Ptr<DiffuseCompositePass> pass = aznew DiffuseCompositePass(descriptor);
-            return AZStd::move(pass);
-        }
-
-        DiffuseCompositePass::DiffuseCompositePass(const RPI::PassDescriptor& descriptor)
-            : RPI::FullscreenTrianglePass(descriptor)
-        { }
-
-        bool DiffuseCompositePass::IsEnabled() const
-        {
-            const RPI::Scene* scene = GetScene();
-            if (!scene)
-            {
-                return false;
-            }
-            DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor =
-                scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
-            if (!diffuseProbeGridFeatureProcessor || diffuseProbeGridFeatureProcessor->GetVisibleRealTimeProbeGrids().empty())
-            {
-                // no diffuse probe grids
-                return false;
-            }
-            return true;
-        }
-    } // namespace Render
-} // namespace AZ

Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseCompositePass.h

@@ -1,36 +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
- *
- */
-#pragma once
-
-#include <Atom/RPI.Public/Pass/FullscreenTrianglePass.h>
-
-namespace AZ
-{
-    namespace Render
-    {
-        //! A class for DiffuseComposite to allow for disabling
-        class DiffuseCompositePass final
-            : public RPI::FullscreenTrianglePass
-        {
-            AZ_RPI_PASS(DiffuseCompositePass);
-
-        public:
-            AZ_RTTI(DiffuseCompositePass, "{F3DBEBCB-66F8-465C-A06B-DFA76B9D4856}", AZ::RPI::FullscreenTrianglePass);
-            AZ_CLASS_ALLOCATOR(DiffuseCompositePass, SystemAllocator, 0);
-
-            ~DiffuseCompositePass() = default;
-            static RPI::Ptr<DiffuseCompositePass> Create(const RPI::PassDescriptor& descriptor);
-
-            bool IsEnabled() const override;
-
-        private:
-            DiffuseCompositePass(const RPI::PassDescriptor& descriptor);
-
-        };
-    } // namespace Render
-} // namespace AZ

Gems/Atom/Feature/Common/Code/atom_feature_common_files.cmake

@@ -134,8 +134,6 @@ set(FILES
     Source/DiffuseGlobalIllumination/DiffuseProbeGridDownsamplePass.h
     Source/DiffuseGlobalIllumination/DiffuseProbeGridRenderPass.cpp
     Source/DiffuseGlobalIllumination/DiffuseProbeGridRenderPass.h
-    Source/DiffuseGlobalIllumination/DiffuseCompositePass.cpp
-    Source/DiffuseGlobalIllumination/DiffuseCompositePass.h
     Source/DiffuseGlobalIllumination/DiffuseProbeGrid.cpp
     Source/DiffuseGlobalIllumination/DiffuseProbeGrid.h
     Source/DiffuseGlobalIllumination/DiffuseProbeGridTextureReadback.cpp