From 42a8dbbd1629881089d77d23af4b32f2f5e1e658 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Thu, 6 Jul 2017 15:44:13 -0700 Subject: upgrade to VMP package 507104 --- indra/newview/llfeaturemanager.cpp | 99 +++++++++++++++++++++----------------- 1 file changed, 54 insertions(+), 45 deletions(-) (limited to 'indra/newview/llfeaturemanager.cpp') diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index ad048f6668..8aa4505e57 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -403,70 +403,79 @@ F32 gpu_benchmark(); bool LLFeatureManager::loadGPUClass() { - //get memory bandwidth from benchmark - F32 gbps = gpu_benchmark(); - - if (gbps < 0.f) - { //couldn't bench, use GLVersion -#if LL_DARWIN - //GLVersion is misleading on OSX, just default to class 3 if we can't bench + benchmark_flag = gSavedSettings.getBOOL("SkipBenchmark") + if (!benchmark_flag) + { + //get memory bandwidth from benchmark + F32 gbps = gpu_benchmark(); + + if (gbps < 0.f) + { //couldn't bench, use GLVersion + #if LL_DARWIN + //GLVersion is misleading on OSX, just default to class 3 if we can't bench LL_WARNS() << "Unable to get an accurate benchmark; defaulting to class 3" << LL_ENDL; - mGPUClass = GPU_CLASS_3; -#else - if (gGLManager.mGLVersion < 2.f) + mGPUClass = GPU_CLASS_3; + #else + if (gGLManager.mGLVersion < 2.f) + { + mGPUClass = GPU_CLASS_0; + } + else if (gGLManager.mGLVersion < 3.f) + { + mGPUClass = GPU_CLASS_1; + } + else if (gGLManager.mGLVersion < 3.3f) + { + mGPUClass = GPU_CLASS_2; + } + else if (gGLManager.mGLVersion < 4.f) + { + mGPUClass = GPU_CLASS_3; + } + else + { + mGPUClass = GPU_CLASS_4; + } + #endif + } + else if (gGLManager.mGLVersion <= 2.f) + { + mGPUClass = GPU_CLASS_0; + } + else if (gGLManager.mGLVersion <= 3.f) + { + mGPUClass = GPU_CLASS_1; + } + else if (gbps <= 5.f) { mGPUClass = GPU_CLASS_0; } - else if (gGLManager.mGLVersion < 3.f) + else if (gbps <= 8.f) { mGPUClass = GPU_CLASS_1; } - else if (gGLManager.mGLVersion < 3.3f) + else if (gbps <= 16.f) { mGPUClass = GPU_CLASS_2; } - else if (gGLManager.mGLVersion < 4.f) + else if (gbps <= 40.f) { mGPUClass = GPU_CLASS_3; } - else + else if (gbps <= 80.f) { mGPUClass = GPU_CLASS_4; } -#endif - } - else if (gGLManager.mGLVersion <= 2.f) - { - mGPUClass = GPU_CLASS_0; - } - else if (gGLManager.mGLVersion <= 3.f) - { - mGPUClass = GPU_CLASS_1; - } - else if (gbps <= 5.f) - { - mGPUClass = GPU_CLASS_0; - } - else if (gbps <= 8.f) + else + { + mGPUClass = GPU_CLASS_5; + } + } //end if benchmark + else { + //setting says don't benchmark MAINT-7558 mGPUClass = GPU_CLASS_1; } - else if (gbps <= 16.f) - { - mGPUClass = GPU_CLASS_2; - } - else if (gbps <= 40.f) - { - mGPUClass = GPU_CLASS_3; - } - else if (gbps <= 80.f) - { - mGPUClass = GPU_CLASS_4; - } - else - { - mGPUClass = GPU_CLASS_5; - } // defaults mGPUString = gGLManager.getRawGLString(); -- cgit v1.2.3 From 5c1d9d65f65a1fadc00a0a81cf37d6389169b8c0 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Thu, 6 Jul 2017 16:09:44 -0700 Subject: fix missing declaration --- indra/newview/llfeaturemanager.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/llfeaturemanager.cpp') diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 8aa4505e57..9c19bd582c 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -403,8 +403,7 @@ F32 gpu_benchmark(); bool LLFeatureManager::loadGPUClass() { - benchmark_flag = gSavedSettings.getBOOL("SkipBenchmark") - if (!benchmark_flag) + if (!gSavedSettings.getBOOL("SkipBenchmark")) { //get memory bandwidth from benchmark F32 gbps = gpu_benchmark(); -- cgit v1.2.3 From ee2cd159a5d925bb19fe8da7b8c06f28823bce7c Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 12 Jul 2017 15:04:50 -0400 Subject: add logging for skipping benchmark (and fixed some log tags) --- indra/newview/llfeaturemanager.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'indra/newview/llfeaturemanager.cpp') diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 9c19bd582c..3c50810129 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -412,7 +412,7 @@ bool LLFeatureManager::loadGPUClass() { //couldn't bench, use GLVersion #if LL_DARWIN //GLVersion is misleading on OSX, just default to class 3 if we can't bench - LL_WARNS() << "Unable to get an accurate benchmark; defaulting to class 3" << LL_ENDL; + LL_WARNS("RenderInit") << "Unable to get an accurate benchmark; defaulting to class 3" << LL_ENDL; mGPUClass = GPU_CLASS_3; #else if (gGLManager.mGLVersion < 2.f) @@ -473,6 +473,8 @@ bool LLFeatureManager::loadGPUClass() else { //setting says don't benchmark MAINT-7558 + LL_WARNS("RenderInit") << "Setting 'SkipBenchmark' is true; defaulting to class 1 (may be required for some GPUs)" << LL_ENDL; + mGPUClass = GPU_CLASS_1; } @@ -618,7 +620,7 @@ void LLFeatureManager::applyFeatures(bool skipFeatures) LLControlVariable* ctrl = gSavedSettings.getControl(mIt->first); if(ctrl == NULL) { - LL_WARNS() << "AHHH! Control setting " << mIt->first << " does not exist!" << LL_ENDL; + LL_WARNS("RenderInit") << "AHHH! Control setting " << mIt->first << " does not exist!" << LL_ENDL; continue; } @@ -641,7 +643,7 @@ void LLFeatureManager::applyFeatures(bool skipFeatures) } else { - LL_WARNS() << "AHHH! Control variable is not a numeric type!" << LL_ENDL; + LL_WARNS("RenderInit") << "AHHH! Control variable is not a numeric type!" << LL_ENDL; } } } @@ -848,7 +850,7 @@ LLSD LLFeatureManager::getRecommendedSettingsMap() LLControlVariable* ctrl = gSavedSettings.getControl(mIt->first); if (ctrl == NULL) { - LL_WARNS() << "AHHH! Control setting " << mIt->first << " does not exist!" << LL_ENDL; + LL_WARNS("RenderInit") << "AHHH! Control setting " << mIt->first << " does not exist!" << LL_ENDL; continue; } @@ -866,7 +868,7 @@ LLSD LLFeatureManager::getRecommendedSettingsMap() } else { - LL_WARNS() << "AHHH! Control variable is not a numeric type!" << LL_ENDL; + LL_WARNS("RenderInit") << "AHHH! Control variable is not a numeric type!" << LL_ENDL; continue; } map[mIt->first]["Comment"] = ctrl->getComment();; -- cgit v1.2.3