From c8726aba303bcf1207b730a344536e25491420bc Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 10 Nov 2015 09:48:56 -0500 Subject: remove execute permission from many files that should not have it --- indra/llrender/CMakeLists.txt | 0 indra/llrender/llcubemap.cpp | 0 indra/llrender/llcubemap.h | 0 indra/llrender/llfontbitmapcache.cpp | 0 indra/llrender/llfontbitmapcache.h | 0 indra/llrender/llfontfreetype.cpp | 0 indra/llrender/llfontfreetype.h | 0 indra/llrender/llfontgl.cpp | 0 indra/llrender/llfontgl.h | 0 indra/llrender/llfontregistry.cpp | 0 indra/llrender/llfontregistry.h | 0 indra/llrender/llgl.cpp | 0 indra/llrender/llgl.h | 0 indra/llrender/llgldbg.cpp | 0 indra/llrender/llgldbg.h | 0 indra/llrender/llglheaders.h | 0 indra/llrender/llglslshader.cpp | 0 indra/llrender/llglslshader.h | 0 indra/llrender/llglstates.h | 0 indra/llrender/llgltypes.h | 0 indra/llrender/llimagegl.cpp | 0 indra/llrender/llimagegl.h | 0 indra/llrender/llpostprocess.cpp | 0 indra/llrender/llpostprocess.h | 0 indra/llrender/llrender.cpp | 0 indra/llrender/llrender.h | 0 indra/llrender/llrendernavprim.cpp | 0 indra/llrender/llrendernavprim.h | 0 indra/llrender/llrendersphere.cpp | 0 indra/llrender/llrendersphere.h | 0 indra/llrender/llrendertarget.cpp | 0 indra/llrender/llrendertarget.h | 0 indra/llrender/llshadermgr.cpp | 0 indra/llrender/llshadermgr.h | 0 indra/llrender/lltexture.cpp | 0 indra/llrender/lltexture.h | 0 indra/llrender/llvertexbuffer.cpp | 0 indra/llrender/llvertexbuffer.h | 0 38 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 indra/llrender/CMakeLists.txt mode change 100755 => 100644 indra/llrender/llcubemap.cpp mode change 100755 => 100644 indra/llrender/llcubemap.h mode change 100755 => 100644 indra/llrender/llfontbitmapcache.cpp mode change 100755 => 100644 indra/llrender/llfontbitmapcache.h mode change 100755 => 100644 indra/llrender/llfontfreetype.cpp mode change 100755 => 100644 indra/llrender/llfontfreetype.h mode change 100755 => 100644 indra/llrender/llfontgl.cpp mode change 100755 => 100644 indra/llrender/llfontgl.h mode change 100755 => 100644 indra/llrender/llfontregistry.cpp mode change 100755 => 100644 indra/llrender/llfontregistry.h mode change 100755 => 100644 indra/llrender/llgl.cpp mode change 100755 => 100644 indra/llrender/llgl.h mode change 100755 => 100644 indra/llrender/llgldbg.cpp mode change 100755 => 100644 indra/llrender/llgldbg.h mode change 100755 => 100644 indra/llrender/llglheaders.h mode change 100755 => 100644 indra/llrender/llglslshader.cpp mode change 100755 => 100644 indra/llrender/llglslshader.h mode change 100755 => 100644 indra/llrender/llglstates.h mode change 100755 => 100644 indra/llrender/llgltypes.h mode change 100755 => 100644 indra/llrender/llimagegl.cpp mode change 100755 => 100644 indra/llrender/llimagegl.h mode change 100755 => 100644 indra/llrender/llpostprocess.cpp mode change 100755 => 100644 indra/llrender/llpostprocess.h mode change 100755 => 100644 indra/llrender/llrender.cpp mode change 100755 => 100644 indra/llrender/llrender.h mode change 100755 => 100644 indra/llrender/llrendernavprim.cpp mode change 100755 => 100644 indra/llrender/llrendernavprim.h mode change 100755 => 100644 indra/llrender/llrendersphere.cpp mode change 100755 => 100644 indra/llrender/llrendersphere.h mode change 100755 => 100644 indra/llrender/llrendertarget.cpp mode change 100755 => 100644 indra/llrender/llrendertarget.h mode change 100755 => 100644 indra/llrender/llshadermgr.cpp mode change 100755 => 100644 indra/llrender/llshadermgr.h mode change 100755 => 100644 indra/llrender/lltexture.cpp mode change 100755 => 100644 indra/llrender/lltexture.h mode change 100755 => 100644 indra/llrender/llvertexbuffer.cpp mode change 100755 => 100644 indra/llrender/llvertexbuffer.h (limited to 'indra/llrender') diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/indra/llrender/llcubemap.cpp b/indra/llrender/llcubemap.cpp old mode 100755 new mode 100644 diff --git a/indra/llrender/llcubemap.h b/indra/llrender/llcubemap.h old mode 100755 new mode 100644 diff --git a/indra/llrender/llfontbitmapcache.cpp b/indra/llrender/llfontbitmapcache.cpp old mode 100755 new mode 100644 diff --git a/indra/llrender/llfontbitmapcache.h b/indra/llrender/llfontbitmapcache.h old mode 100755 new mode 100644 diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp old mode 100755 new mode 100644 diff --git a/indra/llrender/llfontfreetype.h b/indra/llrender/llfontfreetype.h old mode 100755 new mode 100644 diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp old mode 100755 new mode 100644 diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h old mode 100755 new mode 100644 diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp old mode 100755 new mode 100644 diff --git a/indra/llrender/llfontregistry.h b/indra/llrender/llfontregistry.h old mode 100755 new mode 100644 diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp old mode 100755 new mode 100644 diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h old mode 100755 new mode 100644 diff --git a/indra/llrender/llgldbg.cpp b/indra/llrender/llgldbg.cpp old mode 100755 new mode 100644 diff --git a/indra/llrender/llgldbg.h b/indra/llrender/llgldbg.h old mode 100755 new mode 100644 diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h old mode 100755 new mode 100644 diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp old mode 100755 new mode 100644 diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h old mode 100755 new mode 100644 diff --git a/indra/llrender/llglstates.h b/indra/llrender/llglstates.h old mode 100755 new mode 100644 diff --git a/indra/llrender/llgltypes.h b/indra/llrender/llgltypes.h old mode 100755 new mode 100644 diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp old mode 100755 new mode 100644 diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h old mode 100755 new mode 100644 diff --git a/indra/llrender/llpostprocess.cpp b/indra/llrender/llpostprocess.cpp old mode 100755 new mode 100644 diff --git a/indra/llrender/llpostprocess.h b/indra/llrender/llpostprocess.h old mode 100755 new mode 100644 diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp old mode 100755 new mode 100644 diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h old mode 100755 new mode 100644 diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp old mode 100755 new mode 100644 diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h old mode 100755 new mode 100644 diff --git a/indra/llrender/llrendersphere.cpp b/indra/llrender/llrendersphere.cpp old mode 100755 new mode 100644 diff --git a/indra/llrender/llrendersphere.h b/indra/llrender/llrendersphere.h old mode 100755 new mode 100644 diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp old mode 100755 new mode 100644 diff --git a/indra/llrender/llrendertarget.h b/indra/llrender/llrendertarget.h old mode 100755 new mode 100644 diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp old mode 100755 new mode 100644 diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h old mode 100755 new mode 100644 diff --git a/indra/llrender/lltexture.cpp b/indra/llrender/lltexture.cpp old mode 100755 new mode 100644 diff --git a/indra/llrender/lltexture.h b/indra/llrender/lltexture.h old mode 100755 new mode 100644 diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp old mode 100755 new mode 100644 diff --git a/indra/llrender/llvertexbuffer.h b/indra/llrender/llvertexbuffer.h old mode 100755 new mode 100644 -- cgit v1.3 From 09cb792aa7908bc6c76792ba7ee5082b7569299a Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Wed, 24 Feb 2016 16:22:38 +0200 Subject: MAINT-5297 - icons were not removed from memory --- indra/llrender/llgltexture.cpp | 3 ++- indra/newview/llviewertexture.cpp | 3 ++- indra/newview/llviewertexturelist.cpp | 27 +++++++++++++++++++++------ 3 files changed, 25 insertions(+), 8 deletions(-) (limited to 'indra/llrender') diff --git a/indra/llrender/llgltexture.cpp b/indra/llrender/llgltexture.cpp index 56e263c5f1..3a6eebebba 100644 --- a/indra/llrender/llgltexture.cpp +++ b/indra/llrender/llgltexture.cpp @@ -112,7 +112,8 @@ void LLGLTexture::setBoostLevel(S32 level) if(mBoostLevel != level) { mBoostLevel = level ; - if(mBoostLevel != LLGLTexture::BOOST_NONE) + if(mBoostLevel != LLGLTexture::BOOST_NONE + && mBoostLevel != LLGLTexture::BOOST_ICON) { setNoDelete() ; } diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index e2b8ff8e80..3e059f3b68 100755 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -716,7 +716,8 @@ void LLViewerTexture::setBoostLevel(S32 level) { mBoostLevel = level; if(mBoostLevel != LLViewerTexture::BOOST_NONE && - mBoostLevel != LLViewerTexture::BOOST_SELECTED) + mBoostLevel != LLViewerTexture::BOOST_SELECTED && + mBoostLevel != LLViewerTexture::BOOST_ICON) { setNoDelete(); } diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index a8c93646c6..ca0565fa4b 100755 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -450,11 +450,17 @@ LLViewerFetchedTexture* LLViewerTextureList::getImageFromUrl(const std::string& if (boost_priority != 0) { - if (boost_priority == LLViewerFetchedTexture::BOOST_UI - || boost_priority == LLViewerFetchedTexture::BOOST_ICON) + if (boost_priority == LLViewerFetchedTexture::BOOST_UI) { imagep->dontDiscard(); } + if (boost_priority == LLViewerFetchedTexture::BOOST_ICON) + { + // Agent and group Icons are downloadable content, nothing manages + // icon deletion yet, so they should not persist + imagep->dontDiscard(); + imagep->forceActive(); + } imagep->setBoostLevel(boost_priority); } } @@ -554,10 +560,16 @@ LLViewerFetchedTexture* LLViewerTextureList::createImage(const LLUUID &image_id, if (boost_priority != 0) { - if (boost_priority == LLViewerFetchedTexture::BOOST_UI - || boost_priority == LLViewerFetchedTexture::BOOST_ICON) + if (boost_priority == LLViewerFetchedTexture::BOOST_UI) + { + imagep->dontDiscard(); + } + if (boost_priority == LLViewerFetchedTexture::BOOST_ICON) { + // Agent and group Icons are downloadable content, nothing manages + // icon deletion yet, so they should not persist. imagep->dontDiscard(); + imagep->forceActive(); } imagep->setBoostLevel(boost_priority); } @@ -1679,8 +1691,11 @@ LLUIImagePtr LLUIImageList::loadUIImage(LLViewerFetchedTexture* imagep, const st //don't compress UI images imagep->getGLTexture()->setAllowCompression(false); - //all UI images are non-deletable - imagep->setNoDelete(); + //all UI images are non-deletable, except downloadable icons + if (imagep->getBoostLevel() != LLGLTexture::BOOST_ICON) + { + imagep->setNoDelete(); + } LLUIImagePtr new_imagep = new LLUIImage(name, imagep); new_imagep->setScaleStyle(scale_style); -- cgit v1.3 From 511bf30a2e97f543c5acbd9a2501d7ea5c7414ce Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 7 Mar 2016 15:40:39 -0500 Subject: make shader loading messages LL_DEBUGS --- indra/llrender/llshadermgr.cpp | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'indra/llrender') diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index b2be3cc3b6..b297223c2e 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -515,29 +515,13 @@ void LLShaderMgr::dumpObjectLog(GLhandleARB ret, BOOL warns, const std::string& if (log.length() > 0 || warns) { + LL_DEBUGS("ShaderLoading") << "Shader loading "; + if (!filename.empty()) { - if (warns) - { - LL_WARNS("ShaderLoading") << "From " << filename << ":" << LL_ENDL; - } - else - { - LL_INFOS("ShaderLoading") << "From " << filename << ":" << LL_ENDL; - } - } - } - - if ( log.length() > 0 ) - { - if (warns) - { - LL_WARNS("ShaderLoading") << log << LL_ENDL; - } - else - { - LL_INFOS("ShaderLoading") << log << LL_ENDL; - } + LL_CONT << "From " << filename << ":\n"; + } + LL_CONT << log << LL_ENDL; } } -- cgit v1.3 From 173886fec32f2f5a8b63e81997f5929b02ddc8c9 Mon Sep 17 00:00:00 2001 From: ruslantproductengine Date: Thu, 10 Mar 2016 19:50:12 +0200 Subject: MAINT-1109 FIXED Toggling graphics options causes viewer memory to increase, eventually causing the rendering pipeline to fall over and crashing the viewer Patchset #2 --- indra/llrender/llglslshader.cpp | 9 ++------- indra/newview/llviewerwindow.cpp | 7 +++++++ 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'indra/llrender') diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 52b8de8365..750e35a71a 100755 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -345,15 +345,10 @@ void LLGLSLShader::unloadInternal() GLhandleARB obj[1024]; GLsizei count; - glGetAttachedObjectsARB(mProgramObject, 1024, &count, obj); + glGetAttachedObjectsARB(mProgramObject, sizeof(obj)/sizeof(obj[0]), &count, obj); for (GLsizei i = 0; i < count; i++) { -#if !LL_DARWIN - if (glIsProgramARB(obj[i])) -#endif - { - glDeleteObjectARB(obj[i]); - } + glDeleteObjectARB(obj[i]); } glDeleteObjectARB(mProgramObject); diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index f96c4b7bf0..d3416ec5fc 100755 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -4951,6 +4951,13 @@ void LLViewerWindow::stopGL(BOOL save_state) gGLManager.mIsDisabled = TRUE; stop_glerror(); + + //unload shader's + while (LLGLSLShader::sInstances.size()) + { + LLGLSLShader* shader = *(LLGLSLShader::sInstances.begin()); + shader->unload(); + } LL_INFOS() << "Remaining allocated texture memory: " << LLImageGL::sGlobalTextureMemory.value() << " bytes" << LL_ENDL; } -- cgit v1.3 From 48016ff54bced607ba11bb02825974b5133ada34 Mon Sep 17 00:00:00 2001 From: ruslantproductengine Date: Tue, 12 Apr 2016 19:29:35 +0300 Subject: MAINT-6286 Viewer 4.0.3.312680 ignores settings for Shaders in Graphics Preferences for ATI Radeon HD 3800 Series graphics card --- indra/llrender/llglslshader.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llrender') diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 750e35a71a..b30bc1aed6 100755 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -348,6 +348,7 @@ void LLGLSLShader::unloadInternal() glGetAttachedObjectsARB(mProgramObject, sizeof(obj)/sizeof(obj[0]), &count, obj); for (GLsizei i = 0; i < count; i++) { + glDetachObjectARB(mProgramObject, obj[i]); glDeleteObjectARB(obj[i]); } -- cgit v1.3