#2434 Intel HD4000 compatibility pass (#2541)

* #2434 Intel HD4000 compatibility pass
* Fixes crash on old drivers when loading shaders
* Fixes 30 second hang on startup
* Fixes occasional dev build crash in LLWearableList
---------

Co-authored-by: Brad Linden <brad@lindenlab.com>

1 files changed, 1 insertions, 52 deletions

diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
index 930a8c28d9..0248f5710f 100644
--- a/indra/newview/llglsandbox.cpp
+++ b/indra/newview/llglsandbox.cpp
@@ -1121,57 +1121,6 @@ F32 gpu_benchmark()
 
     LLGLSLShader::unbind();
 
-    F32 time_passed = 0; // seconds
-
-    { //run CPU timer benchmark
-        glFinish();
-        gBenchmarkProgram.bind();
-        for (S32 c = -1; c < samples && time_passed < time_limit; ++c)
-        {
-            LLTimer timer;
-            timer.start();
-
-            for (U32 i = 0; i < count; ++i)
-            {
-                dest[i].bindTarget();
-                texHolder.bind(i);
-                buff->setBuffer();
-                buff->drawArrays(LLRender::TRIANGLES, 0, 3);
-                dest[i].flush();
-            }
-
-            //wait for current batch of copies to finish
-            glFinish();
-
-            F32 time = timer.getElapsedTimeF32();
-            time_passed += time;
-
-            if (c >= 0) // <-- ignore the first sample as it tends to be artificially slow
-            {
-                //store result in gigabytes per second
-                F32 gb = (F32)((F64)(res * res * 8 * count)) / (1000000000);
-                F32 gbps = gb / time;
-                results.push_back(gbps);
-            }
-        }
-        gBenchmarkProgram.unbind();
-    }
-
-    std::sort(results.begin(), results.end());
-
-    F32 gbps = results[results.size()/2];
-
-    LL_INFOS("Benchmark") << "Memory bandwidth is " << llformat("%.3f", gbps) << " GB/sec according to CPU timers, " << (F32)results.size() << " tests took " << time_passed << " seconds" << LL_ENDL;
-
-#if LL_DARWIN
-    if (gbps > 512.f)
-    {
-        LL_WARNS("Benchmark") << "Memory bandwidth is improbably high and likely incorrect; discarding result." << LL_ENDL;
-        //OSX is probably lying, discard result
-        return -1.f;
-    }
-#endif
-
     // run GPU timer benchmark
     {
         ShaderProfileHelper initProfile;
@@ -1196,7 +1145,7 @@ F32 gpu_benchmark()
     F64 samples_drawn = (F64)gBenchmarkProgram.mSamplesDrawn;
     F64 gpixels_drawn = samples_drawn / 1000000000.0;
     F32 samples_sec = (F32)(gpixels_drawn/seconds);
-    gbps = samples_sec*4;  // 4 bytes per sample
+    F32 gbps = samples_sec*4;  // 4 bytes per sample
 
     LL_INFOS("Benchmark") << "Memory bandwidth is " << llformat("%.3f", gbps) << " GB/sec according to ARB_timer_query, total time " << seconds << " seconds" << LL_ENDL;