diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2019-05-18 02:52:19 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2019-05-18 02:52:19 +0000 |
| commit | b07a8f7033dae6250e144aca4c274d935b648cf7 (patch) | |
| tree | 9cc8587440f0b2f77121c75151deeedc9955f212 /indra/newview | |
| parent | 21d08842009532ac79c6dfd8657552975c937804 (diff) | |
| parent | fa7547c6ebbad5e227613e76927db6e20f34624c (diff) | |
Merged in graham_linden/viewer-eep-g (pull request #402)
SL-10625
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvieweroctree.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp index 459ee1f35c..6365df09e1 100644 --- a/indra/newview/llvieweroctree.cpp +++ b/indra/newview/llvieweroctree.cpp @@ -1110,10 +1110,9 @@ void LLOcclusionCullingGroup::checkOcclusion() static LLCachedControl<bool> wait_for_query(gSavedSettings, "RenderSynchronousOcclusion", true); - U32 target_read_frame = (gFrameCount > 2) ? (gFrameCount - 2) : 0; - if (wait_for_query && (mOcclusionIssued[LLViewerCamera::sCurCameraID] < target_read_frame)) + if (wait_for_query && mOcclusionIssued[LLViewerCamera::sCurCameraID] < gFrameCount) { //query was issued last frame, wait until it's available - S32 max_loop = 64; + S32 max_loop = 1024; LL_RECORD_BLOCK_TIME(FTM_OCCLUSION_WAIT); while (!available && max_loop-- > 0) { |