TrigBufCache: allow combo to be found by smallTrig()

Author: preda

src/TrigBufCache.cpp

@@ -180,7 +180,7 @@ TrigBufCache::~TrigBufCache() = default;
 TrigPtr TrigBufCache::smallTrig(u32 W, u32 nW) {
   lock_guard lock{mut};
   auto& m = small;
-  decay_t<decltype(m)>::key_type key{W, nW};
+  decay_t<decltype(m)>::key_type key{W, nW, 0, 0};
 
   TrigPtr p{};
   auto it = m.find(key);
@@ -198,15 +198,18 @@ TrigPtr TrigBufCache::smallTrigCombo(u32 width, u32 middle, u32 W, u32 nW) {
 #endif
 
   lock_guard lock{mut};
-  auto& m = combo;
-  decay_t<decltype(m)>::key_type key{width, middle, W, nW};
+  auto& m = small;
+  decay_t<decltype(m)>::key_type key1{W, nW, width, middle};
+  // We write the "combo" under two keys, so it can also be retrieved as non-combo by smallTrig()
+  decay_t<decltype(m)>::key_type key2{W, nW, 0, 0};
 
   TrigPtr p{};
-  auto it = m.find(key);
+  auto it = m.find(key1);
   if (it == m.end() || !(p = it->second.lock())) {
     p = make_shared<TrigBuf>(context, genSmallTrigCombo(width, middle, W, nW));
-    m[key] = p;
-    smallComboCache.add(p);
+    m[key1] = p;
+    m[key2] = p;
+    smallCache.add(p);
   }
   return p;
 }

src/TrigBufCache.h

@@ -27,15 +27,13 @@ class TrigBufCache {
   const Context* context;
   std::mutex mut;
 
-  std::map<tuple<u32, u32>, TrigPtr::weak_type> small;
+  std::map<tuple<u32, u32, u32, u32>, TrigPtr::weak_type> small;
   std::map<tuple<u32, u32, u32>, TrigPtr::weak_type> middle;
-  std::map<tuple<u32, u32, u32, u32>, TrigPtr::weak_type> combo;
 
   // The shared-pointers below keep the most recent set of buffers alive even without any Gpu instance
   // referencing them. This allows a single worker to delete & re-create the Gpu instance and still reuse the buffers.
   StrongCache smallCache{4};
   StrongCache middleCache{4};
-  StrongCache smallComboCache{2};
 
 public:
   TrigBufCache(const Context* context) :