diff options
author | Oz Linden <oz@lindenlab.com> | 2011-12-12 09:04:33 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-12-12 09:04:33 -0500 |
commit | f1a4593e471f4ae0e08767f73f100add683965bf (patch) | |
tree | 0f0f42a772c9c739ee5e726a8044e2888d17b735 /indra/newview/llviewershadermgr.cpp | |
parent | d7e6f21981b0a00c0d89096cc17bab07be60e51a (diff) | |
parent | 50a57ba9fec0435a990338398d5c4f23c5cc91f0 (diff) |
merge changes for vmrg-204
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
-rw-r--r-- | indra/newview/llviewershadermgr.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 18ae83e3b6..bddc07b395 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -1338,6 +1338,7 @@ BOOL LLViewerShaderMgr::loadShadersDeferred() if (success) { gDeferredShadowAlphaMaskProgram.mName = "Deferred Shadow Alpha Mask Shader"; + gDeferredShadowAlphaMaskProgram.mFeatures.mIndexedTextureChannels = LLGLSLShader::sIndexedTextureChannels; gDeferredShadowAlphaMaskProgram.mShaderFiles.clear(); gDeferredShadowAlphaMaskProgram.mShaderFiles.push_back(make_pair("deferred/shadowAlphaMaskV.glsl", GL_VERTEX_SHADER_ARB)); gDeferredShadowAlphaMaskProgram.mShaderFiles.push_back(make_pair("deferred/shadowAlphaMaskF.glsl", GL_FRAGMENT_SHADER_ARB)); |