diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-31 17:20:44 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-31 17:20:44 -0500 |
| commit | 5406ebad3e2073a860ced69094bbfb76880ce999 (patch) | |
| tree | 16a279a28f1cc699b1fef3e301917c512b4ae8f3 /indra | |
| parent | bc65e929fc32950a42d58931694961263db9c8ed (diff) | |
SH-2521 Put back "high detail" terrain render when basic shaders disabled (still broken).
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lldrawpoolterrain.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp index d61df9c048..3e9d30283a 100644 --- a/indra/newview/lldrawpoolterrain.cpp +++ b/indra/newview/lldrawpoolterrain.cpp @@ -198,7 +198,7 @@ void LLDrawPoolTerrain::render(S32 pass) return; } // Render simplified land if video card can't do sufficient multitexturing - if (!LLGLSLShader::sNoFixedFunction || !gGLManager.mHasARBEnvCombine || (gGLManager.mNumTextureUnits < 2)) + if (!gGLManager.mHasARBEnvCombine || (gGLManager.mNumTextureUnits < 2)) { renderSimple(); // Render without multitexture return; @@ -223,11 +223,16 @@ void LLDrawPoolTerrain::render(S32 pass) { gPipeline.enableLightsStatic(); - if (sDetailMode == 0){ + if (sDetailMode == 0) + { renderSimple(); - } else if (gGLManager.mNumTextureUnits < 4){ + } + else if (gGLManager.mNumTextureUnits < 4) + { renderFull2TU(); - } else { + } + else + { renderFull4TU(); } } |