Update Catch to v2.2.2

* This allows us to use ToStr as a stringifier

renderdoc/driver/gl/gl_common.cpp

@@ -1941,19 +1941,6 @@ Topology MakePrimitiveTopology(const GLHookSet &gl, GLenum Topo)
 
 #include "3rdparty/catch/catch.hpp"
 
-#define CATCH_TOSTR(type)                                                  \
-  namespace Catch                                                          \
-  {                                                                        \
-  template <>                                                              \
-  struct StringMaker<type>                                                 \
-  {                                                                        \
-    static std::string convert(type const &value) { return ToStr(value); } \
-  };                                                                       \
-  }
-
-CATCH_TOSTR(CompType);
-CATCH_TOSTR(GLenum);
-
 TEST_CASE("GL formats", "[format][gl]")
 {
   // must be updated by hand
@@ -2136,7 +2123,7 @@ TEST_CASE("GL formats", "[format][gl]")
       if(fmt.type != ResourceFormatType::Regular)
         continue;
 
-      INFO("Format is " << ToStr(f));
+      INFO("Format is " << f);
 
       uint32_t size = fmt.compCount * fmt.compByteWidth * 123 * 456;
 

renderdoc/renderdoc.vcxproj

@@ -108,6 +108,7 @@
   <ItemGroup>
     <ClInclude Include="3rdparty\android\android_manifest.h" />
     <ClInclude Include="3rdparty\catch\catch.hpp" />
+    <ClInclude Include="3rdparty\catch\official\catch.hpp" />
     <ClInclude Include="3rdparty\interceptor-lib\lib\AArch64\target_aarch64.h" />
     <ClInclude Include="3rdparty\interceptor-lib\lib\ARM\target_arm.h" />
     <ClInclude Include="3rdparty\interceptor-lib\lib\code_generator.h" />

renderdoc/renderdoc.vcxproj.filters

@@ -124,6 +124,9 @@
     <Filter Include="3rdparty\interceptor-lib\AArch64">
       <UniqueIdentifier>{7894d954-a38a-450f-9780-a38f73df1208}</UniqueIdentifier>
     </Filter>
+    <Filter Include="3rdparty\catch\official">
+      <UniqueIdentifier>{c46ee73c-e0dd-446d-b9a3-38c3ee0433fe}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="maths\camera.h">
@@ -426,6 +429,9 @@
     <ClInclude Include="3rdparty\interceptor-lib\lib\AArch64\target_aarch64.h">
       <Filter>3rdparty\interceptor-lib\AArch64</Filter>
     </ClInclude>
+    <ClInclude Include="3rdparty\catch\official\catch.hpp">
+      <Filter>3rdparty\catch\official</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="maths\camera.cpp">

renderdoc/replay/entry_points.cpp

@@ -23,7 +23,6 @@
  * THE SOFTWARE.
  ******************************************************************************/
 
-#include "3rdparty/catch/catch.hpp"
 #include "android/android.h"
 #include "api/replay/renderdoc_replay.h"
 #include "api/replay/version.h"