Skip to content
Snippets Groups Projects
Commit 9c7ec66d authored by David Parks's avatar David Parks
Browse files

SL-16691 Add GPU memory bandwidth to ViewerStats

parent 6721b96f
No related branches found
No related tags found
No related merge requests found
...@@ -419,6 +419,8 @@ bool LLFeatureManager::loadGPUClass() ...@@ -419,6 +419,8 @@ bool LLFeatureManager::loadGPUClass()
LL_WARNS("RenderInit") << "GPU benchmark failed: " << e.what() << LL_ENDL; LL_WARNS("RenderInit") << "GPU benchmark failed: " << e.what() << LL_ENDL;
} }
mGPUMemoryBandwidth = gbps;
// bias by CPU speed // bias by CPU speed
F32 cpu_basis_mhz = gSavedSettings.getF32("RenderCPUBasis"); F32 cpu_basis_mhz = gSavedSettings.getF32("RenderCPUBasis");
F32 cpu_mhz = (F32) gSysCPU.getMHz(); F32 cpu_mhz = (F32) gSysCPU.getMHz();
......
...@@ -111,6 +111,10 @@ class LLFeatureManager : public LLFeatureList, public LLSingleton<LLFeatureManag ...@@ -111,6 +111,10 @@ class LLFeatureManager : public LLFeatureList, public LLSingleton<LLFeatureManag
EGPUClass getGPUClass() { return mGPUClass; } EGPUClass getGPUClass() { return mGPUClass; }
std::string& getGPUString() { return mGPUString; } std::string& getGPUString() { return mGPUString; }
// get the measured GPU memory bandwidth in GB/sec
// may return 0 of benchmark has not been run or failed to run
F32 getGPUMemoryBandwidth() { return mGPUMemoryBandwidth; }
BOOL isGPUSupported() { return mGPUSupported; } BOOL isGPUSupported() { return mGPUSupported; }
F32 getExpectedGLVersion() { return mExpectedGLVersion; } F32 getExpectedGLVersion() { return mExpectedGLVersion; }
...@@ -162,6 +166,7 @@ class LLFeatureManager : public LLFeatureList, public LLSingleton<LLFeatureManag ...@@ -162,6 +166,7 @@ class LLFeatureManager : public LLFeatureList, public LLSingleton<LLFeatureManag
S32 mTableVersion; S32 mTableVersion;
BOOL mSafe; // Reinitialize everything to the "safe" mask BOOL mSafe; // Reinitialize everything to the "safe" mask
EGPUClass mGPUClass; EGPUClass mGPUClass;
F32 mGPUMemoryBandwidth = 0.f; // measured memory bandwidth of GPU in GB/second
F32 mExpectedGLVersion; //expected GL version according to gpu table F32 mExpectedGLVersion; //expected GL version according to gpu table
std::string mGPUString; std::string mGPUString;
BOOL mGPUSupported; BOOL mGPUSupported;
......
...@@ -512,6 +512,7 @@ void send_viewer_stats(bool include_preferences) ...@@ -512,6 +512,7 @@ void send_viewer_stats(bool include_preferences)
system["gpu"] = gpu_desc; system["gpu"] = gpu_desc;
system["gpu_class"] = (S32)LLFeatureManager::getInstance()->getGPUClass(); system["gpu_class"] = (S32)LLFeatureManager::getInstance()->getGPUClass();
system["gpu_memory_bandwidth"] = LLFeatureManager::getInstance()->getGPUMemoryBandwidth();
system["gpu_vendor"] = gGLManager.mGLVendorShort; system["gpu_vendor"] = gGLManager.mGLVendorShort;
system["gpu_version"] = gGLManager.mDriverVersionVendorString; system["gpu_version"] = gGLManager.mDriverVersionVendorString;
system["opengl_version"] = gGLManager.mGLVersionString; system["opengl_version"] = gGLManager.mGLVersionString;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment