From 66e175a2ee02f42a23ebfc1dd862177d13b46280 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 16 Sep 2024 20:35:33 +0100 Subject: [PATCH] tests/gl_basic_test: undo overzealous clang-format changes Signed-off-by: Emil Velikov --- tests/functional/gl_basic_test.c | 56 +++++++++++++++------------------------- 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/tests/functional/gl_basic_test.c b/tests/functional/gl_basic_test.c index 046188d..f19beed 100644 --- a/tests/functional/gl_basic_test.c +++ b/tests/functional/gl_basic_test.c @@ -171,23 +171,15 @@ get_gl_symbol(enum waffle_enum context_api, const char *name) void *sym = NULL; enum waffle_enum dl = 0; + // clang-format off switch (context_api) { - case WAFFLE_CONTEXT_OPENGL: - dl = WAFFLE_DL_OPENGL; - break; - case WAFFLE_CONTEXT_OPENGL_ES1: - dl = WAFFLE_DL_OPENGL_ES1; - break; - case WAFFLE_CONTEXT_OPENGL_ES2: - dl = WAFFLE_DL_OPENGL_ES2; - break; - case WAFFLE_CONTEXT_OPENGL_ES3: - dl = WAFFLE_DL_OPENGL_ES3; - break; - default: - assert_true(0); - break; + case WAFFLE_CONTEXT_OPENGL: dl = WAFFLE_DL_OPENGL; break; + case WAFFLE_CONTEXT_OPENGL_ES1: dl = WAFFLE_DL_OPENGL_ES1; break; + case WAFFLE_CONTEXT_OPENGL_ES2: dl = WAFFLE_DL_OPENGL_ES2; break; + case WAFFLE_CONTEXT_OPENGL_ES3: dl = WAFFLE_DL_OPENGL_ES3; break; + default: assert_true(0); break; } + // clang-format on if (waffle_dl_can_open(dl)) { sym = waffle_dl_sym(dl, name); @@ -217,9 +209,10 @@ gl_basic_init(void **state) return -1; const int32_t init_attrib_list[] = { - WAFFLE_PLATFORM, - waffle_platform, + // clang-format off + WAFFLE_PLATFORM, waffle_platform, 0, + // clang-format on }; ts->initialized = waffle_init(init_attrib_list); @@ -352,11 +345,11 @@ gl_basic_draw__(void **state, struct gl_basic_draw_args__ args) int i; const intptr_t window_attrib_list[] = { - WAFFLE_WINDOW_WIDTH, - WINDOW_WIDTH, - WAFFLE_WINDOW_HEIGHT, - WINDOW_HEIGHT, + // clang-format off + WAFFLE_WINDOW_WIDTH, WINDOW_WIDTH, + WAFFLE_WINDOW_HEIGHT, WINDOW_HEIGHT, 0, + // clang-format on }; i = 0; @@ -469,23 +462,16 @@ gl_basic_draw__(void **state, struct gl_basic_draw_args__ args) ASSERT_GL(version_str = (const char *)glGetString(GL_VERSION)); assert_true(version_str != NULL); + // clang-format off switch (waffle_context_api) { - case WAFFLE_CONTEXT_OPENGL: - expected_version_str = ""; - break; - case WAFFLE_CONTEXT_OPENGL_ES1: - expected_version_str = "OpenGL ES-CM "; - break; + case WAFFLE_CONTEXT_OPENGL: expected_version_str = ""; break; + case WAFFLE_CONTEXT_OPENGL_ES1: expected_version_str = "OpenGL ES-CM "; break; case WAFFLE_CONTEXT_OPENGL_ES2: - case WAFFLE_CONTEXT_OPENGL_ES3: - expected_version_str = "OpenGL ES "; - break; - default: - // Explicitly initialize, to appease GCC - expected_version_str = ""; - assert_true(0); - break; + case WAFFLE_CONTEXT_OPENGL_ES3: expected_version_str = "OpenGL ES "; break; + // Explicitly initialize, to appease GCC + default: expected_version_str = ""; assert_true(0); break; } + // clang-format on const size_t version_str_len = strlen(expected_version_str); assert_string_len_equal(version_str, expected_version_str, version_str_len); -- 2.11.4.GIT