From c9ef206e39063c46c1fbab355c1a015e3e8b022e Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Thu, 28 Apr 2022 13:08:37 -0700
Subject: Beginning viewer side work for SL-17198 new asset and inventory types
 for Materials

---
 indra/llprimitive/llmaterial.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/llprimitive/llmaterial.cpp')

diff --git a/indra/llprimitive/llmaterial.cpp b/indra/llprimitive/llmaterial.cpp
index a219ac1450..f546ac1645 100644
--- a/indra/llprimitive/llmaterial.cpp
+++ b/indra/llprimitive/llmaterial.cpp
@@ -331,6 +331,17 @@ void LLMaterial::setAlphaMaskCutoff(U8 cutoff)
     mAlphaMaskCutoff = cutoff;
 }
 
+LLUUID LLMaterial::getMaterialID() const
+{
+    // TODO - not null
+    return LLUUID::null;
+}
+
+void LLMaterial::setMaterialID(const LLUUID &material_id)
+{
+    // TODO - set
+}
+
 LLSD LLMaterial::asLLSD() const
 {
     LLSD material_data;
-- 
cgit v1.2.3


From 7bd9d21e19b923096ba2b5ea3cbc8be3e13d7aa0 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Thu, 19 Jan 2023 09:13:45 -0600
Subject: Optimizations, decruft, and intel compatibility pass (#53)

SL-18869, SL-18772  Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc
---
 indra/llprimitive/llmaterial.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'indra/llprimitive/llmaterial.cpp')

diff --git a/indra/llprimitive/llmaterial.cpp b/indra/llprimitive/llmaterial.cpp
index f546ac1645..0ab97a0df3 100644
--- a/indra/llprimitive/llmaterial.cpp
+++ b/indra/llprimitive/llmaterial.cpp
@@ -27,6 +27,7 @@
 #include "linden_common.h"
 
 #include "llmaterial.h"
+#include "llmd5.h"
 
 /**
  * Materials cap parameters
@@ -475,4 +476,16 @@ U32 LLMaterial::getShaderMask(U32 alpha_mode)
     return ret;
 }
 
+LLUUID LLMaterial::getHash() const
+{
+    LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
+    LLMD5 md5;
+    // HACK - hash the bytes of this LLMaterial, but trim off the S32 in LLRefCount
+    md5.update((unsigned char*)this + sizeof(S32), sizeof(this) - sizeof(S32));
+    md5.finalize();
+    LLUUID id;
+    md5.raw_digest(id.mData);
+    // *TODO: Hash the overrides
+    return id;
+}
 
-- 
cgit v1.2.3


From 93b1da52f56293663d9bfe5272a83a77185f4cff Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 2 Feb 2023 14:35:09 -0600
Subject: SL-18908 Make media texture override base color and emissive texture
 on PBR materials when present.

---
 indra/llprimitive/llmaterial.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'indra/llprimitive/llmaterial.cpp')

diff --git a/indra/llprimitive/llmaterial.cpp b/indra/llprimitive/llmaterial.cpp
index 0ab97a0df3..a694a666c6 100644
--- a/indra/llprimitive/llmaterial.cpp
+++ b/indra/llprimitive/llmaterial.cpp
@@ -27,7 +27,7 @@
 #include "linden_common.h"
 
 #include "llmaterial.h"
-#include "llmd5.h"
+#include "hbxxh.h"
 
 /**
  * Materials cap parameters
@@ -479,13 +479,9 @@ U32 LLMaterial::getShaderMask(U32 alpha_mode)
 LLUUID LLMaterial::getHash() const
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
-    LLMD5 md5;
     // HACK - hash the bytes of this LLMaterial, but trim off the S32 in LLRefCount
-    md5.update((unsigned char*)this + sizeof(S32), sizeof(this) - sizeof(S32));
-    md5.finalize();
     LLUUID id;
-    md5.raw_digest(id.mData);
-    // *TODO: Hash the overrides
+    HBXXH128::digest(id, (unsigned char*)this + sizeof(S32), sizeof(this) - sizeof(S32));
     return id;
 }
 
-- 
cgit v1.2.3


From e23b3972a00370aff25d582ce33dc0db6d795213 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 22 Mar 2023 18:25:47 -0500
Subject: DRTVWR-559 Fix for bad hashing of materials breaking render batches
 and who knows what else.

---
 indra/llprimitive/llmaterial.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llprimitive/llmaterial.cpp')

diff --git a/indra/llprimitive/llmaterial.cpp b/indra/llprimitive/llmaterial.cpp
index a694a666c6..37525e4a3d 100644
--- a/indra/llprimitive/llmaterial.cpp
+++ b/indra/llprimitive/llmaterial.cpp
@@ -481,7 +481,7 @@ LLUUID LLMaterial::getHash() const
     LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
     // HACK - hash the bytes of this LLMaterial, but trim off the S32 in LLRefCount
     LLUUID id;
-    HBXXH128::digest(id, (unsigned char*)this + sizeof(S32), sizeof(this) - sizeof(S32));
+    HBXXH128::digest(id, (unsigned char*)this + sizeof(LLRefCount), sizeof(*this) - sizeof(LLRefCount));
     return id;
 }
 
-- 
cgit v1.2.3


From e7e565dc6e7e0c666132ffffa4798b2cfc00d6a4 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Fri, 21 Jul 2023 13:01:11 -0700
Subject: SL-20024: Put material in object inventory when material is no-modify
 or no-transfer

---
 indra/llprimitive/llmaterial.cpp | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'indra/llprimitive/llmaterial.cpp')

diff --git a/indra/llprimitive/llmaterial.cpp b/indra/llprimitive/llmaterial.cpp
index f6cb3c8b70..0d146de949 100644
--- a/indra/llprimitive/llmaterial.cpp
+++ b/indra/llprimitive/llmaterial.cpp
@@ -332,17 +332,6 @@ void LLMaterial::setAlphaMaskCutoff(U8 cutoff)
     mAlphaMaskCutoff = cutoff;
 }
 
-LLUUID LLMaterial::getMaterialID() const
-{
-    // TODO - not null
-    return LLUUID::null;
-}
-
-void LLMaterial::setMaterialID(const LLUUID &material_id)
-{
-    // TODO - set
-}
-
 LLSD LLMaterial::asLLSD() const
 {
     LLSD material_data;
-- 
cgit v1.2.3