Skip to content

Commit f33deb2

Browse files
eXpl0it3reXpl0it3r
committed
Update CMake's minimum version to 3.28
- Target Ubuntu 24.04 instead of 22.04 - Ubuntu 24.04 tracks CMake 3.28 - Remove anti-aliasing test as there's no guarantee - Update MinGW to the latest WinLibs distribution - Temporarily disable caching of OpenCppCoverage as it fails to properly restore the cache at times
1 parent 76a80ff commit f33deb2

6 files changed

Lines changed: 52 additions & 58 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 35 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ jobs:
3636
- { name: Windows VS2022 Unity, os: windows-2025, flags: -DSFML_USE_MESA3D=ON -DCMAKE_UNITY_BUILD=ON -GNinja }
3737
- { name: Windows LLVM/Clang, os: windows-2025, flags: -DSFML_USE_MESA3D=ON -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -GNinja }
3838
- { name: Windows MinGW, os: windows-2025, flags: -DSFML_USE_MESA3D=ON -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -GNinja }
39-
- { name: Linux GCC, os: ubuntu-22.04, flags: -GNinja }
40-
- { name: Linux Clang, os: ubuntu-22.04, flags: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -GNinja , gcovr_options: '--gcov-executable="llvm-cov-$CLANG_VERSION gcov"' }
41-
- { name: Linux GCC DRM, os: ubuntu-22.04, flags: -DSFML_USE_DRM=ON -DSFML_RUN_DISPLAY_TESTS=OFF -GNinja }
42-
- { name: Linux GCC OpenGL ES, os: ubuntu-22.04, flags: -DSFML_OPENGL_ES=ON -DSFML_RUN_DISPLAY_TESTS=OFF -GNinja }
39+
- { name: Linux GCC, os: ubuntu-24.04, flags: -GNinja }
40+
- { name: Linux Clang, os: ubuntu-24.04, flags: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -GNinja , gcovr_options: '--gcov-executable="llvm-cov-$CLANG_VERSION gcov"' }
41+
- { name: Linux GCC DRM, os: ubuntu-24.04, flags: -DSFML_USE_DRM=ON -DSFML_RUN_DISPLAY_TESTS=OFF -GNinja }
42+
- { name: Linux GCC OpenGL ES, os: ubuntu-24.04, flags: -DSFML_OPENGL_ES=ON -DSFML_RUN_DISPLAY_TESTS=OFF -GNinja }
4343
- { name: macOS x64, os: macos-13, flags: -GNinja }
4444
- { name: macOS x64 Xcode, os: macos-13, flags: -GXcode }
4545
- { name: macOS arm64, os: macos-15, flags: -GNinja -DSFML_RUN_AUDIO_DEVICE_TESTS=OFF }
@@ -55,13 +55,13 @@ jobs:
5555
include:
5656
- platform: { name: Windows VS2022 x64, os: windows-2025 }
5757
config: { name: Static with PCH (MSVC), flags: -DSFML_USE_MESA3D=ON -GNinja -DBUILD_SHARED_LIBS=OFF -DSFML_ENABLE_PCH=ON }
58-
- platform: { name: Linux GCC, os: ubuntu-22.04 }
58+
- platform: { name: Linux GCC, os: ubuntu-24.04 }
5959
config: { name: Static with PCH (GCC), flags: -GNinja -DCMAKE_CXX_COMPILER=g++ -DBUILD_SHARED_LIBS=OFF -DSFML_ENABLE_PCH=ON }
60-
- platform: { name: Linux Clang, os: ubuntu-22.04 }
60+
- platform: { name: Linux Clang, os: ubuntu-24.04 }
6161
config: { name: Static with PCH (Clang), flags: -GNinja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DBUILD_SHARED_LIBS=OFF -DSFML_ENABLE_PCH=ON }
62-
- platform: { name: Linux GCC, os: ubuntu-22.04 }
62+
- platform: { name: Linux GCC, os: ubuntu-24.04 }
6363
config: { name: Bundled Deps Static, flags: -GNinja -DCMAKE_CXX_COMPILER=g++ -DBUILD_SHARED_LIBS=OFF -DSFML_USE_SYSTEM_DEPS=OFF }
64-
- platform: { name: Linux GCC, os: ubuntu-22.04 }
64+
- platform: { name: Linux GCC, os: ubuntu-24.04 }
6565
config: { name: Bundled Deps Shared, flags: -GNinja -DCMAKE_CXX_COMPILER=g++ -DBUILD_SHARED_LIBS=ON -DSFML_USE_SYSTEM_DEPS=OFF }
6666
- platform: { name: Windows MinGW, os: windows-2025 }
6767
config: { name: Static Standard Libraries, flags: -GNinja -DSFML_USE_MESA3D=ON -DCMAKE_CXX_COMPILER=g++ -DSFML_USE_STATIC_STD_LIBS=ON }
@@ -71,28 +71,28 @@ jobs:
7171
config: { name: Frameworks, flags: -GNinja -DSFML_BUILD_FRAMEWORKS=ON -DBUILD_SHARED_LIBS=ON }
7272
- platform: { name: macOS , os: macos-14 }
7373
config: { name: System Deps, flags: -GNinja -DBUILD_SHARED_LIBS=ON -DSFML_USE_SYSTEM_DEPS=ON }
74-
- platform: { name: Android, os: ubuntu-22.04 }
74+
- platform: { name: Android, os: ubuntu-24.04 }
7575
config:
7676
name: x86 (API 21)
7777
flags: -GNinja -DCMAKE_ANDROID_ARCH_ABI=x86 -DCMAKE_SYSTEM_NAME=Android -DCMAKE_SYSTEM_VERSION=21 -DCMAKE_ANDROID_NDK=$ANDROID_NDK_ROOT -DBUILD_SHARED_LIBS=ON -DCMAKE_ANDROID_STL_TYPE=c++_shared -DSFML_RUN_DISPLAY_TESTS=OFF -DSFML_RUN_AUDIO_DEVICE_TESTS=OFF
7878
arch: x86
7979
api: 21
8080
type: { name: Release }
81-
- platform: { name: Android, os: ubuntu-22.04 }
81+
- platform: { name: Android, os: ubuntu-24.04 }
8282
config:
8383
name: x86_64 (API 24)
8484
flags: -GNinja -DCMAKE_ANDROID_ARCH_ABI=x86_64 -DCMAKE_SYSTEM_NAME=Android -DCMAKE_SYSTEM_VERSION=24 -DCMAKE_ANDROID_NDK=$ANDROID_NDK_ROOT -DBUILD_SHARED_LIBS=ON -DCMAKE_ANDROID_STL_TYPE=c++_shared -DSFML_RUN_DISPLAY_TESTS=OFF -DSFML_RUN_AUDIO_DEVICE_TESTS=OFF
8585
arch: x86_64
8686
api: 24
8787
type: { name: Release }
88-
- platform: { name: Android, os: ubuntu-22.04 }
88+
- platform: { name: Android, os: ubuntu-24.04 }
8989
config:
9090
name: armeabi-v7a (API 29)
9191
flags: -GNinja -DCMAKE_ANDROID_ARCH_ABI=armeabi-v7a -DCMAKE_SYSTEM_NAME=Android -DCMAKE_SYSTEM_VERSION=29 -DCMAKE_ANDROID_NDK=$ANDROID_NDK_ROOT -DBUILD_SHARED_LIBS=ON -DCMAKE_ANDROID_STL_TYPE=c++_shared
9292
arch: armeabi-v7a
9393
api: 29
9494
type: { name: Debug, flags: -DCMAKE_BUILD_TYPE=Debug -DSFML_FATAL_OPENGL_ERRORS=ON }
95-
- platform: { name: Android, os: ubuntu-22.04 }
95+
- platform: { name: Android, os: ubuntu-24.04 }
9696
config:
9797
name: arm64-v8a (API 33)
9898
flags: -GNinja -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a -DCMAKE_SYSTEM_NAME=Android -DCMAKE_SYSTEM_VERSION=33 -DCMAKE_ANDROID_NDK=$ANDROID_NDK_ROOT -DBUILD_SHARED_LIBS=ON -DCMAKE_ANDROID_STL_TYPE=c++_shared -DSFML_RUN_DISPLAY_TESTS=OFF -DSFML_RUN_AUDIO_DEVICE_TESTS=OFF
@@ -116,26 +116,19 @@ jobs:
116116
with:
117117
arch: ${{ contains(matrix.platform.name, 'arm64') && 'amd64_arm64' || contains(matrix.platform.name, 'x86') && 'x86' || 'x64' }}
118118

