Sfoglia il codice sorgente

udpated method working with most samples

Signed-off-by: antonmic <[email protected]>
antonmic 3 anni fa
parent
commit
65f893c1bd

+ 7 - 1
Passes/CheckerboardPipeline.pass

@@ -5,7 +5,13 @@
     "ClassData": {
     "ClassData": {
         "PassTemplate": {
         "PassTemplate": {
             "Name": "CheckerboardPipeline",
             "Name": "CheckerboardPipeline",
-            "PassClass": "PipelinePass",
+            "PassClass": "ParentPass",
+            "Slots": [
+                {
+                    "Name": "SwapChainOutput",
+                    "SlotType": "InputOutput"
+                }
+            ],
             "PassRequests": [
             "PassRequests": [
                 {
                 {
                     "Name": "MorphTargetPass",
                     "Name": "MorphTargetPass",

+ 8 - 2
Passes/ComplexPipeline.pass

@@ -5,7 +5,13 @@
     "ClassData": {
     "ClassData": {
         "PassTemplate": {
         "PassTemplate": {
             "Name": "ComplexPipeline",
             "Name": "ComplexPipeline",
-            "PassClass": "PipelinePass",
+            "PassClass": "ParentPass",
+            "Slots": [
+                {
+                    "Name": "SwapChainOutput",
+                    "SlotType": "InputOutput"
+                }
+            ],
             "PassRequests": [
             "PassRequests": [
                 {
                 {
                     "Name": "MorphTargetPass",
                     "Name": "MorphTargetPass",
@@ -44,7 +50,7 @@
                 },
                 },
                 {
                 {
                     "Name": "ProjectedShadowmapsPass",
                     "Name": "ProjectedShadowmapsPass",
-                    "TemplateName": "ProjectedLightShadowmapsTemplate",
+                    "TemplateName": "ProjectedShadowmapsTemplate",
                     "PassData": {
                     "PassData": {
                         "$type": "RasterPassData",
                         "$type": "RasterPassData",
                         "DrawListTag": "shadow",
                         "DrawListTag": "shadow",

+ 7 - 1
Passes/ImGuiOnlyPipeline.pass

@@ -5,7 +5,13 @@
     "ClassData": {
     "ClassData": {
         "PassTemplate": {
         "PassTemplate": {
             "Name": "ImGuiOnlyPipeline",
             "Name": "ImGuiOnlyPipeline",
-            "PassClass": "PipelinePass",
+            "PassClass": "ParentPass",
+            "Slots": [
+                {
+                    "Name": "SwapChainOutput",
+                    "SlotType": "InputOutput"
+                }
+            ],
             "PassRequests": [
             "PassRequests": [
                 {
                 {
                     "Name": "ImGuiNoInputPass",
                     "Name": "ImGuiNoInputPass",

+ 9 - 3
Passes/RHISamplePipeline.pass

@@ -5,13 +5,19 @@
     "ClassData": {
     "ClassData": {
         "PassTemplate": {
         "PassTemplate": {
             "Name": "RHISamplePipelineTemplate",
             "Name": "RHISamplePipelineTemplate",
-            "PassClass": "PipelinePass",
-            "PassRequests": [                     
+            "PassClass": "ParentPass",
+            "Slots": [
+                {
+                    "Name": "SwapChainOutput",
+                    "SlotType": "InputOutput"
+                }
+            ],
+            "PassRequests": [
                 {
                 {
                     "Name": "RHISamplePass",
                     "Name": "RHISamplePass",
                     "TemplateName": "RHISamplePassTemplate",
                     "TemplateName": "RHISamplePassTemplate",
                     "Enabled": true
                     "Enabled": true
-                },      
+                },
                 {
                 {
                     "Name": "ImGuiPass",
                     "Name": "ImGuiPass",
                     "TemplateName": "ImGuiPassTemplate",
                     "TemplateName": "ImGuiPassTemplate",

+ 28 - 16
Passes/SsaoPipeline.pass

@@ -5,24 +5,19 @@
     "ClassData": {
     "ClassData": {
         "PassTemplate": {
         "PassTemplate": {
             "Name": "SsaoPipeline",
             "Name": "SsaoPipeline",
-            "PassClass": "PipelinePass",
+            "PassClass": "ParentPass",
+            "Slots": [
+                {
+                    "Name": "SwapChainOutput",
+                    "SlotType": "InputOutput"
+                }
+            ],
             "PassData": {
             "PassData": {
-                "$type": "PipelinePassData",
+                "$type": "PassData",
                 "PipelineConnections": [
                 "PipelineConnections": [
                     {
                     {
-                        "GlobalName": "Depth",
-                        "ChildPass": "DepthPrePass",
-                        "ChildPassSlot": "Depth"
-                    },
-                    {
-                        "GlobalName": "DepthMSAA",
-                        "ChildPass": "DepthPrePass",
-                        "ChildPassSlot": "DepthMSAA"
-                    },
-                    {
-                        "GlobalName": "DepthLinear",
-                        "ChildPass": "DepthPrePass",
-                        "ChildPassSlot": "DepthLinear"
+                        "GlobalName": "SwapChainOutput",
+                        "Slot": "SwapChainOutput"
                     }
                     }
                 ]
                 ]
             },
             },
@@ -66,7 +61,24 @@
                                 "Attachment": "SwapChainOutput"
                                 "Attachment": "SwapChainOutput"
                             }
                             }
                         }
                         }
-                    ]
+                    ],
+                    "PassData": {
+                        "$type": "PassData",
+                        "PipelineConnections": [
+                            {
+                                "GlobalName": "Depth",
+                                "Slot": "Depth"
+                            },
+                            {
+                                "GlobalName": "DepthMSAA",
+                                "Slot": "DepthMSAA"
+                            },
+                            {
+                                "GlobalName": "DepthLinear",
+                                "Slot": "DepthLinear"
+                            }
+                        ]
+                    }
                 },
                 },
                 {
                 {
                     "Name": "LightCullingPass",
                     "Name": "LightCullingPass",