diff options
author | Oz Linden <oz@lindenlab.com> | 2012-06-28 10:35:22 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-06-28 10:35:22 -0400 |
commit | 764d1e3cafa3e86f1f44a4c2bec0705879b9da38 (patch) | |
tree | a2ac72c6625c729e73ae6077e790a104c2b598a3 /indra/llrender/llshadermgr.cpp | |
parent | ba90a4ec367d47a6876962d7d071cf4615289a11 (diff) | |
parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) |
merge up to 3.3.3-release
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
-rw-r--r-- | indra/llrender/llshadermgr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 7d384450e6..5a6e6cab3e 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1062,8 +1062,9 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("proj_shadow_res"); mReservedUniforms.push_back("depth_cutoff"); mReservedUniforms.push_back("norm_cutoff"); + mReservedUniforms.push_back("shadow_target_width"); - llassert(mReservedUniforms.size() == LLShaderMgr::DEFERRED_NORM_CUTOFF+1); + llassert(mReservedUniforms.size() == LLShaderMgr::DEFERRED_SHADOW_TARGET_WIDTH+1); mReservedUniforms.push_back("tc_scale"); mReservedUniforms.push_back("rcp_screen_res"); |