Subgroups operations merge

.github/docker/Dockerfile

@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023, Arm Limited and Contributors
+# Copyright (c) 2022-2025, Arm Limited and Contributors
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -80,7 +80,7 @@ ENV PATH="$PATH:$ANDROID_HOME/platform-tools:${ANDROID_SDK_TOOLS}/tools/bin:$AND
 RUN mkdir -p $ANDROID_HOME
 
 # Configure Android NDK
-ENV NDK_VERSION=r25b
+ENV NDK_VERSION=r28c
 
 RUN set -x && wget -q https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-linux.zip -O /tmp/android-ndk.zip \
     && unzip -qq /tmp/android-ndk.zip -d /usr/local \

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
     name: "Build ${{ matrix.platform }} in ${{ matrix.build_type }}"
     strategy:
       matrix:
-        platform: [windows, ubuntu, macos]
+        platform: [windows, ubuntu]
         build_type: [Debug, Release]
     env:
       PARALLEL: -j 2
@@ -52,7 +52,58 @@ jobs:
       - if: ${{ matrix.platform != 'windows' }}
         name: Configure and build
         run: |
-          cmake -B"build/${{ matrix.platform }}" -DVKB_BUILD_TESTS=ON -DVKB_BUILD_SAMPLES=ON
+          cmake -B"build/${{ matrix.platform }}" -DVKB_BUILD_TESTS=ON -DVKB_BUILD_SAMPLES=ON -DGLFW_BUILD_WAYLAND=OFF
+          cmake --build "build/${{ matrix.platform }}" --target vulkan_samples --config ${{ matrix.build_type }} ${{ env.PARALLEL }}
+
+  build_v2:
+    name: "Build ${{ matrix.platform }} in ${{ matrix.build_type }}"
+    strategy:
+      matrix:
+        platform: [windows, ubuntu]
+        build_type: [Release]
+    env:
+      PARALLEL: -j 2
+    runs-on: "${{ matrix.platform }}-latest"
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+
+      - if: ${{ matrix.platform == 'ubuntu' }}
+        name: Install RandR headers
+        run: |
+          sudo apt-get update
+          sudo apt install xorg-dev libglu1-mesa-dev
+
+      - name: Configure
+        run: cmake -B"build/${{ matrix.platform }}" -DVKB_BUILD_TESTS=ON -DGLFW_BUILD_WAYLAND=OFF
+
+      - name: "Build Components ${{ matrix.platform }} in ${{ matrix.build_type }}"
+        run: cmake --build "build/${{ matrix.platform }}" --target vkb__components --config ${{ matrix.build_type }} ${{ env.PARALLEL }}
+
+  build_macos:
+    needs: build
+    name: "Build ${{ matrix.platform }} in ${{ matrix.build_type }}"
+    strategy:
+      # masoc is 10x expensive to run on GitHub machines, so only build simplest variations
+      matrix:
+        platform: [macos]
+        # Release builds are about 3 times faster than debug builds
+        build_type: [Release]
+    env:
+      PARALLEL: -j 2
+    runs-on: "${{ matrix.platform }}-latest"
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2.9
+        with:
+          key: ${{ github.job }}-${{ matrix.os }}
+      - name: Configure and build
+        run: |
+          cmake -B"build/${{ matrix.platform }}" -DVKB_BUILD_TESTS=ON -DVKB_BUILD_SAMPLES=ON -DCMAKE_OSX_SYSROOT=macosx -DCMAKE_OSX_DEPLOYMENT_TARGET=13.3
           cmake --build "build/${{ matrix.platform }}" --target vulkan_samples --config ${{ matrix.build_type }} ${{ env.PARALLEL }}
 
   build_d2d:
@@ -89,11 +140,11 @@ jobs:
         with:
           submodules: "recursive"
 
-      - name: set up JDK 11
-        uses: actions/setup-java@v3
+      - name: set up JDK
+        uses: actions/setup-java@v4
         with:
-          java-version: "11"
-          distribution: "temurin"
+          java-version: "21"
+          distribution: "zulu"
           cache: gradle
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2.9
@@ -108,11 +159,13 @@ jobs:
         run: NDK_CCACHE=1 NDK_CCACHE_BIN=ccache ./gradlew app:assemble${{ matrix.build_type }} --info
 
   build_ios:
