Fixed #9859 (100% CPU usage after some messages in /debugscript)

Author: ccw808

Client/core/CChat.cpp

@@ -145,7 +145,7 @@ void CChat::LoadCVars(void)
 //
 // Draw
 //
-void CChat::Draw(bool bUseCacheTexture)
+void CChat::Draw(bool bUseCacheTexture, bool bAllowOutline)
 {
     // Are we visible?
     if (!m_bVisible)
@@ -159,9 +159,12 @@ void CChat::Draw(bool bUseCacheTexture)
         UpdateGUI();
     }
 
+    bool bUsingOutline = m_bTextBlackOutline && bAllowOutline && bUseCacheTexture;
+    DrawInputLine(bUsingOutline);
+
     // Get drawList for the chat box text
     SDrawList drawList;
-    GetDrawList(drawList);
+    GetDrawList(drawList, bUsingOutline);
 
     // Calc some size info
     CVector2D chatTopLeft(drawList.renderBounds.fX1, drawList.renderBounds.fY1);
@@ -212,6 +215,7 @@ void CChat::Draw(bool bUseCacheTexture)
     // If we can't get a rendertarget for some reason, just render the text directly to the screen
     if (!m_pCacheTexture)
     {
+        drawList.bOutline = false;      // Outline too slow without cache texture
         DrawDrawList(drawList, chatTopLeft);
         return;
     }
@@ -270,15 +274,14 @@ void CChat::DrawDrawList(const SDrawList& drawList, const CVector2D& topLeftOffs
 //
 // Get list of text lines to draw
 //
-void CChat::GetDrawList(SDrawList& outDrawList)
+void CChat::GetDrawList(SDrawList& outDrawList, bool bUsingOutline)
 {
     float     fLineDifference = CChat::GetFontHeight(m_vecScale.fY);
     CVector2D vecPosition(m_vecBackgroundPosition.fX + (5.0f * m_vecScale.fX), m_vecBackgroundPosition.fY + m_vecBackgroundSize.fY - (fLineDifference * 1.25f));
     float     fMaxLineWidth = m_vecBackgroundSize.fX - (10.0f * m_vecScale.fX);
     unsigned long ulTime = GetTickCount32();
     float         fRcpChatLineFadeOut = 1.0f / m_ulChatLineFadeOut;
-    bool          bShadow = (m_Color.A * m_fBackgroundAlpha == 0.f) && !m_bTextBlackOutline;
-    bool          bInputShadow = (m_InputColor.A * m_fInputBackgroundAlpha == 0.f) && !m_bTextBlackOutline;
+    bool          bShadow = (m_Color.A * m_fBackgroundAlpha == 0.f) && !bUsingOutline;
 
     if (m_Color.A * m_fBackgroundAlpha > 0.f)
     {
@@ -304,7 +307,7 @@ void CChat::GetDrawList(SDrawList& outDrawList)
 
     outDrawList.renderBounds = RenderBounds;
     outDrawList.bShadow = bShadow;
-    outDrawList.bOutline = m_bTextBlackOutline;
+    outDrawList.bOutline = bUsingOutline;
 
     // Smooth scroll
     int   iLineScroll;
@@ -351,7 +354,13 @@ void CChat::GetDrawList(SDrawList& outDrawList)
         if (uiLine == m_uiMostRecentLine)            // Went through all lines?
             break;
     }
+}
 
+//
+// CChat::DrawInputLine
+//
+void CChat::DrawInputLine(bool bUsingOutline)
+{
     if (m_InputColor.A * m_fInputBackgroundAlpha > 0.f)
     {
         if (m_pInput)
@@ -366,8 +375,10 @@ void CChat::GetDrawList(SDrawList& outDrawList)
 
     if (m_bInputVisible)
     {
+        float     fLineDifference = CChat::GetFontHeight(m_vecScale.fY);
+        bool      bInputShadow = (m_InputColor.A * m_fInputBackgroundAlpha == 0.f) && !bUsingOutline;
         CVector2D vecPosition(m_vecInputPosition.fX + (5.0f * m_vecScale.fX), m_vecInputPosition.fY + (fLineDifference * 0.125f));
-        m_InputLine.Draw(vecPosition, 255, bInputShadow, m_bTextBlackOutline);
+        m_InputLine.Draw(vecPosition, 255, bInputShadow, bUsingOutline);
     }
 }
 

Client/core/CChat.h

@@ -157,7 +157,7 @@ class CChat
     CChat(CGUI* pManager, const CVector2D& vecPosition);
     ~CChat(void);
 
-    virtual void Draw(bool bUseCacheTexture);
+    virtual void Draw(bool bUseCacheTexture, bool bAllowOutline);
     virtual void Output(const char* szText, bool bColorCoded = true);
     void         Clear(void);
     void         ClearInput(void);
@@ -202,7 +202,8 @@ class CChat
     void UpdatePosition(void);
     void UpdateSmoothScroll(float* pfPixelScroll, int* piLineScroll);
     void DrawDrawList(const SDrawList& drawList, const CVector2D& topLeftOffset = CVector2D(0, 0));
-    void GetDrawList(SDrawList& outDrawList);
+    void GetDrawList(SDrawList& outDrawList, bool bUsingOutline);
+    void DrawInputLine(bool bUsingOutline);
 
     CChatLine      m_Lines[CHAT_MAX_LINES];            // Circular buffer
     int            m_iScrollState;                     // 1 up, 0 stop, -1 down

Client/core/CDebugView.cpp

@@ -76,7 +76,7 @@ CDebugView::CDebugView(CGUI* pManager, const CVector2D& vecPosition) : CChat()
     UpdateGUI();
 }
 
-void CDebugView::Draw(bool bUseCacheTexture)
+void CDebugView::Draw(bool bUseCacheTexture, bool bAllowOutline)
 {
     // Are we visible?
     if (!m_bVisible)
@@ -91,9 +91,11 @@ void CDebugView::Draw(bool bUseCacheTexture)
     CVector2D vecResolution = m_pManager->GetResolution();
     float     height = m_uiNumLines * GetFontHeight(1) * m_vecScale.fY;
     m_vecBackgroundPosition = vecPosition * vecResolution - CVector2D(0, height);
+    m_vecBackgroundPosition.fX = Round(m_vecBackgroundPosition.fX);
+    m_vecBackgroundPosition.fY = Round(m_vecBackgroundPosition.fY);
     m_pBackground->SetPosition(m_vecBackgroundPosition);
 
-    CChat::Draw(bUseCacheTexture);
+    CChat::Draw(bUseCacheTexture, bAllowOutline);
     g_pChat = pChat;
 }
 

Client/core/CDebugView.h

@@ -24,7 +24,7 @@ class CDebugView : public CChat
 public:
     CDebugView(CGUI* pManager, const CVector2D& vecPosition);
 
-    void Draw(bool bUseCacheTexture);
+    void Draw(bool bUseCacheTexture, bool bAllowOutline);
     void Output(const char* szText, bool bColorCoded);
 
 protected:

Client/core/CGUI.cpp

@@ -299,9 +299,9 @@ void CLocalGUI::Draw(void)
     UpdateCursor();
 
     // Draw the chat
-    m_pChat->Draw(true);
+    m_pChat->Draw(true, true);
     // Draw the debugger
-    m_pDebugView->Draw(false);
+    m_pDebugView->Draw(true, false);
 
     // If we're not at the loadingscreen
     static bool bDelayedFrame = false;