diff options
| author | Richard Linden <none@none> | 2013-01-11 14:52:31 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-11 14:52:31 -0800 |
| commit | 433d53ea5580b2cbb17e6397afe2ca008e466963 (patch) | |
| tree | 50e13b5949d96e4ea5e0bdcb113458ad7dbbf4b4 /indra/newview/llviewershadermgr.h | |
| parent | 85df1df3c34115efa0e18d116f7923b88ec1dadf (diff) | |
| parent | a3d07fd4c27e527edfb901b25b5857d3fd7d2eaf (diff) | |
Automated merge with file:///c:%5Ccode%5Cviewer-interesting-metrics
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 |