fix update instance attribute failed under multipass for native engine (

cocos#15007)
CosmoLau · May 10, 2023 · 0a207a5 · 0a207a5
1 parent 6cbad38
commit 0a207a5
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/native/cocos/scene/Model.cpp b/native/cocos/scene/Model.cpp
@@ -514,8 +514,18 @@ void Model::updateAttributesAndBinding(index_t subModelIndex) {
         updateWorldBoundDescriptors(subModelIndex, subModel->getWorldBoundDescriptorSet());
     }
 
-    gfx::Shader *shader = subModel->getPasses()[0]->getShaderVariant(subModel->getPatches());
-    updateInstancedAttributes(shader->getAttributes(), subModel);
+    ccstd::vector<gfx::Attribute> attributes;
+    ccstd::unordered_map<ccstd::string, gfx::Attribute> attributeMap;
+    for (const auto &pass : subModel->getPasses()) {
+        gfx::Shader *shader = pass->getShaderVariant(subModel->getPatches());
+        for (const auto &attr : shader->getAttributes()) {
+            if (attributeMap.find(attr.name) == attributeMap.end()) {
+                attributes.push_back(attr);
+                attributeMap.insert({attr.name, attr});
+            }
+        }
+    }
+    updateInstancedAttributes(attributes, subModel);
 }
 
 void Model::updateInstancedAttributes(const ccstd::vector<gfx::Attribute> &attributes, SubModel *subModel) {