diff options
| author | Andre Weissflog <floooh@gmail.com> | 2022-11-02 17:50:55 +0100 |
|---|---|---|
| committer | Andre Weissflog <floooh@gmail.com> | 2022-11-02 17:50:55 +0100 |
| commit | 45e9f933b774ad2a22bb0826228ebed823d68f48 (patch) | |
| tree | d9227dd68bbbd2214e9312d6fe97ee42724fa7bf /tests | |
| parent | 3735adc0b47adc5ac124d1c3cb3b5886a3bef45d (diff) | |
| parent | 7244adc9d72d7a3ac6480a31c3d3573adfe3f913 (diff) | |
Merge branch 'master' into sokol-spine
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 11 | ||||
| -rwxr-xr-x | tests/analyze_linux.sh | 3 | ||||
| -rw-r--r-- | tests/test_common.sh | 10 | ||||
| -rwxr-xr-x | tests/test_linux.sh | 4 |
4 files changed, 26 insertions, 2 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a021312a..62df858d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -7,6 +7,7 @@ set(CMAKE_CXX_STANDARD 17) # needed for UWP # SOKOL_GLCORE33, SOKOL_GLES2, SOKOL_GLES3, SOKOL_D3D11, SOKOL_METAL, SOKOL_WGPU, SOKOL_DUMMY set(SOKOL_BACKEND "SOKOL_DUMMY_BACKEND" CACHE STRING "Select 3D backend API") set_property(CACHE SOKOL_BACKEND PROPERTY STRINGS SOKOL_GLCORE33 SOKOL_METAL SOKOL_D3D11 SOKOL_DUMMY_BACKEND) +option(SOKOL_FORCE_EGL "Force EGL with GLCORE33 backend" OFF) option(USE_ARC "Enable/disable ARC" OFF) option(USE_ANALYZER "Enable/disable clang analyzer" OFF) @@ -29,6 +30,7 @@ else() endif() message(">> SOKOL_BACKEND: ${SOKOL_BACKEND}") +message(">> SOKOL_FORCE_EGL: ${SOKOL_FORCE_EGL}") if (OSX_IOS OR OSX_MACOS) if (USE_ARC) message(">> ObjC ARC ENABLED") @@ -85,7 +87,11 @@ elseif (ANDROID) elseif (LINUX) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) - set(system_libs ${system_libs} X11 Xi Xcursor GL asound dl m Threads::Threads) + if ((SOKOL_BACKEND STREQUAL SOKOL_GLES3) OR SOKOL_FORCE_EGL) + set(system_libs ${system_libs} X11 Xi Xcursor EGL GL asound dl m Threads::Threads) + else() + set(system_libs ${system_libs} X11 Xi Xcursor GL asound dl m Threads::Threads) + endif() elseif (OSX_MACOS) set(exe_type MACOSX_BUNDLE) if (USE_ARC) @@ -105,6 +111,9 @@ elseif (WINDOWS) endif() macro(configure_common target) + if (SOKOL_FORCE_EGL) + target_compile_definitions(${target} PRIVATE SOKOL_FORCE_EGL) + endif() target_compile_definitions(${target} PRIVATE ${SOKOL_BACKEND}) target_link_options(${target} PRIVATE ${link_flags}) target_link_libraries(${target} PRIVATE ${system_libs}) diff --git a/tests/analyze_linux.sh b/tests/analyze_linux.sh index 35b408f4..229e272a 100755 --- a/tests/analyze_linux.sh +++ b/tests/analyze_linux.sh @@ -3,4 +3,5 @@ set -e source test_common.sh prepare -analyze linux_gl_analyze SOKOL_GLCORE33 Debug
\ No newline at end of file +analyze linux_gl_analyze SOKOL_GLCORE33 Debug +analyze linux_gles3_analyze SOKOL_GLES3 Debug
\ No newline at end of file diff --git a/tests/test_common.sh b/tests/test_common.sh index dc67f260..c363820c 100644 --- a/tests/test_common.sh +++ b/tests/test_common.sh @@ -44,6 +44,16 @@ build() { cd ../.. } +build_force_egl() { + cfg=$1 + backend=$2 + mode=$3 + mkdir -p build/$cfg && cd build/$cfg + cmake -GNinja -DSOKOL_BACKEND=$backend -DSOKOL_FORCE_EGL=ON -DCMAKE_BUILD_TYPE=$mode ../.. + cmake --build . + cd ../.. +} + analyze() { cfg=$1 backend=$2 diff --git a/tests/test_linux.sh b/tests/test_linux.sh index e157ec2c..5cd86e70 100755 --- a/tests/test_linux.sh +++ b/tests/test_linux.sh @@ -4,5 +4,9 @@ source test_common.sh prepare build linux_gl_debug SOKOL_GLCORE33 Debug build linux_gl_release SOKOL_GLCORE33 Release +build linux_gles3_debug SOKOL_GLES3 Debug +build linux_gles3_release SOKOL_GLES3 Release +build_force_egl linux_gl_egl_debug SOKOL_GLCORE33 Debug +build_force_egl linux_gl_egl_release SOKOL_GLCORE33 Release runtest linux_gl_debug |