diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-01-09 22:44:44 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-01-09 22:44:44 -0700 |
| commit | cda5666dc765c4988b4f01ab34b8a008039ae261 (patch) | |
| tree | 06c00e15896998d373810465d8eb161358dcb340 /indra/newview/llviewershadermgr.h | |
| parent | 27bec2b2f21f19a7c04707b03f83c8caa855872d (diff) | |
| parent | 7cc37d949e9319a5b60641ff8453a0fed763d817 (diff) | |
Automated merge with https://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llviewershadermgr.h')
| -rw-r--r-- | indra/newview/llviewershadermgr.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h index d6dd645e8c..3e7c615f23 100644 --- a/indra/newview/llviewershadermgr.h +++ b/indra/newview/llviewershadermgr.h @@ -233,7 +233,11 @@ extern LLGLSLShader gAlphaMaskProgram; //output tex0[tc0] + tex1[tc1] extern LLGLSLShader gTwoTextureAddProgram; - +//output tex0[tc0] - tex1[tc1] +extern LLGLSLShader gTwoTextureCompareProgram; +//discard some fragments based on user-set color tolerance +extern LLGLSLShader gOneTextureFilterProgram; + extern LLGLSLShader gOneTextureNoColorProgram; //object shaders |