+    # iOS is 10x expensive to run on GitHub machines, so only run if we know something else fast/simple passed as well
+    needs: build
     name: "Build ios in ${{ matrix.build_type }}"
     runs-on: macos-latest
     strategy:
       matrix:
-        build_type: [Debug]
+        build_type: [Release]
 
     steps:
       - uses: actions/checkout@v4
@@ -126,21 +179,20 @@ jobs:
 
       - name: Load VulkanSDK from cache
         id: VulkanSDK
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: VulkanSDK
           key: vulkan
 
       - name: retrieve VulkanSDK
         if: steps.VulkanSDK.outputs.cache-hit != 'true'
         run: |
-          wget https://sdk.lunarg.com/sdk/download/1.3.290.0/mac/vulkansdk-macos-1.3.290.0.dmg
-          sudo hdiutil attach vulkansdk-macos-1.3.290.0.dmg
-          sudo /Volumes/vulkansdk-macos-1.3.290.0/InstallVulkan.app/Contents/MacOS/InstallVulkan --root ~/VulkanSDK --accept-licenses --default-answer --confirm-command install com.lunarg.vulkan.ios
-          sudo hdiutil detach /Volumes/vulkansdk-macos-1.3.290.0
+          wget https://sdk.lunarg.com/sdk/download/1.4.304.1/mac/vulkansdk-macos-1.4.304.1.zip
+          unzip vulkansdk-macos-1.4.304.1.zip
+          sudo InstallVulkan-1.4.304.1.app/Contents/MacOS/InstallVulkan-1.4.304.1 --root ~/VulkanSDK --accept-licenses --default-answer --confirm-command install com.lunarg.vulkan.ios
 
       - name: build_ios
         run: |
           source ~/VulkanSDK/iOS/setup-env.sh
-          cmake -H"." -B"build/ios" -DVKB_BUILD_TESTS=ON -DVKB_BUILD_SAMPLES=ON -G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_DEPLOYMENT_TARGET=13.0 -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO
-          cmake --build "build/ios" --target vulkan_samples --config ${{ matrix.build_type }} -- -sdk iphoneos -allowProvisioningUpdates
+          cmake -H"." -B"build/ios" -DVKB_BUILD_TESTS=ON -DVKB_BUILD_SAMPLES=ON -G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DCMAKE_OSX_DEPLOYMENT_TARGET=16.3 -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO
+          cmake --build "build/ios" --target vulkan_samples --config ${{ matrix.build_type }} -- -allowProvisioningUpdates

.github/workflows/check.yml

@@ -99,7 +99,7 @@ jobs:
         with:
           submodules: "recursive"
       - run: git config --global --add safe.directory /__w/Vulkan-Samples/Vulkan-Samples
-      - run: cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -Bbuild/clang
+      - run: cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DGLFW_BUILD_WAYLAND=OFF -Bbuild/clang
       - run: |
           /usr/bin/run-clang-tidy -j $(($(nproc)/2+1)) -p build/clang -header-filter=framework,samples,app -checks=-*,google-*,-google-runtime-references -quiet ${{ needs.changed-files.outputs.all }}
 

.gitignore

@@ -1,4 +1,5 @@
 assets/scenes
+cache
 build
 .vs
 .vscode

.gitmodules

@@ -16,9 +16,6 @@
 [submodule "third_party/glfw"]
 	path = third_party/glfw
 	url = https://github.com/glfw/glfw
-[submodule "third_party/glslang"]
-	path = third_party/glslang
-	url = https://github.com/KhronosGroup/glslang
 [submodule "third_party/spirv-cross"]
 	path = third_party/spirv-cross
 	url = https://github.com/KhronosGroup/SPIRV-Cross
@@ -37,25 +34,16 @@
 [submodule "third_party/astc"]
 	path = third_party/astc
 	url = https://github.com/ARM-software/astc-encoder
