MAINT-8721 Enabled benchmarking for Intel GPUs

indra/newview/llfeaturemanager.cpp

@@ -407,7 +407,16 @@ bool LLFeatureManager::loadGPUClass()
 	if (!gSavedSettings.getBOOL("SkipBenchmark"))
 	{
 		//get memory bandwidth from benchmark
-		F32 gbps = gpu_benchmark();
+		F32 gbps;
+		try
+		{
+			gbps = gpu_benchmark();
+		}
+		catch (const std::exception& e)
+		{
+			gbps = -1.f;
+			LL_WARNS("RenderInit") << "GPU benchmark failed: " << e.what() << LL_ENDL;
+		}
 	
 		if (gbps < 0.f)
 		{ //couldn't bench, use GLVersion

indra/newview/llglsandbox.cpp

@@ -966,15 +966,6 @@ class ShaderBinder
 //-----------------------------------------------------------------------------
 F32 gpu_benchmark()
 {
-#if LL_WINDOWS
-	if (gGLManager.mIsIntel
-		&& std::string::npos != LLOSInfo::instance().getOSStringSimple().find("Microsoft Windows 8")) // or 8.1
-	{ // don't run benchmark on Windows 8/8.1 based PCs with Intel GPU (MAINT-8197)
-		LL_WARNS() << "Skipping gpu_benchmark() for Intel graphics on Windows 8." << LL_ENDL;
-		return -1.f;
-	}
-#endif
-
 	if (!gGLManager.mHasShaderObjects || !gGLManager.mHasTimerQuery)
 	{ // don't bother benchmarking the fixed function
       // or venerable drivers which don't support accurate timing anyway