diff options
| author | Richard Linden <none@none> | 2013-04-12 11:53:54 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-04-12 11:53:54 -0700 |
| commit | 8db22a591645a3a7c3308827ca819bc2415692d8 (patch) | |
| tree | 72a48ab9da03f06c1725318c6a46986cd52d0ad5 /indra/newview/llviewershadermgr.cpp | |
| parent | f964c8faa84cfa95bbf73552e99a2d0b80f7bee2 (diff) | |
| parent | 493b84f2fc34ab1bb798b20c022be6edf036b3d7 (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); } } |