From 8dc59e5ef37836b15d478fb0d04e3043a9f986de Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 16 Sep 2022 16:25:26 -0500
Subject: SL-18128 Clear out much OpenGL cruft and switch to core profile on
 AMD

---
 indra/llprimitive/lldaeloader.cpp | 11 ++++-------
 indra/llprimitive/llmodel.cpp     |  9 ---------
 indra/llprimitive/llmodel.h       |  1 -
 3 files changed, 4 insertions(+), 17 deletions(-)

(limited to 'indra/llprimitive')

diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index 9470146ce4..dbb34ab60b 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -2551,9 +2551,6 @@ bool LLDAELoader::loadModelsFromDomMesh(domMesh* mesh, std::vector<LLModel*>& mo
 	LLVolume::face_list_t remainder;
 	do 
 	{
-        // generate tangents and cache optimize before normalizing
-        ret->preprocessVolumeFaces();
-
 		// Insure we do this once with the whole gang and not per-model
 		//
 		if (!normalized && !mNoNormalize)
@@ -2565,10 +2562,10 @@ bool LLDAELoader::loadModelsFromDomMesh(domMesh* mesh, std::vector<LLModel*>& mo
 		ret->trimVolumeFacesToSize(LL_SCULPT_MESH_MAX_FACES, &remainder);
 
         // remove unused/redundant vertices after normalizing
-		//if (!mNoOptimize)
-		//{
-		//	ret->remapVolumeFaces();
-		//}
+		if (!mNoOptimize)
+		{
+			ret->remapVolumeFaces();
+		}
 
 		volume_faces = remainder.size();
 
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index ab507edc40..eff47d9d98 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -187,15 +187,6 @@ void LLModel::trimVolumeFacesToSize(U32 new_count, LLVolume::face_list_t* remain
 	}
 }
 
-// generate mikkt space tangents and cache optimize
-void LLModel::preprocessVolumeFaces()
-{
-    for (auto& face : mVolumeFaces)
-    {
-        face.cacheOptimize();
-    }
-}
-
 // Shrink the model to fit
 // on a 1x1x1 cube centered at the origin.
 // The positions and extents
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
index ea97851ce8..354ceb26b7 100644
--- a/indra/llprimitive/llmodel.h
+++ b/indra/llprimitive/llmodel.h
@@ -182,7 +182,6 @@ public:
 	void addFace(const LLVolumeFace& face);
 
 	void sortVolumeFacesByMaterialName();
-    void preprocessVolumeFaces();
 	void normalizeVolumeFaces();
 	void trimVolumeFacesToSize(U32 new_count = LL_SCULPT_MESH_MAX_FACES, LLVolume::face_list_t* remainder = NULL);
     void remapVolumeFaces();
-- 
cgit v1.2.3