Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 815d93bfb2d07914b65f2051b89a58819017b6c0
https://github.com/WebKit/WebKit/commit/815d93bfb2d07914b65f2051b89a58819017b6c0
Author: Nikolas Zimmermann <[email protected]>
Date: 2026-07-10 (Fri, 10 Jul 2026)
Changed paths:
M Source/cmake/OptionsGTK.cmake
M Source/cmake/OptionsWPE.cmake
M Tools/TestWebKitAPI/glib/CMakeLists.txt
M Tools/TestWebKitAPI/openxr-mock/MockOpenXRRuntime.cpp
Log Message:
-----------
REGRESSION(316809@main): RPi4 build broken with older OpenXR SDK
https://bugs.webkit.org/show_bug.cgi?id=319040
Reviewed by Carlos Garcia Campos.
The __has_include header selection in 316870@main was not enough. The
loader negotiation structs (XrNegotiateLoaderInfo, XrNegotiateRuntimeRequest)
are only exposed by an installed public header, openxr_loader_negotiation.h,
since OpenXR 1.1. Older SDKs keep them in a loader-internal header that is not
shipped in the runtime package, so neither include branch resolves and the
mock runtime cannot build there at all.
Rather than guard the source, stop building the mock runtime on old SDKs.
Expose the detected OpenXR version as a cache variable so it reaches the
TestWebKitAPI subdirectory, then build MockOpenXRRuntime and the
TestOpenXRInstanceLifecycle test that dlopens it only when the SDK is 1.1 or
newer. TestWebKitWebXR stays unconditional, so older bots keep that coverage.
With the mock now limited to 1.1+, revert MockOpenXRRuntime.cpp back to a
plain include of openxr_loader_negotiation.h.
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsWPE.cmake:
* Tools/TestWebKitAPI/glib/CMakeLists.txt:
* Tools/TestWebKitAPI/openxr-mock/MockOpenXRRuntime.cpp:
Canonical link: https://commits.webkit.org/316877@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