119-
# Although the CMake configuration will run with 3.24 on Windows and 3.22
120-
# elsewhere, we install 3.25 on Windows in order to support specifying
121-
# CMAKE_MSVC_DEBUG_INFORMATION_FORMAT which allows CCache to cache MSVC object
122-
# files, see: https://cmake.org/cmake/help/latest/release/3.25.html#variables
123119
- name: Get CMake and Ninja
124120
uses: lukka/get-cmake@latest
125121
with:
126-
cmakeVersion: ${{ runner.os == 'Windows' && '3.25' || '3.22' }}
122+
cmakeVersion: 3.28
127123
ninjaVersion: latest
128124

129125
- name: Install Linux Dependencies and Tools
130126
if: runner.os == 'Linux'
131127
run: |
132128
CLANG_VERSION=$(clang++ --version | sed -n 's/.*version \([0-9]\+\)\..*/\1/p')
133129
echo "CLANG_VERSION=$CLANG_VERSION" >> $GITHUB_ENV
134-
sudo apt-get update && sudo apt-get install xorg-dev libxrandr-dev libxcursor-dev libxi-dev libudev-dev libflac-dev libvorbis-dev libgl1-mesa-dev libegl1-mesa-dev libdrm-dev libgbm-dev xvfb fluxbox ccache gcovr ${{ matrix.platform.name == 'Linux Clang' && 'llvm-$CLANG_VERSION' || '' }}
135-
136-
- name: Remove ALSA Library
137-
if: runner.os == 'Linux' && matrix.platform.name != 'Android'
138-
run: sudo apt-get remove -y libasound2
130+
sudo apt-get update
131+
sudo apt-get install xorg-dev libxrandr-dev libxcursor-dev libxi-dev libudev-dev libflac-dev libvorbis-dev libgl1-mesa-dev libegl1-mesa-dev libdrm-dev libgbm-dev xvfb fluxbox ccache gcovr ${{ matrix.platform.name == 'Linux Clang' && 'llvm-$CLANG_VERSION' || '' }}
139132
140133
- name: Install Android Components
141134
if: matrix.platform.name == 'Android'
@@ -175,17 +168,9 @@ jobs:
175168
with:
176169
packages: gcovr
177170

