MAINT-3131 fallback to CPU timers for return value of benchmark if ARB_timer_query is unavailable.

indra/newview/llglsandbox.cpp

@@ -880,8 +880,8 @@ void LLViewerObjectList::renderObjectBeacons()
 
 F32 gpu_benchmark()
 {
-	if (!gGLManager.mHasShaderObjects || !gGLManager.mHasTimerQuery)
-	{ //don't bother benchmarking the fixed function or using CPU timers
+	if (!gGLManager.mHasShaderObjects)
+	{ //don't bother benchmarking the fixed function
 		return -1.f;
 	}
 
@@ -1011,6 +1011,8 @@ F32 gpu_benchmark()
 
 	llinfos << "Memory bandwidth is " << llformat("%.3f", gbps) << "GB/sec according to CPU timers" << llendl;
 	
+	if (gGLManager.mHasTimerQuery)
+	{
 		F32 ms = gBenchmarkProgram.mTimeElapsed/1000000.f;
 		F32 seconds = ms/1000.f;
 
@@ -1018,8 +1020,6 @@ F32 gpu_benchmark()
 		F32 samples_sec = (samples_drawn/1000000000.0)/seconds;
 		gbps = samples_sec*8;
 
-	if (gGLManager.mHasTimerQuery)
-	{
 		llinfos << "Memory bandwidth is " << llformat("%.3f", gbps) << "GB/sec according to ARB_timer_query" << llendl;
 	}
 	else