Merge pull request #3100 from secondlife/v-2570

cosmic-linden · web-flow · commit 99bddd52ad53 · 2024-11-18T09:05:49.000-08:00
#2570: Fix BoM texture interference on PBR materials. Also fix PBR copy/paste (#3099)
diff --git a/indra/newview/llfetchedgltfmaterial.cpp b/indra/newview/llfetchedgltfmaterial.cpp
@@ -221,6 +221,14 @@ void LLFetchedGLTFMaterial::updateTextureTracking()
     }
 }
 
+void LLFetchedGLTFMaterial::clearFetchedTextures()
+{
+    mBaseColorTexture = nullptr;
+    mNormalTexture = nullptr;
+    mMetallicRoughnessTexture = nullptr;
+    mEmissiveTexture = nullptr;
+}
+
 void LLFetchedGLTFMaterial::materialBegin()
 {
     llassert(!mFetching);
diff --git a/indra/newview/llfetchedgltfmaterial.h b/indra/newview/llfetchedgltfmaterial.h
@@ -67,6 +67,7 @@ class LLFetchedGLTFMaterial: public LLGLTFMaterial
     LLPointer<LLViewerFetchedTexture> mNormalTexture;
     LLPointer<LLViewerFetchedTexture> mMetallicRoughnessTexture;
     LLPointer<LLViewerFetchedTexture> mEmissiveTexture;
+    void clearFetchedTextures();
 
     std::set<LLTextureEntry*> mTextureEntires;
 
diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp
@@ -409,7 +409,7 @@ void LLGLTFMaterialList::flushUpdates(void(*done_callback)(bool))
     {
         callback_holder = std::make_shared<CallbackHolder>(done_callback);
     }
-    while (!sModifyQueue.empty() || !sApplyQueue.empty())
+    while (!sModifyQueue.empty() || !sApplyQueue.empty() || !sUpdates.isEmpty())
     {
         flushUpdatesOnce(callback_holder);
     }
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
@@ -4404,8 +4404,7 @@ void LLPanelFace::onPasteTexture(LLViewerObject* objectp, S32 te)
             if (te_data["te"].has("pbr"))
             {
                 objectp->setRenderMaterialID(te, te_data["te"]["pbr"].asUUID(), false /*managing our own update*/);
-                tep->setGLTFRenderMaterial(nullptr);
-                tep->setGLTFMaterialOverride(nullptr);
+                objectp->setTEGLTFMaterialOverride(te, nullptr);
 
                 LLSD override_data;
                 override_data["object_id"] = objectp->getID();
@@ -4426,8 +4425,7 @@ void LLPanelFace::onPasteTexture(LLViewerObject* objectp, S32 te)
             else
             {
                 objectp->setRenderMaterialID(te, LLUUID::null, false /*send in bulk later*/ );
-                tep->setGLTFRenderMaterial(nullptr);
-                tep->setGLTFMaterialOverride(nullptr);
+                objectp->setTEGLTFMaterialOverride(te, nullptr);
 
                 // blank out most override data on the server
                 LLGLTFMaterialList::queueApply(objectp, te, LLUUID::null);
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
@@ -5075,11 +5075,10 @@ void LLViewerObject::setNumTEs(const U8 num_tes)
                     if (base_material && override_material)
                     {
                         tep->setGLTFMaterialOverride(new LLGLTFMaterial(*override_material));
-
-                        LLGLTFMaterial* render_material = new LLFetchedGLTFMaterial();
-                        *render_material = *base_material;
-                        render_material->applyOverride(*override_material);
-                        tep->setGLTFRenderMaterial(render_material);
+                    }
+                    if (base_material)
+                    {
+                        initRenderMaterial(i);
                     }
                 }
             }
@@ -5254,6 +5253,9 @@ void LLViewerObject::updateTEMaterialTextures(U8 te)
                 });
         }
         getTE(te)->setGLTFMaterial(mat);
