diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-08-20 21:14:55 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-08-20 21:14:55 +0000 |
| commit | d76a10aab6bd5336f043a7d39e1c94f3612fac2c (patch) | |
| tree | 572528e88ffefcf4e38ed4cc924f1466763e6ac3 | |
| parent | 60eaa353a9e6acd9bec032cd408c570c28024e09 (diff) | |
| parent | d77b7bdc5484fab731f7537a15d690a1e022c246 (diff) | |
Merged in euclid-remove-sleep-throttle (pull request #256)
SL-13565, remove SL-10625 throttling erroneously applied to all GPUs
| -rw-r--r-- | indra/newview/llappviewer.cpp | 15 |
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(); |