diff options
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llfeaturemanager.cpp | 12 | ||||
| -rwxr-xr-x | indra/newview/llglsandbox.cpp | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 4db0422634..f081d5c36c 100755 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -452,23 +452,23 @@ bool LLFeatureManager::loadGPUClass() } #endif } - else if (gbps < 5.f) + else if (gbps < 4.f) { mGPUClass = GPU_CLASS_0; } - else if (gbps < 10.f) + else if (gbps < 8.f) { mGPUClass = GPU_CLASS_1; } - else if (gbps < 20.f) + else if (gbps < 16.f) { mGPUClass = GPU_CLASS_2; } - else if (gbps < 40.f) + else if (gbps < 24.f) { mGPUClass = GPU_CLASS_3; } - else if (gbps < 80.f) + else if (gbps < 30.f) { mGPUClass = GPU_CLASS_4; } @@ -476,7 +476,7 @@ bool LLFeatureManager::loadGPUClass() { mGPUClass = GPU_CLASS_5; } - + // defaults mGPUString = gGLManager.getRawGLString(); mGPUSupported = TRUE; diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp index 08ec8031e8..04429ddd75 100755 --- a/indra/newview/llglsandbox.cpp +++ b/indra/newview/llglsandbox.cpp @@ -984,11 +984,11 @@ F32 gpu_benchmark() bool busted_finish = false; + buff->setBuffer(LLVertexBuffer::MAP_VERTEX); + glFinish(); + for (S32 c = -1; c < samples; ++c) { - buff->setBuffer(LLVertexBuffer::MAP_VERTEX); - glFinish(); - LLTimer timer; timer.start(); |