From d5df35599f0a65e94b5745ca4a64438305166db7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 1 Jun 2026 19:21:37 +0200 Subject: [PATCH] package: test on ES2 also w/o EXT_texture_rg and EXT_unpack_subimage. Glyph cache implementations in the Text library pick features based on those, and while I'm pretty sure I tested both codepaths at some point, not having them automatically covered makes them prone to code rot. --- package/archlinux/PKGBUILD-es2 | 4 ++++ package/archlinux/PKGBUILD-es2desktop | 4 ++++ package/ci/unix-desktop-gles.sh | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/package/archlinux/PKGBUILD-es2 b/package/archlinux/PKGBUILD-es2 index 9a1851abf..6f8b32933 100644 --- a/package/archlinux/PKGBUILD-es2 +++ b/package/archlinux/PKGBUILD-es2 @@ -68,6 +68,10 @@ check() { MAGNUM_DISABLE_EXTENSIONS="GL_OES_vertex_array_object GL_NV_framebuffer_multisample GL_NV_framebuffer_blit GL_EXT_robustness GL_EXT_draw_elements_base_vertex" CORRADE_TEST_COLOR=ON ctest --output-on-failure -j9 -R GLTest MAGNUM_DISABLE_EXTENSIONS="GL_OES_vertex_array_object GL_NV_framebuffer_multisample GL_NV_framebuffer_blit GL_EXT_robustness GL_EXT_draw_elements_base_vertex GL_OES_draw_elements_base_vertex" CORRADE_TEST_COLOR=ON ctest --output-on-failure -j9 -R GLTest MAGNUM_DISABLE_EXTENSIONS="GL_OES_vertex_array_object GL_NV_framebuffer_multisample GL_NV_framebuffer_blit GL_EXT_robustness GL_EXT_draw_elements_base_vertex GL_OES_draw_elements_base_vertex GL_EXT_multi_draw_arrays GL_ANGLE_multi_draw" CORRADE_TEST_COLOR=ON ctest --output-on-failure -j9 -R GLTest + # Glyph caches in the Text library pick features based on a combination of + # those two + MAGNUM_DISABLE_EXTENSIONS="GL_EXT_texture_rg GL_EXT_unpack_subimage" CORRADE_TEST_COLOR=ON ctest --output-on-failure -j9 -R GLTest + MAGNUM_DISABLE_EXTENSIONS="GL_EXT_unpack_subimage" CORRADE_TEST_COLOR=ON ctest --output-on-failure -j9 -R GLTest MAGNUM_DISABLE_EXTENSIONS="GL_KHR_debug" CORRADE_TEST_COLOR=ON ctest --output-on-failure -j9 -R GLTest } diff --git a/package/archlinux/PKGBUILD-es2desktop b/package/archlinux/PKGBUILD-es2desktop index c72b81d87..b51cf76c5 100644 --- a/package/archlinux/PKGBUILD-es2desktop +++ b/package/archlinux/PKGBUILD-es2desktop @@ -70,6 +70,10 @@ check() { MAGNUM_DISABLE_EXTENSIONS="GL_OES_vertex_array_object GL_NV_framebuffer_multisample GL_NV_framebuffer_blit GL_EXT_robustness GL_EXT_draw_elements_base_vertex" CORRADE_TEST_COLOR=ON ctest --output-on-failure -j9 -R GLTest MAGNUM_DISABLE_EXTENSIONS="GL_OES_vertex_array_object GL_NV_framebuffer_multisample GL_NV_framebuffer_blit GL_EXT_robustness GL_EXT_draw_elements_base_vertex GL_OES_draw_elements_base_vertex" CORRADE_TEST_COLOR=ON ctest --output-on-failure -j9 -R GLTest MAGNUM_DISABLE_EXTENSIONS="GL_OES_vertex_array_object GL_NV_framebuffer_multisample GL_NV_framebuffer_blit GL_EXT_robustness GL_EXT_draw_elements_base_vertex GL_OES_draw_elements_base_vertex GL_EXT_multi_draw_arrays GL_ANGLE_multi_draw" CORRADE_TEST_COLOR=ON ctest --output-on-failure -j9 -R GLTest + # Glyph caches in the Text library pick features based on a combination of + # those two + MAGNUM_DISABLE_EXTENSIONS="GL_EXT_texture_rg GL_EXT_unpack_subimage" CORRADE_TEST_COLOR=ON ctest --output-on-failure -j9 -R GLTest + MAGNUM_DISABLE_EXTENSIONS="GL_EXT_unpack_subimage" CORRADE_TEST_COLOR=ON ctest --output-on-failure -j9 -R GLTest MAGNUM_DISABLE_EXTENSIONS="GL_KHR_debug" CORRADE_TEST_COLOR=ON ctest --output-on-failure -j9 -R GLTest } diff --git a/package/ci/unix-desktop-gles.sh b/package/ci/unix-desktop-gles.sh index 3c989db54..6fcd94ea0 100755 --- a/package/ci/unix-desktop-gles.sh +++ b/package/ci/unix-desktop-gles.sh @@ -72,6 +72,10 @@ ctest -V -E GLBenchmark MAGNUM_DISABLE_EXTENSIONS="GL_OES_vertex_array_object GL_NV_framebuffer_multisample GL_NV_framebuffer_blit GL_EXT_robustness GL_EXT_draw_elements_base_vertex" ctest -V -R GLTest MAGNUM_DISABLE_EXTENSIONS="GL_OES_vertex_array_object GL_NV_framebuffer_multisample GL_NV_framebuffer_blit GL_EXT_robustness GL_EXT_draw_elements_base_vertex GL_OES_draw_elements_base_vertex GL_ANGLE_base_vertex_base_instance" ctest -V -R GLTest MAGNUM_DISABLE_EXTENSIONS="GL_OES_vertex_array_object GL_NV_framebuffer_multisample GL_NV_framebuffer_blit GL_EXT_robustness GL_EXT_draw_elements_base_vertex GL_OES_draw_elements_base_vertex GL_ANGLE_base_vertex_base_instance GL_EXT_multi_draw_arrays GL_ANGLE_multi_draw" ctest -V -R GLTest +# Glyph caches in the Text library pick features based on a combination of +# those two +MAGNUM_DISABLE_EXTENSIONS="GL_EXT_texture_rg GL_EXT_unpack_subimage" ctest -V -R GLTest +MAGNUM_DISABLE_EXTENSIONS="GL_EXT_unpack_subimage" ctest -V -R GLTest MAGNUM_DISABLE_EXTENSIONS="GL_KHR_debug" ctest -V -R GLTest Debug/bin/magnum-gl-info --extension-strings Debug/bin/magnum-gl-info --limits