diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2022-06-23 14:53:36 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2022-06-23 14:53:36 +0000 |
| commit | d995ac67ae2b668d988dc395f28b219f5809c284 (patch) | |
| tree | 0caf93cd03728bb4c5fbd52fb339531c765c6676 /indra/llrender | |
| parent | 6540b4c480d1d4b4c8342a0d093d09f525485659 (diff) | |
| parent | d67e1f4f91e4b206e36343ee31fa4877dd58c01c (diff) | |
Merged in SL-17274_view_dir (pull request #1029)
SL-17274: Add view_dir uniform
Approved-by: Dave Parks
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 4 | ||||
| -rw-r--r-- | indra/llrender/llshadermgr.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 10939db5e4..9e28e18fee 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1218,6 +1218,7 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("minimum_alpha"); mReservedUniforms.push_back("emissive_brightness"); + // Deferred mReservedUniforms.push_back("shadow_matrix"); mReservedUniforms.push_back("env_mat"); mReservedUniforms.push_back("shadow_clip"); @@ -1242,8 +1243,9 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("depth_cutoff"); mReservedUniforms.push_back("norm_cutoff"); mReservedUniforms.push_back("shadow_target_width"); + mReservedUniforms.push_back("view_dir"); // DEFERRED_VIEW_DIR - llassert(mReservedUniforms.size() == LLShaderMgr::DEFERRED_SHADOW_TARGET_WIDTH+1); + llassert(mReservedUniforms.size() == LLShaderMgr::DEFERRED_VIEW_DIR+1); mReservedUniforms.push_back("tc_scale"); mReservedUniforms.push_back("rcp_screen_res"); diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index 5b19dd53d1..067df6fa04 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -144,6 +144,7 @@ public: DEFERRED_DEPTH_CUTOFF, // "depth_cutoff" DEFERRED_NORM_CUTOFF, // "norm_cutoff" DEFERRED_SHADOW_TARGET_WIDTH, // "shadow_target_width" + DEFERRED_VIEW_DIR, // "view_dir" FXAA_TC_SCALE, // "tc_scale" FXAA_RCP_SCREEN_RES, // "rcp_screen_res" |