diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index ed3a22195..1a40a768e 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -33,6 +33,10 @@ jobs: - cc: clang-16 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 diff --git a/libvisual/tools/lv-tool/display/sdl_driver.cpp b/libvisual/tools/lv-tool/display/sdl_driver.cpp index affaeaede..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); @@ -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..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); @@ -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; }