summaryrefslogtreecommitdiff
path: root/indra/newview/llviewershadermgr.h
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-08-11 14:19:58 -0500
committerDave Parks <davep@lindenlab.com>2011-08-11 14:19:58 -0500
commit2dd8ce53e4e0d14f2bc20796eb6bdf1ef12a65df (patch)
tree6adee912e10da8b54754edaaac7ed1d3f7a691d0 /indra/newview/llviewershadermgr.h
parent364f8771ed6b7a4fabaf2ec1e547aafb8227c876 (diff)
SH-2242 FXAA support instead of unreliable multisample textures (done here because it's a smaller change than integrating glVertexAttrib with FSAA pipe). Shader integration with LLDynamicTexture subclasses.
Diffstat (limited to 'indra/newview/llviewershadermgr.h')
-rw-r--r--indra/newview/llviewershadermgr.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h
index 270c05b669..c63260fb2e 100644
--- a/indra/newview/llviewershadermgr.h
+++ b/indra/newview/llviewershadermgr.h
@@ -273,6 +273,7 @@ extern LLVector4 gShinyOrigin;
extern LLGLSLShader gOcclusionProgram;
extern LLGLSLShader gCustomAlphaProgram;
extern LLGLSLShader gGlowCombineProgram;
+extern LLGLSLShader gGlowCombineFXAAProgram;
//output tex0[tc0] + tex1[tc1]
extern LLGLSLShader gTwoTextureAddProgram;
@@ -281,6 +282,7 @@ extern LLGLSLShader gOneTextureNoColorProgram;
//object shaders
extern LLGLSLShader gObjectSimpleProgram;
+extern LLGLSLShader gObjectPreviewProgram;
extern LLGLSLShader gObjectSimpleAlphaMaskProgram;
extern LLGLSLShader gObjectSimpleWaterProgram;
extern LLGLSLShader gObjectSimpleWaterAlphaMaskProgram;