Merge pull request xbmc#23022 from sarbes/scissor-culling

Cull GUI elements not in scissor bounds

xbmc/guilib/GUIControl.cpp

@@ -180,6 +180,10 @@ void CGUIControl::Process(unsigned int currentTime, CDirtyRegionList &dirtyregio
 // 3. reset the animation transform
 void CGUIControl::DoRender()
 {
+  if (IsControlRenderable() &&
+      !m_renderRegion.Intersects(CServiceBroker::GetWinSystem()->GetGfxContext().GetScissors()))
+    return;
+
   if (IsVisible() && !m_isCulled)
   {
     bool hasStereo =
@@ -954,6 +958,24 @@ void CGUIControl::UpdateControlStats()
   }
 }
 
+bool CGUIControl::IsControlRenderable()
+{
+  switch (ControlType)
+  {
+    case GUICONTAINER_EPGGRID:
+    case GUICONTAINER_FIXEDLIST:
+    case GUICONTAINER_LIST:
+    case GUICONTAINER_PANEL:
+    case GUICONTAINER_WRAPLIST:
+    case GUICONTROL_GROUP:
+    case GUICONTROL_GROUPLIST:
+    case GUICONTROL_LISTGROUP:
+      return false;
+    default:
+      return true;
+  }
+}
+
 void CGUIControl::SetHitRect(const CRect& rect, const UTILS::COLOR::Color& color)
 {
   m_hitRect = rect;

xbmc/guilib/GUIControl.h

@@ -306,6 +306,11 @@ class CGUIControl
   };
   GUICONTROLTYPES GetControlType() const { return ControlType; }
 
+  /*! \brief Test whether the control is "drawable" (not a group or similar)
+   \return true if the control has textures/labels it wants to render
+   */
+  bool IsControlRenderable();
+
   enum GUIVISIBLE { HIDDEN = 0, DELAYED, VISIBLE };
 
   enum GUISCROLLVALUE { FOCUS = 0, NEVER, ALWAYS };

xbmc/utils/Geometry.h

@@ -281,6 +281,11 @@ template <typename T> class CRectGen
     return (x1 <= point.x && point.x <= x2 && y1 <= point.y && point.y <= y2);
   };
 
+  constexpr bool Intersects(const this_type& rect) const
+  {
+    return (x1 < rect.x2 && x2 > rect.x1 && y1 < rect.y2 && y2 > rect.y1);
+  };
+
   this_type& operator-=(const point_type &point) XBMC_FORCE_INLINE
   {
     x1 -= point.x;