diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-20 16:44:39 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-20 16:44:39 -0700 |
| commit | 2a03e8f9fb24bb68b79e34bcfa9a45d3e377b0b8 (patch) | |
| tree | b6d325cb77de72da605fc4fc032cf4970126ee14 /indra/newview/llvovolume.cpp | |
| parent | 8aadd9d27025e6ed8e50e88ec9548d48e48095c8 (diff) | |
MAINT-3172 fix rendering regressions from release mergedown
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rwxr-xr-x | indra/newview/llvovolume.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index c52fe78cf2..d9efd23b43 100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1036,6 +1036,7 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams ¶ms_in, const S32 detail, bo } } + static LLCachedControl<bool> use_transform_feedback(gSavedSettings, "RenderUseTransformFeedback"); bool cache_in_vram = use_transform_feedback && gTransformPositionProgram.mProgramObject && @@ -1052,9 +1053,7 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams ¶ms_in, const S32 detail, bo break; } volume->genTangents(i); - //gGLDebugLoggingEnabled = TRUE; LLFace::cacheFaceInVRAM(face); - //gGLDebugLoggingEnabled = FALSE; } } @@ -4461,8 +4460,6 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) bool emissive = false; - - { LLFastTimer t(FTM_REBUILD_VOLUME_FACE_LIST); |