diff options
| author | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-02-14 10:57:28 -0800 |
|---|---|---|
| committer | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-02-14 10:57:28 -0800 |
| commit | e2f3ea50d57ac530512e0ed77c537f0722198c18 (patch) | |
| tree | acd3e38ad5864126e986ffd11f1349a91b7effb2 /indra | |
| parent | e82da1c8204b34ffe3e5adcad1340dc49e11ef1f (diff) | |
For MAINT-1291 Re-order cubemap disable and shader tex disable to avoid false alarm when using RenderDebugGL. Code Review: DaveP
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 1b0b11298c..079cbe3a21 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -449,9 +449,6 @@ void LLDrawPoolBump::unbindCubeMap(LLGLSLShader* shader, S32 shader_level, S32& LLCubeMap* cube_map = gSky.mVOSkyp ? gSky.mVOSkyp->getCubeMap() : NULL; if( cube_map ) { - cube_map->disable(); - cube_map->restoreMatrix(); - if (!invisible && shader_level > 1) { shader->disableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, LLTexUnit::TT_CUBE_MAP); @@ -464,6 +461,10 @@ void LLDrawPoolBump::unbindCubeMap(LLGLSLShader* shader, S32 shader_level, S32& } } } + // Placed after shader->disableTex(ENV,TT_CUBE_MAP) above to avoid sequencing false alarm when using RenderDebugGL + // MAINT-1291 + cube_map->disable(); + cube_map->restoreMatrix(); } if (!LLGLSLShader::sNoFixedFunction) |