178-
- name: Cache OpenCppCoverage
179-
if: matrix.type.name == 'Debug' && runner.os == 'Windows'
180-
id: opencppcoverage-cache
181-
uses: actions/cache@v4
182-
with:
183-
path: C:\Program Files\OpenCppCoverage
184-
key: opencppcoverage
185-
186171
- name: Install OpenCppCoverage
187172
uses: nick-fields/retry@v3
188-
if: matrix.type.name == 'Debug' && runner.os == 'Windows' && steps.opencppcoverage-cache.outputs.cache-hit != 'true'
173+
if: matrix.type.name == 'Debug' && runner.os == 'Windows'
189174
with:
190175
max_attempts: 10
191176
timeout_minutes: 3
@@ -197,22 +182,25 @@ jobs:
197182
uses: actions/cache@v4
198183
with:
199184
path: "C:\\Program Files\\mingw64"
200-
key: winlibs-x86_64-posix-seh-gcc-12.2.0-llvm-16.0.0-mingw-w64msvcrt-10.0.0-r5
185+
key: winlibs-x86_64-posix-seh-gcc-14.2.0-llvm-19.1.7-mingw-w64msvcrt-12.0.0-r3
201186

202187
- name: Install MinGW
203188
if: matrix.platform.name == 'Windows MinGW' && steps.mingw-cache.outputs.cache-hit != 'true'
204189
run: |
205-
curl -Lo mingw64.zip https://github.com/brechtsanders/winlibs_mingw/releases/download/12.2.0-16.0.0-10.0.0-msvcrt-r5/winlibs-x86_64-posix-seh-gcc-12.2.0-llvm-16.0.0-mingw-w64msvcrt-10.0.0-r5.zip
190+
curl -Lo mingw64.zip https://github.com/brechtsanders/winlibs_mingw/releases/download/14.2.0posix-19.1.7-12.0.0-msvcrt-r3/winlibs-x86_64-posix-seh-gcc-14.2.0-llvm-19.1.7-mingw-w64msvcrt-12.0.0-r3.zip
206191
unzip -qq -d "C:\Program Files" mingw64.zip
207192
208-
- name: Add OpenCppCoverage and MinGW to PATH and remove MinGW-supplied CCache
193+
- name: Add OpenCppCoverage and MinGW to PATH and remove MinGW-supplied CCache & CMake
209194
if: runner.os == 'Windows'
210195
run: |
211196
echo "C:\Program Files\OpenCppCoverage" >> $GITHUB_PATH
212197
echo "C:\Program Files\mingw64\bin" >> $GITHUB_PATH
213198
rm -f "C:\Program Files\mingw64\bin\ccache.exe"
214199
echo "Using $(which ccache)"
215200
ccache --version
201+
rm -f "C:\Program Files\mingw64\bin\cmake.exe"
202+
echo "Using $(which cmake)"
203+
cmake --version
216204
217205
- name: Configure CMake
218206
run: cmake --preset dev -DCMAKE_VERBOSE_MAKEFILE=ON ${{matrix.platform.flags}} ${{matrix.config.flags}} ${{matrix.type.flags}}
@@ -241,7 +229,8 @@ jobs:
241229
242230
- name: Test (Windows)
243231
if: runner.os == 'Windows' && !contains(matrix.platform.name, 'MinGW') && !contains(matrix.platform.name, 'arm64')
244-
run: cmake --build build --target runtests --config ${{ matrix.type.name == 'Debug' && 'Debug' || 'Release' }}
232+
run: |
233+
cmake --build build --target runtests --config ${{ matrix.type.name == 'Debug' && 'Debug' || 'Release' }}
245234
246235
- name: Test (Linux/macOS/MinGW)
247236
if: (runner.os != 'Windows' || contains(matrix.platform.name, 'MinGW')) && !contains(matrix.platform.name, 'iOS') && !contains(matrix.platform.name, 'Android')
@@ -251,6 +240,7 @@ jobs:
251240
if [ "${{ matrix.type.name }}" == "Debug" ]; then
252241
gcovr -r $GITHUB_WORKSPACE -x build/coverage.out -s -f 'src/SFML/.*' -f 'include/SFML/.*' ${{ matrix.platform.gcovr_options }} $GITHUB_WORKSPACE
253242
fi
243+
ls build/
254244
255245
- name: Upload Coverage Report to Coveralls
256246
if: matrix.type.name == 'Debug' && github.repository == 'SFML/SFML' && !contains(matrix.platform.name, 'iOS') && !contains(matrix.platform.name, 'Android') && !contains(matrix.platform.name, 'arm64') # Disable upload in forks
@@ -271,7 +261,7 @@ jobs:
271261
coverage:
272262
name: Finalize Coverage Upload
273263
needs: build
274-
runs-on: ubuntu-22.04
264+
runs-on: ubuntu-24.04
275265
if: github.repository == 'SFML/SFML' # Disable upload in forks
276266

