From 53ba68be4ab5949232e39dd6d2f0c19db321203a Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 2 Feb 2023 04:32:44 +0100 Subject: [PATCH 1/4] Actions (Linux): Fix installation of Clang 16 (cherry picked from commit 798146f94173c69ac27c7c46b1115fab09a1a8b1) --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index ed3a22195..09fc34b52 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -33,7 +33,7 @@ jobs: - cc: clang-16 cxx: clang++-16 clang_major_version: 16 - clang_repo_suffix: + clang_repo_suffix: -16 steps: - name: Add Clang/LLVM repositories if: "${{ contains(matrix.cxx, 'clang') }}" From 3a60ce5ab395ab067a9f8abe8afe48e3c4a09e63 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 2 Feb 2023 04:34:22 +0100 Subject: [PATCH 2/4] Actions (Linux): Start covering Clang 17 (based on commit 5ebc1dc938107d5f1963d3c44fc5390b08f2a582) --- .github/workflows/linux.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 09fc34b52..1a40a768e 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -34,6 +34,10 @@ jobs: cxx: clang++-16 clang_major_version: 16 clang_repo_suffix: -16 + - cc: clang-17 + cxx: clang++-17 + clang_major_version: 17 + clang_repo_suffix: steps: - name: Add Clang/LLVM repositories if: "${{ contains(matrix.cxx, 'clang') }}" From 682ca9b130e2781a2a5f03a4313a00fbe1f32a37 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 2 Feb 2023 04:47:03 +0100 Subject: [PATCH 3/4] lv-tool: Address Clang 17 warning -Wtautological-unsigned-enum-zero-compare --- libvisual/tools/lv-tool/display/sdl_driver.cpp | 2 +- libvisual/tools/lv-tool/display/stdout_sdl_driver.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvisual/tools/lv-tool/display/sdl_driver.cpp b/libvisual/tools/lv-tool/display/sdl_driver.cpp index affaeaede..f4209cffe 100644 --- a/libvisual/tools/lv-tool/display/sdl_driver.cpp +++ b/libvisual/tools/lv-tool/display/sdl_driver.cpp @@ -117,7 +117,7 @@ namespace { for (unsigned int i = VISUAL_GL_ATTRIBUTE_NONE; i < VISUAL_GL_ATTRIBUTE_LAST; i++) { SDL_GLattr sdl_attribute = sdl_gl_attribute_map[vidoptions->gl_attrs[i].attribute]; - if (sdl_attribute < 0) { + if (sdl_attribute == static_cast (-1)) { continue; } diff --git a/libvisual/tools/lv-tool/display/stdout_sdl_driver.cpp b/libvisual/tools/lv-tool/display/stdout_sdl_driver.cpp index 82ea0bf2d..bbcc0267c 100644 --- a/libvisual/tools/lv-tool/display/stdout_sdl_driver.cpp +++ b/libvisual/tools/lv-tool/display/stdout_sdl_driver.cpp @@ -131,7 +131,7 @@ namespace { SDL_GLattr sdl_attribute = sdl_gl_attribute_map[vidoptions->gl_attrs[i].attribute]; - if (sdl_attribute < 0) { + if (sdl_attribute == static_cast (-1)) { continue; } From 42452821657f1f21bdd1af27538301e3aa6ffbbf Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 2 Feb 2023 19:29:29 +0100 Subject: [PATCH 4/4] lv-tool: Use static_cast for existing "SDL_GLattr (-1)" --- .../tools/lv-tool/display/sdl_driver.cpp | 36 +++++++++---------- .../lv-tool/display/stdout_sdl_driver.cpp | 36 +++++++++---------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/libvisual/tools/lv-tool/display/sdl_driver.cpp b/libvisual/tools/lv-tool/display/sdl_driver.cpp index f4209cffe..1cde3ee67 100644 --- a/libvisual/tools/lv-tool/display/sdl_driver.cpp +++ b/libvisual/tools/lv-tool/display/sdl_driver.cpp @@ -33,24 +33,24 @@ namespace { SDL_GLattr const sdl_gl_attribute_map[] = { - SDL_GLattr (-1), // VISUAL_GL_ATTRIBUTE_NONE - SDL_GL_BUFFER_SIZE, // VISUAL_GL_ATTRIBUTE_BUFFER_SIZE - SDL_GLattr (-1), // VISUAL_GL_ATTRIBUTE_LEVEL - SDL_GLattr (-1), // VISUAL_GL_ATTRIBUTE_RGBA - SDL_GL_DOUBLEBUFFER, // VISUAL_GL_ATTRIBUTE_DOUBLEBUFFER - SDL_GL_STEREO, // VISUAL_GL_ATTRIBUTE_STEREO - SDL_GLattr (-1), // VISUAL_GL_ATTRIBUTE_AUX_BUFFERS - SDL_GL_RED_SIZE, // VISUAL_GL_ATTRIBUTE_RED_SIZE - SDL_GL_GREEN_SIZE, // VISUAL_GL_ATTRIBUTE_GREEN_SIZE - SDL_GL_BLUE_SIZE, // VISUAL_GL_ATTRIBUTE_BLUE_SIZE - SDL_GL_ALPHA_SIZE, // VISUAL_GL_ATTRIBUTE_ALPHA_SIZE - SDL_GL_DEPTH_SIZE, // VISUAL_GL_ATTRIBUTE_DEPTH_SIZE - SDL_GL_STENCIL_SIZE, // VISUAL_GL_ATTRIBUTE_STENCIL_SIZE - SDL_GL_ACCUM_RED_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE - SDL_GL_ACCUM_GREEN_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE - SDL_GL_ACCUM_BLUE_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE - SDL_GL_ACCUM_ALPHA_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE - SDL_GLattr (-1) // VISUAL_GL_ATTRIBUTE_LAST + static_cast (-1), // VISUAL_GL_ATTRIBUTE_NONE + SDL_GL_BUFFER_SIZE, // VISUAL_GL_ATTRIBUTE_BUFFER_SIZE + static_cast (-1), // VISUAL_GL_ATTRIBUTE_LEVEL + static_cast (-1), // VISUAL_GL_ATTRIBUTE_RGBA + SDL_GL_DOUBLEBUFFER, // VISUAL_GL_ATTRIBUTE_DOUBLEBUFFER + SDL_GL_STEREO, // VISUAL_GL_ATTRIBUTE_STEREO + static_cast (-1), // VISUAL_GL_ATTRIBUTE_AUX_BUFFERS + SDL_GL_RED_SIZE, // VISUAL_GL_ATTRIBUTE_RED_SIZE + SDL_GL_GREEN_SIZE, // VISUAL_GL_ATTRIBUTE_GREEN_SIZE + SDL_GL_BLUE_SIZE, // VISUAL_GL_ATTRIBUTE_BLUE_SIZE + SDL_GL_ALPHA_SIZE, // VISUAL_GL_ATTRIBUTE_ALPHA_SIZE + SDL_GL_DEPTH_SIZE, // VISUAL_GL_ATTRIBUTE_DEPTH_SIZE + SDL_GL_STENCIL_SIZE, // VISUAL_GL_ATTRIBUTE_STENCIL_SIZE + SDL_GL_ACCUM_RED_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE + SDL_GL_ACCUM_GREEN_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE + SDL_GL_ACCUM_BLUE_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE + SDL_GL_ACCUM_ALPHA_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE + static_cast (-1) // VISUAL_GL_ATTRIBUTE_LAST }; void get_nearest_resolution (int& width, int& height); diff --git a/libvisual/tools/lv-tool/display/stdout_sdl_driver.cpp b/libvisual/tools/lv-tool/display/stdout_sdl_driver.cpp index bbcc0267c..123f2135f 100644 --- a/libvisual/tools/lv-tool/display/stdout_sdl_driver.cpp +++ b/libvisual/tools/lv-tool/display/stdout_sdl_driver.cpp @@ -44,24 +44,24 @@ namespace { SDL_GLattr const sdl_gl_attribute_map[] = { - SDL_GLattr (-1), // VISUAL_GL_ATTRIBUTE_NONE - SDL_GL_BUFFER_SIZE, // VISUAL_GL_ATTRIBUTE_BUFFER_SIZE - SDL_GLattr (-1), // VISUAL_GL_ATTRIBUTE_LEVEL - SDL_GLattr (-1), // VISUAL_GL_ATTRIBUTE_RGBA - SDL_GL_DOUBLEBUFFER, // VISUAL_GL_ATTRIBUTE_DOUBLEBUFFER - SDL_GL_STEREO, // VISUAL_GL_ATTRIBUTE_STEREO - SDL_GLattr (-1), // VISUAL_GL_ATTRIBUTE_AUX_BUFFERS - SDL_GL_RED_SIZE, // VISUAL_GL_ATTRIBUTE_RED_SIZE - SDL_GL_GREEN_SIZE, // VISUAL_GL_ATTRIBUTE_GREEN_SIZE - SDL_GL_BLUE_SIZE, // VISUAL_GL_ATTRIBUTE_BLUE_SIZE - SDL_GL_ALPHA_SIZE, // VISUAL_GL_ATTRIBUTE_ALPHA_SIZE - SDL_GL_DEPTH_SIZE, // VISUAL_GL_ATTRIBUTE_DEPTH_SIZE - SDL_GL_STENCIL_SIZE, // VISUAL_GL_ATTRIBUTE_STENCIL_SIZE - SDL_GL_ACCUM_RED_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE - SDL_GL_ACCUM_GREEN_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE - SDL_GL_ACCUM_BLUE_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE - SDL_GL_ACCUM_ALPHA_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE - SDL_GLattr (-1) // VISUAL_GL_ATTRIBUTE_LAST + static_cast (-1), // VISUAL_GL_ATTRIBUTE_NONE + SDL_GL_BUFFER_SIZE, // VISUAL_GL_ATTRIBUTE_BUFFER_SIZE + static_cast (-1), // VISUAL_GL_ATTRIBUTE_LEVEL + static_cast (-1), // VISUAL_GL_ATTRIBUTE_RGBA + SDL_GL_DOUBLEBUFFER, // VISUAL_GL_ATTRIBUTE_DOUBLEBUFFER + SDL_GL_STEREO, // VISUAL_GL_ATTRIBUTE_STEREO + static_cast (-1), // VISUAL_GL_ATTRIBUTE_AUX_BUFFERS + SDL_GL_RED_SIZE, // VISUAL_GL_ATTRIBUTE_RED_SIZE + SDL_GL_GREEN_SIZE, // VISUAL_GL_ATTRIBUTE_GREEN_SIZE + SDL_GL_BLUE_SIZE, // VISUAL_GL_ATTRIBUTE_BLUE_SIZE + SDL_GL_ALPHA_SIZE, // VISUAL_GL_ATTRIBUTE_ALPHA_SIZE + SDL_GL_DEPTH_SIZE, // VISUAL_GL_ATTRIBUTE_DEPTH_SIZE + SDL_GL_STENCIL_SIZE, // VISUAL_GL_ATTRIBUTE_STENCIL_SIZE + SDL_GL_ACCUM_RED_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE + SDL_GL_ACCUM_GREEN_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE + SDL_GL_ACCUM_BLUE_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE + SDL_GL_ACCUM_ALPHA_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE + static_cast (-1) // VISUAL_GL_ATTRIBUTE_LAST }; void get_nearest_resolution (int& width, int& height);