lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-29 13:20:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix interaction of mixed must/normal filters

Browse Source
This commit is contained in:
baldurk
2021-06-10 17:50:16 +01:00
parent dc16db6c2d
commit 0c63ff08ae
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/EventBrowser.cpp
+10 -5
View File
@@ -1189,19 +1189,24 @@ bool EvaluateFilterSet(ICaptureContext &ctx, const rdcarray<EventFilter> &filter
bool accept = false;
bool anyNormal = false;
bool anyMust = false;
for(const EventFilter &filter : filters)
anyNormal |= (filter.type == MatchType::Normal);
anyMust |= (filter.type == MatchType::MustMatch);
// if there aren't any normal filters, they're all CantMatch or MustMatch. In this case we default
// if there are MustMatch filters we ignore normals for the sake of matching. We also default
// to acceptance so that if they all pass then we match. This handles cases like +foo -bar which
// would return the default on a string like "foothing" which would return a false match
if(!anyNormal)
// would return the default on a string like "foothing" which would return a false match if we
// didn't do this
if(anyMust)
accept = true;
// if any top-level filter matches, we match
for(const EventFilter &filter : filters)
{
// ignore normal filters when we have must matches. Only consider must/can't
if(anyMust && filter.type == MatchType::Normal)
continue;
// if we've already accepted and this is a normal filter and we are in non-all mode, it won't
// change the result so don't bother running the filter.
if(accept && !all && filter.type == MatchType::Normal)