277267
steps:
@@ -330,7 +320,9 @@ jobs:
330320
331321
- name: Install Linux Dependencies
332322
if: runner.os == 'Linux'
333-
run: sudo apt-get update && sudo apt-get install libfreetype-dev libxrandr-dev libxcursor-dev libxi-dev libudev-dev libflac-dev libvorbis-dev libgl1-mesa-dev libegl1-mesa-dev libdrm-dev libgbm-dev
323+
run: |
324+
sudo apt-get update
325+
sudo apt-get install libfreetype-dev libxrandr-dev libxcursor-dev libxi-dev libudev-dev libflac-dev libvorbis-dev libgl1-mesa-dev libegl1-mesa-dev libdrm-dev libgbm-dev
334326
335327
- name: Install macOS Dependencies
336328
if: runner.os == 'macOS'
@@ -353,9 +345,9 @@ jobs:
353345
fail-fast: false
354346
matrix:
355347
platform:
356-
- { name: Linux, os: ubuntu-22.04, flags: }
357-
- { name: Linux DRM, os: ubuntu-22.04, flags: -DSFML_RUN_DISPLAY_TESTS=OFF -DSFML_USE_DRM=ON }
358-
- { name: Linux GCC OpenGL ES, os: ubuntu-22.04, flags: -DSFML_RUN_DISPLAY_TESTS=OFF -DSFML_OPENGL_ES=ON }
348+
- { name: Linux, os: ubuntu-24.04 }
349+
- { name: Linux DRM, os: ubuntu-24.04, flags: -DSFML_RUN_DISPLAY_TESTS=OFF -DSFML_USE_DRM=ON }
350+
- { name: Linux GCC OpenGL ES, os: ubuntu-24.04, flags: -DSFML_RUN_DISPLAY_TESTS=OFF -DSFML_OPENGL_ES=ON }
359351

