From ea5cfa6e9596e6a13e3cb6db6b3530fcd6df5d2e Mon Sep 17 00:00:00 2001
From: Jake Turner <jake@evansturner.co.uk>
Date: Mon, 4 Apr 2022 08:54:54 +0100
Subject: [PATCH] Change serialized name for wrapped Metal Objects

Change WrappedMTL<TYPE>* -> MTL<TYPE>

Before

<ResourceId name="Device" typename="WrappedMTLDevice *" width="8">4</ResourceId>
<ResourceId name="Library" typename="WrappedMTLLibrary *" width="8">9</ResourceId>
<ResourceId name="vertexFunction" typename="WrappedMTLFunction *" width="8">10</ResourceId>

After
<ResourceId name="Device" typename="MTLDevice" width="8">4</ResourceId>
<ResourceId name="Library" typename="MTLLibrary" width="8">9</ResourceId>
<ResourceId name="vertexFunction" typename="MTLFunction" width="8">10</ResourceId>
---
 renderdoc/driver/metal/metal_types.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/renderdoc/driver/metal/metal_types.h b/renderdoc/driver/metal/metal_types.h
index 3fe7f2a12..9c69478eb 100644
--- a/renderdoc/driver/metal/metal_types.h
+++ b/renderdoc/driver/metal/metal_types.h
@@ -37,9 +37,15 @@
 
 // These serialise overloads will fetch the ID during capture, serialise the ID
 // directly as-if it were the original type, then on replay load up the resource if available.
-#define DECLARE_WRAPPED_TYPE_SERIALISE(CPPTYPE) \
-  class WrappedMTL##CPPTYPE;                    \
-  DECLARE_REFLECTION_STRUCT(WrappedMTL##CPPTYPE *)
+#define DECLARE_WRAPPED_TYPE_SERIALISE(CPPTYPE)       \
+  class WrappedMTL##CPPTYPE;                          \
+  template <>                                         \
+  inline rdcliteral TypeName<WrappedMTL##CPPTYPE *>() \
+  {                                                   \
+    return STRING_LITERAL(STRINGIZE(MTL##CPPTYPE));   \
+  }                                                   \
+  template <class SerialiserType>                     \
+  void DoSerialise(SerialiserType &ser, WrappedMTL##CPPTYPE *&el);
 
 METALCPP_WRAPPED_PROTOCOLS(DECLARE_WRAPPED_TYPE_SERIALISE);
 #undef DECLARE_WRAPPED_TYPE_SERIALISE