diff options
author | Graham Linden <graham@lindenlab.com> | 2018-09-06 22:50:26 +0100 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2018-09-06 22:50:26 +0100 |
commit | 451ab80ca65a7ae75316442086f42b6553ea6bbe (patch) | |
tree | c9ed6fa0517eaf48d60c8a0be2eb226fd4d00d1b /indra/llrender/llrender.cpp | |
parent | 59a36c2037b6ee87c656d5b314745d3bf82ede1a (diff) |
Fix tex format mismatch between what libatmosphere was generating and what we were claiming to use in rendering.
First pass at sky shader using libatmosphere sky radiance lookup.
Add atmo density controls to ext daycycle floater tabs.
Diffstat (limited to 'indra/llrender/llrender.cpp')
-rw-r--r-- | indra/llrender/llrender.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 67898f1258..251c02dd77 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -1241,16 +1241,10 @@ void LLRender::syncMatrices() } if (shader->getUniformLocation(LLShaderMgr::INVERSE_MODELVIEW_MATRIX)) - { - glh::matrix4f ogl_to_cfr = copy_matrix((F32*)OGL_TO_CFR_ROTATION); - glh::matrix4f modelview = ogl_to_cfr.inverse() * get_current_modelview(); - - glh::matrix4f inv_modelview = modelview.inverse(); - shader->uniformMatrix4fv(LLShaderMgr::INVERSE_MODELVIEW_MATRIX, 1, FALSE, inv_modelview.m); + { + shader->uniformMatrix4fv(LLShaderMgr::INVERSE_MODELVIEW_MATRIX, 1, GL_FALSE, cached_inv_mdv.m); } - shader->uniformMatrix4fv(LLShaderMgr::INVERSE_MODELVIEW_MATRIX, 1, GL_FALSE, cached_inv_mdv.m); - //update MVP matrix mvp_done = true; loc = shader->getUniformLocation(LLShaderMgr::MODELVIEW_PROJECTION_MATRIX); |