diff options
Diffstat (limited to 'indra')
| -rw-r--r--[-rwxr-xr-x] | indra/llcommon/llfasttimer_class.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/llfloatermodelpreview.h | 0 | ||||
| -rw-r--r-- | indra/newview/llspatialpartition.cpp | 4 |
3 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llfasttimer_class.cpp b/indra/llcommon/llfasttimer_class.cpp index bd594b06cf..bd594b06cf 100755..100644 --- a/indra/llcommon/llfasttimer_class.cpp +++ b/indra/llcommon/llfasttimer_class.cpp diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h index 9dceb9c145..9dceb9c145 100755..100644 --- a/indra/newview/llfloatermodelpreview.h +++ b/indra/newview/llfloatermodelpreview.h diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index cb72f35eee..1b5800b8a5 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -1619,7 +1619,7 @@ void LLSpatialGroup::doOcclusion(LLCamera* camera) { glEnable(GL_DEPTH_CLAMP); } - +#if !LL_DARWIN U32 mode = gGLManager.mHasOcclusionQuery2 ? GL_ANY_SAMPLES_PASSED : GL_SAMPLES_PASSED_ARB; glBeginQueryARB(mode, mOcclusionQuery[LLViewerCamera::sCurCameraID]); @@ -1637,7 +1637,7 @@ void LLSpatialGroup::doOcclusion(LLCamera* camera) } glEndQueryARB(mode); - +#endif if (use_depth_clamp) { glDisable(GL_DEPTH_CLAMP); |