Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
9c7ec66d
Commit
9c7ec66d
authored
3 years ago
by
David Parks
Browse files
Options
Downloads
Patches
Plain Diff
SL-16691 Add GPU memory bandwidth to ViewerStats
parent
6721b96f
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
indra/newview/llfeaturemanager.cpp
+2
-0
2 additions, 0 deletions
indra/newview/llfeaturemanager.cpp
indra/newview/llfeaturemanager.h
+5
-0
5 additions, 0 deletions
indra/newview/llfeaturemanager.h
indra/newview/llviewerstats.cpp
+1
-0
1 addition, 0 deletions
indra/newview/llviewerstats.cpp
with
8 additions
and
0 deletions
indra/newview/llfeaturemanager.cpp
+
2
−
0
View file @
9c7ec66d
...
@@ -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
();
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llfeaturemanager.h
+
5
−
0
View file @
9c7ec66d
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llviewerstats.cpp
+
1
−
0
View file @
9c7ec66d
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment