diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-03-02 13:35:10 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-03-02 13:35:10 -0600 |
| commit | f53fa08c7069f7f604f3fcab70d65af8bb616f08 (patch) | |
| tree | ccd6ee9ea9333aab8a8cadd697d488be81ca8c41 /indra/newview/lldrawpoolbump.cpp | |
| parent | 302f4085a5f9fd7b5267fd573a8e15f890cfe573 (diff) | |
MAINT-708 Use texture compression to minimize memory bloat (experimental)
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index b58efe62ab..6f71e6ebc8 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -1341,8 +1341,7 @@ void LLBumpImageList::onSourceLoaded( BOOL success, LLViewerTexture *src_vi, LLI // immediately assign bump to a global smart pointer in case some local smart pointer // accidentally releases it. LLPointer<LLViewerTexture> bump = LLViewerTextureManager::getLocalTexture( TRUE ); - - + if (!LLPipeline::sRenderDeferred) { LLFastTimer t(FTM_BUMP_SOURCE_CREATE); @@ -1351,6 +1350,10 @@ void LLBumpImageList::onSourceLoaded( BOOL success, LLViewerTexture *src_vi, LLI } else { //convert to normal map + + //disable compression on normal maps to prevent errors below + bump->getGLTexture()->setAllowCompression(false); + { LLFastTimer t(FTM_BUMP_SOURCE_CREATE); bump->setExplicitFormat(GL_RGBA8, GL_ALPHA); |