diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-11-21 15:32:57 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-11-21 15:32:57 -0700 |
| commit | dbfb429bd1800d84d21670addb02745a3030573e (patch) | |
| tree | 8af3441b0fc2af92d8bb1715f7066dc6c76b79a3 | |
| parent | fb29358d70410cba8c8941c289c594d946569e7a (diff) | |
fix for SH-4628: Project Interesting Viewer reduces & fixes graphics to lowest settings on a MAC
| -rw-r--r-- | indra/newview/llscenemonitor.cpp | 7 | ||||
| -rwxr-xr-x | indra/newview/llviewershadermgr.cpp | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp index 77f53616cd..7f705e44d2 100644 --- a/indra/newview/llscenemonitor.cpp +++ b/indra/newview/llscenemonitor.cpp @@ -340,6 +340,7 @@ static LLStaticHashedString sDitherScaleT("dither_scale_t"); void LLSceneMonitor::compare() { +#ifdef LL_WINDOWS if(mDiffState != NEED_DIFF) { return; @@ -415,6 +416,7 @@ void LLSceneMonitor::compare() { calcDiffAggregate(); } +#endif } static LLStaticHashedString sTolerance("tolerance"); @@ -422,6 +424,8 @@ static LLStaticHashedString sTolerance("tolerance"); //calculate Diff aggregate information in GPU, and enable gl occlusion query to capture it. void LLSceneMonitor::calcDiffAggregate() { +#ifdef LL_WINDOWS + LL_RECORD_BLOCK_TIME(FTM_SCENE_LOAD_IMAGE_DIFF); if(mDiffState != EXECUTE_DIFF && !mDebugViewerVisible) @@ -469,7 +473,8 @@ void LLSceneMonitor::calcDiffAggregate() if(!mDebugViewerVisible) { glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - } + } +#endif } static LLTrace::EventStatHandle<> sFramePixelDiff("FramePixelDifference"); diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index ec7dcbecf6..9b4d0ee2c5 100755 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -3112,6 +3112,7 @@ BOOL LLViewerShaderMgr::loadShadersInterface() } } +#ifdef LL_WINDOWS if (success) { gTwoTextureCompareProgram.mName = "Two Texture Compare Shader"; @@ -3143,6 +3144,7 @@ BOOL LLViewerShaderMgr::loadShadersInterface() gOneTextureFilterProgram.uniform1i(sTex0, 0); } } +#endif if (success) { |