From ff573219bf2bab8f758114134e70cd7130325fd5 Mon Sep 17 00:00:00 2001 From: Shokunin <30949000+tetrisgm@users.noreply.github.com> Date: Fri, 9 Oct 2026 01:07:59 -0700 Subject: [PATCH] CMake: register the facade GL fixtures where their SDL include and target exist gl_texture_lod_test (#585) and gl_xbr_filter_test sat in the SDL3::SDL3-static block after _gl_scale_sdl_inc was unset, so they got an empty --sdl-include and were not registered where the static target is absent. Move them into the gl_scale_invariance block that defines both. Co-Authored-By: Claude Opus 5.5 --- runtime/CMakeLists.txt | 50 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 40ef7653..757f33c9 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -262,6 +262,31 @@ if(BUILD_TESTING) --output "${CMAKE_CURRENT_BINARY_DIR}/gl-frame-gen-results") set_tests_properties(gl_frame_gen_test PROPERTIES LABELS "gpu;opengl;hardware" TIMEOUT 300 SKIP_RETURN_CODE 77) + # [video] texture_lod / anisotropic_filtering: off and untracked/ + # magnified prims are unchanged; minified world textures average + # inside their UV bounds; render thread and PGXP depth agree. + add_test(NAME gl_texture_lod_test + COMMAND "${Python3_EXECUTABLE}" + "${CMAKE_CURRENT_SOURCE_DIR}/tests/run_gl_render_thread.py" --single + --fixture "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_gl_texture_lod.c" + --cc "${CMAKE_C_COMPILER}" + --sdl-include "${_gl_scale_sdl_inc}" + --sdl-library "$" + --output "${CMAKE_CURRENT_BINARY_DIR}/gl-texture-lod-results") + set_tests_properties(gl_texture_lod_test PROPERTIES + LABELS "gpu;opengl;hardware" TIMEOUT 180 SKIP_RETURN_CODE 77) + # texture_filtering = "xbr": diagonals lose the staircase, straight + # edges, flat areas, cutouts and 1:1 draws stay nearest; RT agrees. + add_test(NAME gl_xbr_filter_test + COMMAND "${Python3_EXECUTABLE}" + "${CMAKE_CURRENT_SOURCE_DIR}/tests/run_gl_render_thread.py" --single + --fixture "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_gl_xbr.c" + --cc "${CMAKE_C_COMPILER}" + --sdl-include "${_gl_scale_sdl_inc}" + --sdl-library "$" + --output "${CMAKE_CURRENT_BINARY_DIR}/gl-xbr-results") + set_tests_properties(gl_xbr_filter_test PROPERTIES + LABELS "gpu;opengl;hardware" TIMEOUT 180 SKIP_RETURN_CODE 77) unset(_gl_scale_sdl_inc) else() message(STATUS "gl_scale_invariance_test: not registered (needs macOS, Linux or MinGW, Python 3 and SDL3)") @@ -309,31 +334,6 @@ if(BUILD_TESTING) --output "${CMAKE_CURRENT_BINARY_DIR}/gl-fmv-chroma-results") set_tests_properties(gl_fmv_chroma_test PROPERTIES LABELS "gpu;opengl;hardware" TIMEOUT 180 SKIP_RETURN_CODE 77) - # [video] texture_lod / anisotropic_filtering: off and untracked/ - # magnified prims are unchanged; minified world textures average - # inside their UV bounds; render thread and PGXP depth agree. - add_test(NAME gl_texture_lod_test - COMMAND "${Python3_EXECUTABLE}" - "${CMAKE_CURRENT_SOURCE_DIR}/tests/run_gl_render_thread.py" --single - --fixture "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_gl_texture_lod.c" - --cc "${CMAKE_C_COMPILER}" - --sdl-include "${_gl_scale_sdl_inc}" - --sdl-library "$" - --output "${CMAKE_CURRENT_BINARY_DIR}/gl-texture-lod-results") - set_tests_properties(gl_texture_lod_test PROPERTIES - LABELS "gpu;opengl;hardware" TIMEOUT 180 SKIP_RETURN_CODE 77) - # texture_filtering = "xbr": diagonals lose the staircase, straight - # edges, flat areas, cutouts and 1:1 draws stay nearest; RT agrees. - add_test(NAME gl_xbr_filter_test - COMMAND "${Python3_EXECUTABLE}" - "${CMAKE_CURRENT_SOURCE_DIR}/tests/run_gl_render_thread.py" --single - --fixture "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_gl_xbr.c" - --cc "${CMAKE_C_COMPILER}" - --sdl-include "${_gl_scale_sdl_inc}" - --sdl-library "$" - --output "${CMAKE_CURRENT_BINARY_DIR}/gl-xbr-results") - set_tests_properties(gl_xbr_filter_test PROPERTIES - LABELS "gpu;opengl;hardware" TIMEOUT 180 SKIP_RETURN_CODE 77) endif() add_executable(launcher_device_roundtrip_test tests/test_launcher_device_roundtrip.cpp)