diff options
author | Richard Linden <none@none> | 2013-02-09 00:54:46 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2013-02-09 00:54:46 -0800 |
commit | 50d35d00cb68f0c9119b562f85ccefa4d279f0f9 (patch) | |
tree | 23dd1fef3401a31216e0ee4563c9461f53c13e91 /indra/newview/llviewershadermgr.cpp | |
parent | 2e15e8fd4ba62204c76f6e2a91d3e50f62e6c1fc (diff) | |
parent | 8144fa95701122f24c36b8ae2a51a5ce720614a6 (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 1aa36eafee..dd86ef4f34 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -2723,6 +2723,7 @@ BOOL LLViewerShaderMgr::loadShadersInterface() gTwoTextureCompareProgram.bind(); gTwoTextureCompareProgram.uniform1i("tex0", 0); gTwoTextureCompareProgram.uniform1i("tex1", 1); + gTwoTextureCompareProgram.uniform1i("dither_tex", 2); } } |