From 24f8745914f7cec320d707f36895ac393575b861 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 19 Mar 2014 17:57:00 -0500
Subject: MAINT-3131 Use benchmark to determine GPU class instead of GPU table.

---
 indra/llrender/llglslshader.cpp | 58 +++++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 20 deletions(-)

(limited to 'indra/llrender/llglslshader.cpp')

diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 1c50a51d02..b99435f39e 100755
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -87,6 +87,7 @@ LLShaderFeatures::LLShaderFeatures()
 	, mIndexedTextureChannels(0)
 	, disableTextureIndex(false)
 	, hasAlphaMask(false)
+	, attachNothing(false)
 {
 }
 
@@ -119,28 +120,31 @@ struct LLGLSLShaderCompareTimeElapsed
 };
 
 //static
-void LLGLSLShader::finishProfile()
+void LLGLSLShader::finishProfile(bool emit_report)
 {
 	sProfileEnabled = false;
 
-	std::vector<LLGLSLShader*> sorted;
-
-	for (std::set<LLGLSLShader*>::iterator iter = sInstances.begin(); iter != sInstances.end(); ++iter)
+	if (emit_report)
 	{
-		sorted.push_back(*iter);
-	}
+		std::vector<LLGLSLShader*> sorted;
 
-	std::sort(sorted.begin(), sorted.end(), LLGLSLShaderCompareTimeElapsed());
+		for (std::set<LLGLSLShader*>::iterator iter = sInstances.begin(); iter != sInstances.end(); ++iter)
+		{
+			sorted.push_back(*iter);
+		}
 
-	for (std::vector<LLGLSLShader*>::iterator iter = sorted.begin(); iter != sorted.end(); ++iter)
-	{
-		(*iter)->dumpStats();
-	}
+		std::sort(sorted.begin(), sorted.end(), LLGLSLShaderCompareTimeElapsed());
 
-	llinfos << "-----------------------------------" << llendl;
-	llinfos << "Total rendering time: " << llformat("%.4f ms", sTotalTimeElapsed/1000000.f) << llendl;
-	llinfos << "Total samples drawn: " << llformat("%.4f million", sTotalSamplesDrawn/1000000.f) << llendl;
-	llinfos << "Total triangles drawn: " << llformat("%.3f million", sTotalTrianglesDrawn/1000000.f) << llendl;
+		for (std::vector<LLGLSLShader*>::iterator iter = sorted.begin(); iter != sorted.end(); ++iter)
+		{
+			(*iter)->dumpStats();
+		}
+			
+		llinfos << "-----------------------------------" << llendl;
+		llinfos << "Total rendering time: " << llformat("%.4f ms", sTotalTimeElapsed/1000000.f) << llendl;
+		llinfos << "Total samples drawn: " << llformat("%.4f million", sTotalSamplesDrawn/1000000.f) << llendl;
+		llinfos << "Total triangles drawn: " << llformat("%.3f million", sTotalTrianglesDrawn/1000000.f) << llendl;
+	}
 }
 
 void LLGLSLShader::clearStats()
@@ -175,7 +179,7 @@ void LLGLSLShader::dumpStats()
 			}
 		}
 		llinfos << "=============================================" << llendl;
-
+	
 		F32 ms = mTimeElapsed/1000000.f;
 		F32 seconds = ms/1000.f;
 
@@ -221,6 +225,7 @@ void LLGLSLShader::placeProfileQuery()
 #if !LL_DARWIN
 	if (mTimerQuery == 0)
 	{
+		glGenQueriesARB(1, &mSamplesQuery);
 		glGenQueriesARB(1, &mTimerQuery);
 	}
 
@@ -257,7 +262,7 @@ void LLGLSLShader::placeProfileQuery()
 	}
 
 
-	glBeginQueryARB(GL_SAMPLES_PASSED, 1);
+	glBeginQueryARB(GL_SAMPLES_PASSED, mSamplesQuery);
 	glBeginQueryARB(GL_TIME_ELAPSED, mTimerQuery);
 #endif
 }
@@ -272,7 +277,7 @@ void LLGLSLShader::readProfileQuery(U32 count, U32 mode)
 	glGetQueryObjectui64v(mTimerQuery, GL_QUERY_RESULT, &time_elapsed);
 
 	U64 samples_passed = 0;
-	glGetQueryObjectui64v(1, GL_QUERY_RESULT, &samples_passed);
+	glGetQueryObjectui64v(mSamplesQuery, GL_QUERY_RESULT, &samples_passed);
 
 	sTotalTimeElapsed += time_elapsed;
 	mTimeElapsed += time_elapsed;
@@ -307,14 +312,15 @@ LLGLSLShader::LLGLSLShader()
 	  mShaderLevel(0), 
 	  mShaderGroup(SG_DEFAULT), 
 	  mUniformsDirty(FALSE),
-	  mTimerQuery(0)
+	  mTimerQuery(0),
+	  mSamplesQuery(0)
+
 {
 	
 }
 
 LLGLSLShader::~LLGLSLShader()
 {
-	
 }
 
 void LLGLSLShader::unload()
@@ -349,6 +355,18 @@ void LLGLSLShader::unload()
 		mProgramObject = 0;
 	}
 	
+	if (mTimerQuery)
+	{
+		glDeleteQueriesARB(1, &mTimerQuery);
+		mTimerQuery = 0;
+	}
+	
+	if (mSamplesQuery)
+	{
+		glDeleteQueriesARB(1, &mSamplesQuery);
+		mSamplesQuery = 0;
+	}
+
 	//hack to make apple not complain
 	glGetError();
 	
-- 
cgit v1.2.3