diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-10-06 18:49:13 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-10-06 18:49:13 +0000 |
| commit | 027ca696bd7bf222be63cf4d0af6e975b83a6815 (patch) | |
| tree | 5c581b1bba52d39df5dba52dd1d38164c78aff49 /indra/newview/llglsandbox.cpp | |
| parent | 4778f9497ec8b871c297b4efc4c0a44ee5726af1 (diff) | |
| parent | 3e99853b2984a40093ff6b504abfcabe065b251b (diff) | |
Merged in euclid-16138 (pull request #720)
SL-16138 avoid redundant shader binds, and related cleanup
Approved-by: Dave Parks
Approved-by: Michael Pohoreski
Diffstat (limited to 'indra/newview/llglsandbox.cpp')
| -rw-r--r-- | indra/newview/llglsandbox.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp index 698c15bd2d..0f288e05ca 100644 --- a/indra/newview/llglsandbox.cpp +++ b/indra/newview/llglsandbox.cpp @@ -993,9 +993,8 @@ private: //----------------------------------------------------------------------------- F32 gpu_benchmark() { - if (!gGLManager.mHasShaderObjects || !gGLManager.mHasTimerQuery) - { // don't bother benchmarking the fixed function - // or venerable drivers which don't support accurate timing anyway + if (!gGLManager.mHasTimerQuery) + { // don't bother benchmarking venerable drivers which don't support accurate timing anyway // and are likely to be correctly identified by the GPU table already. return -1.f; } |