diff options
author | Graham Linden <graham@lindenlab.com> | 2019-03-15 08:13:04 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-03-15 08:13:04 -0700 |
commit | a10ec81e82d79bd79d5b058fda1b370073bfb480 (patch) | |
tree | a6e7f5be307197ace5b0a58429a99d2ecfd55dac /indra/llrender | |
parent | 7021c7a8db9610e0d1866c2c4cbc644e2243367e (diff) |
SL-10743, SL-10744
Don't step on SUNLIGHT_COLOR uniform w/ syncLightState competing set.
Put drawpool alpha render loop lighting setup changes as they were
(this will give back some performance and possibly require reopening 10566).
Diffstat (limited to 'indra/llrender')
-rw-r--r-- | indra/llrender/llrender.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index e3bb9298cb..dc662bf898 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -1180,8 +1180,6 @@ void LLRender::syncLightState() shader->uniform4fv(LLShaderMgr::LIGHT_ATTENUATION, 8, attenuation[0].mV); shader->uniform3fv(LLShaderMgr::LIGHT_DIFFUSE, 8, diffuse[0].mV); shader->uniform4fv(LLShaderMgr::LIGHT_AMBIENT, 1, mAmbientLightColor.mV); - shader->uniform4fv(LLShaderMgr::SUNLIGHT_COLOR, 1, diffuse[0].mV); - shader->uniform4fv(LLShaderMgr::MOONLIGHT_COLOR, 1, diffuseB[0].mV); } } |