fix web (#165)

* fix web * fix fg dispatcher
cocos · Oct 9, 2023 · 7ccbd91 · 7ccbd91
1 parent 36a2933
commit 7ccbd91
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/cocos/rendering/custom/executor.ts b/cocos/rendering/custom/executor.ts
@@ -1249,7 +1249,7 @@ class DeviceComputePass {
             const layoutGraph = context.layoutGraph;
             const stageId = layoutGraph.locateChild(layoutGraph.nullVertex(), stageName);
             if (stageId !== 0xFFFFFFFF) {
-                this._layout = new RenderPassLayoutInfo(stageId, input);
+                this._layout = new RenderPassLayoutInfo(stageId, this._computeInfo.id, input);
             }
         }
     }

diff --git a/native/cocos/renderer/pipeline/custom/FrameGraphDispatcher.cpp b/native/cocos/renderer/pipeline/custom/FrameGraphDispatcher.cpp
@@ -794,10 +794,15 @@ struct AttachmentSortKey {
     const ccstd::pmr::string &name;
 };
 
-struct AttachmentComparator {
+struct SubpassComparator {
     bool operator()(const AttachmentSortKey &lhs, const AttachmentSortKey &rhs) const {
-        return std::tie(rhs.samples, lhs.accessType, lhs.attachmentWeight, lhs.slotID, lhs.slotName, lhs.name) <
-               std::tie(lhs.samples, rhs.accessType, rhs.attachmentWeight, rhs.slotID, rhs.slotName, rhs.name);
+        return std::tie(rhs.samples, lhs.accessType, lhs.attachmentWeight, lhs.name) < std::tie(lhs.samples, rhs.accessType, rhs.attachmentWeight, rhs.name);
+    }
+};
+
+struct PassComparator {
+    bool operator()(const AttachmentSortKey &lhs, const AttachmentSortKey &rhs) const {
+        return lhs.slotID < rhs.slotID;
     }
 };
 
@@ -1058,7 +1063,7 @@ bool checkResolveResource(const Graphs &graphs,
         colorMap.emplace(AttachmentSortKey{desc.sampleCount,
                                            AccessType::WRITE,
                                            ATTACHMENT_TYPE_WEIGHT[static_cast<uint32_t>(attachmentType)],
-                                           INVALID_ID,
+                                           static_cast<uint32_t>(colorMap.size()),
                                            "",
                                            resolveTargetName},
                          ViewInfo{desc.format,