360352
steps:
361353
- name: Checkout Code
@@ -369,7 +361,9 @@ jobs:
369361

370362
- name: Install Linux Dependencies
371363
if: runner.os == 'Linux'
372-
run: sudo apt-get update && sudo apt-get install xorg-dev libxrandr-dev libxcursor-dev libxi-dev libudev-dev libflac-dev libvorbis-dev libgl1-mesa-dev libegl1-mesa-dev libdrm-dev libgbm-dev xvfb fluxbox && sudo apt-get remove -y libasound2
364+
run: |
365+
sudo apt-get update
366+
sudo apt-get install xorg-dev libxrandr-dev libxcursor-dev libxi-dev libudev-dev libflac-dev libvorbis-dev libgl1-mesa-dev libegl1-mesa-dev libdrm-dev libgbm-dev xvfb fluxbox
373367
374368
- name: Configure
375369
run: cmake --preset dev -GNinja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DSFML_BUILD_EXAMPLES=OFF -DSFML_ENABLE_SANITIZERS=ON ${{matrix.platform.flags}}

‎CMakeLists.txt‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
if(CMAKE_HOST_WIN32)
2-
# We require a CMake version greater than or equal to 3.24 on Windows in order to
3-
# support specifying target_include_directories with SYSTEM for Visual Studio Generators
4-
# see: https://cmake.org/cmake/help/latest/release/3.24.html#generators
5-
cmake_minimum_required(VERSION 3.24)
6-
else()
7-
# For all other systems, 3.22 will suffice
8-
cmake_minimum_required(VERSION 3.22)
9-
endif()
1+
cmake_minimum_required(VERSION 3.28)
102

113
# define a macro that helps defining an option
124
macro(sfml_set_option var default type docstring)

‎test/Audio/Music.test.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#include <SFML/Audio/Music.hpp>
22

33
// Other 1st party headers
4+
#include <SFML/Audio/PlaybackDevice.hpp>
5+
46
#include <SFML/System/Exception.hpp>
57
#include <SFML/System/FileInputStream.hpp>
68

@@ -14,6 +16,8 @@
1416

