summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2020-08-20 15:08:47 -0600
committerDave Houlton <euclid@lindenlab.com>2020-08-20 15:08:55 -0600
commitd77b7bdc5484fab731f7537a15d690a1e022c246 (patch)
tree572528e88ffefcf4e38ed4cc924f1466763e6ac3
parent60eaa353a9e6acd9bec032cd408c570c28024e09 (diff)
SL-13565, remove SL-10625 throttling erroneously applied to all GPUs
Remove the sleep throttle applied in 10625 to work around an Intel GPU driver bug. It was erroneously being applied to all GPUs, and also as of Intel driver 26.20.100.7755 (1/9/2020) it appears that the driver bug no longer exists.
-rw-r--r--indra/newview/llappviewer.cpp15
1 files changed, 0 insertions, 15 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index f7a3898b73..780dd62d5b 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1482,21 +1482,6 @@ bool LLAppViewer::doFrame()
display();
- static U64 last_call = 0;
- if (!gTeleportDisplay || gGLManager.mIsIntel) // SL-10625...throttle early, throttle often with Intel
- {
- // Frame/draw throttling
- U64 elapsed_time = LLTimer::getTotalTime() - last_call;
- if (elapsed_time < mMinMicroSecPerFrame)
- {
- LL_RECORD_BLOCK_TIME(FTM_SLEEP);
- // llclamp for when time function gets funky
- U64 sleep_time = llclamp(mMinMicroSecPerFrame - elapsed_time, (U64)1, (U64)1e6);
- micro_sleep(sleep_time, 0);
- }
- }
- last_call = LLTimer::getTotalTime();
-
pingMainloopTimeout("Main:Snapshot");
LLFloaterSnapshot::update(); // take snapshots
LLFloaterOutfitSnapshot::update();