-[submodule "third_party/CTPL"]
-	path = third_party/CTPL
-	url = https://github.com/vit-vit/CTPL
 [submodule "third_party/vulkan"]
 	path = third_party/vulkan
 	url = https://github.com/KhronosGroup/Vulkan-Headers
 [submodule "assets"]
 	path = assets
 	url = https://github.com/KhronosGroup/Vulkan-Samples-Assets
 	shallow = true
-[submodule "third_party/cli11"]
-	path = third_party/cli11
-	url = https://github.com/CLIUtils/CLI11.git
 [submodule "third_party/opencl"]
 	path = third_party/opencl
 	url = https://github.com/KhronosGroup/OpenCL-Headers.git
-[submodule "third_party/catch2"]
-	path = third_party/catch2
-	url = https://github.com/catchorg/Catch2.git
 [submodule "third_party/fmt"]
 	path = third_party/fmt
 	url = https://github.com/fmtlib/fmt

CMakeLists.txt

@@ -1,5 +1,6 @@
-# Copyright (c) 2020-2024, Arm Limited and Contributors
-# Copyright (c) 2024, Mobica Limited
+# Copyright (c) 2020-2025, Arm Limited and Contributors
+# Copyright (c) 2024-2025, Mobica Limited
+# Copyright (c) 2024-2025, Sascha Willems
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -36,6 +37,9 @@ cmake_minimum_required(VERSION 3.16)
 
 project(vulkan_samples)
 
+if(VKB_GENERATE_ANTORA_SITE)
+    add_subdirectory(antora)
+else ()
 # search for Vulkan SDK
 find_package(Vulkan)
 
@@ -53,11 +57,57 @@ if(Vulkan_FOUND)
     else()
         message(STATUS "Couldn't find DirectX Shader Compiler executable, make sure it is present in Vulkan SDK or add it manually via Vulkan_dxc_EXECUTABLE cmake variable. HLSL shaders won't be compiled.")
     endif()
+    # slang compiler
+    if(NOT Vulkan_slang_exe_FOUND)
+        find_program(Vulkan_slang_EXECUTABLE
+                    NAMES slangc
+                    HINTS
+                    "$ENV{VULKAN_SDK}/Bin"
+                    "$ENV{VULKAN_SDK}/bin"
+                    )
+    endif()
+    if(Vulkan_slang_EXECUTABLE)
+        message(STATUS "Found slang Shader Compiler under ${Vulkan_slang_EXECUTABLE}")
+    else()
+        message(STATUS "Couldn't find slang Shader Compiler executable, make sure it is present in Vulkan SDK or add it manually via Vulkan_slang_EXECUTABLE cmake variable. Slang shaders won't be compiled.")
+    endif()
+    # glsl compiler
+    if(NOT Vulkan_glslc_exe_FOUND)
+        find_program(Vulkan_glslc_EXECUTABLE
+                    NAMES glslc
+                    HINTS
+                    "$ENV{VULKAN_SDK}/Bin"
+                    "$ENV{VULKAN_SDK}/bin"
+                    )
+    endif()
+    if(Vulkan_glslc_EXECUTABLE)
+        message(STATUS "Found glslc Shader Compiler under ${Vulkan_glslc_EXECUTABLE}")
+    else()
+        message(STATUS "Couldn't find glslc Shader Compiler executable, make sure it is present in Vulkan SDK or add it manually via Vulkan_glslc_EXECUTABLE cmake variable. GLSL shaders won't be compiled.")
+    endif()
+    # spvasm compiler
+    if(NOT Vulkan_spirvas_exe_FOUND)
+        find_program(Vulkan_spirvas_EXECUTABLE
+                    NAMES spirv-as
+                    HINTS
+                    "$ENV{VULKAN_SDK}/Bin"
+                    "$ENV{VULKAN_SDK}/bin"
+                    )
+    endif()
+    if(Vulkan_spirvas_EXECUTABLE)
+        message(STATUS "Found spirv-as Shader Compiler under ${Vulkan_spirvas_EXECUTABLE}")
+    else()
+        message(STATUS "Couldn't find spirv-as Shader Compiler executable, make sure it is present in Vulkan SDK or add it manually via Vulkan_spirvas_EXECUTABLE cmake variable. SPIR-V assembly shaders won't be compiled.")
+    endif()
+
 endif()
 
 # globally add VKB_DEBUG for the debug build
 add_compile_definitions($<$<CONFIG:DEBUG>:VKB_DEBUG>)
 
