From db5a9432cf7ee2b9887a58a3a4a3ed1ba641f734 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Wed, 2 Jul 2025 12:14:22 +0300 Subject: [PATCH] Windows ARM: Enable OpenGL for WoA 11 23h2 OpenCL, OpenGL, and Vulkan Compatibility pack has been installed to WoA 11 23h2 Tier1 images to support OpenGL usage with these modules: - QtBase - QtGui - QtWidgets - QtDeclarative - QtQuick - Qt3D Enabling OpenGL by removing tags: -no-opengl -no-feature-run-opengl-tests Introduce new cross-compile build target for WoA 11 23h2 - windows-11_23H2-msvc2022-arm64-23H2 - Which has OpenGL enabled - Should not be used with WoA 11 22h2 as it doesn't have OpenGL New build will be used only for WoA 11 23h2 tests - windows-11-x86_64-arm64-tests-23H2 (new in 6.9) - Which has OpenGL tests enabled Names for these build and test targets will be renamed later when WoA 11 23h2 replaces WoA 11 22h2 by removing '-23H2' suffix from names. Note: - In 6.9 there is no Win 11 24h2 x64 like in dev and 6.10 - Therefore 6.9 uses Win 11 23h2 x64 for cross-compile target Task-number: QTQAINFRA-6973 Task-number: QTQAINFRA-6109 Task-number: QTBUG-126030 Change-Id: Ifa29d93d996ac4884a86835328170d857bf91f33 Reviewed-by: Jani Heikkinen Reviewed-by: Oliver Wolff Reviewed-by: Artem Dyomin (cherry picked from commit d48682bcdf9d6a959277ff2d2456e2cd6c276c9f) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit db339574e21f71a6d69286be559b1f542f74b267) --- coin/platform_configs/cmake_platforms.yaml | 28 ++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 2af72f56..40917561 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -154,8 +154,8 @@ Configurations: Id: 'windows-11_23h2-arm64-msvc2022' Template: 'qtci-windows-11_23H2-aarch64-53' Compiler: 'MSVC2022' - Features: ['DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure'] - Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-opengl -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' + Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure'] + Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', 'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE', @@ -179,6 +179,23 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc_arm64}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] +- + Id: 'windows-11_23H2-msvc2022-arm64-23H2' + Template: 'qtci-windows-11_23H2-x86_64-54' + Compiler: 'MSVC2022' + Target arch: 'arm64' + Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Platform dependency: 'windows-10_22h2-mingw13' + Environment variables: [ + 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', + 'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer', + 'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE', + 'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}', + 'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}', + 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}', + 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', + ] - Id: 'windows-11-x86_64-arm64-tests' Template: 'qtci-windows-11_22H2-aarch64-55' @@ -186,6 +203,13 @@ Configurations: Features: ['TestOnly'] Configure arguments: '-no-opengl -cross-compiled' Platform dependency: 'windows-11_23H2-msvc2022-arm64' +- + Id: 'windows-11-x86_64-arm64-tests-23H2' + Template: 'qtci-windows-11_23H2-aarch64-53' + Compiler: 'MSVC2022' + Features: ['TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure'] + Configure arguments: '-cross-compiled' + Platform dependency: 'windows-11_23H2-msvc2022-arm64-23H2' - Id: 'windows-11_23H2-msvc2022-developer-build' Template: 'qtci-windows-11_23H2-x86_64-54'