From 50bad91f1487eec46ac22d39a0ac4066144f93ec Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 26 Dec 2021 20:40:03 +0100 Subject: [PATCH] - handle edge case in clipper where adding a new window will remove the entire clipper's content before adding the new range. This case would have passed the actual logic but not the asserts. --- source/core/rendering/scene/hw_clipper.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/source/core/rendering/scene/hw_clipper.cpp b/source/core/rendering/scene/hw_clipper.cpp index 38fb81324..0c917cc32 100644 --- a/source/core/rendering/scene/hw_clipper.cpp +++ b/source/core/rendering/scene/hw_clipper.cpp @@ -562,17 +562,21 @@ void Clipper::AddWindowRange(int start, int end, float topclip, float bottomclip node = next; } - // we get here if a new range needs to be inserted. - node = cliphead; - // advance to the place where this can be inserted. - while (node != nullptr && node->start < end) + // cliphead *can* be null here if a sole existing older range got removed because this one covers it entirely. + if (cliphead) { - prevNode = node; - node = node->next; + // we get here if a new range needs to be inserted. + node = cliphead; + // advance to the place where this can be inserted. + while (node != nullptr && node->start < end) + { + prevNode = node; + node = node->next; + } + assert(!prevNode || prevNode->end <= start); + assert(!prevNode || !prevNode->next || prevNode->next->start >= end); + assert(prevNode || (cliphead && (!cliphead->next || cliphead->next->start >= end))); } - assert(!prevNode || prevNode->end <= start); - assert(!prevNode || !prevNode->next || prevNode->next->start >= end); - assert(prevNode || (cliphead && (!cliphead->next || cliphead->next->start >= end))); } if (topclip > viewz) topclip = FLT_MAX;