diff options
author | Richard Linden <none@none> | 2013-02-13 15:26:43 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2013-02-13 15:26:43 -0800 |
commit | dcf4e489213d6e954a34fbb3c5c96e94645b868b (patch) | |
tree | 31eff571382cf2c553ce459aa3637221a4c78453 /indra/newview/llviewershadermgr.cpp | |
parent | a6bb68b6e530df91d03abfc062c700ebc4e856aa (diff) | |
parent | 50d35d00cb68f0c9119b562f85ccefa4d279f0f9 (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); } } |