diff options
| author | Richard Linden <none@none> | 2013-04-12 15:56:49 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-04-12 15:56:49 -0700 |
| commit | 06a953f7fece6e7c5cb8f9facd246580767f8591 (patch) | |
| tree | 18e0db8a706d6451ebad1ab640871a3ca0f52d1c /indra/newview/llviewershadermgr.cpp | |
| parent | 39d8ea6327ad96b4977dfec991a20d66e2442b50 (diff) | |
| parent | dea70426a5c96957dd73b7a50c7fdedf77a3bdfb (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); } } |