+#globally define VULKAN_HPP_NO_STRUCT_CONSTRUCTORS to have designated initializers for the vk-structs
+add_compile_definitions(VULKAN_HPP_NO_STRUCT_CONSTRUCTORS)
+
 # globally set -fno-strict-aliasing, needed due to using reinterpret_cast
 if (NOT MSVC)
   add_compile_options(-fno-strict-aliasing)
@@ -89,8 +139,6 @@ include(component_helper)
 # Add third party libraries
 add_subdirectory(third_party)
 
-vkb__enable_testing()
-
 # Framework v2.0 components directory
 add_subdirectory(components)
 
@@ -104,5 +152,4 @@ endif()
 
 # Add vulkan app (runs all samples)
 add_subdirectory(app)
-
-add_subdirectory(antora)
+endif ()

README.adoc

@@ -1,5 +1,5 @@
 ////
-- Copyright (c) 2019-2024, Arm Limited and Contributors
+- Copyright (c) 2019-2025, Arm Limited and Contributors
 -
 - SPDX-License-Identifier: Apache-2.0
 -
@@ -52,11 +52,14 @@ endif::[]
 xref:samples/performance/README.adoc[Performance samples] show the recommended best practice together with real-time profiling information.
 They are more advanced but also contain a detailed tutorial with more in-detail explanations.
 
+=== Requirements
+
+The samples are written in C{pp} and require a compiler that supports at least C{pp}20. To run the samples, a device that supports at least Vulkan 1.1 or newer is required. Some samples might require a higher Vulkan version and/or support for certain extensions.
+
 === Goals
 
 * Create a collection of resources that demonstrate best-practice recommendations in Vulkan
 * Create tutorials that explain the implementation of best-practices and include performance analysis guides
-* Create a xref:framework/README.adoc[framework] that can be used as reference material and also as a sandbox for advanced experimentation with Vulkan
 
 == Samples
 

antora/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright 2022-2024 The Khronos Group Inc.
+# Copyright 2022-2025 The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 # Configure Vulkan Guide Antora tree with transformed markup files.
@@ -14,16 +14,15 @@ function(gatherAntoraAssets)
             samples
             scripts
             shaders
-            third_party
     )
     set(PAGES_DIR_SEARCH)
     set(IMAGES_DIR_SEARCH)
     foreach (DIR ${DIRS_TO_SEARCH})
         list(APPEND PAGES_DIR_SEARCH ${CMAKE_SOURCE_DIR}/${DIR}/*.adoc)
-        list(APPEND IMAGES_DIR_SEARCH ${CMAKE_SOURCE_DIR}/${DIR}/*.jpg ${CMAKE_SOURCE_DIR}/${DIR}/*.png ${CMAKE_SOURCE_DIR}/${DIR}/*.gif)
+        list(APPEND IMAGES_DIR_SEARCH ${CMAKE_SOURCE_DIR}/${DIR}/*.jpg ${CMAKE_SOURCE_DIR}/${DIR}/*.png ${CMAKE_SOURCE_DIR}/${DIR}/*.gif ${CMAKE_SOURCE_DIR}/*.svg)
     endforeach ()
     file(GLOB PAGES ${CMAKE_SOURCE_DIR}/*.adoc)
-    file(GLOB IMAGES ${CMAKE_SOURCE_DIR}/*.jpg ${CMAKE_SOURCE_DIR}/*.png ${CMAKE_SOURCE_DIR}/*.gif)
+    file(GLOB IMAGES ${CMAKE_SOURCE_DIR}/*.jpg ${CMAKE_SOURCE_DIR}/*.png ${CMAKE_SOURCE_DIR}/*.gif ${CMAKE_SOURCE_DIR}/*.svg)
     file(GLOB_RECURSE PAGES_R ${PAGES_DIR_SEARCH})
     file(GLOB_RECURSE IMAGES_R ${IMAGES_DIR_SEARCH})