1517
TEST_CASE("[Audio] sf::Music", runAudioDeviceTests())
1618
{
19+
[[maybe_unused]] auto result = sf::PlaybackDevice::setDeviceToNull();
20+
1721
SECTION("Type traits")
1822
{
1923
STATIC_CHECK(!std::is_copy_constructible_v<sf::Music>);

‎test/Audio/Sound.test.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include <SFML/Audio/Sound.hpp>
22

33
// Other 1st party headers
4+
#include <SFML/Audio/PlaybackDevice.hpp>
45
#include <SFML/Audio/SoundBuffer.hpp>
56

67
#include <SFML/System/Time.hpp>
@@ -13,6 +14,8 @@
1314

1415
TEST_CASE("[Audio] sf::Sound", runAudioDeviceTests())
1516
{
17+
[[maybe_unused]] auto result = sf::PlaybackDevice::setDeviceToNull();
18+
1619
SECTION("Type traits")
1720
{
1821
STATIC_CHECK(!std::is_constructible_v<sf::Sound, sf::SoundBuffer&&>);

‎test/Audio/SoundStream.test.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#include <SFML/Audio/SoundStream.hpp>
22

3+
// Other 1st party headers
4+
#include <SFML/Audio/PlaybackDevice.hpp>
5+
36
#include <catch2/catch_test_macros.hpp>
47

58
#include <AudioUtil.hpp>
@@ -27,6 +30,8 @@ class SoundStream : public sf::SoundStream
2730

2831
TEST_CASE("[Audio] sf::SoundStream", runAudioDeviceTests())
2932
{
33+
[[maybe_unused]] auto result = sf::PlaybackDevice::setDeviceToNull();
34+
3035
SECTION("Type traits")
3136
{
3237
STATIC_CHECK(!std::is_constructible_v<sf::SoundStream>);

‎test/Window/Window.test.cpp‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,12 @@ TEST_CASE("[Window] sf::Window", runDisplayTests())
7373
"Window Tests",
7474
sf::Style::Resize,
7575
sf::State::Windowed,
76-
sf::ContextSettings{/* depthBits*/ 1, /* stencilBits */ 1, /* antiAliasingLevel */ 1});
76+
sf::ContextSettings{/* depthBits*/ 1, /* stencilBits */ 1});
7777
CHECK(window.isOpen());
7878
CHECK(window.getSize() == sf::Vector2u(360, 240));
7979
CHECK(window.getNativeHandle() != sf::WindowHandle());
8080
CHECK(window.getSettings().depthBits >= 1);
8181
CHECK(window.getSettings().stencilBits >= 1);
82-
CHECK(window.getSettings().antiAliasingLevel >= 1);
8382
}
8483

8584
SECTION("Mode, title, and state")
@@ -96,13 +95,12 @@ TEST_CASE("[Window] sf::Window", runDisplayTests())
9695
const sf::Window window(sf::VideoMode({360, 240}),
9796
"Window Tests",
9897
sf::State::Windowed,
99-
sf::ContextSettings{/* depthBits*/ 1, /* stencilBits */ 1, /* antiAliasingLevel */ 1});
98+
sf::ContextSettings{/* depthBits*/ 1, /* stencilBits */ 1});
10099
CHECK(window.isOpen());
101100
CHECK(window.getSize() == sf::Vector2u(360, 240));
102101
CHECK(window.getNativeHandle() != sf::WindowHandle());
103102
CHECK(window.getSettings().depthBits >= 1);
104103
CHECK(window.getSettings().stencilBits >= 1);
105-
CHECK(window.getSettings().antiAliasingLevel >= 1);
106104
}
107105
}
108106

@@ -143,13 +141,12 @@ TEST_CASE("[Window] sf::Window", runDisplayTests())
143141
"Window Tests",
144142
sf::Style::Resize,
145143
sf::State::Windowed,
146-
sf::ContextSettings{/* depthBits*/ 1, /* stencilBits */ 1, /* antiAliasingLevel */ 1});
144+
sf::ContextSettings{/* depthBits*/ 1, /* stencilBits */ 1});
147145
CHECK(window.isOpen());
148146
CHECK(window.getSize() == sf::Vector2u(240, 360));
149147
CHECK(window.getNativeHandle() != sf::WindowHandle());
150148
CHECK(window.getSettings().depthBits >= 1);
151149
CHECK(window.getSettings().stencilBits >= 1);
152-
CHECK(window.getSettings().antiAliasingLevel >= 1);
153150
}
154151

155152
SECTION("Mode, title, and state")
@@ -166,13 +163,12 @@ TEST_CASE("[Window] sf::Window", runDisplayTests())
166163
window.create(sf::VideoMode({240, 360}),
167164
"Window Tests",
168165
sf::State::Windowed,
169-
sf::ContextSettings{/* depthBits*/ 1, /* stencilBits */ 1, /* antiAliasingLevel */ 1});
166+
sf::ContextSettings{/* depthBits*/ 1, /* stencilBits */ 1});
170167
CHECK(window.isOpen());
171168
CHECK(window.getSize() == sf::Vector2u(240, 360));
172169
CHECK(window.getNativeHandle() != sf::WindowHandle());
173170
CHECK(window.getSettings().depthBits >= 1);
174171
CHECK(window.getSettings().stencilBits >= 1);
175-
CHECK(window.getSettings().antiAliasingLevel >= 1);
176172
}
177173
}
178174
}

0 commit comments

Comments
 (0)