From 6a8b63e9de7ee78db2e24ed77f855c1e19790af2 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Sun, 7 Mar 2010 21:18:10 -0700 Subject: partial fix for EXT-5711: Some textures loading from cache seems jammed. This fix should be able to improve the speed of loading texturs from cache noticeably (30% or more). More fix to come. --- indra/newview/lltextureview.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/lltextureview.cpp') diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp index 98731f90f4..1b44063840 100644 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -683,6 +683,10 @@ void LLTextureView::draw() iter != gTextureList.mImageList.end(); ) { LLPointer imagep = *iter++; + if(!imagep->hasFetcher()) + { + continue ; + } S32 cur_discard = imagep->getDiscardLevel(); S32 desired_discard = imagep->mDesiredDiscardLevel; -- cgit v1.2.3 From 3ee48a2090a5c009318e2630f38c78e48b556427 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Sun, 7 Mar 2010 22:55:52 -0700 Subject: trival fix to eliminate unnecessary warnings "LLView::~LLView(): Deleting view " << mName << " during UI draw() phase" caused in lltextureview.cpp (from the texture console). --- indra/newview/lltextureview.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'indra/newview/lltextureview.cpp') diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp index 1b44063840..a4ca33f10f 100644 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -665,12 +665,18 @@ void LLTextureView::draw() // LLViewerObject *objectp; // S32 te; +//#if LL_DEBUG + BOOL drawing = LLView::sIsDrawing; + LLView::sIsDrawing = FALSE; +//#endif for_each(mTextureBars.begin(), mTextureBars.end(), DeletePointer()); mTextureBars.clear(); - - delete mGLTexMemBar; + + delete mGLTexMemBar; mGLTexMemBar = 0; - +//#if LL_DEBUG + LLView::sIsDrawing = drawing ; +//#endif typedef std::multiset display_list_t; display_list_t display_image_list; -- cgit v1.2.3 From aa56bb6274f3376dc0d28c37e3467d2398d5f48e Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Mon, 8 Mar 2010 12:09:16 -0800 Subject: better fix for spam in LLTextureView reviewed by Palmer --- indra/newview/lltextureview.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'indra/newview/lltextureview.cpp') diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp index a4ca33f10f..6cd8a78b25 100644 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -658,6 +658,14 @@ struct compare_decode_pair } }; +struct KillView +{ + void operator()(LLView* viewp) const + { + viewp->die(); + } +}; + void LLTextureView::draw() { if (!mFreezeView) @@ -665,18 +673,12 @@ void LLTextureView::draw() // LLViewerObject *objectp; // S32 te; -//#if LL_DEBUG - BOOL drawing = LLView::sIsDrawing; - LLView::sIsDrawing = FALSE; -//#endif - for_each(mTextureBars.begin(), mTextureBars.end(), DeletePointer()); + for_each(mTextureBars.begin(), mTextureBars.end(), KillView()); mTextureBars.clear(); delete mGLTexMemBar; mGLTexMemBar = 0; -//#if LL_DEBUG - LLView::sIsDrawing = drawing ; -//#endif + typedef std::multiset display_list_t; display_list_t display_image_list; -- cgit v1.2.3