diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-14 16:38:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-14 16:38:12 -0400 |
| commit | d6fdc6e68fc713b21b68e42740d63c3e9005bceb (patch) | |
| tree | 8692c2c7ac5e3b0bbb5fa2b5362f2796dcf71e8b /indra/newview/llviewershadermgr.h | |
| parent | bc7a579ba285fa64876a2bc116685f0357fe25dc (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
merge changes for 3.7.3-release
Diffstat (limited to 'indra/newview/llviewershadermgr.h')
| -rwxr-xr-x | indra/newview/llviewershadermgr.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h index 3d89f8d20a..53569ca7ab 100755 --- a/indra/newview/llviewershadermgr.h +++ b/indra/newview/llviewershadermgr.h @@ -183,6 +183,7 @@ extern LLGLSLShader gDebugProgram; extern LLGLSLShader gClipProgram; extern LLGLSLShader gDownsampleDepthProgram; extern LLGLSLShader gDownsampleDepthRectProgram; +extern LLGLSLShader gBenchmarkProgram; //output tex0[tc0] + tex1[tc1] extern LLGLSLShader gTwoTextureAddProgram; |