+        initRenderMaterial(te);
+        mat = (LLFetchedGLTFMaterial*) getTE(te)->getGLTFRenderMaterial();
+        llassert(mat == nullptr || dynamic_cast<LLFetchedGLTFMaterial*>(getTE(te)->getGLTFRenderMaterial()) != nullptr);
     }
     else if (mat_id.isNull() && mat != nullptr)
     {
@@ -5643,6 +5645,42 @@ S32 LLViewerObject::setTEMaterialParams(const U8 te, const LLMaterialPtr pMateri
     return retval;
 }
 
+// Set render material if there are overrides or if the base material is has a
+// baked texture. Otherwise, set it to null.
+// If you are setting the material override and not sending an update message,
+// you should probably call this function.
+S32 LLViewerObject::initRenderMaterial(U8 te)
+{
+    LL_PROFILE_ZONE_SCOPED;
+
+    LLTextureEntry* tep = getTE(te);
+    if (!tep) { return 0; }
+    const LLFetchedGLTFMaterial* base_material = static_cast<LLFetchedGLTFMaterial*>(tep->getGLTFMaterial());
+    llassert(base_material);
+    if (!base_material) { return 0; }
+    const LLGLTFMaterial* override_material = tep->getGLTFMaterialOverride();
+    LLFetchedGLTFMaterial* render_material = nullptr;
+    bool need_render_material = override_material;
+    if (!need_render_material)
+    {
+        for (const LLUUID& texture_id : base_material->mTextureId)
+        {
+            if (LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(texture_id))
+            {
+                need_render_material = true;
+                break;
+            }
+        }
+    }
+    if (need_render_material)
+    {
+        render_material = new LLFetchedGLTFMaterial(*base_material);
+        if (override_material) { render_material->applyOverride(*override_material); }
+        render_material->clearFetchedTextures();
+    }
+    return tep->setGLTFRenderMaterial(render_material);
+}
+
 S32 LLViewerObject::setTEGLTFMaterialOverride(U8 te, LLGLTFMaterial* override_mat)
 {
     LL_PROFILE_ZONE_SCOPED;
@@ -5676,22 +5714,13 @@ S32 LLViewerObject::setTEGLTFMaterialOverride(U8 te, LLGLTFMaterial* override_ma
 
     if (retval)
     {
+        retval = initRenderMaterial(te) | retval;
         if (override_mat)
         {
-            LLFetchedGLTFMaterial* render_mat = new LLFetchedGLTFMaterial(*src_mat);
-            render_mat->applyOverride(*override_mat);
-            tep->setGLTFRenderMaterial(render_mat);
-            retval = TEM_CHANGE_TEXTURE;
-
             for (LLGLTFMaterial::local_tex_map_t::value_type &val : override_mat->mTrackingIdToLocalTexture)
             {
                 LLLocalBitmapMgr::getInstance()->associateGLTFMaterial(val.first, override_mat);
             }
-
-        }
-        else if (tep->setGLTFRenderMaterial(nullptr))
-        {
-            retval = TEM_CHANGE_TEXTURE;
         }
     }
 
@@ -7561,25 +7590,15 @@ void LLViewerObject::setRenderMaterialID(S32 te_in, const LLUUID& id, bool updat
             // the overrides have not changed due to being only texture
             // transforms. Re-apply the overrides to the render material here,
             // if present.
-            const LLGLTFMaterial* override_material = tep->getGLTFMaterialOverride();
-            if (override_material)
+            // Also, sometimes, the material has baked textures, which requires
+            // a copy unique to this object.
+            // Currently, we do not deduplicate render materials.
+            new_material->onMaterialComplete([obj_id = getID(), te]()
             {
-                new_material->onMaterialComplete([obj_id = getID(), te]()
-                    {
-                        LLViewerObject* obj = gObjectList.findObject(obj_id);
-                        if (!obj) { return; }
-                        LLTextureEntry* tep = obj->getTE(te);
-                        if (!tep) { return; }
-                        const LLGLTFMaterial* new_material = tep->getGLTFMaterial();
-                        if (!new_material) { return; }
-                        const LLGLTFMaterial* override_material = tep->getGLTFMaterialOverride();
-                        if (!override_material) { return; }
-                        LLGLTFMaterial* render_material = new LLFetchedGLTFMaterial();
-                        *render_material = *new_material;
-                        render_material->applyOverride(*override_material);
-                        tep->setGLTFRenderMaterial(render_material);
-                    });
-            }
+                LLViewerObject* obj = gObjectList.findObject(obj_id);
+                if (!obj) { return; }
+                obj->initRenderMaterial(te);
+            });
         }
     }
 
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
@@ -389,6 +389,7 @@ class LLViewerObject
     /*virtual*/ S32     setTEGlow(const U8 te, const F32 glow);
     /*virtual*/ S32     setTEMaterialID(const U8 te, const LLMaterialID& pMaterialID);
     /*virtual*/ S32     setTEMaterialParams(const U8 te, const LLMaterialPtr pMaterialParams);
+    S32 initRenderMaterial(const U8 te);
     virtual     S32     setTEGLTFMaterialOverride(U8 te, LLGLTFMaterial* mat);
 
     // Used by Materials update functions to properly kick off rebuilds

Original file line number	Diff line number	Diff line change
`@@ -221,6 +221,14 @@ void LLFetchedGLTFMaterial::updateTextureTracking()`
`221`	`221`	`}`
`222`	`222`	`}`
`223`	`223`
	`224`	`+void LLFetchedGLTFMaterial::clearFetchedTextures()`
	`225`	`+{`
	`226`	`+ mBaseColorTexture = nullptr;`
	`227`	`+ mNormalTexture = nullptr;`
	`228`	`+ mMetallicRoughnessTexture = nullptr;`
	`229`	`+ mEmissiveTexture = nullptr;`
	`230`	`+}`
	`231`	`+`
`224`	`232`	`void LLFetchedGLTFMaterial::materialBegin()`
`225`	`233`	`{`
`226`	`234`	`llassert(!mFetching);`
Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ void LLGLTFMaterialList::flushUpdates(void(*done_callback)(bool))`
`409`	`409`	`{`
`410`	`410`	`callback_holder = std::make_shared<CallbackHolder>(done_callback);`
`411`	`411`	`}`
`412`		`- while (!sModifyQueue.empty() \|\| !sApplyQueue.empty())`
	`412`	`+ while (!sModifyQueue.empty() \|\| !sApplyQueue.empty() \|\| !sUpdates.isEmpty())`
`413`	`413`	`{`
`414`	`414`	`flushUpdatesOnce(callback_holder);`
`415`	`415`	`}`