diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-07-28 12:15:32 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-07-28 12:15:32 -0700 |
| commit | 0b9327df241e1a5a4693c690810ce8c330e196ad (patch) | |
| tree | 1bdff29f5e3de1764410a7bf706763d4a35ebe8b /indra/newview/llviewershadermgr.h | |
| parent | 75452dd7a8f9f51bf3fbcb871976168f80e0cae0 (diff) | |
| parent | b8d5c8993d46dc5b24bc07f721115a174ff918c8 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewershadermgr.h')
| -rw-r--r-- | indra/newview/llviewershadermgr.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h index efef9ec5b2..93a0ecc4f0 100644 --- a/indra/newview/llviewershadermgr.h +++ b/indra/newview/llviewershadermgr.h @@ -287,6 +287,14 @@ inline bool operator != (LLViewerShaderMgr::shader_iter const & a, LLViewerShade extern LLVector4 gShinyOrigin; +//utility shaders +extern LLGLSLShader gOcclusionProgram; +extern LLGLSLShader gCustomAlphaProgram; +extern LLGLSLShader gGlowCombineProgram; + +//output tex0[tc0] + tex1[tc1] +extern LLGLSLShader gTwoTextureAddProgram; + //object shaders extern LLGLSLShader gObjectSimpleProgram; extern LLGLSLShader gObjectSimpleWaterProgram; @@ -296,6 +304,7 @@ extern LLGLSLShader gObjectFullbrightProgram; extern LLGLSLShader gObjectFullbrightWaterProgram; extern LLGLSLShader gObjectFullbrightNonIndexedProgram; extern LLGLSLShader gObjectFullbrightNonIndexedWaterProgram; +extern LLGLSLShader gObjectBumpProgram; extern LLGLSLShader gObjectSimpleLODProgram; extern LLGLSLShader gObjectFullbrightLODProgram; |