merge up to 3.7.18

1 files changed, 63 insertions, 4 deletions

diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index d0555477ea..4db0422634 100755
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -417,13 +417,71 @@ bool LLFeatureManager::parseFeatureTable(std::string filename)
 	return parse_ok;
 }
 
+F32 gpu_benchmark();
+
 bool LLFeatureManager::loadGPUClass()
 {
+	//get memory bandwidth from benchmark
+	F32 gbps = gpu_benchmark();
+
+	if (gbps < 0.f)
+	{ //couldn't bench, use GLVersion
+#if LL_DARWIN
+        //GLVersion is misleading on OSX, just default to class 3 if we can't bench
+        mGPUClass = GPU_CLASS_3;
+#else
+		if (gGLManager.mGLVersion < 2.f)
+		{
+			mGPUClass = GPU_CLASS_0;
+		}
+		else if (gGLManager.mGLVersion < 3.f)
+		{
+			mGPUClass = GPU_CLASS_1;
+		}
+		else if (gGLManager.mGLVersion < 3.3f)
+		{
+			mGPUClass = GPU_CLASS_2;
+		}
+		else if (gGLManager.mGLVersion < 4.f)
+		{
+			mGPUClass = GPU_CLASS_3;
+		}
+		else 
+		{
+			mGPUClass = GPU_CLASS_4;
+		}
+#endif
+	}
+	else if (gbps < 5.f)
+	{
+		mGPUClass = GPU_CLASS_0;
+	}
+	else if (gbps < 10.f)
+	{
+		mGPUClass = GPU_CLASS_1;
+	}
+	else if (gbps < 20.f)
+	{
+		mGPUClass = GPU_CLASS_2;
+	}
+	else if (gbps < 40.f)
+	{
+		mGPUClass = GPU_CLASS_3;
+	}
+	else if (gbps < 80.f)
+	{
+		mGPUClass = GPU_CLASS_4;
+	}
+	else 
+	{
+		mGPUClass = GPU_CLASS_5;
+	}
+	
 	// defaults
-	mGPUClass = GPU_CLASS_UNKNOWN;
 	mGPUString = gGLManager.getRawGLString();
-	mGPUSupported = FALSE;
+	mGPUSupported = TRUE;
 
+#if 0
 	// first table is in the app dir
 	std::string app_path = gDirUtilp->getAppRODataDir();
 	app_path += gDirUtilp->getDirDelimiter();
@@ -451,8 +509,8 @@ bool LLFeatureManager::loadGPUClass()
 	{
 		parse_ok = parseGPUTable(app_path);
 	}
-
-	return parse_ok; // indicates that the file parsed correctly, not that the gpu was recognized
+#endif
+	return true; // indicates that the file parsed correctly, not that the gpu was recognized
 }
 
 	
@@ -730,6 +788,7 @@ void LLFeatureManager::init()
 
 void LLFeatureManager::applyRecommendedSettings()
 {
+	loadGPUClass();
 	// apply saved settings
 	// cap the level at 2 (high)
 	U32 level = llmax(GPU_CLASS_0, llmin(mGPUClass, GPU_CLASS_5));