diff options
| author | Richard Linden <none@none> | 2013-04-12 14:27:25 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-04-12 14:27:25 -0700 |
| commit | 1ddad3737977b9e750c4d1815ea99b51e75f18aa (patch) | |
| tree | 140d51925a3cd2fbca3677ff293fc2d37b051759 /indra/newview/llviewershadermgr.cpp | |
| parent | 54d7fc95893d1bf8cc3b6ebe94f3bf37f40125d0 (diff) | |
| parent | 8db22a591645a3a7c3308827ca819bc2415692d8 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 28bd02c606..78775c7205 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -2724,6 +2724,7 @@ BOOL LLViewerShaderMgr::loadShadersInterface() gTwoTextureCompareProgram.bind(); gTwoTextureCompareProgram.uniform1i("tex0", 0); gTwoTextureCompareProgram.uniform1i("tex1", 1); + gTwoTextureCompareProgram.uniform1i("dither_tex", 2); } } |