From f40d8c545c1eb0ae56121f2e454a96f21d2775c2 Mon Sep 17 00:00:00 2001 From: Corentin Wallez Date: Mon, 20 Nov 2017 15:48:58 -0500 Subject: [PATCH] Fix warnings in IndexFormatTests --- src/tests/NXTTest.h | 2 +- src/tests/end2end/IndexFormatTests.cpp | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/tests/NXTTest.h b/src/tests/NXTTest.h index f188dfdf23..e83b1ec417 100644 --- a/src/tests/NXTTest.h +++ b/src/tests/NXTTest.h @@ -131,7 +131,7 @@ class NXTTest : public ::testing::TestWithParam { }; // Instantiate the test once for each backend provided after the first argument. Use it like this: -// NXT_INSTANTIATE_TEST(MyTestFixture, OpenGLBackend, MetalBackend) +// NXT_INSTANTIATE_TEST(MyTestFixture, MetalBackend, OpenGLBackend) #define NXT_INSTANTIATE_TEST(testName, firstParam, ...) \ const decltype(firstParam) testName##params[] = { firstParam, ##__VA_ARGS__ }; \ INSTANTIATE_TEST_CASE_P(, testName, \ diff --git a/src/tests/end2end/IndexFormatTests.cpp b/src/tests/end2end/IndexFormatTests.cpp index 6103a0d731..debf15c432 100644 --- a/src/tests/end2end/IndexFormatTests.cpp +++ b/src/tests/end2end/IndexFormatTests.cpp @@ -153,13 +153,15 @@ TEST_P(IndexFormatTest, Uint16) { // Test for primitive restart use vertices like in the drawing and draw the following // indices: 0 1 2 PRIM_RESTART 3 4 2. Then A and B should be written but not C. -// 0 -// |\ -// |B \ -// 2---1 -// /| C -// / A| -// 4---3 +// |--------------| +// | 0 | +// | |\ | +// | |B \ | +// | 2---1 | +// | /| C | +// | / A| | +// | 4---3 | +// |--------------| // Test use of primitive restart with an Uint32 index format TEST_P(IndexFormatTest, Uint32PrimitiveRestart) { @@ -265,4 +267,4 @@ TEST_P(IndexFormatTest, ChangePipelineAfterSetIndexBuffer) { EXPECT_PIXEL_RGBA8_EQ(RGBA8(0, 255, 0, 255), renderTarget, 100, 100); } -NXT_INSTANTIATE_TEST(IndexFormatTest, MetalBackend) +NXT_INSTANTIATE_TEST(IndexFormatTest, MetalBackend, OpenGLBackend)