From bc82b836ddddb330fa6347f8aac9ca2ed08b36fe Mon Sep 17 00:00:00 2001
From: Matt Pharr <matt@pharr.org>
Date: Wed, 18 Nov 2020 14:09:31 -0800
Subject: [PATCH] Use MapType to generate list of types for MaterialEvalQueue.

---
 src/pbrt/gpu/workitems.h |  9 ++-------
 src/pbrt/gpu/workqueue.h | 16 ++++++++--------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/pbrt/gpu/workitems.h b/src/pbrt/gpu/workitems.h
index 4a963fa..bb0d071 100644
--- a/src/pbrt/gpu/workitems.h
+++ b/src/pbrt/gpu/workitems.h
@@ -13,6 +13,7 @@
 #include <pbrt/lightsamplers.h>
 #include <pbrt/materials.h>
 #include <pbrt/ray.h>
+#include <pbrt/util/containers.h>
 #include <pbrt/util/pstd.h>
 #include <pbrt/util/soa.h>
 
@@ -437,13 +438,7 @@ using MediumScatterQueue = WorkQueue<MediumScatterWorkItem>;
 
 // MaterialEvalQueue Definition
 using MaterialEvalQueue = MultiWorkQueue<
-    MaterialEvalWorkItem<CoatedDiffuseMaterial>,
-    MaterialEvalWorkItem<CoatedConductorMaterial>,
-    MaterialEvalWorkItem<ConductorMaterial>, MaterialEvalWorkItem<DielectricMaterial>,
-    MaterialEvalWorkItem<DiffuseMaterial>,
-    MaterialEvalWorkItem<DiffuseTransmissionMaterial>, MaterialEvalWorkItem<HairMaterial>,
-    MaterialEvalWorkItem<MeasuredMaterial>, MaterialEvalWorkItem<SubsurfaceMaterial>,
-    MaterialEvalWorkItem<ThinDielectricMaterial>, MaterialEvalWorkItem<MixMaterial>>;
+    typename MapType<MaterialEvalWorkItem, typename MaterialHandle::Types>::type>;
 
 }  // namespace pbrt
 
diff --git a/src/pbrt/gpu/workqueue.h b/src/pbrt/gpu/workqueue.h
index 5535d6e..6255eac 100644
--- a/src/pbrt/gpu/workqueue.h
+++ b/src/pbrt/gpu/workqueue.h
@@ -99,21 +99,21 @@ void ForAllQueued(const char *desc, WorkQueue<WorkItem> *q, int maxQueued, F fun
 }
 
 // MultiWorkQueue Definition
-template <typename... Ts>
+template <typename T>
 class MultiWorkQueue;
 
 template <>
-class MultiWorkQueue<> {
+class MultiWorkQueue<TypePack<>> {
   public:
     MultiWorkQueue(int n, Allocator alloc, pstd::span<const bool> haveType) {}
 };
 
 template <typename T, typename... Ts>
-class MultiWorkQueue<T, Ts...> : public MultiWorkQueue<Ts...> {
+class MultiWorkQueue<TypePack<T, Ts...>> : public MultiWorkQueue<TypePack<Ts...>> {
   public:
     // MultiWorkQueue Public Methods
     MultiWorkQueue(int n, Allocator alloc, pstd::span<const bool> haveType)
-        : MultiWorkQueue<Ts...>(n, alloc, haveType.subspan(1, haveType.size())),
+        : MultiWorkQueue<TypePack<Ts...>>(n, alloc, haveType.subspan(1, haveType.size())),
           q(haveType.front() ? n : 1, alloc) {}
 
     template <typename Tsz>
@@ -121,14 +121,14 @@ class MultiWorkQueue<T, Ts...> : public MultiWorkQueue<Ts...> {
         if constexpr (std::is_same_v<Tsz, T>)
             return q.Size();
         else
-            return MultiWorkQueue<Ts...>::template Size<Tsz>();
+            return MultiWorkQueue<TypePack<Ts...>>::template Size<Tsz>();
     }
 
     PBRT_CPU_GPU
     void Reset() {
         q.Reset();
         if constexpr (sizeof...(Ts) > 0)
-            MultiWorkQueue<Ts...>::Reset();
+            MultiWorkQueue<TypePack<Ts...>>::Reset();
     }
 
     template <typename Tg>
@@ -136,7 +136,7 @@ class MultiWorkQueue<T, Ts...> : public MultiWorkQueue<Ts...> {
         if constexpr (std::is_same_v<Tg, T>)
             return &q;
         else
-            return MultiWorkQueue<Ts...>::template Get<Tg>();
+            return MultiWorkQueue<TypePack<Ts...>>::template Get<Tg>();
     }
 
     template <typename Tq>
@@ -144,7 +144,7 @@ class MultiWorkQueue<T, Ts...> : public MultiWorkQueue<Ts...> {
         if constexpr (std::is_same_v<Tq, T>)
             return q.Push(item);
         else
-            return MultiWorkQueue<Ts...>::template Push<Tq>(item);
+            return MultiWorkQueue<TypePack<Ts...>>::template Push<Tq>(item);
     }
 
   private:
-- 
GitLab