rename TEST macro to un-confused visual assist

* Visual assist comes with a pre-defined interpretation of TEST() for googletest, which conflicts with ours. We can't seem to override it with a va_stdafx.h even
2026-05-06 01:50:38 +00:00 · 2019-09-17 12:40:00 +01:00
parent a6aa0ac5d0
commit 6d282f90d9
94 changed files with 94 additions and 94 deletions
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Many_UAVs, D3D11GraphicsTest)
+RD_TEST(D3D11_Many_UAVs, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Test using more than 8 compute shader UAVs (D3D11.1 feature)";
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Array_Interpolator, D3D11GraphicsTest)
+RD_TEST(D3D11_Array_Interpolator, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Test passing an array of float2 to make sure the interpolator packing is handled by "
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Binding_Hazards, D3D11GraphicsTest)
+RD_TEST(D3D11_Binding_Hazards, D3D11GraphicsTest)
 {
  static constexpr const char *Description = "Test of D3D11 hazard tracking write/read bindings";

@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Byte_Address_Buffers, D3D11GraphicsTest)
+RD_TEST(D3D11_Byte_Address_Buffers, D3D11GraphicsTest)
 {
  static constexpr const char *Description = "Tests reading and writing from byte address buffers";

@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_CBuffer_Zoo, D3D11GraphicsTest)
+RD_TEST(D3D11_CBuffer_Zoo, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Tests every kind of constant that can be in a cbuffer to make sure it's decoded "
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Counter_Query_Pred, D3D11GraphicsTest)
+RD_TEST(D3D11_Counter_Query_Pred, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Tests use of D3D11 counters, queries and predication. "
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Deferred_UpdateSubresource, D3D11GraphicsTest)
+RD_TEST(D3D11_Deferred_UpdateSubresource, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Test that does UpdateSubresource on a deferred context which might need some "
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Discard_View, D3D11GraphicsTest)
+RD_TEST(D3D11_Discard_View, D3D11GraphicsTest)
 {
  static constexpr const char *Description = "Test that discards an RTV";

@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Divergent_Shader, D3D11GraphicsTest)
+RD_TEST(D3D11_Divergent_Shader, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Test running a shader that diverges across a quad and then expects derivatives to "
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Draw_Zoo, D3D11GraphicsTest)
+RD_TEST(D3D11_Draw_Zoo, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Draws several variants using different vertex/index offsets.";
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Empty_Compute_Dispatch, D3D11GraphicsTest)
+RD_TEST(D3D11_Empty_Compute_Dispatch, D3D11GraphicsTest)
 {
  static constexpr const char *Description = "Test dispatching with one threadgroup count set to 0";

@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Empty_Drawcall, D3D11GraphicsTest)
+RD_TEST(D3D11_Empty_Drawcall, D3D11GraphicsTest)
 {
  static constexpr const char *Description = "Test a drawcall of 0 size";

@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Empty_Viewports, D3D11GraphicsTest)
+RD_TEST(D3D11_Empty_Viewports, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Test setting some viewports that are empty, but enabled";
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Many_RTVs, D3D11GraphicsTest)
+RD_TEST(D3D11_Many_RTVs, D3D11GraphicsTest)
 {
  static constexpr const char *Description = "Test repeatedly creating and destroying RTVs";

@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Map_Overrun, D3D11GraphicsTest)
+RD_TEST(D3D11_Map_Overrun, D3D11GraphicsTest)
 {
  static constexpr const char *Description = "Test overrunning the bounds of a Map() call";

@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Midframe_Create, D3D11GraphicsTest)
+RD_TEST(D3D11_Midframe_Create, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Tests creating resources mid-frame to make sure that they and their contents are "
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Mip_Gen_RT, D3D11GraphicsTest)
+RD_TEST(D3D11_Mip_Gen_RT, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Tests rendering from one mip to another to do a downsample chain";
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Mip_RTV, D3D11GraphicsTest)
+RD_TEST(D3D11_Mip_RTV, D3D11GraphicsTest)
 {
  static constexpr const char *Description = "Test rendering into RTV mip levels";

@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Overdraw_Stress, D3D11GraphicsTest)
+RD_TEST(D3D11_Overdraw_Stress, D3D11GraphicsTest)
 {
  static constexpr const char *Description = "Renders a lot of overlapping triangles";

@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Overlay_Test, D3D11GraphicsTest)
+RD_TEST(D3D11_Overlay_Test, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Makes a couple of draws that show off all the overlays in some way";
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Primitive_Restart, D3D11GraphicsTest)
+RD_TEST(D3D11_Primitive_Restart, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Test of primitive restart in triangle strips with -1 index";
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Refcount_Check, D3D11GraphicsTest)
+RD_TEST(D3D11_Refcount_Check, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Ensures that the device etc doesn't delete itself when there are still outstanding "
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Resource_Lifetimes, D3D11GraphicsTest)
+RD_TEST(D3D11_Resource_Lifetimes, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Test various edge-case resource lifetimes: a resource that is first dirtied within a frame "
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Saturate, D3D11GraphicsTest)
+RD_TEST(D3D11_Saturate, D3D11GraphicsTest)
 {
  static constexpr const char *Description = "Tests using saturate, originally for a bug report";

@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Shader_Debug_Zoo, D3D11GraphicsTest)
+RD_TEST(D3D11_Shader_Debug_Zoo, D3D11GraphicsTest)
 {
  static constexpr const char *Description = "Tests shader debugging in different edge cases";

@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Simple_Dispatch, D3D11GraphicsTest)
+RD_TEST(D3D11_Simple_Dispatch, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Test that just does a dispatch and some copies, for checking basic compute stuff";
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Simple_Triangle, D3D11GraphicsTest)
+RD_TEST(D3D11_Simple_Triangle, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Just draws a simple triangle, using normal pipeline. Basic test that can be used "
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Stream_Out, D3D11GraphicsTest)
+RD_TEST(D3D11_Stream_Out, D3D11GraphicsTest)
 {
  static constexpr const char *Description = "Test using D3D11's streamout feature";

@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Stripped_Shaders, D3D11GraphicsTest)
+RD_TEST(D3D11_Stripped_Shaders, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Tests shaders with their debug/reflection info stripped out and stored in separate blobs";
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Structured_Buffer_MisalignedDirty, D3D11GraphicsTest)
+RD_TEST(D3D11_Structured_Buffer_MisalignedDirty, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Test updating a misaligned chunk of a structured buffer";
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Structured_Buffer_Nested, D3D11GraphicsTest)
+RD_TEST(D3D11_Structured_Buffer_Nested, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Test reading from structured buffers with nested structs";
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Structured_Buffer_Read, D3D11GraphicsTest)
+RD_TEST(D3D11_Structured_Buffer_Read, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Test reading from structured buffers, with and without offsets";
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Texture_3D, D3D11GraphicsTest)
+RD_TEST(D3D11_Texture_3D, D3D11GraphicsTest)
 {
  static constexpr const char *Description = "Test that creates and samples a 3D texture";

@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Untyped_Backbuffer_Descriptor, D3D11GraphicsTest)
+RD_TEST(D3D11_Untyped_Backbuffer_Descriptor, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Just draws a simple triangle, using normal pipeline. Basic test that can be used "
@@ -24,7 +24,7 @@

 #include "d3d11_test.h"

-TEST(D3D11_Vertex_Attr_Zoo, D3D11GraphicsTest)
+RD_TEST(D3D11_Vertex_Attr_Zoo, D3D11GraphicsTest)
 {
  static constexpr const char *Description =
      "Draws a triangle but using different kinds of vertex attributes, including doubles, arrays, "
@@ -52,7 +52,7 @@ COM_SMARTPTR(IMFByteStream);
 ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////

-TEST(D3D11_Video_Textures, D3D11GraphicsTest), IMFMediaEngineNotify
+RD_TEST(D3D11_Video_Textures, D3D11GraphicsTest), IMFMediaEngineNotify
 {
  static constexpr const char *Description = "Tests of YUV textures";

@@ -24,7 +24,7 @@

 #include "d3d12_test.h"

-TEST(D3D12_CBuffer_Zoo, D3D12GraphicsTest)
+RD_TEST(D3D12_CBuffer_Zoo, D3D12GraphicsTest)
 {
  static constexpr const char *Description =
      "Tests every kind of constant that can be in a cbuffer to make sure it's decoded "
@@ -24,7 +24,7 @@

 #include "d3d12_test.h"

-TEST(D3D12_Overlay_Test, D3D12GraphicsTest)
+RD_TEST(D3D12_Overlay_Test, D3D12GraphicsTest)
 {
  static constexpr const char *Description =
      "Makes a couple of draws that show off all the overlays in some way";
@@ -24,7 +24,7 @@

 #include "d3d12_test.h"

-TEST(D3D12_Resource_Lifetimes, D3D12GraphicsTest)
+RD_TEST(D3D12_Resource_Lifetimes, D3D12GraphicsTest)
 {
  static constexpr const char *Description =
      "Test various edge-case resource lifetimes: a resource that is first dirtied within a frame "
@@ -24,7 +24,7 @@

 #include "d3d12_test.h"

-TEST(D3D12_Simple_Triangle, D3D12GraphicsTest)
+RD_TEST(D3D12_Simple_Triangle, D3D12GraphicsTest)
 {
  static constexpr const char *Description =
      "Just draws a simple triangle, using normal pipeline. Basic test that can be used "
@@ -24,7 +24,7 @@

 #include "d3d12_test.h"

-TEST(D3D12_Untyped_Backbuffer_Descriptor, D3D12GraphicsTest)
+RD_TEST(D3D12_Untyped_Backbuffer_Descriptor, D3D12GraphicsTest)
 {
  static constexpr const char *Description =
      "D3D12 inherits D3D11's ability to have a mutable format on a non-typeless backbuffer "
@@ -24,7 +24,7 @@

 #include "d3d12_test.h"

-TEST(D3D12_Vertex_Attr_Zoo, D3D12GraphicsTest)
+RD_TEST(D3D12_Vertex_Attr_Zoo, D3D12GraphicsTest)
 {
  static constexpr const char *Description =
      "Draws a triangle but using different kinds of vertex attributes, including doubles, arrays, "
@@ -37,7 +37,7 @@
 ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////

-TEST(D3D12_Video_Textures, D3D12GraphicsTest)
+RD_TEST(D3D12_Video_Textures, D3D12GraphicsTest)
 {
  static constexpr const char *Description = "Tests of YUV textures";

@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_Buffer_Updates, OpenGLGraphicsTest)
+RD_TEST(GL_Buffer_Updates, OpenGLGraphicsTest)
 {
  static constexpr const char *Description =
      "Test of buffer updates, both buffers that are updated regularly and get marked as "
@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_CBuffer_Zoo, OpenGLGraphicsTest)
+RD_TEST(GL_CBuffer_Zoo, OpenGLGraphicsTest)
 {
  static constexpr const char *Description =
      "Tests every kind of constant that can be in a cbuffer to make sure it's decoded "
@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_DepthStencil_FBO, OpenGLGraphicsTest)
+RD_TEST(GL_DepthStencil_FBO, OpenGLGraphicsTest)
 {
  static constexpr const char *Description =
      "Creates a depth-stencil FBO and writes both depth and stencil to it";
@@ -29,7 +29,7 @@

 #include "3rdparty/glad/glad_wgl.h"

-TEST(GL_DX_Interop, OpenGLGraphicsTest)
+RD_TEST(GL_DX_Interop, OpenGLGraphicsTest)
 {
  static constexpr const char *Description =
      "Test interop between GL and DX (Create and render to a DX surface and include into "
@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_Entry_Points, OpenGLGraphicsTest)
+RD_TEST(GL_Entry_Points, OpenGLGraphicsTest)
 {
  static constexpr const char *Description =
      "Test that RenderDoc correctly lists the different function call aliases used.";
@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_Large_BCn_Arrays, OpenGLGraphicsTest)
+RD_TEST(GL_Large_BCn_Arrays, OpenGLGraphicsTest)
 {
  static constexpr const char *Description =
      "Test creating large texture 2D arrays of BC4, BC5, BC6, BC7 textures";
@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_Map_Overrun, OpenGLGraphicsTest)
+RD_TEST(GL_Map_Overrun, OpenGLGraphicsTest)
 {
  static constexpr const char *Description = "Test overrunning the bounds of a Map() call";

@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_Midframe_Context_Create, OpenGLGraphicsTest)
+RD_TEST(GL_Midframe_Context_Create, OpenGLGraphicsTest)
 {
  static constexpr const char *Description =
      "Creates a context and activates it in the middle of rendering.";
@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_Mip_Gen_RT, OpenGLGraphicsTest)
+RD_TEST(GL_Mip_Gen_RT, OpenGLGraphicsTest)
 {
  static constexpr const char *Description =
      "Tests rendering from one mip to another to do a downsample chain";
@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_Multi_Window, OpenGLGraphicsTest)
+RD_TEST(GL_Multi_Window, OpenGLGraphicsTest)
 {
  static constexpr const char *Description =
      "Render to two different windows to test out different contexts and window resolutions.";
@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_Overlay_Test, OpenGLGraphicsTest)
+RD_TEST(GL_Overlay_Test, OpenGLGraphicsTest)
 {
  static constexpr const char *Description =
      "Makes a couple of draws that show off all the overlays in some way";
@@ -31,7 +31,7 @@ extern "C" __declspec(dllexport) GLenum APIENTRY InternalFunction()
 }
 #endif

-TEST(GL_Parameter_Zoo, OpenGLGraphicsTest)
+RD_TEST(GL_Parameter_Zoo, OpenGLGraphicsTest)
 {
  static constexpr const char *Description =
      "General tests of parameters known to cause problems - e.g. optional values that should be "
@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_Per_Type_Tex_Units, OpenGLGraphicsTest)
+RD_TEST(GL_Per_Type_Tex_Units, OpenGLGraphicsTest)
 {
  static constexpr const char *Description =
      "GL lets each type (2D, 3D, Cube) have a different binding to the same texture unit. This "
@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_Resource_Lifetimes, OpenGLGraphicsTest)
+RD_TEST(GL_Resource_Lifetimes, OpenGLGraphicsTest)
 {
  static constexpr const char *Description =
      "Test various edge-case resource lifetimes: a resource that is first dirtied within a frame "
@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_Runtime_Bind_Prog_To_Pipe, OpenGLGraphicsTest)
+RD_TEST(GL_Runtime_Bind_Prog_To_Pipe, OpenGLGraphicsTest)
 {
  static constexpr const char *Description =
      "Creates a single program pipeline and binds different programs to it mid-frame";
@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_Separable_Geometry_Shaders, OpenGLGraphicsTest)
+RD_TEST(GL_Separable_Geometry_Shaders, OpenGLGraphicsTest)
 {
  static constexpr const char *Description =
      "Draws using geometry shadess and separable programs created with glCreateShaderProgramv";
@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_Shader_Editing, OpenGLGraphicsTest)
+RD_TEST(GL_Shader_Editing, OpenGLGraphicsTest)
 {
  static constexpr const char *Description =
      "Ensures that shader editing works with different combinations of shader re-use and handles "
@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_Simple_Triangle, OpenGLGraphicsTest)
+RD_TEST(GL_Simple_Triangle, OpenGLGraphicsTest)
 {
  static constexpr const char *Description =
      "Just draws a simple triangle, using normal pipeline. Basic test that can be used "
@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_SPIRV_Shader, OpenGLGraphicsTest)
+RD_TEST(GL_SPIRV_Shader, OpenGLGraphicsTest)
 {
  static constexpr const char *Description = "Draws using a SPIR-V shader pipeline.";

@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_Structured_Buffer_Nested, OpenGLGraphicsTest)
+RD_TEST(GL_Structured_Buffer_Nested, OpenGLGraphicsTest)
 {
  static constexpr const char *Description =
      "Just draws a simple triangle, using normal pipeline. Basic test that can be used "
@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_Unsized_MS_FBO_Attachment, OpenGLGraphicsTest)
+RD_TEST(GL_Unsized_MS_FBO_Attachment, OpenGLGraphicsTest)
 {
  static constexpr const char *Description =
      "Creates a MS FBO with one attachment created with an unsized internal format";
@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_VAO_0, OpenGLGraphicsTest)
+RD_TEST(GL_VAO_0, OpenGLGraphicsTest)
 {
  static constexpr const char *Description = "Uses VAO 0 (i.e. never binds a VAO)";

@@ -24,7 +24,7 @@

 #include "gl_test.h"

-TEST(GL_Vertex_Attr_Zoo, OpenGLGraphicsTest)
+RD_TEST(GL_Vertex_Attr_Zoo, OpenGLGraphicsTest)
 {
  static constexpr const char *Description =
      "Draws a triangle but using different kinds of vertex attributes, including doubles, arrays, "
@@ -228,7 +228,7 @@ struct TestMetadata

 void RegisterTest(TestMetadata test);

-#define TEST(Test, Parent)                \
+#define RD_TEST(Test, Parent)             \
  struct Test;                            \
  typedef Test CurrentTest;               \
  namespace                               \
@@ -108,7 +108,7 @@ struct UBO
  int8_t test;
 };

-TEST(VK_Adv_CBuffer_Zoo, VulkanGraphicsTest)
+RD_TEST(VK_Adv_CBuffer_Zoo, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Tests VK_EXT_scalar_block_layout as well as 8-bit/16-bit storage "
@@ -30,7 +30,7 @@
 #if defined(__LP64__) || defined(_WIN64) || defined(__x86_64__) || defined(_M_X64) || \
    defined(__ia64) || defined(_M_IA64) || defined(__aarch64__) || defined(__powerpc64__)

-TEST(VK_Buffer_Address, VulkanGraphicsTest)
+RD_TEST(VK_Buffer_Address, VulkanGraphicsTest)
 {
  static constexpr const char *Description = "Test capture and replay of VK_EXT_buffer_reference";

@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_CBuffer_Zoo, VulkanGraphicsTest)
+RD_TEST(VK_CBuffer_Zoo, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Tests every kind of constant that can be in a cbuffer to make sure it's decoded correctly.";
@@ -47,7 +47,7 @@
 #define STRINGISE2(a) #a
 #define STRINGISE(a) STRINGISE2(a)

-TEST(VK_Descriptor_Indexing, VulkanGraphicsTest)
+RD_TEST(VK_Descriptor_Indexing, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Draws a triangle using descriptor indexing with large descriptor sets.";
@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_Discard_Rectangles, VulkanGraphicsTest)
+RD_TEST(VK_Discard_Rectangles, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Draws a large number of triangles using VK_EXT_discard_rectangles discard rectangles to "
@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_Draw_Zoo, VulkanGraphicsTest)
+RD_TEST(VK_Draw_Zoo, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Draws several variants using different vertex/index offsets.";
@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_Image_Layouts, VulkanGraphicsTest)
+RD_TEST(VK_Image_Layouts, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Tests edge-cases of image layout transitions, such as images being in UNDEFINED, "
@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_Imageless_Framebuffer, VulkanGraphicsTest)
+RD_TEST(VK_Imageless_Framebuffer, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Test using VK_KHR_imageless_framebuffer to specify image views at the last second";
@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_Indirect, VulkanGraphicsTest)
+RD_TEST(VK_Indirect, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Tests different indirect drawing and dispatching functions, including parameters that are "
@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_Int8_IBuffer, VulkanGraphicsTest)
+RD_TEST(VK_Int8_IBuffer, VulkanGraphicsTest)
 {
  static constexpr const char *Description = "Draws a triangle strip with 8-bit width indices";

@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_Line_Raster, VulkanGraphicsTest)
+RD_TEST(VK_Line_Raster, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Test using VK_EXT_line_rasterization to do funky rasterization of lines";
@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_Misaligned_Dirty, VulkanGraphicsTest)
+RD_TEST(VK_Misaligned_Dirty, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Generate a case where the initial states for a buffer end up being misaligned with what can "
@@ -25,7 +25,7 @@
 #include <thread>
 #include "vk_test.h"

-TEST(VK_Multi_Thread_Windows, VulkanGraphicsTest)
+RD_TEST(VK_Multi_Thread_Windows, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Draws to as many windows as it can in parallel (one queue/thread per window).";
@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_Overlay_Test, VulkanGraphicsTest)
+RD_TEST(VK_Overlay_Test, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Makes a couple of draws that show off all the overlays in some way";
@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_Parameter_Zoo, VulkanGraphicsTest)
+RD_TEST(VK_Parameter_Zoo, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "General tests of parameters known to cause problems - e.g. optional values that should be "
@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_Resource_Lifetimes, VulkanGraphicsTest)
+RD_TEST(VK_Resource_Lifetimes, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Test various edge-case resource lifetimes: a resource that is first dirtied within a frame "
@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_Sample_Locations, VulkanGraphicsTest)
+RD_TEST(VK_Sample_Locations, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Draws two triangles with different sample locations using VK_EXT_sample_locations";
@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_Secondary_CmdBuf, VulkanGraphicsTest)
+RD_TEST(VK_Secondary_CmdBuf, VulkanGraphicsTest)
 {
  static constexpr const char *Description = "Draw using secondary command buffers";

@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_Shader_Editing, VulkanGraphicsTest)
+RD_TEST(VK_Shader_Editing, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Ensures that shader editing works with different combinations of shader re-use.";
@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_Simple_Triangle, VulkanGraphicsTest)
+RD_TEST(VK_Simple_Triangle, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Just draws a simple triangle, using normal pipeline. Basic test that can be used "
@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_Spec_Constants, VulkanGraphicsTest)
+RD_TEST(VK_Spec_Constants, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Tests using the same shader multiple times with specialisation constants";
@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_SPIRV_13_Shaders, VulkanGraphicsTest)
+RD_TEST(VK_SPIRV_13_Shaders, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Draws a triangle using SPIR-V 1.3 shaders to ensure they are handled correctly.";
@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_Structured_Buffer_Nested, VulkanGraphicsTest)
+RD_TEST(VK_Structured_Buffer_Nested, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Just draws a simple triangle, using normal pipeline. Basic test that can be used "
@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_Triangle_Fan, VulkanGraphicsTest)
+RD_TEST(VK_Triangle_Fan, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Draws a triangle fan with primitive restart to test different edge cases.";
@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_Vertex_Attr_Zoo, VulkanGraphicsTest)
+RD_TEST(VK_Vertex_Attr_Zoo, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Draws a triangle but using different kinds of vertex attributes, including doubles, arrays, "
@@ -37,7 +37,7 @@
 ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////

-TEST(VK_Video_Textures, VulkanGraphicsTest)
+RD_TEST(VK_Video_Textures, VulkanGraphicsTest)
 {
  static constexpr const char *Description = "Tests of YUV textures";

@@ -24,7 +24,7 @@

 #include "vk_test.h"

-TEST(VK_VS_Max_Desc_Set, VulkanGraphicsTest)
+RD_TEST(VK_VS_Max_Desc_Set, VulkanGraphicsTest)
 {
  static constexpr const char *Description =
      "Uses the device's maximum number of descriptor sets in the vertex shader.";