lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid need to re-state test name in REGISTER_TEST() macro

Browse Source 
* At the same time while changing this we ensure all tests are prefixed.
This commit is contained in:
baldurk
2019-05-24 12:08:24 +01:00
parent 786d6c84af
commit 8d12dfc3e3
76 changed files with 192 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/test/demos/d3d11/d3d11_1_many_uavs.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Many_UAVs : D3D11GraphicsTest
TEST(D3D11_Many_UAVs, D3D11GraphicsTest)
{
static constexpr const char *Description =
"Test using more than 8 compute shader UAVs (D3D11.1 feature)";
@@ -79,4 +79,4 @@ void main()
}
};
REGISTER_TEST(Many_UAVs);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_array_interpolator.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Array_Interpolator : D3D11GraphicsTest
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 "
@@ -115,4 +115,4 @@ float4 main(v2f IN) : SV_Target0
}
};
REGISTER_TEST(Array_Interpolator);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_binding_hazards.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Binding_Hazards : D3D11GraphicsTest
TEST(D3D11_Binding_Hazards, D3D11GraphicsTest)
{
static constexpr const char *Description = "Test of D3D11 hazard tracking write/read bindings";
@@ -242,4 +242,4 @@ void main()
}
};
REGISTER_TEST(Binding_Hazards);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_byte_address_buffers.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Byte_Address_Buffers : D3D11GraphicsTest
TEST(D3D11_Byte_Address_Buffers, D3D11GraphicsTest)
{
static constexpr const char *Description = "Tests reading and writing from byte address buffers";
@@ -83,4 +83,4 @@ void main()
}
};
REGISTER_TEST(Byte_Address_Buffers);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_cbuffer_zoo.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct D3D11_CBuffer_Zoo : D3D11GraphicsTest
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 "
@@ -288,4 +288,4 @@ float4 main() : SV_Target0
}
};
REGISTER_TEST(D3D11_CBuffer_Zoo);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_counter_query_pred.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Counter_Query_Pred : D3D11GraphicsTest
TEST(D3D11_Counter_Query_Pred, D3D11GraphicsTest)
{
static constexpr const char *Description =
"Tests use of D3D11 counters, queries and predication. "
@@ -286,4 +286,4 @@ struct Counter_Query_Pred : D3D11GraphicsTest
}
};
REGISTER_TEST(Counter_Query_Pred);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_debug_shader.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Debug_Shader : D3D11GraphicsTest
TEST(D3D11_Debug_Shader, D3D11GraphicsTest)
{
static constexpr const char *Description =
"Tests simple shader debugging identities by rendering many small triangles and "
@@ -284,4 +284,4 @@ float4 main(v2f IN) : SV_Target0
}
};
REGISTER_TEST(Debug_Shader);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_deferred_updatesubresource.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Deferred_UpdateSubresource : D3D11GraphicsTest
TEST(D3D11_Deferred_UpdateSubresource, D3D11GraphicsTest)
{
static constexpr const char *Description =
"Test that does UpdateSubresource on a deferred context which might need some "
@@ -233,4 +233,4 @@ float4 main(v2f IN) : SV_Target0
}
};
REGISTER_TEST(Deferred_UpdateSubresource);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_discard_view.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Discard_View : D3D11GraphicsTest
TEST(D3D11_Discard_View, D3D11GraphicsTest)
{
static constexpr const char *Description = "Test that discards an RTV";
@@ -131,4 +131,4 @@ float4 main() : SV_Target0
}
};
REGISTER_TEST(Discard_View);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_divergent_shader.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Divergent_Shader : D3D11GraphicsTest
TEST(D3D11_Divergent_Shader, D3D11GraphicsTest)
{
static constexpr const char *Description =
"Test running a shader that diverges across a quad and then expects derivatives to "
@@ -165,4 +165,4 @@ float4 main(v2f IN) : SV_Target0
}
};
REGISTER_TEST(Divergent_Shader);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_draw_zoo.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct D3D11_Draw_Zoo : D3D11GraphicsTest
TEST(D3D11_Draw_Zoo, D3D11GraphicsTest)
{
static constexpr const char *Description =
"Draws several variants using different vertex/index offsets.";
@@ -399,4 +399,4 @@ float4 main(v2f IN) : SV_Target0
}
};
REGISTER_TEST(D3D11_Draw_Zoo);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_empty_compute_dispatch.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Empty_Compute_Dispatch : D3D11GraphicsTest
TEST(D3D11_Empty_Compute_Dispatch, D3D11GraphicsTest)
{
static constexpr const char *Description = "Test dispatching with one threadgroup count set to 0";
@@ -77,4 +77,4 @@ void main()
}
};
REGISTER_TEST(Empty_Compute_Dispatch);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_empty_drawcall.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Empty_Drawcall : D3D11GraphicsTest
TEST(D3D11_Empty_Drawcall, D3D11GraphicsTest)
{
static constexpr const char *Description = "Test a drawcall of 0 size";
@@ -68,4 +68,4 @@ struct Empty_Drawcall : D3D11GraphicsTest
}
};
REGISTER_TEST(Empty_Drawcall);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_empty_viewports.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Empty_Viewports : D3D11GraphicsTest
TEST(D3D11_Empty_Viewports, D3D11GraphicsTest)
{
static constexpr const char *Description =
"Test setting some viewports that are empty, but enabled";
@@ -74,4 +74,4 @@ struct Empty_Viewports : D3D11GraphicsTest
}
};
REGISTER_TEST(Empty_Viewports);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_many_rtvs.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Many_RTVs : D3D11GraphicsTest
TEST(D3D11_Many_RTVs, D3D11GraphicsTest)
{
static constexpr const char *Description = "Test repeatedly creating and destroying RTVs";
@@ -103,4 +103,4 @@ float4 main() : SV_Target0
}
};
REGISTER_TEST(Many_RTVs);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_map_overrun.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct D3D11_Map_Overrun : D3D11GraphicsTest
TEST(D3D11_Map_Overrun, D3D11GraphicsTest)
{
static constexpr const char *Description = "Test overrunning the bounds of a Map() call";
@@ -117,4 +117,4 @@ float4 main(v2f IN) : SV_Target0
}
};
REGISTER_TEST(D3D11_Map_Overrun);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_midframe_create.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct D3D11_Midframe_Create : D3D11GraphicsTest
TEST(D3D11_Midframe_Create, D3D11GraphicsTest)
{
static constexpr const char *Description =
"Tests creating resources mid-frame to make sure that they and their contents are "
@@ -270,4 +270,4 @@ float4 main(v2f IN) : SV_Target0
}
};
REGISTER_TEST(D3D11_Midframe_Create);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_mip_gen_rt.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct D3D11_Mip_Gen_RT : D3D11GraphicsTest
TEST(D3D11_Mip_Gen_RT, D3D11GraphicsTest)
{
static constexpr const char *Description =
"Tests rendering from one mip to another to do a downsample chain";
@@ -155,4 +155,4 @@ float4 main(v2f IN) : SV_Target0
}
};
REGISTER_TEST(D3D11_Mip_Gen_RT);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_mip_rtv.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Mip_RTV : D3D11GraphicsTest
TEST(D3D11_Mip_RTV, D3D11GraphicsTest)
{
static constexpr const char *Description = "Test rendering into RTV mip levels";
@@ -117,4 +117,4 @@ float4 main() : SV_Target0
}
};
REGISTER_TEST(Mip_RTV);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_overdraw_stress.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Overdraw_Stress : D3D11GraphicsTest
TEST(D3D11_Overdraw_Stress, D3D11GraphicsTest)
{
static constexpr const char *Description = "Renders a lot of overlapping triangles";
@@ -123,4 +123,4 @@ struct Overdraw_Stress : D3D11GraphicsTest
}
};
REGISTER_TEST(Overdraw_Stress);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_overlay_test.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct D3D11_Overlay_Test : D3D11GraphicsTest
TEST(D3D11_Overlay_Test, D3D11GraphicsTest)
{
static constexpr const char *Description =
"Makes a couple of draws that show off all the overlays in some way";
@@ -167,4 +167,4 @@ struct D3D11_Overlay_Test : D3D11GraphicsTest
}
};
REGISTER_TEST(D3D11_Overlay_Test);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_primitive_restart.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct D3D11_Primitive_Restart : D3D11GraphicsTest
TEST(D3D11_Primitive_Restart, D3D11GraphicsTest)
{
static constexpr const char *Description =
"Test of primitive restart in triangle strips with -1 index";
@@ -123,4 +123,4 @@ struct D3D11_Primitive_Restart : D3D11GraphicsTest
}
};
REGISTER_TEST(D3D11_Primitive_Restart);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_refcount_check.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Refcount_Check : D3D11GraphicsTest
TEST(D3D11_Refcount_Check, D3D11GraphicsTest)
{
static constexpr const char *Description =
"Ensures that the device etc doesn't delete itself when there are still outstanding "
@@ -123,4 +123,4 @@ struct Refcount_Check : D3D11GraphicsTest
}
};
REGISTER_TEST(Refcount_Check);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_resource_lifetimes.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct D3D11_Resource_Lifetimes : D3D11GraphicsTest
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 "
@@ -192,4 +192,4 @@ float4 main(v2f IN) : SV_Target0
}
};
REGISTER_TEST(D3D11_Resource_Lifetimes);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_saturate.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Saturate : D3D11GraphicsTest
TEST(D3D11_Saturate, D3D11GraphicsTest)
{
static constexpr const char *Description = "Tests using saturate, originally for a bug report";
@@ -104,4 +104,4 @@ void main(float4 pos : SV_Position, out float4 a : SV_Target0, out float4 b : SV
}
};
REGISTER_TEST(Saturate);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_simple_dispatch.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Simple_Dispatch : D3D11GraphicsTest
TEST(D3D11_Simple_Dispatch, D3D11GraphicsTest)
{
static constexpr const char *Description =
"Test that just does a dispatch and some copies, for checking basic compute stuff";
@@ -98,4 +98,4 @@ void main()
}
};
REGISTER_TEST(Simple_Dispatch);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_simple_triangle.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct D3D11_Simple_Triangle : D3D11GraphicsTest
TEST(D3D11_Simple_Triangle, D3D11GraphicsTest)
{
static constexpr const char *Description =
"Just draws a simple triangle, using normal pipeline. Basic test that can be used "
@@ -70,4 +70,4 @@ struct D3D11_Simple_Triangle : D3D11GraphicsTest
}
};
REGISTER_TEST(D3D11_Simple_Triangle);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_streamout.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct StreamOut : D3D11GraphicsTest
TEST(D3D11_StreamOut, D3D11GraphicsTest)
{
static constexpr const char *Description = "Test using D3D11's streamout feature";
@@ -131,4 +131,4 @@ struct StreamOut : D3D11GraphicsTest
}
};
REGISTER_TEST(StreamOut);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_stripped_shaders.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Stripped_Shaders : D3D11GraphicsTest
TEST(D3D11_Stripped_Shaders, D3D11GraphicsTest)
{
static constexpr const char *Description =
"Tests shaders with their debug/reflection info stripped out and stored in separate blobs";
@@ -79,4 +79,4 @@ struct Stripped_Shaders : D3D11GraphicsTest
}
};
REGISTER_TEST(Stripped_Shaders);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_structured_buffer_misaligned_dirty.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Structured_Buffer_MisalignedDirty : D3D11GraphicsTest
TEST(D3D11_Structured_Buffer_MisalignedDirty, D3D11GraphicsTest)
{
static constexpr const char *Description =
"Test updating a misaligned chunk of a structured buffer";
@@ -141,4 +141,4 @@ float4 main() : SV_Target0
}
};
REGISTER_TEST(Structured_Buffer_MisalignedDirty);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_structured_buffer_nested.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct D3D11_Structured_Buffer_Nested : D3D11GraphicsTest
TEST(D3D11_Structured_Buffer_Nested, D3D11GraphicsTest)
{
static constexpr const char *Description =
"Test reading from structured buffers with nested structs";
@@ -137,4 +137,4 @@ float4 main() : SV_Target0
}
};
REGISTER_TEST(D3D11_Structured_Buffer_Nested);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_structured_buffer_read.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Structured_Buffer_Read : D3D11GraphicsTest
TEST(D3D11_Structured_Buffer_Read, D3D11GraphicsTest)
{
static constexpr const char *Description =
"Test reading from structured buffers, with and without offsets";
@@ -103,4 +103,4 @@ float4 main() : SV_Target0
}
};
REGISTER_TEST(Structured_Buffer_Read);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_texture_3d.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d11_test.h"
struct Texture_3D : D3D11GraphicsTest
TEST(D3D11_Texture_3D, D3D11GraphicsTest)
{
static constexpr const char *Description = "Test that creates and samples a 3D texture";
@@ -266,4 +266,4 @@ float4 main(v2f IN) : SV_Target0
}
};
REGISTER_TEST(Texture_3D);
REGISTER_TEST();
util/test/demos/d3d11/d3d11_video_textures.cpp
+2 -2
View File
@@ -52,7 +52,7 @@ COM_SMARTPTR(IMFByteStream);
///////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////
struct D3D11_Video_Textures : D3D11GraphicsTest, IMFMediaEngineNotify
TEST(D3D11_Video_Textures, D3D11GraphicsTest), IMFMediaEngineNotify
{
static constexpr const char *Description = "Tests of YUV textures";
@@ -846,4 +846,4 @@ float4 main(v2f IN) : SV_Target0
}
};
REGISTER_TEST(D3D11_Video_Textures);
REGISTER_TEST();
util/test/demos/d3d12/d3d12_cbuffer_zoo.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d12_test.h"
struct D3D12_CBuffer_Zoo : D3D12GraphicsTest
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 "
@@ -356,4 +356,4 @@ float4 main() : SV_Target0
}
};
REGISTER_TEST(D3D12_CBuffer_Zoo);
REGISTER_TEST();
util/test/demos/d3d12/d3d12_overlay_test.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d12_test.h"
struct D3D12_Overlay_Test : D3D12GraphicsTest
TEST(D3D12_Overlay_Test, D3D12GraphicsTest)
{
static constexpr const char *Description =
"Makes a couple of draws that show off all the overlays in some way";
@@ -195,4 +195,4 @@ struct D3D12_Overlay_Test : D3D12GraphicsTest
}
};
REGISTER_TEST(D3D12_Overlay_Test);
REGISTER_TEST();
util/test/demos/d3d12/d3d12_resource_lifetimes.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d12_test.h"
struct D3D12_Resource_Lifetimes : D3D12GraphicsTest
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 "
@@ -528,4 +528,4 @@ float4 main(v2f IN) : SV_Target0
}
};
REGISTER_TEST(D3D12_Resource_Lifetimes);
REGISTER_TEST();
util/test/demos/d3d12/d3d12_simple_triangle.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "d3d12_test.h"
struct D3D12_Simple_Triangle : D3D12GraphicsTest
TEST(D3D12_Simple_Triangle, D3D12GraphicsTest)
{
static constexpr const char *Description =
"Just draws a simple triangle, using normal pipeline. Basic test that can be used "
@@ -86,4 +86,4 @@ struct D3D12_Simple_Triangle : D3D12GraphicsTest
}
};
REGISTER_TEST(D3D12_Simple_Triangle);
REGISTER_TEST();
util/test/demos/d3d12/d3d12_video_textures.cpp
+2 -2
View File
@@ -37,7 +37,7 @@
///////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////
struct D3D12_Video_Textures : D3D12GraphicsTest
TEST(D3D12_Video_Textures, D3D12GraphicsTest)
{
static constexpr const char *Description = "Tests of YUV textures";
@@ -700,4 +700,4 @@ float4 main(v2f IN) : SV_Target0
}
};
REGISTER_TEST(D3D12_Video_Textures);
REGISTER_TEST();
util/test/demos/gl/gl_buffer_updates.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "gl_test.h"
struct GL_Buffer_Updates : OpenGLGraphicsTest
TEST(GL_Buffer_Updates, OpenGLGraphicsTest)
{
static constexpr const char *Description =
"Test of buffer updates, both buffers that are updated regularly and get marked as "
@@ -520,4 +520,4 @@ void main()
}
};
REGISTER_TEST(GL_Buffer_Updates);
REGISTER_TEST();
util/test/demos/gl/gl_cbuffer_zoo.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "gl_test.h"
struct GL_CBuffer_Zoo : OpenGLGraphicsTest
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 "
@@ -561,4 +561,4 @@ void main()
}
};
REGISTER_TEST(GL_CBuffer_Zoo);
REGISTER_TEST();
util/test/demos/gl/gl_depthstencil_fbo.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "gl_test.h"
struct DepthStencil_FBO : OpenGLGraphicsTest
TEST(GL_DepthStencil_FBO, OpenGLGraphicsTest)
{
static constexpr const char *Description =
"Creates a depth-stencil FBO and writes both depth and stencil to it";
@@ -196,4 +196,4 @@ void main()
}
};
REGISTER_TEST(DepthStencil_FBO);
REGISTER_TEST();
util/test/demos/gl/gl_dx_interop.cpp
+2 -2
View File
@@ -29,7 +29,7 @@
#include "3rdparty/glad/glad_wgl.h"
struct GL_DX_Interop : OpenGLGraphicsTest
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 "
@@ -321,6 +321,6 @@ void main()
}
};
REGISTER_TEST(GL_DX_Interop);
REGISTER_TEST();
#endif
util/test/demos/gl/gl_entry_points.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "gl_test.h"
struct GL_Entry_Points : OpenGLGraphicsTest
TEST(GL_Entry_Points, OpenGLGraphicsTest)
{
static constexpr const char *Description =
"Test that RenderDoc correctly lists the different function call aliases used.";
@@ -112,4 +112,4 @@ void main()
}
};
REGISTER_TEST(GL_Entry_Points);
REGISTER_TEST();
util/test/demos/gl/gl_large_bcn_arrays.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "gl_test.h"
struct Large_BCn_Arrays : OpenGLGraphicsTest
TEST(GL_Large_BCn_Arrays, OpenGLGraphicsTest)
{
static constexpr const char *Description =
"Test creating large texture 2D arrays of BC4, BC5, BC6, BC7 textures";
@@ -185,4 +185,4 @@ void main()
}
};
REGISTER_TEST(Large_BCn_Arrays);
REGISTER_TEST();
util/test/demos/gl/gl_map_overrun.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "gl_test.h"
struct GL_Map_Overrun : OpenGLGraphicsTest
TEST(GL_Map_Overrun, OpenGLGraphicsTest)
{
static constexpr const char *Description = "Test overrunning the bounds of a Map() call";
@@ -123,4 +123,4 @@ void main()
}
};
REGISTER_TEST(GL_Map_Overrun);
REGISTER_TEST();
util/test/demos/gl/gl_midframe_context_create.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "gl_test.h"
struct Midframe_Context_Create : OpenGLGraphicsTest
TEST(GL_Midframe_Context_Create, OpenGLGraphicsTest)
{
static constexpr const char *Description =
"Creates a context and activates it in the middle of rendering.";
@@ -141,4 +141,4 @@ void main()
}
};
REGISTER_TEST(Midframe_Context_Create);
REGISTER_TEST();
util/test/demos/gl/gl_mip_gen_rt.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "gl_test.h"
struct GL_Mip_Gen_RT : OpenGLGraphicsTest
TEST(GL_Mip_Gen_RT, OpenGLGraphicsTest)
{
static constexpr const char *Description =
"Tests rendering from one mip to another to do a downsample chain";
@@ -166,4 +166,4 @@ void main()
}
};
REGISTER_TEST(GL_Mip_Gen_RT);
REGISTER_TEST();
util/test/demos/gl/gl_multi_window.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "gl_test.h"
struct Multi_Window : OpenGLGraphicsTest
TEST(GL_Multi_Window, OpenGLGraphicsTest)
{
static constexpr const char *Description =
"Render to two different windows to test out different contexts and window resolutions.";
@@ -165,4 +165,4 @@ void main()
}
};
REGISTER_TEST(Multi_Window);
REGISTER_TEST();
util/test/demos/gl/gl_overlay_test.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "gl_test.h"
struct GL_Overlay_Test : OpenGLGraphicsTest
TEST(GL_Overlay_Test, OpenGLGraphicsTest)
{
static constexpr const char *Description =
"Makes a couple of draws that show off all the overlays in some way";
@@ -230,4 +230,4 @@ void main()
}
};
REGISTER_TEST(GL_Overlay_Test);
REGISTER_TEST();
util/test/demos/gl/gl_resource_lifetimes.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "gl_test.h"
struct GL_Resource_Lifetimes : OpenGLGraphicsTest
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 "
@@ -413,4 +413,4 @@ void main()
}
};
REGISTER_TEST(GL_Resource_Lifetimes);
REGISTER_TEST();
util/test/demos/gl/gl_runtime_bind_prog_to_pipe.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "gl_test.h"
struct Runtime_Bind_Prog_To_Pipe : OpenGLGraphicsTest
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";
@@ -141,4 +141,4 @@ void main()
}
};
REGISTER_TEST(Runtime_Bind_Prog_To_Pipe);
REGISTER_TEST();
util/test/demos/gl/gl_separable_geometry_shader.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "gl_test.h"
struct GL_Separable_Geometry_Shaders : OpenGLGraphicsTest
TEST(GL_Separable_Geometry_Shaders, OpenGLGraphicsTest)
{
static constexpr const char *Description =
"Draws using geometry shadess and separable programs created with glCreateShaderProgramv";
@@ -206,4 +206,4 @@ void main()
}
};
REGISTER_TEST(GL_Separable_Geometry_Shaders);
REGISTER_TEST();
util/test/demos/gl/gl_simple_triangle.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "gl_test.h"
struct GL_Simple_Triangle : OpenGLGraphicsTest
TEST(GL_Simple_Triangle, OpenGLGraphicsTest)
{
static constexpr const char *Description =
"Just draws a simple triangle, using normal pipeline. Basic test that can be used "
@@ -119,4 +119,4 @@ void main()
}
};
REGISTER_TEST(GL_Simple_Triangle);
REGISTER_TEST();
util/test/demos/gl/gl_spirv_shader.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "gl_test.h"
struct SPIRV_Shader : OpenGLGraphicsTest
TEST(GL_SPIRV_Shader, OpenGLGraphicsTest)
{
static constexpr const char *Description = "Draws using a SPIR-V shader pipeline.";
@@ -261,4 +261,4 @@ void main()
}
};
REGISTER_TEST(SPIRV_Shader);
REGISTER_TEST();
util/test/demos/gl/gl_structured_buffer_nested.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "gl_test.h"
struct GL_Structured_Buffer_Nested : OpenGLGraphicsTest
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 "
@@ -209,4 +209,4 @@ void main()
}
};
REGISTER_TEST(GL_Structured_Buffer_Nested);
REGISTER_TEST();
util/test/demos/gl/gl_unsized_ms_fbo_attachment.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "gl_test.h"
struct Unsized_MS_FBO_Attachment : OpenGLGraphicsTest
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";
@@ -161,4 +161,4 @@ void main()
}
};
REGISTER_TEST(Unsized_MS_FBO_Attachment);
REGISTER_TEST();
util/test/demos/gl/gl_vao_0.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "gl_test.h"
struct GL_VAO_0 : OpenGLGraphicsTest
TEST(GL_VAO_0, OpenGLGraphicsTest)
{
static constexpr const char *Description = "Uses VAO 0 (i.e. never binds a VAO)";
@@ -151,4 +151,4 @@ void main()
}
};
REGISTER_TEST(GL_VAO_0);
REGISTER_TEST();
util/test/demos/main.cpp
+4 -5
View File
@@ -287,7 +287,7 @@ Usage: %s Test_Name [test_options]
{
if(prev != TestAPI::Count)
printf("\n\n");
printf("======== %s tests ========\n\n", test.APIName());
printf("======== %s tests ========\n\n", APIName(test.API));
}
prev = test.API;
@@ -401,8 +401,7 @@ Usage: %s Test_Name [test_options]
if(!tests[i].IsAvailable())
continue;
std::string name = tests[i].QualifiedName();
std::string lower_name = strlower(name);
std::string lower_name = strlower(tests[i].Name);
// apply filters
if(!allow[(int)tests[i].API] ||
@@ -419,7 +418,7 @@ Usage: %s Test_Name [test_options]
if(curtest == -1)
curtest = i;
if(nk_select_label(ctx, name.c_str(), NK_TEXT_LEFT, curtest == i))
if(nk_select_label(ctx, tests[i].Name, NK_TEXT_LEFT, curtest == i))
curtest = i;
}
@@ -446,7 +445,7 @@ Usage: %s Test_Name [test_options]
nk_layout_row_push(ctx, 0.25f);
nk_label(ctx, "API:", NK_TEXT_ALIGN_TOP | NK_TEXT_ALIGN_RIGHT);
nk_layout_row_push(ctx, 0.75f);
nk_label(ctx, selected_test.APIName(), NK_TEXT_ALIGN_TOP | NK_TEXT_ALIGN_LEFT);
nk_label(ctx, APIName(selected_test.API), NK_TEXT_ALIGN_TOP | NK_TEXT_ALIGN_LEFT);
nk_layout_row_end(ctx);
nk_layout_row_begin(ctx, NK_DYNAMIC, 0, 2);
util/test/demos/test_common.h
+40 -40
View File
@@ -189,6 +189,20 @@ enum class TestAPI
Count,
};
inline const char *APIName(TestAPI API)
{
switch(API)
{
case TestAPI::D3D11: return "D3D11";
case TestAPI::Vulkan: return "Vulkan";
case TestAPI::OpenGL: return "OpenGL";
case TestAPI::D3D12: return "D3D12";
case TestAPI::Count: break;
}
return "???";
}
struct TestMetadata
{
TestAPI API;
@@ -198,28 +212,6 @@ struct TestMetadata
bool IsAvailable() const { return test->Avail.empty(); }
const char *AvailMessage() const { return test->Avail.c_str(); }
std::string QualifiedName() const
{
std::string ret = APIName();
ret += "::";
ret += Name;
return ret;
}
const char *APIName() const
{
switch(API)
{
case TestAPI::D3D11: return "D3D11";
case TestAPI::Vulkan: return "VK";
case TestAPI::OpenGL: return "GL";
case TestAPI::D3D12: return "D3D12";
case TestAPI::Count: break;
}
return "???";
}
bool operator<(const TestMetadata &o)
{
if(API != o.API)
@@ -235,24 +227,32 @@ struct TestMetadata
void RegisterTest(TestMetadata test);
#define REGISTER_TEST(TestName) \
namespace \
{ \
struct TestRegistration \
{ \
TestName m_impl; \
TestRegistration() \
{ \
TestMetadata test; \
test.API = TestName::API; \
test.Name = #TestName; \
test.Description = TestName::Description; \
test.test = &m_impl; \
RegisterTest(test); \
} \
}; \
}; \
static TestRegistration Anon##__LINE__;
#define TEST(Test, Parent) \
struct Test; \
typedef Test CurrentTest; \
namespace \
{ \
constexpr const char *TestName = #Test; \
}; \
struct Test : Parent
#define REGISTER_TEST() \
namespace \
{ \
struct TestRegistration \
{ \
CurrentTest m_impl; \
TestRegistration() \
{ \
TestMetadata test; \
test.API = CurrentTest::API; \
test.Name = TestName; \
test.Description = CurrentTest::Description; \
test.test = &m_impl; \
RegisterTest(test); \
} \
} Anon##__LINE__; \
};
std::string GetCWD();
std::string GetEnvVar(const char *var);
util/test/demos/vk/vk_adv_cbuffer_zoo.cpp
+2 -2
View File
@@ -108,7 +108,7 @@ struct UBO
int8_t test;
};
struct VK_Adv_CBuffer_Zoo : VulkanGraphicsTest
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 "
@@ -404,4 +404,4 @@ void main()
}
};
REGISTER_TEST(VK_Adv_CBuffer_Zoo);
REGISTER_TEST();
util/test/demos/vk/vk_awkward_triangle.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "vk_test.h"
struct Awkward_Triangle : VulkanGraphicsTest
TEST(VK_Awkward_Triangle, VulkanGraphicsTest)
{
static constexpr const char *Description =
"Draws a triangle but using vertex buffers in formats that only support VBs and not "
@@ -170,4 +170,4 @@ void main()
}
};
REGISTER_TEST(Awkward_Triangle);
REGISTER_TEST();
util/test/demos/vk/vk_buffer_address.cpp
+2 -2
View File
@@ -30,7 +30,7 @@
#if defined(__LP64__) || defined(_WIN64) || defined(__x86_64__) || defined(_M_X64) || \
defined(__ia64) || defined(_M_IA64) || defined(__aarch64__) || defined(__powerpc64__)
struct VK_Buffer_Address : VulkanGraphicsTest
TEST(VK_Buffer_Address, VulkanGraphicsTest)
{
static constexpr const char *Description = "Test capture and replay of VK_EXT_buffer_reference";
@@ -280,6 +280,6 @@ void main()
}
};
REGISTER_TEST(VK_Buffer_Address);
REGISTER_TEST();
#endif // if 64-bit
util/test/demos/vk/vk_cbuffer_zoo.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "vk_test.h"
struct VK_CBuffer_Zoo : VulkanGraphicsTest
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.";
@@ -633,4 +633,4 @@ float4 main() : SV_Target0
}
};
REGISTER_TEST(VK_CBuffer_Zoo);
REGISTER_TEST();
util/test/demos/vk/vk_descriptor_index.cpp
+2 -2
View File
@@ -46,7 +46,7 @@
#define STRINGISE2(a) #a
#define STRINGISE(a) STRINGISE2(a)
struct VK_Descriptor_Indexing : VulkanGraphicsTest
TEST(VK_Descriptor_Indexing, VulkanGraphicsTest)
{
static constexpr const char *Description =
"Draws a triangle using descriptor indexing with large descriptor sets.";
@@ -583,4 +583,4 @@ void main()
}
};
REGISTER_TEST(VK_Descriptor_Indexing);
REGISTER_TEST();
util/test/demos/vk/vk_discard_rects.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "vk_test.h"
struct VK_Discard_Rectangles : VulkanGraphicsTest
TEST(VK_Discard_Rectangles, VulkanGraphicsTest)
{
static constexpr const char *Description =
"Draws a large number of triangles using VK_EXT_discard_rectangles discard rectangles to "
@@ -210,4 +210,4 @@ void main()
}
};
REGISTER_TEST(VK_Discard_Rectangles);
REGISTER_TEST();
util/test/demos/vk/vk_draw_zoo.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "vk_test.h"
struct VK_Draw_Zoo : VulkanGraphicsTest
TEST(VK_Draw_Zoo, VulkanGraphicsTest)
{
static constexpr const char *Description =
"Draws several variants using different vertex/index offsets.";
@@ -480,4 +480,4 @@ void main()
}
};
REGISTER_TEST(VK_Draw_Zoo);
REGISTER_TEST();
util/test/demos/vk/vk_indirect.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "vk_test.h"
struct VK_Indirect : VulkanGraphicsTest
TEST(VK_Indirect, VulkanGraphicsTest)
{
static constexpr const char *Description =
"Tests different indirect drawing and dispatching functions, including parameters that are "
@@ -543,4 +543,4 @@ void main()
}
};
REGISTER_TEST(VK_Indirect);
REGISTER_TEST();
util/test/demos/vk/vk_overlay_test.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "vk_test.h"
struct VK_Overlay_Test : VulkanGraphicsTest
TEST(VK_Overlay_Test, VulkanGraphicsTest)
{
static constexpr const char *Description =
"Makes a couple of draws that show off all the overlays in some way";
@@ -286,4 +286,4 @@ void main()
}
};
REGISTER_TEST(VK_Overlay_Test);
REGISTER_TEST();
util/test/demos/vk/vk_resource_lifetimes.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "vk_test.h"
struct VK_Resource_Lifetimes : VulkanGraphicsTest
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 "
@@ -567,4 +567,4 @@ void main()
}
};
REGISTER_TEST(VK_Resource_Lifetimes);
REGISTER_TEST();
util/test/demos/vk/vk_sample_locations.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "vk_test.h"
struct VK_Sample_Locations : VulkanGraphicsTest
TEST(VK_Sample_Locations, VulkanGraphicsTest)
{
static constexpr const char *Description =
"Draws two triangles with different sample locations using VK_EXT_sample_locations";
@@ -302,4 +302,4 @@ void main()
}
};
REGISTER_TEST(VK_Sample_Locations);
REGISTER_TEST();
util/test/demos/vk/vk_secondary_cmdbuf.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "vk_test.h"
struct VK_Secondary_CmdBuf : VulkanGraphicsTest
TEST(VK_Secondary_CmdBuf, VulkanGraphicsTest)
{
static constexpr const char *Description = "Draw using secondary command buffers";
@@ -238,4 +238,4 @@ void main()
}
};
REGISTER_TEST(VK_Secondary_CmdBuf);
REGISTER_TEST();
util/test/demos/vk/vk_simple_triangle.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "vk_test.h"
struct VK_Simple_Triangle : VulkanGraphicsTest
TEST(VK_Simple_Triangle, VulkanGraphicsTest)
{
static constexpr const char *Description =
"Just draws a simple triangle, using normal pipeline. Basic test that can be used "
@@ -145,4 +145,4 @@ void main()
}
};
REGISTER_TEST(VK_Simple_Triangle);
REGISTER_TEST();
util/test/demos/vk/vk_structured_buffer_nested.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "vk_test.h"
struct VK_Structured_Buffer_Nested : VulkanGraphicsTest
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 "
@@ -337,4 +337,4 @@ float4 main() : SV_Target0
}
};
REGISTER_TEST(VK_Structured_Buffer_Nested);
REGISTER_TEST();
util/test/demos/vk/vk_video_textures.cpp
+2 -2
View File
@@ -37,7 +37,7 @@
///////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////
struct VK_Video_Textures : VulkanGraphicsTest
TEST(VK_Video_Textures, VulkanGraphicsTest)
{
static constexpr const char *Description = "Tests of YUV textures";
@@ -993,4 +993,4 @@ void main()
}
};
REGISTER_TEST(VK_Video_Textures);
REGISTER_TEST();
util/test/demos/vk/vk_vs_max_desc_set.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "vk_test.h"
struct VK_VS_Max_Desc_Set : VulkanGraphicsTest
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.";
@@ -197,4 +197,4 @@ void main()
}
};
REGISTER_TEST(VK_VS_Max_Desc_Set);
REGISTER_TEST();