Merge tag 'vulkan-sdk-1.3.268.0'
Change-Id: Ifc13f35a3b2d2bd35b0728fc780fd841e44acb01
diff --git a/.cmake-format.py b/.cmake-format.py
deleted file mode 100644
index 07d2f99..0000000
--- a/.cmake-format.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Configuration for cmake-format (v0.4.1, circa Jul 2018)
-# https://github.com/cheshirekow/cmake_format
-
-# How wide to allow formatted cmake files
-line_width = 132
-
-# How many spaces to tab for indent
-tab_size = 4
-
-# If arglists are longer than this, break them always
-max_subargs_per_line = 3
-
-# If true, separate flow control names from their parentheses with a space
-separate_ctrl_name_with_space = False
-
-# If true, separate function names from parentheses with a space
-separate_fn_name_with_space = False
-
-# If a statement is wrapped to more than one line, than dangle the closing
-# parenthesis on it's own line
-dangle_parens = False
-
-# What character to use for bulleted lists
-bullet_char = u'*'
-
-# What character to use as punctuation after numerals in an enumerated list
-enum_char = u'.'
-
-# What style line endings to use in the output.
-line_ending = u'unix'
-
-# Format command names consistently as 'lower' or 'upper' case
-command_case = u'lower'
-
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index a7a3872..0000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright (c) 2021 Valve Corporation
-# Copyright (c) 2021 LunarG, Inc.
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Author: Jeremy Kniager <jeremyk@lunarg.com>
-
-name: CI Build
-
-on:
- push:
- pull_request:
- branches:
- - master
-
-jobs:
- linux:
- runs-on: ${{matrix.os}}
-
- strategy:
- matrix:
- cc: [ gcc, clang ]
- cxx: [ g++, clang++ ]
- config: [ Debug, Release ]
- os: [ ubuntu-18.04, ubuntu-20.04 ]
- cube_wsi: [ XCB, XLIB, WAYLAND, DISPLAY ]
- exclude:
- - cc: gcc
- cxx: clang++
- - cc: clang
- cxx: g++
- - os: ubuntu-18.04
- cube_wsi: WAYLAND
-
- steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-python@v2
- with:
- python-version: '3.7'
- - run: |
- sudo apt-get -qq update
- sudo apt install libxkbcommon-dev libwayland-dev libmirclient-dev libxrandr-dev libx11-xcb-dev wayland-protocols
-
- - name: Fetch and install headers
- run: python scripts/update_deps.py --dir external
-
- - name: Generate build files
- run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=${{matrix.config}} -DCUBE_WSI_SELECTION=${{matrix.cube_wsi}} -Cexternal/helper.cmake
- env:
- CC: ${{matrix.cc}}
- CXX: ${{matrix.cxx}}
-
- - name: Build the tools
- run: make -C build
-
- - name: Verify generated source files
- run: python scripts/generate_source.py --verify external/Vulkan-Headers/registry
-
- windows:
- runs-on: ${{matrix.os}}
-
- strategy:
- matrix:
- arch: [ Win32, x64 ]
- config: [ Debug, Release ]
- os: [ windows-latest ]
-
- steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-python@v2
- with:
- python-version: '3.7'
-
- - name: Fetch and install headers
- run: python scripts/update_deps.py --dir external
-
- - name: Generate build files
- run: cmake -S. -Bbuild -A${{matrix.arch}} "-Cexternal/helper.cmake"
-
- - name: Build the tools
- run: cmake --build ./build --config ${{matrix.config}}
-
- - name: Verify generated source files
- run: python scripts/generate_source.py --verify external/Vulkan-Headers/registry
-
- mac:
- runs-on: macos-latest
-
- strategy:
- matrix:
- config: [ Debug, Release ]
-
- steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-python@v2
- with:
- python-version: '3.7'
-
- - name: Fetch and install headers
- run: python scripts/update_deps.py --dir external
-
- - name: Generate build files
- run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=${{matrix.config}} -Cexternal/helper.cmake
-
- - name: Build the tools
- run: make -C build
-
- - name: Verify generated source files
- run: python scripts/generate_source.py --verify external/Vulkan-Headers/registry
-
- gn:
- runs-on: ubuntu-18.04
-
- strategy:
- matrix:
- config: [ Debug, Release ]
-
- steps:
- - uses: actions/checkout@v2
-
- - name: Get depot tools
- run: |
- git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git depot_tools
- echo "$GITHUB_WORKSPACE/depot_tools" >> $GITHUB_PATH
- - name: Fetch and install headers
- run: ./build-gn/update_deps.sh
-
- - name: Generate build files
- run: gn gen out/${{matrix.config}} --args="is_debug=true"
- if: matrix.config != 'Release'
-
- - name: Generate build files
- run: gn gen out/${{matrix.config}} --args="is_debug=false"
- if: matrix.config == 'Release'
-
- - name: Build the tools
- run: ninja -C out/${{matrix.config}}
-
- android:
- runs-on: ubuntu-20.04
- steps:
- - uses: actions/checkout@v2
- - name: Setup Environment
- run: |
- echo "ANDROID_SDK_HOME=$ANDROID_SDK_ROOT" >> $GITHUB_ENV
- echo "ANDROID_NDK_HOME=$ANDROID_NDK_LATEST_HOME" >> $GITHUB_ENV
- echo "$ANDROID_SDK_ROOT/build-tools/31.0.0" >> $GITHUB_PATH
- echo "$ANDROID_NDK_LATEST_HOME" >> $GITHUB_PATH
- $ANDROID_SDK_ROOT/tools/bin/sdkmanager "platforms;android-23"
- keytool -genkey -v -keystore $HOME/.android/debug.keystore -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "C=US, O=Android, CN=Android Debug"
- - name: Build vkcube
- run: |
- cd build-android
- ./build_all.sh
diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml
new file mode 100644
index 0000000..eeaebdd
--- /dev/null
+++ b/.github/workflows/tools.yml
@@ -0,0 +1,222 @@
+# Copyright (c) 2021-2023 Valve Corporation
+# Copyright (c) 2021-2023 LunarG, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: tools
+
+on:
+ push:
+ pull_request:
+ branches:
+ - main
+
+# https://docs.github.com/en/actions/using-jobs/using-concurrency
+concurrency:
+ # github.head_ref is only defined on pull_request
+ # Fallback to the run ID, which is guaranteed to be both unique and defined for the run.
+ group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+ cancel-in-progress: true
+
+jobs:
+ linux:
+ runs-on: ${{matrix.os}}
+
+ strategy:
+ matrix:
+ cc: [ gcc ]
+ cxx: [ g++ ]
+ config: [ Debug, Release ]
+ os: [ ubuntu-20.04, ubuntu-22.04 ]
+ cube_wsi: [ XCB ]
+ include:
+ # Test WAYLAND
+ - cc: gcc
+ cxx: g++
+ config: Release
+ os: ubuntu-22.04
+ cube_wsi: WAYLAND
+ # Test clang on ubuntu 20 with XLIB
+ - cc: clang
+ cxx: clang++
+ config: Debug
+ os: ubuntu-20.04
+ cube_wsi: XLIB
+ # Test clang on ubuntu 22 with the DISPLAY option
+ - cc: clang
+ cxx: clang++
+ config: Release
+ os: ubuntu-22.04
+ cube_wsi: DISPLAY
+
+
+ steps:
+ - uses: actions/checkout@v3
+ - uses: actions/setup-python@v4
+ with:
+ python-version: '3.7'
+ - run: |
+ sudo apt-get -qq update
+ sudo apt install libwayland-dev xorg-dev wayland-protocols
+ - uses: lukka/get-cmake@latest
+ with:
+ cmakeVersion: 3.17.2
+ - name: Setup ccache
+ uses: hendrikmuhs/ccache-action@v1.2
+ with:
+ key: ${{ runner.os }}-${{ matrix.config }}-${{ matrix.cc }}-${{matrix.cube_wsi}}
+ - name: Configure
+ run: |
+ cmake -S. -B build -G "Ninja" \
+ -D CMAKE_BUILD_TYPE=${{matrix.config}} \
+ -D CUBE_WSI_SELECTION=${{matrix.cube_wsi}} \
+ -D UPDATE_DEPS=ON \
+ -D BUILD_WERROR=ON \
+ -D INSTALL_ICD=ON \
+ -D BUILD_TESTS=ON \
+ -D ENABLE_ADDRESS_SANITIZER=ON
+ env:
+ CC: ${{matrix.cc}}
+ CXX: ${{matrix.cxx}}
+ CMAKE_CXX_COMPILER_LAUNCHER: ccache
+ CMAKE_C_COMPILER_LAUNCHER: ccache
+
+ - name: Build
+ run: cmake --build build
+
+ - name: Install
+ run: cmake --install build/ --prefix build/install
+
+ - name: Test
+ working-directory: ./build
+ run: ctest --output-on-failure
+
+ - name: Verify generated source files
+ run: python scripts/generate_source.py --verify external/${{ matrix.config }}/Vulkan-Headers/build/install/share/vulkan/registry
+
+ windows:
+ runs-on: ${{matrix.os}}
+
+ strategy:
+ matrix:
+ arch: [ Win32, x64 ]
+ config: [ Debug, Release ]
+ os: [ windows-latest ]
+
+ steps:
+ - uses: actions/checkout@v3
+ - uses: actions/setup-python@v4
+ with:
+ python-version: '3.7'
+ - uses: lukka/get-cmake@latest
+ - uses: ilammy/msvc-dev-cmd@v1
+ with:
+ arch: ${{ matrix.arch }}
+
+ - name: Configure
+ run: cmake -S. -B build -G "Ninja" -DCMAKE_BUILD_TYPE=${{matrix.config}} -D UPDATE_DEPS=ON -D INSTALL_ICD=ON -D BUILD_TESTS=ON -D BUILD_WERROR=ON
+
+ - name: Build
+ run: cmake --build ./build
+
+ - name: Install
+ run: cmake --install build/ --prefix build/install
+
+ - name: Test
+ working-directory: ./build
+ run: ctest --output-on-failure
+
+ - name: Verify generated source files
+ run: python scripts/generate_source.py --verify external/${{matrix.config}}/Vulkan-Headers/build/install/share/vulkan/registry
+
+ mac:
+ runs-on: macos-latest
+ steps:
+ - uses: actions/checkout@v3
+ - uses: actions/setup-python@v4
+ with:
+ python-version: '3.7'
+ - uses: lukka/get-cmake@latest
+
+ - name: Setup ccache
+ uses: hendrikmuhs/ccache-action@v1.2
+ with:
+ key: macos
+
+ # NOTE: Add ccache this way instead of with CMAKE_<LANG>_COMPILER_LAUNCHER since MoltenVK doesn't use CMake.
+ - name: Add ccache to PATH
+ run: echo "/usr/lib/ccache:/usr/local/opt/ccache/libexec" >> $GITHUB_PATH
+
+ - name: Configure
+ run: cmake -S. -B build -G "Ninja" -DCMAKE_BUILD_TYPE=Release -D UPDATE_DEPS=ON -D INSTALL_ICD=ON -D BUILD_TESTS=ON -D ENABLE_ADDRESS_SANITIZER=ON -D BUILD_WERROR=ON
+ env:
+ MACOSX_DEPLOYMENT_TARGET: 10.15
+
+ - name: Build
+ run: cmake --build build
+
+ - name: Test
+ working-directory: ./build
+ run: ctest --output-on-failure
+
+ - name: Verify generated source files
+ run: python scripts/generate_source.py --verify external/Release/Vulkan-Headers/build/install/share/vulkan/registry
+
+ android:
+ runs-on: ubuntu-22.04
+ strategy:
+ matrix:
+ abi: [ armeabi-v7a, arm64-v8a ]
+ steps:
+ - uses: actions/checkout@v3
+ - uses: actions/setup-python@v4
+ with:
+ python-version: '3.8'
+ - uses: lukka/get-cmake@latest
+ - name: Configure
+ run: |
+ cmake -S . -B build/ --toolchain $ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake \
+ -D ANDROID_PLATFORM=23 \
+ -D CMAKE_ANDROID_ARCH_ABI=${{matrix.abi}} \
+ -D CMAKE_ANDROID_STL_TYPE=c++_static \
+ -D ANDROID_USE_LEGACY_TOOLCHAIN_FILE=NO \
+ -D CMAKE_BUILD_TYPE=Release \
+ -D UPDATE_DEPS=ON \
+ -D BUILD_TESTS=ON \
+ -D BUILD_WERROR=ON \
+ -G "Ninja"
+ - name: Build
+ run: cmake --build build
+ - name: Test
+ working-directory: ./build
+ run: ctest --output-on-failure -C Release
+ - name: Install
+ run: cmake --install build --prefix /tmp
+
+ tools_codegen:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ - uses: actions/setup-python@v4
+ with:
+ python-version: '3.10'
+ - run: sudo apt-get -qq update && sudo apt install libwayland-dev xorg-dev wayland-protocols
+ - run: cmake -S . -B build/ -D UPDATE_DEPS=ON -D UPDATE_DEPS_DIR=external -D TOOLS_CODEGEN=ON
+ - run: cmake --build build --target tools_codegen
+ - run: git diff --exit-code
+
+ chromium:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ - run: scripts/gn/gn.py
diff --git a/.gitignore b/.gitignore
index d9c7c96..8bac04a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,12 @@
+# By default we install dependencies to the external directory
+/external/*
+
+# Ignore any build directories
+*build*/
+
CMakeCache.txt
CMakeLists.txt.user
+CMakeUserPresets.json
CMakeFiles/
cmake_install.cmake
Makefile
@@ -17,10 +24,6 @@
*.vcxproj
*.sdf
*.filters
-build
-build32
-dbuild
-build-android/external
*.config
*.creator
*.creator.user
@@ -28,3 +31,16 @@
*.includes
.vscode/
.DS_Store
+
+# Chromium build artifacts
+.cipd/
+.gn
+.gclient
+.gclient_entries
+.gclient_previous_sync_commits
+out/
+third_party/
+buildtools/
+depot_tools/
+testing/
+tools/
diff --git a/.gn b/.gn
deleted file mode 100644
index e190259..0000000
--- a/.gn
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2019 LunarG, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-buildconfig = "//build/config/BUILDCONFIG.gn"
-secondary_source = "//build-gn/secondary/"
-
-default_args = {
- clang_use_chrome_plugins = false
- use_custom_libcxx = false
-}
-
diff --git a/BUILD.gn b/BUILD.gn
index db00aba..0b4de08 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1,5 +1,5 @@
# Copyright (C) 2018-2019 The ANGLE Project Authors.
-# Copyright (C) 2019 LunarG, Inc.
+# Copyright (C) 2019-2023 LunarG, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,29 +16,6 @@
import("//build_overrides/build.gni")
import("//build_overrides/vulkan_tools.gni")
-
-config("vulkan_internal_config") {
- defines = [ "VULKAN_NON_CMAKE_BUILD" ]
- if (is_clang || !is_win) {
- cflags = [ "-Wno-unused-function" ]
- }
- if (is_linux || is_chromeos) {
- defines += [
- "SYSCONFDIR=\"/etc\"",
- "FALLBACK_CONFIG_DIRS=\"/etc/xdg\"",
- "FALLBACK_DATA_DIRS=\"/usr/local/share:/usr/share\"",
- ]
- }
-}
-
-# Vulkan tool generated utility headers
-source_set("vulkan_tools_headers") {
- public_deps = [ "$vulkan_headers_dir:vulkan_headers" ]
- sources = [
- "icd/generated/vk_typemap_helper.h",
- ]
-}
-
if (!is_android) {
vulkan_undefine_configs = []
if (is_win && build_with_chromium) {
@@ -48,21 +25,24 @@
]
}
- raw_vulkan_icd_dir = rebase_path("icd", root_build_dir)
-
- vulkan_data_dir = "$root_out_dir/$vulkan_data_subdir"
- raw_vulkan_data_dir = rebase_path(vulkan_data_dir, root_build_dir)
-
# Vulkan Mock ICD
# ---------------
shared_library("VkICD_mock_icd") {
configs -= vulkan_undefine_configs
- deps = [ ":vulkan_tools_headers" ]
- public_deps = [ "$vulkan_headers_dir:vulkan_headers" ]
+ deps = [
+ "$vulkan_headers_dir:vulkan_headers"
+ ]
data_deps = [ ":vulkan_gen_icd_json_file" ]
sources = [
- "icd/generated/mock_icd.cpp",
- "icd/generated/mock_icd.h",
+ "icd/mock_icd.h",
+ "icd/mock_icd.cpp",
+ "icd/generated/function_declarations.h",
+ "icd/generated/function_definitions.h",
+ "icd/generated/vk_typemap_helper.h",
+ ]
+ include_dirs = [
+ "icd",
+ "icd/generated",
]
if (is_win) {
sources += [ "icd/VkICD_mock_icd.def" ]
@@ -74,31 +54,40 @@
}
action("vulkan_gen_icd_json_file") {
- script = "build-gn/generate_vulkan_layers_json.py"
+ script = "scripts/gn/generate_vulkan_icd_json.py"
+
public_deps = [ "$vulkan_headers_dir:vulkan_headers" ]
- sources = [ "$vulkan_headers_dir/include/vulkan/vulkan_core.h" ]
- args = [ "--icd" ]
- if (is_win) {
- sources += [ "icd/windows/VkICD_mock_icd.json" ]
- args += [ "$raw_vulkan_icd_dir/windows" ]
- }
- if (is_linux || is_chromeos) {
- sources += [ "icd/linux/VkICD_mock_icd.json" ]
- args += [ "$raw_vulkan_icd_dir/linux" ]
- }
- if (is_fuchsia) {
- sources += [ "icd/linux/VkICD_mock_icd.json" ]
- args += [ "$raw_vulkan_icd_dir/fuchsia" ]
- }
- if (is_mac) {
- sources += [ "icd/macos/VkICD_mock_icd.json" ]
- args += [ "$raw_vulkan_icd_dir/macos" ]
+
+ sources = [ "icd/VkICD_mock_icd.json.in" ]
+
+ vulkan_data_dir = "$root_out_dir/$vulkan_data_subdir"
+
+ outputs = [ "$vulkan_data_dir/VkICD_mock_icd.json" ]
+
+ if (is_linux) {
+ _platform = "Linux"
+ } else if (is_win) {
+ _platform = "Windows"
+ } else if (is_mac) {
+ _platform = "Darwin"
+ } else if (is_fuchsia) {
+ _platform = "Fuchsia"
+ } else {
+ _platform = "Other"
}
- # The layer JSON files are part of the necessary data deps.
- outputs = [ "$vulkan_data_dir/VkICD_mock_icd.json" ]
+ args = [
+ "--icd",
+ "--platform", _platform,
+ rebase_path("icd/", root_build_dir),
+ rebase_path(vulkan_data_dir, root_build_dir)
+ ] + rebase_path(sources, root_build_dir)
+
+ if (is_win) {
+ args += [ "--no-path-prefix" ]
+ }
+
data = outputs
- args += [ raw_vulkan_data_dir ] + rebase_path(sources, root_build_dir)
}
config("vulkaninfo_warnings") {
diff --git a/BUILD.md b/BUILD.md
index d665785..d939cad 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -1,453 +1,103 @@
# Build Instructions
-Instructions for building this repository on Linux, Windows, Android, and MacOS.
-
-## Index
-
-1. [Contributing](#contributing-to-the-repository)
-1. [Repository Content](#repository-content)
-1. [Repository Set-Up](#repository-set-up)
-1. [Windows Build](#building-on-windows)
+1. [Requirements](#requirements)
+1. [Building Overview](#building-overview)
+1. [Generated source code](#generated-source-code)
+1. [Dependencies](#dependencies)
1. [Linux Build](#building-on-linux)
-1. [Android Build](#building-on-android)
+1. [Windows Build](#building-on-windows)
1. [MacOS build](#building-on-macos)
+1. [Android Build](#building-for-android)
+1. [Installed Files](#installed-files)
-## Contributing to the Repository
+## Requirements
-If you intend to contribute, the preferred work flow is for you to develop
-your contribution in a fork of this repository in your GitHub account and then
-submit a pull request. Please see the [CONTRIBUTING.md](CONTRIBUTING.md) file
-in this repository for more details.
+1. CMake >= 3.17.2
+1. C++17 compatible toolchain
+1. Git
+1. Python >= 3.10
-## Repository Content
-
-This repository contains the source code necessary to build the following components:
-
-- vulkaninfo
-- vkcube and vkcubepp demos
-- mock ICD
-
-### Installed Files
-
-The `install` target installs the following files under the directory
-indicated by *install_dir*:
-
-- *install_dir*`/bin` : The vulkaninfo, vkcube and vkcubepp executables
-- *install_dir*`/lib` : The mock ICD library and JSON (Windows) (If INSTALL_ICD=ON)
-- *install_dir*`/share/vulkan/icd.d` : mock ICD JSON (Linux/MacOS) (If INSTALL_ICD=ON)
-
-The `uninstall` target can be used to remove the above files from the install
-directory.
-
-## Repository Set-Up
-
-### Display Drivers
-
-This repository does not contain a Vulkan-capable driver. You will need to
-obtain and install a Vulkan driver from your graphics hardware vendor or from
-some other suitable source if you intend to run Vulkan applications.
-
-### Download the Repository
-
-To create your local git repository:
-
- git clone https://github.com/KhronosGroup/Vulkan-Tools.git
-
-### Repository Dependencies
-
-This repository attempts to resolve some of its dependencies by using
-components found from the following places, in this order:
-
-1. CMake or Environment variable overrides (e.g., -DVULKAN_HEADERS_INSTALL_DIR)
-1. LunarG Vulkan SDK, located by the `VULKAN_SDK` environment variable
-1. System-installed packages, mostly applicable on Linux
-
-Dependencies that cannot be resolved by the SDK or installed packages must be
-resolved with the "install directory" override and are listed below. The
-"install directory" override can also be used to force the use of a specific
-version of that dependency.
-
-#### Vulkan-Headers
-
-This repository has a required dependency on the
-[Vulkan Headers repository](https://github.com/KhronosGroup/Vulkan-Headers).
-You must clone the headers repository and build its `install` target before
-building this repository. The Vulkan-Headers repository is required because it
-contains the Vulkan API definition files (registry) that are required to build
-the mock ICD. You must also take note of the headers install directory and
-pass it on the CMake command line for building this repository, as described
-below.
-
-Note that this dependency can be ignored if not building the mock ICD
-(CMake option: `-DBUILD_ICD=OFF`).
-
-#### glslang
-
-This repository has a required dependency on the `glslangValidator` (shader
-compiler) for compiling the shader programs for the vkcube demos.
-
-The CMake code in this repository downloads release binaries of glslang if a
-build glslang repository is not provided. The glslangValidator is obtained
-from this set of release binaries.
-
-If you don't wish the CMake code to download these binaries, then you must
-clone the [glslang repository](https://github.com/KhronosGroup/glslang) and
-build its `install` target. Follow the build instructions in the glslang
-[README.md](https://github.com/KhronosGroup/glslang/blob/master/README.md)
-file. Ensure that the `update_glslang_sources.py` script has been run as part
-of building glslang. You must also take note of the glslang install directory
-and pass it on the CMake command line for building this repository, as
-described below.
-
-Note that this dependency can be ignored if not building the vkcube demo
-(CMake option: `-DBUILD_CUBE=OFF`).
-
-### Build and Install Directories
-
-A common convention is to place the build directory in the top directory of
-the repository with a name of `build` and place the install directory as a
-child of the build directory with the name `install`. The remainder of these
-instructions follow this convention, although you can use any name for these
-directories and place them in any location.
-
-### Building Dependent Repositories with Known-Good Revisions
-
-There is a Python utility script, `scripts/update_deps.py`, that you can use to
-gather and build the dependent repositories mentioned above. This script uses
-information stored in the `scripts/known_good.json` file to check out dependent
-repository revisions that are known to be compatible with the revision of this
-repository that you currently have checked out. As such, this script is useful
-as a quick-start tool for common use cases and default configurations.
-
-For all platforms, start with:
-
- git clone git@github.com:KhronosGroup/Vulkan-Tools.git
- cd Vulkan-Tools
- mkdir build
- cd build
-
-For 64-bit Linux and MacOS, continue with:
-
- ../scripts/update_deps.py
- cmake -C helper.cmake ..
- cmake --build .
-
-For 64-bit Windows, continue with:
-
- ..\scripts\update_deps.py --arch x64
- cmake -A x64 -C helper.cmake ..
- cmake --build .
-
-For 32-bit Windows, continue with:
-
- ..\scripts\update_deps.py --arch Win32
- cmake -A Win32 -C helper.cmake ..
- cmake --build .
-
-Please see the more detailed build information later in this file if you have
-specific requirements for configuring and building these components.
-
-#### Notes
-
-- You may need to adjust some of the CMake options based on your platform. See
- the platform-specific sections later in this document.
-- The `update_deps.py` script fetches and builds the dependent repositories in
- the current directory when it is invoked. In this case, they are built in
- the `build` directory.
-- The `build` directory is also being used to build this
- (Vulkan-Tools) repository. But there shouldn't be any conflicts
- inside the `build` directory between the dependent repositories and the
- build files for this repository.
-- The `--dir` option for `update_deps.py` can be used to relocate the
- dependent repositories to another arbitrary directory using an absolute or
- relative path.
-- The `update_deps.py` script generates a file named `helper.cmake` and places
- it in the same directory as the dependent repositories (`build` in this
- case). This file contains CMake commands to set the CMake `*_INSTALL_DIR`
- variables that are used to point to the install artifacts of the dependent
- repositories. You can use this file with the `cmake -C` option to set these
- variables when you generate your build files with CMake. This lets you avoid
- entering several `*_INSTALL_DIR` variable settings on the CMake command line.
-- If using "MINGW" (Git For Windows), you may wish to run
- `winpty update_deps.py` in order to avoid buffering all of the script's
- "print" output until the end and to retain the ability to interrupt script
- execution.
-- Please use `update_deps.py --help` to list additional options and read the
- internal documentation in `update_deps.py` for further information.
+NOTE: Python is needed for working on generated code, and helping grab dependencies.
+While it's not technically required, it's practically required for most users.
### Generated source code
-This repository contains generated source code in the `icd/generated`
-directory which is not intended to be modified directly. Instead, changes should be
-made to the corresponding generator in the `scripts` directory. The source files can
-then be regenerated using `scripts/generate_source.py`:
+This repository contains generated source code which is not intended to be modified directly.
- python3 scripts/generate_source.py PATH_TO_VULKAN_HEADERS_REGISTRY_DIR
+A helper CMake target `tools_codegen` is also provided to simplify the invocation of `scripts/generate_source.py` from the build directory:
-A helper CMake target `VulkanTools_generated_source` is also provided to simplify
-the invocation of `scripts/generate_source.py` from the build directory:
+```bash
+cmake -S . -B build -D TOOLS_CODEGEN=ON
+cmake --build build --target tools_codegen
+```
- cmake --build . --target VulkanTools_generated_source
+NOTE: `TOOLS_CODEGEN` is `OFF` by default.
-### Build Options
+## Building Overview
-When generating native platform build files through CMake, several options can
-be specified to customize the build. Some of the options are binary on/off
-options, while others take a string as input. The following is a table of all
-on/off options currently supported by this repository:
+The following will be enough for most people, for more detailed instructions, see below.
-| Option | Platform | Default | Description |
-| ------ | -------- | ------- | ----------- |
-| BUILD_CUBE | All | `ON` | Controls whether or not the vkcube demo is built. |
-| BUILD_VULKANINFO | All | `ON` | Controls whether or not the vulkaninfo utility is built. |
-| BUILD_ICD | All | `ON` | Controls whether or not the mock ICD is built. |
-| INSTALL_ICD | All | `OFF` | Controls whether or not the mock ICD is installed as part of the install target. |
-| BUILD_WSI_XCB_SUPPORT | Linux | `ON` | Build the components with XCB support. |
-| BUILD_WSI_XLIB_SUPPORT | Linux | `ON` | Build the components with Xlib support. |
-| BUILD_WSI_WAYLAND_SUPPORT | Linux | `ON` | Build the components with Wayland support. |
-| BUILD_WSI_DIRECTFB_SUPPORT | Linux | `OFF` | Build the components with DirectFB support. |
-| USE_CCACHE | Linux | `OFF` | Enable caching with the CCache program. |
+```bash
+git clone https://github.com/KhronosGroup/Vulkan-Tools.git
+cd Vulkan-Tools
-The following is a table of all string options currently supported by this repository:
+cmake -S . -B build -D UPDATE_DEPS=ON -D BUILD_WERROR=ON -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=Debug
+cmake --build build --config Debug
+```
-| Option | Platform | Default | Description |
-| ------ | -------- | ------- | ----------- |
-| CMAKE_OSX_DEPLOYMENT_TARGET | MacOS | `10.12` | The minimum version of MacOS for loader deployment. |
-| VULKANINFO_BUILD_DLL_VERSIONINFO | Windows | `""` | Set the Windows specific version information for Vulkaninfo. Format is "major.minor.patch.build". |
+### Warnings as errors off by default!
-These variables should be set using the `-D` option when invoking CMake to
-generate the native platform files.
+By default `BUILD_WERROR` is `OFF`. The idiom for open source projects is to NOT enable warnings as errors.
-## Building On Windows
+System/language package managers have to build on multiple different platforms and compilers.
-### Windows Development Environment Requirements
+By defaulting to `ON` we cause issues for package managers since there is no standard way to disable warnings until CMake 3.24
-- Windows
- - Any Personal Computer version supported by Microsoft
-- Microsoft [Visual Studio](https://www.visualstudio.com/)
- - Versions
- - [2013 (update 4)](https://www.visualstudio.com/vs/older-downloads/)
- - [2015](https://www.visualstudio.com/vs/older-downloads/)
- - [2017](https://www.visualstudio.com/vs/downloads/)
- - The Community Edition of each of the above versions is sufficient, as
- well as any more capable edition.
-- [CMake 3.10.2](https://cmake.org/files/v3.10/cmake-3.10.2-win64-x64.zip) is recommended.
- - Use the installer option to add CMake to the system PATH
-- Git Client Support
- - [Git for Windows](http://git-scm.com/download/win) is a popular solution
- for Windows
- - Some IDEs (e.g., [Visual Studio](https://www.visualstudio.com/),
- [GitHub Desktop](https://desktop.github.com/)) have integrated
- Git client support
+Add `-D BUILD_WERROR=ON` to your workflow. Or use the `dev` preset shown below which will also enabling warnings as errors.
-### Windows Build - Microsoft Visual Studio
+## Dependencies
-The general approach is to run CMake to generate the Visual Studio project
-files. Then either run CMake with the `--build` option to build from the
-command line or use the Visual Studio IDE to open the generated solution and
-work with the solution interactively.
+Currently this repo has a custom process for grabbing C/C++ dependencies.
-#### Windows Quick Start
+Keep in mind this repo predates tools like `vcpkg`, `conan`, etc. Our process is most similar to `vcpkg`.
- cd Vulkan-Tools
- mkdir build
- cd build
- cmake -A x64 -DVULKAN_HEADERS_INSTALL_DIR=absolute_path_to_install_dir
- cmake --build .
+By specifying `-D UPDATE_DEPS=ON` when configuring CMake we grab dependencies listed in [known_good.json](scripts/known_good.json).
-The above commands instruct CMake to find and use the default Visual Studio
-installation to generate a Visual Studio solution and projects for the x64
-architecture. The second CMake command builds the Debug (default)
-configuration of the solution.
+All we are doing is streamlining `building`/`installing` the `known good` dependencies and helping CMake `find` the dependencies.
-See below for the details.
+This is done via a combination of `Python` and `CMake` scripting.
-#### Use `CMake` to Create the Visual Studio Project Files
+Misc Useful Information:
-Change your current directory to the top of the cloned repository directory,
-create a build directory and generate the Visual Studio project files:
+- By default `UPDATE_DEPS` is `OFF`. The intent is to be friendly by default to system/language package managers.
+- You can run `update_deps.py` manually but it isn't recommended for most users.
- cd Vulkan-Tools
- mkdir build
- cd build
- cmake -A x64 -DVULKAN_HEADERS_INSTALL_DIR=absolute_path_to_install_dir
+### How to test new dependency versions
-> Note: The `..` parameter tells `cmake` the location of the top of the
-> repository. If you place your build directory someplace else, you'll need to
-> specify the location of the repository top differently.
+Typically most developers alter `known_good.json` with the commit/branch they are testing.
-The `-A` option is used to select either the "Win32" or "x64" architecture.
+Alternatively you can modify `CMAKE_PREFIX_PATH` as follows.
-If a generator for a specific version of Visual Studio is required, you can
-specify it for Visual Studio 2015, for example, with:
-
- 64-bit: -G "Visual Studio 14 2015 Win64"
- 32-bit: -G "Visual Studio 14 2015"
-
-See this [list](#cmake-visual-studio-generators) of other possible generators
-for Visual Studio.
-
-When generating the project files, the absolute path to a Vulkan-Headers
-install directory must be provided. This can be done by setting the
-`VULKAN_HEADERS_INSTALL_DIR` environment variable or by setting the
-`VULKAN_HEADERS_INSTALL_DIR` CMake variable with the `-D` CMake option. In
-either case, the variable should point to the installation directory of a
-Vulkan-Headers repository built with the install target.
-
-The above steps create a Windows solution file named
-`Vulkan-Tools.sln` in the build directory.
-
-At this point, you can build the solution from the command line or open the
-generated solution with Visual Studio.
-
-#### Build the Solution From the Command Line
-
-While still in the build directory:
-
- cmake --build .
-
-to build the Debug configuration (the default), or:
-
- cmake --build . --config Release
-
-to make a Release build.
-
-#### Build the Solution With Visual Studio
-
-Launch Visual Studio and open the "Vulkan-Tools.sln" solution file in the
-build folder. You may select "Debug" or "Release" from the Solution
-Configurations drop-down list. Start a build by selecting the Build->Build
-Solution menu item.
-
-#### Windows Install Target
-
-The CMake project also generates an "install" target that you can use to copy
-the primary build artifacts to a specific location using a "bin, include, lib"
-style directory structure. This may be useful for collecting the artifacts and
-providing them to another project that is dependent on them.
-
-The default location is `$CMAKE_BINARY_DIR\install`, but can be changed with
-the `CMAKE_INSTALL_PREFIX` variable when first generating the project build
-files with CMake.
-
-You can build the install target from the command line with:
-
- cmake --build . --config Release --target install
-
-or build the `INSTALL` target from the Visual Studio solution explorer.
-
-#### Using a Loader Built from a Repository
-
-If you do need to build and use your own loader, build the Vulkan-Loader
-repository with the install target and modify your CMake invocation to add the
-location of the loader's install directory:
-
- cmake -A x64 -DVULKAN_HEADERS_INSTALL_DIR=absolute_path_to_install_dir \
- -DVULKAN_LOADER_INSTALL_DIR=absolute_path_to_install_dir ..
-
-#### Using glslang Built from a Repository
-
-If you do need to build and use your own glslang, build the glslang repository
-with the install target and modify your CMake invocation to add the location
-of the glslang's install directory:
-
- cmake -A x64 -DVULKAN_HEADERS_INSTALL_DIR=absolute_path_to_install_dir \
- -DGLSLANG_INSTALL_DIR=absolute_path_to_install_dir ..
-
-### Windows Notes
-
-#### CMake Visual Studio Generators
-
-The chosen generator should match one of the Visual Studio versions that you
-have installed. Generator strings that correspond to versions of Visual Studio
-include:
-
-| Build Platform | 64-bit Generator | 32-bit Generator |
-|------------------------------|-------------------------------|-------------------------|
-| Microsoft Visual Studio 2013 | "Visual Studio 12 2013 Win64" | "Visual Studio 12 2013" |
-| Microsoft Visual Studio 2015 | "Visual Studio 14 2015 Win64" | "Visual Studio 14 2015" |
-| Microsoft Visual Studio 2017 | "Visual Studio 15 2017 Win64" | "Visual Studio 15 2017" |
+```sh
+# Delete the CMakeCache.txt which will cache find_* results
+rm build/ -rf
+cmake -S . -B build/ ... -D CMAKE_PREFIX_PATH=~/foobar/my_custom_glslang_install/ ...
+```
## Building On Linux
### Linux Build Requirements
-This repository has been built and tested on the two most recent Ubuntu LTS
-versions. Currently, the oldest supported version is Ubuntu 16.04, meaning
-that the minimum officially supported C++11 compiler version is GCC 5.4.0,
-although earlier versions may work. It should be straightforward to adapt this
-repository to other Linux distributions.
+This repository is regularly built and tested on the two most recent Ubuntu LTS versions.
-[CMake 3.10.2](https://cmake.org/files/v3.10/cmake-3.10.2-Linux-x86_64.tar.gz) is recommended.
+```bash
+sudo apt-get install git build-essential python3 cmake
-#### Required Package List
+# Linux WSI system libraries
+sudo apt-get install libwayland-dev xorg-dev
+```
- sudo apt-get install git cmake build-essential libx11-xcb-dev \
- libxkbcommon-dev libwayland-dev libxrandr-dev wayland-protocols
-
-### Linux Build
-
-The general approach is to run CMake to generate make files. Then either run
-CMake with the `--build` option or `make` to build from the command line.
-
-#### Linux Quick Start
-
- cd Vulkan-Tools
- mkdir build
- cd build
- cmake -DVULKAN_HEADERS_INSTALL_DIR=absolute_path_to_install_dir ..
- make
-
-See below for the details.
-
-#### Use CMake to Create the Make Files
-
-Change your current directory to the top of the cloned repository directory,
-create a build directory and generate the make files.
-
- cd Vulkan-Tools
- mkdir build
- cd build
- cmake -DCMAKE_BUILD_TYPE=Debug \
- -DVULKAN_HEADERS_INSTALL_DIR=absolute_path_to_install_dir \
- -DCMAKE_INSTALL_PREFIX=install ..
-
-> Note: The `..` parameter tells `cmake` the location of the top of the
-> repository. If you place your `build` directory someplace else, you'll need
-> to specify the location of the repository top differently.
-
-Use `-DCMAKE_BUILD_TYPE` to specify a Debug or Release build.
-
-When generating the project files, the absolute path to a Vulkan-Headers
-install directory must be provided. This can be done by setting the
-`VULKAN_HEADERS_INSTALL_DIR` environment variable or by setting the
-`VULKAN_HEADERS_INSTALL_DIR` CMake variable with the `-D` CMake option. In
-either case, the variable should point to the installation directory of a
-Vulkan-Headers repository built with the install target.
-
-> Note: For Linux, the default value for `CMAKE_INSTALL_PREFIX` is
-> `/usr/local`, which would be used if you do not specify
-> `CMAKE_INSTALL_PREFIX`. In this case, you may need to use `sudo` to install
-> to system directories later when you run `make install`.
-
-#### Build the Project
-
-You can just run `make` to begin the build.
-
-To speed up the build on a multi-core machine, use the `-j` option for `make`
-to specify the number of cores to use for the build. For example:
-
- make -j4
-
-You can also use
-
- cmake --build .
-
-If your build system supports ccache, you can enable that via CMake option `-DUSE_CCACHE=On`
-
-### Linux Notes
-
-#### WSI Support Build Options
+### WSI Support Build Options
By default, the repository components are built with support for the
Vulkan-defined WSI display servers: Xcb, Xlib, and Wayland. It is recommended
@@ -456,331 +106,220 @@
these modules without support for one of the display servers, the appropriate
CMake option of the form `BUILD_WSI_xxx_SUPPORT` can be set to `OFF`.
-Note vulkaninfo currently only supports Xcb and Xlib WSI display servers. See
-the CMakeLists.txt file in `Vulkan-Tools/vulkaninfo` for more info.
+### Linux 32-bit support
-You can select which WSI subsystem is used to execute the vkcube applications
-using a CMake option called CUBE_WSI_SELECTION. Supported options are XCB
-(default), XLIB, and WAYLAND. Note that you must build using the corresponding
-BUILD_WSI_*_SUPPORT enabled at the base repository level. For instance,
-creating a build that will use Xlib when running the vkcube demos, your CMake
-command line might look like:
-
- cmake -DCMAKE_BUILD_TYPE=Debug -DCUBE_WSI_SELECTION=XLIB ..
-
-#### Linux Install to System Directories
-
-Installing the files resulting from your build to the systems directories is
-optional since environment variables can usually be used instead to locate the
-binaries. There are also risks with interfering with binaries installed by
-packages. If you are certain that you would like to install your binaries to
-system directories, you can proceed with these instructions.
-
-Assuming that you've built the code as described above and the current
-directory is still `build`, you can execute:
-
- sudo make install
-
-This command installs files to `/usr/local` if no `CMAKE_INSTALL_PREFIX` is
-specified when creating the build files with CMake.
-
-You may need to run `ldconfig` in order to refresh the system loader search
-cache on some Linux systems.
-
-You can further customize the installation location by setting additional
-CMake variables to override their defaults. For example, if you would like to
-install to `/tmp/build` instead of `/usr/local`, on your CMake command line
-specify:
-
- -DCMAKE_INSTALL_PREFIX=/tmp/build
-
-Then run `make install` as before. The install step places the files in
-`/tmp/build`. This may be useful for collecting the artifacts and providing
-them to another project that is dependent on them.
-
-Note: The Mock ICD is not installed by default since it is a "null" driver
-that does not render anything and is used for testing purposes. Installing it
-to system directories may cause some applications to discover and use this
-driver instead of other full drivers installed on the system. If you really
-want to install this null driver, use:
-
- -DINSTALL_ICD=ON
-
-See the CMake documentation for more details on using these variables to
-further customize your installation.
-
-Also see the `LoaderAndLayerInterface` document in the `loader` folder of the
-Vulkan-Loader repository for more information about loader and layer
-operation.
-
-#### Linux Uninstall
-
-To uninstall the files from the system directories, you can execute:
-
- sudo make uninstall
-
-### Linux Tests
-
-After making any changes to the repository, you should perform some quick
-sanity tests, such as running the vkcube demo with validation enabled.
-
-To run the **vkcube application** with validation, in a terminal change to the
-`build/cube` directory and run:
-
- VK_LAYER_PATH=../path/to/validation/layers ./vkcube --validate
-
-If you have an SDK installed and have run the setup script to set the
-`VULKAN_SDK` environment variable, it may be unnecessary to specify a
-`VK_LAYER_PATH`.
-
-#### Linux 32-bit support
-
-Usage of the contents of this repository in 32-bit Linux environments is not
+Usage of this repository's contents in 32-bit Linux environments is not
officially supported. However, since this repository is supported on 32-bit
Windows, these modules should generally work on 32-bit Linux.
Here are some notes for building 32-bit targets on a 64-bit Ubuntu "reference"
platform:
-If not already installed, install the following 32-bit development libraries:
-
-`gcc-multilib g++-multilib libx11-dev:i386`
-
-This list may vary depending on your distribution and which windowing systems
-you are building for.
+```bash
+# 32-bit libs
+# your PKG_CONFIG configuration may be different, depending on your distribution
+sudo apt-get install gcc-multilib g++-multilib libx11-dev:i386
+```
Set up your environment for building 32-bit targets:
- export ASFLAGS=--32
- export CFLAGS=-m32
- export CXXFLAGS=-m32
- export PKG_CONFIG_LIBDIR=/usr/lib/i386-linux-gnu
+```bash
+export ASFLAGS=--32
+export CFLAGS=-m32
+export CXXFLAGS=-m32
+export PKG_CONFIG_LIBDIR=/usr/lib/i386-linux-gnu
+```
-Again, your PKG_CONFIG configuration may be different, depending on your
-distribution.
+## Building On Windows
-Finally, rebuild the repository using `cmake` and `make`, as explained above.
+### Windows Development Environment Requirements
-## Building On Android
+- Windows 10+
+- Visual Studio
-Install the required tools for Linux and Windows covered above, then add the
-following.
+Note: Anything less than `Visual Studio 2019` is not guaranteed to compile/work.
-### Android Build Requirements
+### Visual Studio Generator
-- Install [Android Studio 2.3](https://developer.android.com/studio/index.html) or later.
-- From the "Welcome to Android Studio" splash screen, add the following components using
- Configure > SDK Manager:
- - SDK Platforms > Android 6.0 and newer
- - SDK Tools > Android SDK Build-Tools
- - SDK Tools > Android SDK Platform-Tools
- - SDK Tools > NDK (Side by side)
+Run CMake to generate [Visual Studio project files](https://cmake.org/cmake/help/latest/guide/user-interaction/index.html#command-line-g-option).
-#### Add Android specifics to environment
+```bash
+# NOTE: By default CMake picks the latest version of Visual Studio as the default generator.
+cmake -S . -B build --preset dev
-For each of the below, you may need to specify a different build-tools and ndk
-versions, as Android Studio will roll them forward fairly regularly.
+# Open the Visual Studio solution
+cmake --open build
+```
-On Linux:
+See the [CMake documentation](https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html#visual-studio-generators) for further information on Visual Studio generators.
- export ANDROID_SDK_HOME=$HOME/Android/sdk
- export ANDROID_NDK_HOME=$HOME/Android/sdk/ndk/23.0.7599858
- export PATH=$ANDROID_NDK_HOME:$PATH
- export PATH=$ANDROID_SDK_HOME/platform-tools:$PATH
- export PATH=$ANDROID_SDK_HOME/build-tools/31.0.0:$PATH
-
-On Windows:
-
- set ANDROID_SDK_HOME=%LOCALAPPDATA%\Android\sdk
- set ANDROID_NDK_HOME=%LOCALAPPDATA%\Android\sdk\ndk\23.0.7599858
- set PATH=%ANDROID_NDK_HOME%;%PATH%
- set PATH=%ANDROID_SDK_HOME%\platform-tools;%PATH%
- set PATH=%ANDROID_SDK_HOME%\build-tools\31.0.0;%PATH%
-
-On OSX:
-
- export ANDROID_SDK_HOME=$HOME/Library/Android/sdk
- export ANDROID_NDK_HOME=$HOME/Library/Android/sdk/ndk/23.0.7599858
- export PATH=$ANDROID_NDK_PATH:$PATH
- export PATH=$ANDROID_SDK_HOME/platform-tools:$PATH
- export PATH=$ANDROID_SDK_HOME/build-tools/31.0.0:$PATH
-
-Note: If `jarsigner` is missing from your platform, you can find it in the
-Android Studio install or in your Java installation. If you do not have Java,
-you can get it with something like the following:
-
- sudo apt-get install openjdk-8-jdk
-
-### Android Build
-
-Use the following script to build the vkcube demo for Android:
-
- cd build-android
- ./build_all.sh
-
-The APK can be installed on production devices with:
-
- ./install_all.sh [-s <serial number>]
-
-Note that there are no equivalent scripts on Windows yet, that work needs to
-be completed.
-
-### Run vkcube
-
-Use the following command to run vkcube for Android:
-
- adb shell am start com.example.VkCube/android.app.NativeActivity
+NOTE: Windows developers don't have to develop in Visual Studio. Visual Studio just helps streamlining the needed C++ toolchain requirements (compilers, linker, etc).
## Building on MacOS
-### MacOS Build Requirements
+### MacOS Development Environment Requirements
-Tested on OSX version 10.12.6
-
-- [CMake 3.10.2](https://cmake.org/files/v3.10/cmake-3.10.2-Darwin-x86_64.tar.gz) is recommended.
-
-Setup Homebrew and components
-
-- Follow instructions on [brew.sh](http://brew.sh) to get Homebrew installed.
-
- /usr/bin/ruby -e "$(curl -fsSL \
- https://raw.githubusercontent.com/Homebrew/install/master/install)"
-
-- Ensure Homebrew is at the beginning of your PATH:
-
- export PATH=/usr/local/bin:$PATH
-
-- Add packages with the following (may need refinement)
-
- brew install python python3 git
-
-### Clone the Repository
-
-Clone the Vulkan-Tools repository as defined above in the [Download the Repository](#download-the-repository)
-section.
-
-### Get the External Libraries
-
-[MoltenVK](https://github.com/KhronosGroup/MoltenVK) Library
-
-- Building the vkcube and vulkaninfo applications require linking to the
- MoltenVK Library (libMoltenVK.dylib)
- - The following option should be used on the cmake command line to specify a
- vulkan loader library: MOLTENVK_REPO_ROOT=/absolute_path_to/MoltenVK
- making sure to specify an absolute path, like so: cmake
- -DMOLTENVK_REPO_ROOT=/absolute_path_to/MoltenVK ....
-
-Vulkan Loader Library
-
-- Building the vkcube and vulkaninfo applications require linking to the Vulkan
- Loader Library (libvulkan.1.dylib)
- - The following option should be used on the cmake command line to specify a
- vulkan loader library:
- VULKAN_LOADER_INSTALL_DIR=/absolute_path_to/Vulkan-Loader_install_dir
- making sure to specify an absolute path.
-
-### MacOS build
-
-#### CMake Generators
-
-This repository uses CMake to generate build or project files that are then
-used to build the repository. The CMake generators explicitly supported in
-this repository are:
-
-- Unix Makefiles
- Xcode
-#### Building with the Unix Makefiles Generator
+NOTE: MacOS developers don't have to develop in Xcode. Xcode just helps streamlining the needed C++ toolchain requirements (compilers, linker, etc). Similar to Visual Studio on Windows.
-This generator is the default generator, so all that is needed for a debug
-build is:
-
- mkdir build
- cd build
- cmake -DCMAKE_BUILD_TYPE=Debug \
- -DVULKAN_LOADER_INSTALL_DIR=/absolute_path_to/Vulkan-Loader_install_dir \
- -DMOLTENVK_REPO_ROOT=/absolute_path_to/MoltenVK \
- -DCMAKE_INSTALL_PREFIX=install ..
- make
-
-To speed up the build on a multi-core machine, use the `-j` option for `make`
-to specify the number of cores to use for the build. For example:
-
- make -j4
-
-You can now run the demo applications from the command line:
-
- open cube/vkcube.app
- open cube/vkcubepp.app
- open vulkaninfo/vulkaninfo.app
-
-Or you can locate them from `Finder` and launch them from there.
-
-##### The Install Target and RPATH
-
-The applications you just built are "bundled applications", but the
-executables are using the `RPATH` mechanism to locate runtime dependencies
-that are still in your build tree.
-
-To see this, run this command from your `build` directory:
-
- otool -l cube/cube.app/Contents/MacOS/vkcube
-
-and note that the `vkcube` executable contains loader commands:
-
-- `LC_LOAD_DYLIB` to load `libvulkan.1.dylib` via an `@rpath`
-- `LC_RPATH` that contains an absolute path to the build location of the Vulkan loader
-
-This makes the bundled application "non-transportable", meaning that it won't
-run unless the Vulkan loader is on that specific absolute path. This is useful
-for debugging the loader or other components built in this repository, but not
-if you want to move the application to another machine or remove your build
-tree.
-
-To address this problem, run:
-
- make install
-
-This step copies the bundled applications to the location specified by
-CMAKE_INSTALL_PREFIX and "cleans up" the `RPATH` to remove any external
-references and performs other bundle fix-ups. After running `make install`,
-run the `otool` command again from the `build/install` directory and note:
-
-- `LC_LOAD_DYLIB` is now `@executable_path/../MacOS/libvulkan.1.dylib`
-- `LC_RPATH` is no longer present
-
-The "bundle fix-up" operation also puts a copy of the Vulkan loader into the
-bundle, making the bundle completely self-contained and self-referencing.
-
-##### The Non-bundled vulkaninfo Application
-
-There is also a non-bundled version of the `vulkaninfo` application that you
-can run from the command line:
-
- vulkaninfo/vulkaninfo
-
-If you run this from the build directory, vulkaninfo's RPATH is already
-set to point to the Vulkan loader in the build tree, so it has no trouble
-finding it. But the loader will not find the MoltenVK driver and you'll see a
-message about an incompatible driver. To remedy this:
-
- VK_ICD_FILENAMES=<path-to>/MoltenVK/Package/Latest/MoltenVK/macOS/MoltenVK_icd.json vulkaninfo/vulkaninfo
-
-If you run `vulkaninfo` from the install directory, the `RPATH` in the
-`vulkaninfo` application got removed and the OS needs extra help to locate
-the Vulkan loader:
-
- DYLD_LIBRARY_PATH=<path-to>/Vulkan-Loader/loader VK_ICD_FILENAMES=<path-to>/MoltenVK/Package/Latest/MoltenVK/macOS/MoltenVK_icd.json vulkaninfo/vulkaninfo
-
-#### Building with the Xcode Generator
+### Xcode Generator
To create and open an Xcode project:
- mkdir build-xcode
- cd build-xcode
- cmake -DVULKAN_LOADER_INSTALL_DIR=/absolute_path_to/Vulkan-Loader_install_dir -DMOLTENVK_REPO_ROOT=/absolute_path_to/MoltenVK -GXcode ..
- open VULKAN.xcodeproj
+```bash
+# Create the Xcode project
+cmake -S . -B build -G Xcode --preset dev
-Within Xcode, you can select Debug or Release builds in the project's Build
-Settings. You can also select individual schemes for working with specific
-applications like `vkcube`.
+# Open the Xcode project
+cmake --open build
+```
+
+See the [CMake documentation](https://cmake.org/cmake/help/latest/generator/Xcode.html) for further information on the Xcode generator.
+
+## Building For Android
+
+- CMake 3.21+
+- NDK r25+
+- Ninja 1.10+
+- Android SDK Build-Tools 34.0.0+
+
+### Android Build Requirements
+
+- Download [Android Studio](https://developer.android.com/studio)
+- Install (https://developer.android.com/studio/install)
+- From the `Welcome to Android Studio` splash screen, add the following components using the SDK Manager:
+ - SDK Platforms > Android 8.0 and newer (API Level 26 or higher)
+ - SDK Tools > Android SDK Build-Tools
+ - SDK Tools > Android SDK Platform-Tools
+ - SDK Tools > Android SDK Tools
+ - SDK Tools > NDK
+ - SDK Tools > CMake
+
+#### Add Android specifics to environment
+
+NOTE: The following commands are streamlined for Linux but easily transferable to other platforms.
+The main intent is setting 2 environment variables and ensuring the NDK and build tools are in the `PATH`.
+
+```sh
+# Set environment variables
+# https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md#environment-variables-2
+export ANDROID_SDK_ROOT=$HOME/Android/Sdk
+export ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk/X.Y.Z
+
+# Modify path
+export PATH=$ANDROID_SDK_ROOT/build-tools/X.Y.Z:$PATH
+
+# (Optional if you have new enough version of CMake + Ninja)
+export PATH=$ANDROID_SDK_ROOT/cmake/3.22.1/bin:$PATH
+
+# Verify SDK build-tools is set correctly
+which aapt
+
+# Verify CMake/Ninja are in the path
+which cmake
+which ninja
+
+# Check apksigner
+apksigner --help
+```
+
+Note: If `apksigner` gives a `java: not found` error you do not have Java in your path.
+
+```bash
+# A common way to install on the system
+sudo apt install default-jre
+```
+
+### Android Build
+
+1. Building libraries to package with your APK
+
+Invoking CMake directly to build the binary is relatively simple.
+
+See https://developer.android.com/ndk/guides/cmake#command-line for CMake NDK documentation.
+
+```sh
+# Build release binary for arm64-v8a
+cmake -S . -B build \
+ -D CMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake \
+ -D ANDROID_PLATFORM=26 \
+ -D CMAKE_ANDROID_ARCH_ABI=arm64-v8a \
+ -D CMAKE_ANDROID_STL_TYPE=c++_static \
+ -D ANDROID_USE_LEGACY_TOOLCHAIN_FILE=NO \
+ -D CMAKE_BUILD_TYPE=Release \
+ -D UPDATE_DEPS=ON \
+ -G Ninja
+
+cmake --build build
+
+cmake --install build --prefix build/install
+```
+
+Then you just package the library into your APK under the appropriate lib directory based on the ABI:
+https://en.wikipedia.org/wiki/Apk_(file_format)#Package_contents
+
+Alternatively users can also use `scripts/android.py` to build the binaries.
+
+Note: `scripts/android.py` will place the binaries in the `build-android/libs` directory.
+
+```sh
+# Build release binary for arm64-v8a
+python3 scripts/android.py --config Release --app-abi arm64-v8a --app-stl c++_static
+```
+
+`android.py` can also streamline building for multiple ABIs:
+
+```sh
+# Build release binaries for all ABIs
+python3 scripts/android.py --config Release --app-abi 'armeabi-v7a arm64-v8a x86 x86_64' --app-stl c++_static
+```
+
+2. Building the test APK for development purposes
+
+Creating the test APK is a bit of an involved process since it requires running multiple CLI tools after the CMake build has finished.
+
+As a result users are enouraged to use `scripts/android.py` to build the test APK.
+
+This script handles wrapping CMake and various Android CLI tools to create the APK for you.
+
+```sh
+# Build a complete test APK with debug binaries for all ABIS
+python3 scripts/android.py --config Debug --app-abi 'armeabi-v7a arm64-v8a x86 x86_64' --app-stl c++_shared --apk --tests
+
+# Build a clean test APK with release binaries for arm64-v8a
+python3 scripts/android.py --config Release --app-abi arm64-v8a --app-stl c++_shared --apk --tests --clean
+```
+
+Note: `scripts/android.py` will place the APK in the `build-android/bin` directory.
+
+See [tests/README.md](tests/README.md) for running APK / `vulkaninfo` on Android.
+
+### Installed Files
+
+- *install_dir*`/bin` : The `vulkaninfo`, `vkcube` and `vkcubepp` executables
+
+If `INSTALL_ICD` is configured then MockICD will be installed as follows:
+
+For Unix operating systems:
+
+- *install_dir*`/bin` : The Mock ICD
+- *install_dir*`/share/vulkan/icd.d` : Mock ICD JSON
+
+For WIN32:
+
+- *install_dir*`/bin` : The Mock ICD and JSON
+
+### Software Installation
+
+After you have built your project you can install using CMake's install functionality.
+
+CMake Docs:
+- [Software Installation Guide](https://cmake.org/cmake/help/latest/guide/user-interaction/index.html#software-installation)
+- [CLI for installing a project](https://cmake.org/cmake/help/latest/manual/cmake.1.html#install-a-project)
+
+```sh
+# EX: Installs Release artifacts into `build/install` directory.
+# NOTE: --config is only needed for multi-config generators (Visual Studio, Xcode, etc)
+cmake --install build/ --config Release --prefix build/install
+```
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 422b7d2..9951b93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
# ~~~
-# Copyright (c) 2014-2018 Valve Corporation
-# Copyright (c) 2014-2018 LunarG, Inc.
+# Copyright (c) 2014-2023 Valve Corporation
+# Copyright (c) 2014-2023 LunarG, Inc.
+# Copyright (c) 2023-2023 RasterGrid Kft.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,36 +15,31 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# ~~~
-
-# CMake project initialization ---------------------------------------------------------------------------------------------------
-# This section contains pre-project() initialization, and ends with the project() command.
-
-cmake_minimum_required(VERSION 3.10.2)
-
-# Apple: Must be set before enable_language() or project() as it may influence configuration of the toolchain and flags.
-set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "Minimum OS X deployment version")
+cmake_minimum_required(VERSION 3.17.2)
project(Vulkan-Tools)
-# find_package(), include() and global project settings --------------------------------------------------------------------------
+# This variable enables downstream users to customize the target API
+# variant (e.g. Vulkan SC)
+set(API_TYPE "vulkan")
-find_package(PythonInterp 3 QUIET)
+add_subdirectory(scripts)
-# User-interface declarations ----------------------------------------------------------------------------------------------------
-# This section contains variables that affect development GUIs (e.g. CMake GUI and IDEs), such as option(), folders, and variables
-# with the CACHE property.
-
-# Enable beta Vulkan extensions
-add_definitions(-DVK_ENABLE_BETA_EXTENSIONS)
-
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+set(CMAKE_CXX_VISIBILITY_PRESET "hidden")
+set(CMAKE_C_VISIBILITY_PRESET "hidden")
+set(CMAKE_VISIBILITY_INLINES_HIDDEN "YES")
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_STANDARD_REQUIRED ON)
+set(CMAKE_C_EXTENSIONS OFF)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
option(BUILD_CUBE "Build cube" ON)
option(BUILD_VULKANINFO "Build vulkaninfo" ON)
option(BUILD_ICD "Build icd" ON)
-# Installing the Mock ICD to system directories is probably not desired since this ICD is not a very complete implementation.
-# Require the user to ask that it be installed if they really want it.
-option(INSTALL_ICD "Install icd" OFF)
+option(ENABLE_ADDRESS_SANITIZER "Use address sanitization")
if(WIN32)
# Optional: Allow specify the exact version used in the vulkaninfo executable
@@ -56,37 +52,6 @@
# "Helper" targets that don't have interesting source code should set their FOLDER property to this
set(TOOLS_HELPER_FOLDER "Helper Targets")
-option(USE_CCACHE "Use ccache" OFF)
-if(USE_CCACHE)
- find_program(CCACHE_FOUND ccache)
- if(CCACHE_FOUND)
- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
- endif()
-endif()
-
-# ~~~
-# Find Vulkan Headers and Loader
-# Search order:
-# User-supplied CMAKE_PREFIX_PATH containing paths to the header and/or loader install dirs
-# CMake options VULKAN_HEADERS_INSTALL_DIR and/or VULKAN_LOADER_INSTALL_DIR
-# Env vars VULKAN_HEADERS_INSTALL_DIR and/or VULKAN_LOADER_INSTALL_DIR
-# If on MacOS
-# CMake option MOTLENVK_REPO_ROOT
-# Env vars MOLTENVK_REPO_ROOT
-# Fallback to FindVulkan operation using SDK install or system installed components.
-# ~~~
-set(VULKAN_HEADERS_INSTALL_DIR "HEADERS-NOTFOUND" CACHE PATH "Absolute path to a Vulkan-Headers install directory")
-set(VULKAN_LOADER_INSTALL_DIR "LOADER-NOTFOUND" CACHE PATH "Absolute path to a Vulkan-Loader install directory")
-if(WIN32 AND "${VULKAN_LOADER_INSTALL_DIR}" STREQUAL "LOADER-NOTFOUND")
- if(CMAKE_CL_64)
- set(VULKAN_LOADER_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/x64")
- else()
- set(VULKAN_LOADER_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/x86")
- endif()
-endif()
-set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH};${VULKAN_HEADERS_INSTALL_DIR};${VULKAN_LOADER_INSTALL_DIR};
- $ENV{VULKAN_HEADERS_INSTALL_DIR};$ENV{VULKAN_LOADER_INSTALL_DIR})
-
if(APPLE)
set(MOLTENVK_REPO_ROOT "MOLTENVK-NOTFOUND" CACHE PATH "Absolute path to a MoltenVK repo directory")
if(NOT MOLTENVK_REPO_ROOT AND NOT DEFINED ENV{MOLTENVK_REPO_ROOT})
@@ -98,75 +63,43 @@
endif()
message(STATUS "Using MoltenVK repo location at ${MOLTENVK_REPO_ROOT}")
endif()
-message(STATUS "Using find_package to locate Vulkan")
-find_package(Vulkan)
-find_package(VulkanHeaders)
-get_filename_component(Vulkan_LIBRARY_DIR ${Vulkan_LIBRARY} DIRECTORY)
-message(STATUS "Vulkan FOUND = ${Vulkan_FOUND}")
-message(STATUS "Vulkan Lib Dir = ${Vulkan_LIBRARY_DIR}")
-message(STATUS "Vulkan Lib = ${Vulkan_LIBRARY}")
-message(STATUS "Vulkan Headers Include = ${VulkanHeaders_INCLUDE_DIR}")
-message(STATUS "Vulkan Headers Registry = ${VulkanRegistry_DIR}")
+
+find_package(VulkanHeaders QUIET CONFIG)
+find_package(VulkanLoader QUIET CONFIG)
include(GNUInstallDirs)
-if(WIN32 AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
- # Windows: if install locations not set by user, set install prefix to "<build_dir>\install".
- set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "default install path" FORCE)
+option(BUILD_WERROR "Treat compiler warnings as errors")
+if (BUILD_WERROR)
+ add_compile_options("$<IF:$<CXX_COMPILER_ID:MSVC>,/WX,-Werror>")
endif()
-# uninstall target
-if(NOT TARGET uninstall)
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
- IMMEDIATE
- @ONLY)
+if (${CMAKE_CXX_COMPILER_ID} MATCHES "(GNU|Clang)")
+ add_compile_options(
+ -Wall
+ -Wextra
+ -Wno-unused-parameter
+ -Wno-missing-field-initializers
+ -fno-strict-aliasing
+ -fno-builtin-memcmp
+ )
- add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
- set_target_properties(uninstall PROPERTIES FOLDER ${TOOLS_HELPER_FOLDER})
-endif()
-
-if(APPLE)
- # CMake versions 3 or later need CMAKE_MACOSX_RPATH defined. This avoids the CMP0042 policy message.
- set(CMAKE_MACOSX_RPATH 1)
-endif()
-
-option(BUILD_WERROR "Treat compiler warnings as errors" ON)
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
- set(COMMON_COMPILE_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers")
- set(COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -fno-strict-aliasing -fno-builtin-memcmp")
-
- if(MAKE_C_COMPILER_ID MATCHES "Clang")
- set(COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -Wno-sign-conversion -Wno-shorten-64-to-32 -Wno-string-conversion -Wno-implicit-in-conversion -Wno-enum-enum-conversion")
+ if (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
+ add_compile_options(-Wno-stringop-truncation)
endif()
- if(BUILD_WERROR)
- if((CMAKE_COMPILER_IS_GNUCXX AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.3.0)) OR
- (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 6.0.0)))
- set(COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -Werror")
- endif()
- endif()
-
- # For GCC version 7.1 or greater, we need to disable the implicit fallthrough warning since there's no consistent way to satisfy
- # all compilers until they all accept the C++17 standard
- if(CMAKE_COMPILER_IS_GNUCC AND NOT (CMAKE_CXX_COMPILER_VERSION LESS 7.1))
- set(COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -Wimplicit-fallthrough=0")
- endif()
-
- if(APPLE)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_COMPILE_FLAGS}")
- else()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 ${COMMON_COMPILE_FLAGS}")
- endif()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_COMPILE_FLAGS} -std=c++11 -fno-rtti")
- if(UNIX)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
+ if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
+ add_compile_options(
+ -Wno-sign-conversion
+ -Wno-shorten-64-to-32
+ -Wno-string-conversion
+ -Wno-implicit-int-conversion
+ -Wno-enum-enum-conversion
+ )
endif()
elseif(MSVC)
- if(BUILD_WERROR)
- add_compile_options("/WX")
- endif()
+ # TODO: Update to /W4
+ add_compile_options("/W3")
# Warn about nested declarations
add_compile_options("/w34456")
# Warn about potentially uninitialized variables
@@ -178,14 +111,40 @@
add_compile_options("/w34245")
endif()
-# Optional codegen target
-if(PYTHONINTERP_FOUND)
- add_custom_target(VulkanTools_generated_source
- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/scripts/generate_source.py
- ${VulkanRegistry_DIR} --incremental
- )
-else()
- message("WARNING: VulkanTools_generated_source target requires python 3")
+# NOTE: Our custom code generation target isn't desirable for system package managers or add_subdirectory users.
+# So this target needs to be off by default to avoid obtuse build errors or patches.
+option(TOOLS_CODEGEN "Enable helper codegen target")
+if (TOOLS_CODEGEN)
+ find_package(Python3 REQUIRED QUIET)
+ add_custom_target(tools_codegen
+ COMMAND Python3::Interpreter ${PROJECT_SOURCE_DIR}/scripts/generate_source.py
+ "${VULKAN_HEADERS_INSTALL_DIR}/${CMAKE_INSTALL_DATADIR}/vulkan/registry"
+ --incremental --generated-version ${VulkanHeaders_VERSION} --api ${API_TYPE}
+ )
+endif()
+
+# Default to using the static CRT
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+
+# Find the Git branch & tag info for use in Mock ICD
+find_package (Git)
+if (GIT_FOUND AND EXISTS "${CMAKE_CURRENT_LIST_DIR}/.git/HEAD")
+ execute_process(
+ COMMAND ${GIT_EXECUTABLE} describe --tags --always
+ WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+ OUTPUT_VARIABLE GIT_TAG_INFO)
+ string(REGEX REPLACE "\n$" "" GIT_TAG_INFO "${GIT_TAG_INFO}")
+
+ file(READ "${CMAKE_CURRENT_LIST_DIR}/.git/HEAD" GIT_HEAD_REF_INFO)
+ if (GIT_HEAD_REF_INFO)
+ string(REGEX MATCH "ref: refs/heads/(.*)" _ ${GIT_HEAD_REF_INFO})
+ if (CMAKE_MATCH_1)
+ set(GIT_BRANCH_NAME ${CMAKE_MATCH_1})
+ else()
+ set(GIT_BRANCH_NAME ${GIT_HEAD_REF_INFO})
+ endif()
+ string(REGEX REPLACE "\n$" "" GIT_BRANCH_NAME "${GIT_BRANCH_NAME}")
+ endif()
endif()
if(APPLE)
@@ -203,3 +162,11 @@
if(BUILD_ICD)
add_subdirectory(icd)
endif()
+
+add_subdirectory(windows-runtime-installer)
+
+option(BUILD_TESTS "Build the tests")
+if(BUILD_TESTS)
+ enable_testing()
+ add_subdirectory(tests)
+endif()
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bad1de2..26c4c9b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -22,7 +22,7 @@
This will involve [forking the repository](https://help.github.com/articles/fork-a-repo/),
creating a branch with your commits, and then [submitting a pull request](https://help.github.com/articles/using-pull-requests/).
* Please read and adhere to the style and process [guidelines ](#coding-conventions-and-formatting) enumerated below.
-* Please base your fixes on the master branch. SDK branches are generally not updated except for critical fixes needed to repair an SDK release.
+* Please base your fixes on the main branch. SDK branches are generally not updated except for critical fixes needed to repair an SDK release.
* The resulting Pull Request will be assigned to a repository maintainer. It is the maintainer's responsibility to ensure the Pull Request
passes the Google/LunarG internal CI processes. Once the Pull Request has been approved and is passing internal CI, a repository maintainer
will merge the PR.
@@ -39,9 +39,7 @@
* Run **clang-format** on your changes to maintain consistent formatting
* There are `.clang-format` files present in the repository to define clang-format settings
which are found and used automatically by clang-format.
- * **clang-format** binaries are available from the LLVM orginization, here: [LLVM](https://clang.llvm.org/). Our CI system (Travis-CI)
- currently uses clang-format version 7.0.0 to check that the lines of code you have changed are formatted properly. It is
- recommended that you use the same version to format your code prior to submission.
+ * **clang-format** binaries are available from the LLVM orginization, here: [LLVM](https://clang.llvm.org/).
* A sample git workflow may look like:
> # Make changes to the source.
@@ -64,16 +62,14 @@
Strive for commits that implement a single or related set of functionality, using as many commits as is necessary (more is better).
That said, please ensure that the repository compiles and passes tests without error for each commit in your pull request. Note
that to be accepted into the repository, the pull request must [pass all tests](#testing your changes) on all supported platforms
--- the automatic Github Travis and AppVeyor continuous integration features will assist in enforcing this requirement.
#### Generated Source Code
-The `icd/generated` directory contains source code that is created by several
+The `icd/generated` and `vulkaninfo/generated` directories contains source code that is created by several
generator scripts in the `scripts` directory. All changes to these scripts _must_ be submitted with the
-corresponding generated output to keep the repository self-consistent. This requirement is enforced by both
-Travis CI and AppVeyor test configurations. Regenerate source files after modifying any of the generator
-scripts and before building and testing your changes. More details can be found in
-[BUILD.md](https://github.com/KhronosGroup/Vulkan-Tools/blob/master/BUILD.md#generated-source-code).
+corresponding generated output to keep the repository self-consistent. This requirement is enforced by CI.
+Regenerate source files after modifying any of the generator scripts and before building and testing your changes.
+More details can be found in [BUILD.md](BUILD.md).
#### **Testing Your Changes**
* Run the repository components with the Vulkan Validation Layers before and after each of your commits to check for any regressions.
@@ -85,34 +81,11 @@
* In the `vulkaninfo` directory, run:
> vulkaninfo
* If you are adding or changing JSON output, please read
- [Validating vulkaninfo JSON output](https://github.com/KhronosGroup/Vulkan-Tools/blob/master/vulkaninfo/json_validation_process.md).
+ [Validating vulkaninfo JSON output](https://github.com/KhronosGroup/Vulkan-Tools/blob/main/vulkaninfo/json_validation_process.md).
**Note:** When adding new output to vulkaninfo, do NOT add JSON output unless the formmatting is defined by a schema.
* Run tests that explicitly exercise your changes.
* Feel free to subject your code changes to other tests as well!
-#### Coding Conventions for [CMake](http://cmake.org) files
-
-* When editing configuration files for CMake, follow the style conventions of the surrounding code.
- * The column limit is 132.
- * The indent is 4 spaces.
- * CMake functions are lower-case.
- * Variable and keyword names are upper-case.
-* The format is defined by
- [cmake-format](https://github.com/cheshirekow/cmake_format)
- using the `.cmake-format.py` file in the repository to define the settings.
- See the cmake-format page for information about its simple markup for comments.
-* Disable reformatting of a block of comment lines by inserting
- a `# ~~~` comment line before and after that block.
-* Disable any formatting of a block of lines by surrounding that block with
- `# cmake-format: off` and `# cmake-format: on` comment lines.
-* To install: `sudo pip install cmake_format`
-* To run: `cmake-format --in-place $FILENAME`
-* **IMPORTANT (June 2018)** cmake-format v0.3.6 has a
- [bug]( https://github.com/cheshirekow/cmake_format/issues/50)
- that can corrupt the formatting of comment lines in CMake files.
- A workaround is to use the following command _before_ running cmake-format:
- `sed --in-place='' 's/^ *#/#/' $FILENAME`
-
### **Contributor License Agreement (CLA)**
You will be prompted with a one-time "click-through" CLA dialog as part of submitting your pull request
diff --git a/README.md b/README.md
index 43c6e85..0196b88 100644
--- a/README.md
+++ b/README.md
@@ -1,25 +1,18 @@
-# Vulkan Ecosystem Components
+# KhronosGroup/Vulkan-Tools
-This project provides Khronos official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS.
+This project provides Vulkan tools and utilities that can assist development by enabling developers to verify their applications correct use of the Vulkan API.
-## CI Build Status
-[](https://github.com/KhronosGroup/Vulkan-Tools/actions)
-
-
-## Introduction
-
-This project provides Vulkan tools and utilities that can assist development by enabling developers to
-verify their applications correct use of the Vulkan API.
+## Intro
The following components are available in this repository:
+
- [*Mock ICD*](icd/)
- [*Vkcube and Vkcube++ Demo*](cube/)
- [*VulkanInfo*](vulkaninfo/)
- [*Windows Runtime*](windows-runtime-installer/)
## Contact Information
-* [Tobin Ehlis](mailto:tobine@google.com)
-* [Mark Lobodzinski](mailto:mark@lunarg.com)
+* [Charles Giessen](mailto:charles@lunarg.com)
## Information for Developing or Contributing:
@@ -28,21 +21,20 @@
## How to Build and Run
-[BUILD.md](BUILD.md)
-Includes directions for building all components as well as running the vkcube demo applications.
+[BUILD.md](BUILD.md) includes directions for building all components as well as running the vkcube demo applications.
## Version Tagging Scheme
-Updates to the `Vulkan-Tools` repository which correspond to a new Vulkan specification release are tagged using the following format: `v<`_`version`_`>` (e.g., `v1.1.96`).
+Updates to this repository which correspond to a new Vulkan specification release are tagged using the following format: `v<`_`version`_`>` (e.g., `v1.3.266`).
-**Note**: Marked version releases have undergone thorough testing but do not imply the same quality level as SDK tags. SDK tags follow the `sdk-<`_`version`_`>.<`_`patch`_`>` format (e.g., `sdk-1.1.92.0`).
+**Note**: Marked version releases have undergone thorough testing but do not imply the same quality level as SDK tags. SDK tags follow the `vulkan-sdk-<`_`version`_`>.<`_`patch`_`>` format (e.g., `vulkan-sdk-1.3.266.0`).
-This scheme was adopted following the 1.1.96 Vulkan specification release.
+This scheme was adopted following the `1.3.266` Vulkan specification release.
## License
This work is released as open source under a Apache-style license from Khronos including a Khronos copyright.
-See COPYRIGHT.txt for a full list of licenses used in this repository.
+See LICENSE.txt for a full list of licenses used in this repository.
## Acknowledgements
While this project has been developed primarily by LunarG, Inc., there are many other
diff --git a/build-android/build_all.sh b/build-android/build_all.sh
deleted file mode 100755
index ecc4911..0000000
--- a/build-android/build_all.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-# Copyright 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-if [ -z "${ANDROID_SDK_HOME}" ];
-then echo "Please set ANDROID_SDK_HOME, exiting"; exit 1;
-else echo "ANDROID_SDK_HOME is ${ANDROID_SDK_HOME}";
-fi
-
-if [ -z "${ANDROID_NDK_HOME}" ];
-then echo "Please set ANDROID_NDK_HOME, exiting"; exit 1;
-else echo "ANDROID_NDK_HOME is ${ANDROID_NDK_HOME}";
-fi
-
-if [[ $(uname) == "Linux" ]]; then
- cores=$(nproc) || echo 4
-elif [[ $(uname) == "Darwin" ]]; then
- cores=$(sysctl -n hw.ncpu) || echo 4
-fi
-
-function findtool() {
- if [[ ! $(type -t $1) ]]; then
- echo Command $1 not found, see ../BUILD.md;
- exit 1;
- fi
-}
-
-# Check for dependencies
-findtool aapt
-findtool zipalign
-findtool jarsigner
-
-set -ev
-
-DEMO_BUILD_DIR=$PWD/../cube/android
-echo DEMO_BUILD_DIR="${DEMO_BUILD_DIR}"
-
-function create_APK() {
- aapt package -f -M AndroidManifest.xml -I "$ANDROID_SDK_HOME/platforms/android-23/android.jar" -S res -F bin/$1-unaligned.apk bin/libs
- # update this logic to detect if key is already there. If so, use it, otherwise create it.
- jarsigner -verbose -keystore ~/.android/debug.keystore -storepass android -keypass android bin/$1-unaligned.apk androiddebugkey
- zipalign -f 4 bin/$1-unaligned.apk bin/$1.apk
-}
-
-./update_external_sources_android.sh --no-build
-
-#
-# build vkcube APK
-#
-(
-pushd $DEMO_BUILD_DIR
-ndk-build -j $cores
-mkdir -p $DEMO_BUILD_DIR/cube/bin/libs/lib
-cp -r $DEMO_BUILD_DIR/libs/* $DEMO_BUILD_DIR/cube/bin/libs/lib/
-cd $DEMO_BUILD_DIR/cube
-create_APK vkcube
-popd
-)
-
-echo Builds succeeded
-exit 0
diff --git a/build-android/install_all.sh b/build-android/install_all.sh
deleted file mode 100755
index f2ecd90..0000000
--- a/build-android/install_all.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-# Copyright 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -e
-
-#
-# Parse parameters
-#
-
-function printUsage {
- echo "Supported parameters are:"
- echo " -s|--serial <target device serial number> (optional)"
- echo
- echo "i.e. ${0##*/} -s <serial number>"
- exit 1
-}
-
-if [[ $(($# % 2)) -ne 0 ]]
-then
- echo Parameters must be provided in pairs.
- echo parameter count = $#
- echo
- printUsage
- exit 1
-fi
-
-while [[ $# -gt 0 ]]
-do
- case $1 in
- -s|--serial)
- # include the flag, because we need to leave it off if not provided
- serial="$2"
- shift 2
- ;;
- -*)
- # unknown option
- echo Unknown option: $1
- echo
- printUsage
- exit 1
- ;;
- esac
-done
-
-if [[ $serial ]]; then
- echo serial = "${serial}"
- serialFlag="-s $serial"
- if [[ $(adb devices) != *"$serial"* ]]
- then
- echo Device not found: "${serial}"
- echo
- printUsage
- exit 1
- fi
-else
- echo Using device $(adb get-serialno)
-fi
-
-# Install everything built by build_all.sh
-echo "adb $serialFlag install -r ../cube/android/cube/bin/vkcube.apk"
-adb $serialFlag install -r ../cube/android/cube/bin/vkcube.apk
-
-exit $?
diff --git a/build-android/update_external_sources_android.bat b/build-android/update_external_sources_android.bat
deleted file mode 100755
index 5c6f255..0000000
--- a/build-android/update_external_sources_android.bat
+++ /dev/null
@@ -1,134 +0,0 @@
-@echo off
-REM Update source for vulkan-headers
-
-REM
-REM Copyright 2016 The Android Open Source Project
-REM Copyright (C) 2015 Valve Corporation
-REM
-REM Licensed under the Apache License, Version 2.0 (the "License");
-REM you may not use this file except in compliance with the License.
-REM You may obtain a copy of the License at
-REM
-REM http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing, software
-REM distributed under the License is distributed on an "AS IS" BASIS,
-REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM See the License for the specific language governing permissions and
-REM limitations under the License.
-REM
-
-setlocal EnableDelayedExpansion
-set errorCode=0
-set ANDROID_BUILD_DIR=%~dp0
-set BUILD_DIR=%ANDROID_BUILD_DIR%
-set BASE_DIR=%BUILD_DIR%\third_party
-set VULKAN_HEADERS_DIR=%BASE_DIR%\Vulkan-Headers
-
-for %%X in (where.exe) do (set FOUND=%%~$PATH:X)
-if not defined FOUND (
- echo Dependency check failed:
- echo where.exe not found
- echo This script requires Windows Vista or later, which includes where.exe.
- set errorCode=1
-)
-
-where /q git.exe
-if %ERRORLEVEL% equ 1 (
- echo Dependency check failed:
- echo git.exe not found
- echo Git for Windows can be downloaded here: https://git-scm.com/download/win
- echo Install and ensure git.exe makes it into your PATH
- set errorCode=1
-)
-
-where /q ndk-build.cmd
-if %ERRORLEVEL% equ 1 (
- echo Dependency check failed:
- echo ndk-build.cmd not found
- echo Android NDK can be downloaded here: http://developer.android.com/ndk/guides/setup.html
- echo Install and ensure ndk-build.cmd makes it into your PATH
- set errorCode=1
-)
-
-REM ensure where is working with below false test
-REM where /q foo
-REM if %ERRORLEVEL% equ 1 (
-REM echo foo
-REM )
-
-:main
-
-if %errorCode% neq 0 (goto:error)
-
-REM Read the target versions from external file, which is shared with Linux script
-
-if not exist %ANDROID_BUILD_DIR%\vulkan-headers_revision_android (
- echo.
- echo Missing vulkan-headers_revision_android file. Place it in %ANDROID_BUILD_DIR%
- set errorCode=1
- goto:error
-)
-
-set /p VULKAN_HEADERS_REVISION= < vulkan-headers_revision_android
-echo VULKAN_HEADERS_REVISION=%VULKAN_HEADERS_REVISION%
-
-
-echo Creating vulkan-headers in %BASE_DIR%
-
-set sync-vulkan-headers=1
-
-if %sync-vulkan-headers% equ 1 (
- if %ERRORLEVEL% neq 0 (goto:error)
- if not exist %VULKAN_HEADERS_DIR% (
- call:create_vulkan-headers
- )
- if %errorCode% neq 0 (goto:error)
- call:update_vulkan-headers
- if %errorCode% neq 0 (goto:error)
-)
-
-echo.
-echo Exiting
-goto:finish
-
-:error
-echo.
-echo Halting due to error
-goto:finish
-
-:finish
-if not "%cd%\" == "%BUILD_DIR%" ( cd %BUILD_DIR% )
-endlocal
-REM This needs a fix to return error, something like exit %errorCode%
-REM Right now it is returning 0
-goto:eof
-
-
-
-REM // ======== Functions ======== //
-
-:create_vulkan-headers
- echo.
- echo Creating local vulkan-headers repository %VULKAN_HEADERS_DIR%
- if not exist "%VULKAN_HEADERS_DIR%\" mkdir %VULKAN_HEADERS_DIR%
- cd %VULKAN_HEADERS_DIR%
- git clone https://github.com/KhronosGroup/Vulkan-Headers.git .
- git checkout %VULKAN_HEADERS_REVISION%
- if not exist %VULKAN_HEADERS_DIR%\registry (
- echo vulkan-headers source download failed!
- set errorCode=1
- )
-goto:eof
-
-:update_vulkan-headers
- echo.
- echo Updating %VULKAN_HEADERS_DIR%
- cd %VULKAN_HEADERS_DIR%
- git fetch --all
- git checkout %VULKAN_HEADERS_REVISION%
- if not exist %VULKAN_HEADERS_DIR%\registry (
- echo vulkan-headers source update failed!
- set errorCode=1
- )
-goto:eof
diff --git a/build-android/update_external_sources_android.sh b/build-android/update_external_sources_android.sh
deleted file mode 100755
index d86682d..0000000
--- a/build-android/update_external_sources_android.sh
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/bash
-# Update source for vulkan-headers
-
-# Copyright 2016 The Android Open Source Project
-# Copyright (C) 2015 Valve Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -e
-
-sync_vulkan_headers=1
-
-ANDROIDBUILDDIR=$PWD
-BUILDDIR=$ANDROIDBUILDDIR
-BASEDIR=$BUILDDIR/third_party
-
-VULKAN_HEADERS_REVISION=$(cat $ANDROIDBUILDDIR/vulkan-headers_revision_android)
-
-echo "VULKAN_HEADERS_REVISION=$VULKAN_HEADERS_REVISION"
-
-VULKAN_HEADERS_URL=$(cat $ANDROIDBUILDDIR/vulkan-headers_url_android)
-
-if [[ $(uname) == "Linux" ]]; then
- cores="$(nproc || echo 4)"
-elif [[ $(uname) == "Darwin" ]]; then
- cores=$(sysctl -n hw.ncpu)
-fi
-
-#
-# Parse parameters
-#
-
-function printUsage {
- echo "Supported parameters are:"
- echo " --abi <abi> (optional)"
- echo " --no-build (optional)"
- echo
- echo "i.e. ${0##*/} --abi arm64-v8a \\"
- exit 1
-}
-
-while [[ $# -gt 0 ]]
-do
- case $1 in
- --abi)
- abi="$2"
- shift 2
- ;;
- --no-build)
- nobuild=1
- shift 1
- ;;
- *)
- # unknown option
- echo Unknown option: $1
- echo
- printUsage
- exit 1
- ;;
- esac
-done
-
-echo abi=$abi
-if [[ -z $abi ]]
-then
- echo No abi provided, so building for all supported abis.
-fi
-
-echo no-build=$nobuild
-if [[ $nobuild ]]
-then
- echo Skipping build.
-fi
-
-function create_vulkan-headers () {
- rm -rf $BASEDIR/Vulkan-Headers
- echo "Creating local Vulkan-Headers repository ($BASEDIR/Vulkan-Headers)."
- mkdir -p $BASEDIR/Vulkan-Headers
- cd $BASEDIR/Vulkan-Headers
- git clone $VULKAN_HEADERS_URL .
- git checkout $VULKAN_HEADERS_REVISION
-}
-
-function update_vulkan-headers () {
- echo "Updating $BASEDIR/Vulkan-Headers"
- cd $BASEDIR/Vulkan-Headers
- if [[ $(git config --get remote.origin.url) != $VULKAN_HEADERS_URL ]]; then
- echo "Vulkan-Headers URL mismatch, recreating local repo"
- create_vulkan-headers
- return
- fi
- git fetch --all
- git checkout $VULKAN_HEADERS_REVISION
-}
-
-if [ $sync_vulkan_headers -eq 1 ]; then
- if [ ! -d "$BASEDIR/Vulkan-Headers" -o ! -d "$BASEDIR/Vulkan-Headers/.git" ]; then
- create_vulkan-headers
- fi
- update_vulkan-headers
-fi
-
-echo ""
-echo "${0##*/} finished."
-
diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android
deleted file mode 100644
index 624644b..0000000
--- a/build-android/vulkan-headers_revision_android
+++ /dev/null
@@ -1 +0,0 @@
-v1.3.231
diff --git a/build-android/vulkan-headers_url_android b/build-android/vulkan-headers_url_android
deleted file mode 100644
index 9ce9851..0000000
--- a/build-android/vulkan-headers_url_android
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/KhronosGroup/Vulkan-Headers.git
diff --git a/build-gn/DEPS b/build-gn/DEPS
deleted file mode 100644
index 81cca43..0000000
--- a/build-gn/DEPS
+++ /dev/null
@@ -1,57 +0,0 @@
-vars = {
- 'chromium_git': 'https://chromium.googlesource.com',
-}
-
-deps = {
-
- './build': {
- 'url': '{chromium_git}/chromium/src/build.git@a660b0b9174e3a808f620222017566e8d1b2669b',
- },
-
- './buildtools': {
- 'url': '{chromium_git}/chromium/src/buildtools.git@459baaf66bee809f6eb288e0215cf524f4d2429a',
- },
-
- './testing': {
- 'url': '{chromium_git}/chromium/src/testing@083d633e752e7a57cbe62a468a06e51e28c49ee9',
- },
-
- './tools/clang': {
- 'url': '{chromium_git}/chromium/src/tools/clang.git@3114fbc11f9644c54dd0a4cdbfa867bac50ff983',
- },
-
-}
-
-hooks = [
- # Pull clang-format binaries using checked-in hashes.
- {
- 'name': 'clang_format_linux',
- 'pattern': '.',
- 'condition': 'host_os == "linux"',
- 'action': [ 'download_from_google_storage',
- '--no_resume',
- '--platform=linux*',
- '--no_auth',
- '--bucket', 'chromium-clang-format',
- '-s', './buildtools/linux64/clang-format.sha1',
- ],
- },
- {
- 'name': 'sysroot_x64',
- 'pattern': '.',
- 'condition': 'checkout_linux and checkout_x64',
- 'action': ['python', './build/linux/sysroot_scripts/install-sysroot.py',
- '--arch=x64'],
- },
- {
- # Note: On Win, this should run after win_toolchain, as it may use it.
- 'name': 'clang',
- 'pattern': '.',
- 'action': ['python', './tools/clang/scripts/update.py'],
- },
-]
-
-recursedeps = [
- # buildtools provides clang_format.
- './buildtools',
-]
diff --git a/cmake/Copyright_cmake.txt b/cmake/Copyright_cmake.txt
deleted file mode 100644
index 743c634..0000000
--- a/cmake/Copyright_cmake.txt
+++ /dev/null
@@ -1,126 +0,0 @@
-CMake - Cross Platform Makefile Generator
-Copyright 2000-2018 Kitware, Inc. and Contributors
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-* Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-* Neither the name of Kitware, Inc. nor the names of Contributors
- may be used to endorse or promote products derived from this
- software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-------------------------------------------------------------------------------
-
-The following individuals and institutions are among the Contributors:
-
-* Aaron C. Meadows <cmake@shadowguarddev.com>
-* Adriaan de Groot <groot@kde.org>
-* Aleksey Avdeev <solo@altlinux.ru>
-* Alexander Neundorf <neundorf@kde.org>
-* Alexander Smorkalov <alexander.smorkalov@itseez.com>
-* Alexey Sokolov <sokolov@google.com>
-* Alex Turbov <i.zaufi@gmail.com>
-* Andreas Pakulat <apaku@gmx.de>
-* Andreas Schneider <asn@cryptomilk.org>
-* André Rigland Brodtkorb <Andre.Brodtkorb@ifi.uio.no>
-* Axel Huebl, Helmholtz-Zentrum Dresden - Rossendorf
-* Benjamin Eikel
-* Bjoern Ricks <bjoern.ricks@gmail.com>
-* Brad Hards <bradh@kde.org>
-* Christopher Harvey
-* Christoph Grüninger <foss@grueninger.de>
-* Clement Creusot <creusot@cs.york.ac.uk>
-* Daniel Blezek <blezek@gmail.com>
-* Daniel Pfeifer <daniel@pfeifer-mail.de>
-* Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
-* Eran Ifrah <eran.ifrah@gmail.com>
-* Esben Mose Hansen, Ange Optimization ApS
-* Geoffrey Viola <geoffrey.viola@asirobots.com>
-* Google Inc
-* Gregor Jasny
-* Helio Chissini de Castro <helio@kde.org>
-* Ilya Lavrenov <ilya.lavrenov@itseez.com>
-* Insight Software Consortium <insightsoftwareconsortium.org>
-* Jan Woetzel
-* Kelly Thompson <kgt@lanl.gov>
-* Konstantin Podsvirov <konstantin@podsvirov.pro>
-* Mario Bensi <mbensi@ipsquad.net>
-* Mathieu Malaterre <mathieu.malaterre@gmail.com>
-* Matthaeus G. Chajdas
-* Matthias Kretz <kretz@kde.org>
-* Matthias Maennich <matthias@maennich.net>
-* Michael Stürmer
-* Miguel A. Figueroa-Villanueva
-* Mike Jackson
-* Mike McQuaid <mike@mikemcquaid.com>
-* Nicolas Bock <nicolasbock@gmail.com>
-* Nicolas Despres <nicolas.despres@gmail.com>
-* Nikita Krupen'ko <krnekit@gmail.com>
-* NVIDIA Corporation <www.nvidia.com>
-* OpenGamma Ltd. <opengamma.com>
-* Patrick Stotko <stotko@cs.uni-bonn.de>
-* Per Øyvind Karlsen <peroyvind@mandriva.org>
-* Peter Collingbourne <peter@pcc.me.uk>
-* Petr Gotthard <gotthard@honeywell.com>
-* Philip Lowman <philip@yhbt.com>
-* Philippe Proulx <pproulx@efficios.com>
-* Raffi Enficiaud, Max Planck Society
-* Raumfeld <raumfeld.com>
-* Roger Leigh <rleigh@codelibre.net>
-* Rolf Eike Beer <eike@sf-mail.de>
-* Roman Donchenko <roman.donchenko@itseez.com>
-* Roman Kharitonov <roman.kharitonov@itseez.com>
-* Ruslan Baratov
-* Sebastian Holtermann <sebholt@xwmw.org>
-* Stephen Kelly <steveire@gmail.com>
-* Sylvain Joubert <joubert.sy@gmail.com>
-* Thomas Sondergaard <ts@medical-insight.com>
-* Tobias Hunger <tobias.hunger@qt.io>
-* Todd Gamblin <tgamblin@llnl.gov>
-* Tristan Carel
-* University of Dundee
-* Vadim Zhukov
-* Will Dicharry <wdicharry@stellarscience.com>
-
-See version control history for details of individual contributions.
-
-The above copyright and license notice applies to distributions of
-CMake in source and binary form. Third-party software packages supplied
-with CMake under compatible licenses provide their own copyright notices
-documented in corresponding subdirectories or source files.
-
-------------------------------------------------------------------------------
-
-CMake was initially developed by Kitware with the following sponsorship:
-
- * National Library of Medicine at the National Institutes of Health
- as part of the Insight Segmentation and Registration Toolkit (ITK).
-
- * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
- Visualization Initiative.
-
- * National Alliance for Medical Image Computing (NAMIC) is funded by the
- National Institutes of Health through the NIH Roadmap for Medical Research,
- Grant U54 EB005149.
-
- * Kitware, Inc.
diff --git a/cmake/FindDirectFB.cmake b/cmake/FindDirectFB.cmake
deleted file mode 100644
index 2c98b2a..0000000
--- a/cmake/FindDirectFB.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-# Try to find DirectFB
-#
-# This will define:
-#
-# DIRECTFB_FOUND - True if DirectFB is found
-# DIRECTFB_LIBRARIES - Link these to use DirectFB
-# DIRECTFB_INCLUDE_DIR - Include directory for DirectFB
-# DIRECTFB_DEFINITIONS - Compiler flags for using DirectFB
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-IF (NOT WIN32)
- FIND_PACKAGE(PkgConfig)
- PKG_CHECK_MODULES(PKG_DIRECTFB QUIET directfb)
-
- SET(DIRECTFB_DEFINITIONS ${PKG_DIRECTFB_CFLAGS})
-
- FIND_PATH(DIRECTFB_INCLUDE_DIR NAMES directfb.h HINTS ${PKG_DIRECTFB_INCLUDE_DIRS})
-
- FIND_LIBRARY(DIRECTFB_LIBRARIES NAMES directfb HINTS ${PKG_DIRECTFB_LIBRARY_DIRS})
-
- include(FindPackageHandleStandardArgs)
-
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(DIRECTFB DEFAULT_MSG DIRECTFB_LIBRARIES DIRECTFB_INCLUDE_DIR)
-
- MARK_AS_ADVANCED(DIRECTFB_INCLUDE_DIR DIRECTFB_LIBRARIES)
-ENDIF ()
diff --git a/cmake/FindVulkan.cmake b/cmake/FindVulkan.cmake
deleted file mode 100644
index 846708e..0000000
--- a/cmake/FindVulkan.cmake
+++ /dev/null
@@ -1,80 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#.rst:
-# FindVulkan
-# ----------
-#
-# Try to find Vulkan
-#
-# IMPORTED Targets
-# ^^^^^^^^^^^^^^^^
-#
-# This module defines :prop_tgt:`IMPORTED` target ``Vulkan::Vulkan``, if
-# Vulkan has been found.
-#
-# Result Variables
-# ^^^^^^^^^^^^^^^^
-#
-# This module defines the following variables::
-#
-# Vulkan_FOUND - True if Vulkan was found
-# Vulkan_INCLUDE_DIRS - include directories for Vulkan
-# Vulkan_LIBRARIES - link against this library to use Vulkan
-#
-# The module will also define two cache variables::
-#
-# Vulkan_INCLUDE_DIR - the Vulkan include directory
-# Vulkan_LIBRARY - the path to the Vulkan library
-#
-
-if(WIN32)
- find_path(Vulkan_INCLUDE_DIR
- NAMES vulkan/vulkan.h
- HINTS
- "$ENV{VULKAN_SDK}/Include"
- )
-
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- find_library(Vulkan_LIBRARY
- NAMES vulkan-1
- HINTS
- "$ENV{VULKAN_SDK}/Lib"
- "$ENV{VULKAN_SDK}/Bin"
- )
- elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
- find_library(Vulkan_LIBRARY
- NAMES vulkan-1
- HINTS
- "$ENV{VULKAN_SDK}/Lib32"
- "$ENV{VULKAN_SDK}/Bin32"
- NO_SYSTEM_ENVIRONMENT_PATH
- )
- endif()
-else()
- find_path(Vulkan_INCLUDE_DIR
- NAMES vulkan/vulkan.h
- HINTS
- "$ENV{VULKAN_SDK}/include")
- find_library(Vulkan_LIBRARY
- NAMES vulkan
- HINTS
- "$ENV{VULKAN_SDK}/lib")
-endif()
-
-set(Vulkan_LIBRARIES ${Vulkan_LIBRARY})
-set(Vulkan_INCLUDE_DIRS ${Vulkan_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Vulkan
- DEFAULT_MSG
- Vulkan_LIBRARY Vulkan_INCLUDE_DIR)
-
-mark_as_advanced(Vulkan_INCLUDE_DIR Vulkan_LIBRARY)
-
-if(Vulkan_FOUND AND NOT TARGET Vulkan::Vulkan)
- add_library(Vulkan::Vulkan UNKNOWN IMPORTED)
- set_target_properties(Vulkan::Vulkan PROPERTIES
- IMPORTED_LOCATION "${Vulkan_LIBRARIES}"
- INTERFACE_INCLUDE_DIRECTORIES "${Vulkan_INCLUDE_DIRS}")
-endif()
diff --git a/cmake/FindVulkanHeaders.cmake b/cmake/FindVulkanHeaders.cmake
deleted file mode 100644
index c84d948..0000000
--- a/cmake/FindVulkanHeaders.cmake
+++ /dev/null
@@ -1,71 +0,0 @@
-#.rst:
-# FindVulkanHeaders
-# -----------------
-#
-# Try to find Vulkan Headers and Registry.
-#
-# This module is intended to be used by projects that build Vulkan
-# "system" components such as the loader and layers.
-# Vulkan applications should instead use the FindVulkan (or similar)
-# find module that locates the headers and the loader library.
-#
-# When using this find module to locate the headers and registry
-# in a Vulkan-Headers repository, the Vulkan-Headers repository
-# should be built with 'install' target and the following environment
-# or CMake variable set to the location of the install directory.
-#
-# VULKAN_HEADERS_INSTALL_DIR
-#
-# IMPORTED Targets
-# ^^^^^^^^^^^^^^^^
-#
-# This module defines no IMPORTED targets
-#
-# Result Variables
-# ^^^^^^^^^^^^^^^^
-#
-# This module defines the following variables::
-#
-# VulkanHeaders_FOUND - True if VulkanHeaders was found
-# VulkanHeaders_INCLUDE_DIRS - include directories for VulkanHeaders
-#
-# VulkanRegistry_FOUND - True if VulkanRegistry was found
-# VulkanRegistry_DIRS - directories for VulkanRegistry
-#
-# The module will also define two cache variables::
-#
-# VulkanHeaders_INCLUDE_DIR - the VulkanHeaders include directory
-# VulkanRegistry_DIR - the VulkanRegistry directory
-#
-
-# Use HINTS instead of PATH to search these locations before
-# searching system environment variables like $PATH that may
-# contain SDK directories.
-find_path(VulkanHeaders_INCLUDE_DIR
- NAMES vulkan/vulkan.h
- HINTS
- ${VULKAN_HEADERS_INSTALL_DIR}/include
- "$ENV{VULKAN_HEADERS_INSTALL_DIR}/include"
- "$ENV{VULKAN_SDK}/include")
-
-if(VulkanHeaders_INCLUDE_DIR)
- get_filename_component(VULKAN_REGISTRY_PATH_HINT ${VulkanHeaders_INCLUDE_DIR} DIRECTORY)
- find_path(VulkanRegistry_DIR
- NAMES vk.xml
- HINTS "${VULKAN_REGISTRY_PATH_HINT}/share/vulkan/registry")
-endif()
-
-set(VulkanHeaders_INCLUDE_DIRS ${VulkanHeaders_INCLUDE_DIR})
-set(VulkanRegistry_DIRS ${VulkanRegistry_DIR})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(VulkanHeaders
- DEFAULT_MSG
- VulkanHeaders_INCLUDE_DIR)
-set(FPHSA_NAME_MISMATCHED TRUE)
-find_package_handle_standard_args(VulkanRegistry
- DEFAULT_MSG
- VulkanRegistry_DIR)
-unset(FPHSA_NAME_MISMATCHED)
-
-mark_as_advanced(VulkanHeaders_INCLUDE_DIR VulkanRegistry_DIR)
diff --git a/cmake/FindWayland.cmake b/cmake/FindWayland.cmake
deleted file mode 100644
index f93218b..0000000
--- a/cmake/FindWayland.cmake
+++ /dev/null
@@ -1,66 +0,0 @@
-# Try to find Wayland on a Unix system
-#
-# This will define:
-#
-# WAYLAND_FOUND - True if Wayland is found
-# WAYLAND_LIBRARIES - Link these to use Wayland
-# WAYLAND_INCLUDE_DIR - Include directory for Wayland
-# WAYLAND_DEFINITIONS - Compiler flags for using Wayland
-#
-# In addition the following more fine grained variables will be defined:
-#
-# WAYLAND_CLIENT_FOUND WAYLAND_CLIENT_INCLUDE_DIR WAYLAND_CLIENT_LIBRARIES
-# WAYLAND_SERVER_FOUND WAYLAND_SERVER_INCLUDE_DIR WAYLAND_SERVER_LIBRARIES
-# WAYLAND_EGL_FOUND WAYLAND_EGL_INCLUDE_DIR WAYLAND_EGL_LIBRARIES
-#
-# Copyright (c) 2013 Martin Gräßlin <mgraesslin@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-IF (NOT WIN32)
- IF (WAYLAND_INCLUDE_DIR AND WAYLAND_LIBRARIES)
- # In the cache already
- SET(WAYLAND_FIND_QUIETLY TRUE)
- ENDIF ()
-
- # Use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- FIND_PACKAGE(PkgConfig)
- PKG_CHECK_MODULES(PKG_WAYLAND QUIET wayland-client wayland-server wayland-egl wayland-cursor)
-
- SET(WAYLAND_DEFINITIONS ${PKG_WAYLAND_CFLAGS})
-
- FIND_PATH(WAYLAND_CLIENT_INCLUDE_DIR NAMES wayland-client.h HINTS ${PKG_WAYLAND_INCLUDE_DIRS})
- FIND_PATH(WAYLAND_SERVER_INCLUDE_DIR NAMES wayland-server.h HINTS ${PKG_WAYLAND_INCLUDE_DIRS})
- FIND_PATH(WAYLAND_EGL_INCLUDE_DIR NAMES wayland-egl.h HINTS ${PKG_WAYLAND_INCLUDE_DIRS})
- FIND_PATH(WAYLAND_CURSOR_INCLUDE_DIR NAMES wayland-cursor.h HINTS ${PKG_WAYLAND_INCLUDE_DIRS})
-
- FIND_LIBRARY(WAYLAND_CLIENT_LIBRARIES NAMES wayland-client HINTS ${PKG_WAYLAND_LIBRARY_DIRS})
- FIND_LIBRARY(WAYLAND_SERVER_LIBRARIES NAMES wayland-server HINTS ${PKG_WAYLAND_LIBRARY_DIRS})
- FIND_LIBRARY(WAYLAND_EGL_LIBRARIES NAMES wayland-egl HINTS ${PKG_WAYLAND_LIBRARY_DIRS})
- FIND_LIBRARY(WAYLAND_CURSOR_LIBRARIES NAMES wayland-cursor HINTS ${PKG_WAYLAND_LIBRARY_DIRS})
-
- set(WAYLAND_INCLUDE_DIR ${WAYLAND_CLIENT_INCLUDE_DIR} ${WAYLAND_SERVER_INCLUDE_DIR} ${WAYLAND_EGL_INCLUDE_DIR} ${WAYLAND_CURSOR_INCLUDE_DIR})
-
- set(WAYLAND_LIBRARIES ${WAYLAND_CLIENT_LIBRARIES} ${WAYLAND_SERVER_LIBRARIES} ${WAYLAND_EGL_LIBRARIES} ${WAYLAND_CURSOR_LIBRARIES})
-
- list(REMOVE_DUPLICATES WAYLAND_INCLUDE_DIR)
-
- include(FindPackageHandleStandardArgs)
-
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND_CLIENT DEFAULT_MSG WAYLAND_CLIENT_LIBRARIES WAYLAND_CLIENT_INCLUDE_DIR)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND_SERVER DEFAULT_MSG WAYLAND_SERVER_LIBRARIES WAYLAND_SERVER_INCLUDE_DIR)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND_EGL DEFAULT_MSG WAYLAND_EGL_LIBRARIES WAYLAND_EGL_INCLUDE_DIR)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND_CURSOR DEFAULT_MSG WAYLAND_CURSOR_LIBRARIES WAYLAND_CURSOR_INCLUDE_DIR)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND DEFAULT_MSG WAYLAND_LIBRARIES WAYLAND_INCLUDE_DIR)
-
- MARK_AS_ADVANCED(
- WAYLAND_INCLUDE_DIR WAYLAND_LIBRARIES
- WAYLAND_CLIENT_INCLUDE_DIR WAYLAND_CLIENT_LIBRARIES
- WAYLAND_SERVER_INCLUDE_DIR WAYLAND_SERVER_LIBRARIES
- WAYLAND_EGL_INCLUDE_DIR WAYLAND_EGL_LIBRARIES
- WAYLAND_CURSOR_INCLUDE_DIR WAYLAND_CURSOR_LIBRARIES
- )
-
-ENDIF ()
diff --git a/cmake/FindWaylandProtocols.cmake b/cmake/FindWaylandProtocols.cmake
deleted file mode 100644
index 73d8548..0000000
--- a/cmake/FindWaylandProtocols.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-# Wayland protocols Defines:
-#
-# * WAYLAND_PROTOCOLS_FOUND True if the wayland-protocols data path is found
-# * WAYLAND_PROTOCOLS_PATH Path to the wayland-scanner executable
-#
-
-if(NOT WIN32)
- find_package(PkgConfig)
- pkg_check_modules(WAYLAND_PROTOCOLS_PATH REQUIRED wayland-protocols)
- execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=pkgdatadir wayland-protocols
- OUTPUT_VARIABLE WAYLAND_PROTOCOLS_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
- find_package_handle_standard_args(WAYLAND DEFAULT_MSG WAYLAND_PROTOCOLS_PATH)
- mark_as_advanced(WAYLAND_PROTOCOLS_PATH)
-endif()
diff --git a/cmake/FindWaylandScanner.cmake b/cmake/FindWaylandScanner.cmake
deleted file mode 100644
index cd93d90..0000000
--- a/cmake/FindWaylandScanner.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-# Wayland scanner Defines:
-#
-# * WAYLAND_SCANNER_FOUND True if wayland-scanner is found
-# * WAYLAND_SCANNER_EXECUTABLE Path to the wayland-scanner executable
-#
-
-if(NOT WIN32)
- # Delegate to pkg-config for our first guess
- find_package(PkgConfig)
- pkg_check_modules(PKG_WAYLAND_SCANNER QUIET wayland-scanner)
- find_program(WAYLAND_SCANNER_EXECUTABLE wayland-scanner ${PKG_WAYLAND_SCANNER_PREFIX}/bin/wayland-scanner)
- find_package_handle_standard_args(WAYLAND DEFAULT_MSG WAYLAND_SCANNER_EXECUTABLE)
- mark_as_advanced(WAYLAND_SCANNER_EXECUTABLE)
-endif()
diff --git a/cmake/FindX11_XCB.cmake b/cmake/FindX11_XCB.cmake
deleted file mode 100644
index 956bf89..0000000
--- a/cmake/FindX11_XCB.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-# - Try to find libX11-xcb
-# Once done this will define
-#
-# X11_XCB_FOUND - system has libX11-xcb
-# X11_XCB_LIBRARIES - Link these to use libX11-xcb
-# X11_XCB_INCLUDE_DIR - the libX11-xcb include dir
-# X11_XCB_DEFINITIONS - compiler switches required for using libX11-xcb
-
-# Copyright (c) 2011 Fredrik Höglund <fredrik@kde.org>
-# Copyright (c) 2008 Helio Chissini de Castro, <helio@kde.org>
-# Copyright (c) 2007 Matthias Kretz, <kretz@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-IF (NOT WIN32)
- # use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- FIND_PACKAGE(PkgConfig)
- PKG_CHECK_MODULES(PKG_X11_XCB QUIET x11-xcb)
-
- SET(X11_XCB_DEFINITIONS ${PKG_X11_XCB_CFLAGS})
-
- FIND_PATH(X11_XCB_INCLUDE_DIR NAMES X11/Xlib-xcb.h HINTS ${PKG_X11_XCB_INCLUDE_DIRS})
- FIND_LIBRARY(X11_XCB_LIBRARIES NAMES X11-xcb HINTS ${PKG_X11_XCB_LIBRARY_DIRS})
-
- include(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(X11_XCB DEFAULT_MSG X11_XCB_LIBRARIES X11_XCB_INCLUDE_DIR)
-
- MARK_AS_ADVANCED(X11_XCB_INCLUDE_DIR X11_XCB_LIBRARIES)
-ENDIF (NOT WIN32)
-
diff --git a/cmake/FindXCB.cmake b/cmake/FindXCB.cmake
deleted file mode 100644
index b01c246..0000000
--- a/cmake/FindXCB.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-# - FindXCB
-#
-# Copyright (C) 2015 Valve Corporation
-
-find_package(PkgConfig)
-
-if(NOT XCB_FIND_COMPONENTS)
- set(XCB_FIND_COMPONENTS xcb)
-endif()
-
-include(FindPackageHandleStandardArgs)
-set(XCB_FOUND true)
-set(XCB_INCLUDE_DIRS "")
-set(XCB_LIBRARIES "")
-foreach(comp ${XCB_FIND_COMPONENTS})
- # component name
- string(TOUPPER ${comp} compname)
- string(REPLACE "-" "_" compname ${compname})
- # header name
- string(REPLACE "xcb-" "" headername xcb/${comp}.h)
- # library name
- set(libname ${comp})
-
- pkg_check_modules(PC_${comp} QUIET ${comp})
-
- find_path(${compname}_INCLUDE_DIR NAMES ${headername}
- HINTS
- ${PC_${comp}_INCLUDEDIR}
- ${PC_${comp}_INCLUDE_DIRS}
- )
-
- find_library(${compname}_LIBRARY NAMES ${libname}
- HINTS
- ${PC_${comp}_LIBDIR}
- ${PC_${comp}_LIBRARY_DIRS}
- )
-
- find_package_handle_standard_args(${compname}
- FOUND_VAR ${compname}_FOUND
- REQUIRED_VARS ${compname}_INCLUDE_DIR ${compname}_LIBRARY)
- mark_as_advanced(${compname}_INCLUDE_DIR ${compname}_LIBRARY)
-
- list(APPEND XCB_INCLUDE_DIRS ${${compname}_INCLUDE_DIR})
- list(APPEND XCB_LIBRARIES ${${compname}_LIBRARY})
-
- if(NOT ${compname}_FOUND)
- set(XCB_FOUND false)
- endif()
-endforeach()
-
-list(REMOVE_DUPLICATES XCB_INCLUDE_DIRS)
diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in
deleted file mode 100644
index 2037e36..0000000
--- a/cmake/cmake_uninstall.cmake.in
+++ /dev/null
@@ -1,21 +0,0 @@
-if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
- message(FATAL_ERROR "Cannot find install manifest: @CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-
-file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
-string(REGEX REPLACE "\n" ";" files "${files}")
-foreach(file ${files})
- message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
- if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
- exec_program(
- "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
- OUTPUT_VARIABLE rm_out
- RETURN_VALUE rm_retval
- )
- if(NOT "${rm_retval}" STREQUAL 0)
- message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
- endif(NOT "${rm_retval}" STREQUAL 0)
- else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
- message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
- endif(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
-endforeach(file)
diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt
index 616fbc9..8ab409e 100644
--- a/cube/CMakeLists.txt
+++ b/cube/CMakeLists.txt
@@ -15,60 +15,31 @@
# limitations under the License.
# ~~~
-set(CUBE_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.. ${VulkanHeaders_INCLUDE_DIR})
-
-set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/scripts")
-
-if (NOT GLSLANG_INSTALL_DIR AND DEFINED ENV{GLSLANG_INSTALL_DIR})
- set(GLSLANG_INSTALL_DIR $ENV{GLSLANG_INSTALL_DIR})
-endif()
-
-if(GLSLANG_INSTALL_DIR)
- message(STATUS "Using GLSLANG_INSTALL_DIR to look for glslangValidator")
- find_program(GLSLANG_VALIDATOR names glslangValidator HINTS "${GLSLANG_INSTALL_DIR}/bin")
-else()
- set(GLSLANG_VALIDATOR_NAME "glslangValidator")
- message(STATUS "Using cmake find_program to look for glslangValidator")
- if(WIN32)
- execute_process(
- COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-windows-x64-Release.zip)
- set(GLSLANG_VALIDATOR_NAME "glslangValidator.exe")
- elseif(APPLE)
- execute_process(COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-osx-Release.zip)
- elseif(UNIX AND NOT APPLE) # i.e. Linux
- execute_process(COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-linux-Release.zip)
- endif()
- if (WIN32)
- set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/windows/bin")
- elseif(APPLE)
- set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/darwin/bin")
- else()
- set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/linux/bin")
- endif()
- find_program(GLSLANG_VALIDATOR NAMES ${GLSLANG_VALIDATOR_NAME} HINTS ${PLATFORM_DIR})
-endif()
-
-if(UNIX AND NOT APPLE) # i.e. Linux
- include(FindPkgConfig)
+if (CMAKE_SYSTEM_NAME MATCHES "Linux|BSD")
option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
option(BUILD_WSI_WAYLAND_SUPPORT "Build Wayland WSI support" ON)
option(BUILD_WSI_DIRECTFB_SUPPORT "Build DirectFB WSI support" OFF)
set(CUBE_WSI_SELECTION "XCB" CACHE STRING "Select WSI target for vkcube (XCB, XLIB, WAYLAND, DIRECTFB, DISPLAY)")
+ find_package(PkgConfig REQUIRED QUIET) # Use PkgConfig to find Linux system libraries
+
if(BUILD_WSI_XCB_SUPPORT)
- find_package(XCB REQUIRED)
+ pkg_check_modules(XCB REQUIRED QUIET IMPORTED_TARGET xcb)
endif()
if(BUILD_WSI_XLIB_SUPPORT)
- find_package(X11 REQUIRED)
+ pkg_check_modules(X11 REQUIRED QUIET IMPORTED_TARGET x11)
endif()
if(BUILD_WSI_WAYLAND_SUPPORT)
- find_package(Wayland REQUIRED)
- find_package(WaylandScanner REQUIRED)
- find_package(WaylandProtocols REQUIRED)
- include_directories(${WAYLAND_CLIENT_INCLUDE_DIR})
+ pkg_check_modules(WAYLAND_CLIENT REQUIRED IMPORTED_TARGET wayland-client)
+
+ pkg_get_variable(WAYLAND_SCANNER_EXECUTABLE wayland-scanner wayland_scanner)
+ message(STATUS "WAYLAND_SCANNER_EXECUTABLE = ${WAYLAND_SCANNER_EXECUTABLE}")
+
+ pkg_get_variable(WAYLAND_PROTOCOLS_PATH wayland-protocols pkgdatadir)
+ message(STATUS "WAYLAND_PROTOCOLS_PATH = ${WAYLAND_PROTOCOLS_PATH}")
set(XDG_SHELL_PROTOCOL ${WAYLAND_PROTOCOLS_PATH}/stable/xdg-shell/xdg-shell.xml)
add_custom_command(COMMENT "Generating xdg-shell protocol dispatch data"
OUTPUT xdg-shell-code.c
@@ -107,8 +78,7 @@
endif()
if(BUILD_WSI_DIRECTFB_SUPPORT)
- find_package(DirectFB REQUIRED)
- include_directories(${DIRECTFB_INCLUDE_DIR})
+ pkg_check_modules(DirectFB REQUIRED QUIET IMPORTED_TARGET directfb)
endif()
endif()
@@ -125,7 +95,7 @@
add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR)
elseif(APPLE)
add_definitions(-DVK_USE_PLATFORM_METAL_EXT)
-elseif(UNIX AND NOT APPLE) # i.e. Linux
+elseif(CMAKE_SYSTEM_NAME MATCHES "Linux|BSD")
if(NOT CUBE_WSI_SELECTION)
set(CUBE_WSI_SELECTION "XCB")
endif()
@@ -134,22 +104,19 @@
if(NOT BUILD_WSI_XCB_SUPPORT)
message(FATAL_ERROR "Selected XCB for vkcube build but not building Xcb support")
endif()
- set(CUBE_INCLUDE_DIRS ${XCB_INCLUDE_DIRS} ${CUBE_INCLUDE_DIRS})
- link_libraries(${XCB_LIBRARIES})
+ link_libraries(PkgConfig::XCB)
set(CUBE_PLATFORM VK_USE_PLATFORM_XCB_KHR)
elseif(CUBE_WSI_SELECTION STREQUAL "XLIB")
if(NOT BUILD_WSI_XLIB_SUPPORT)
message(FATAL_ERROR "Selected XLIB for vkcube build but not building Xlib support")
endif()
- set(CUBE_INCLUDE_DIRS ${X11_INCLUDE_DIR} ${CUBE_INCLUDE_DIRS})
- link_libraries(${X11_LIBRARIES})
+ link_libraries(PkgConfig::X11)
set(CUBE_PLATFORM VK_USE_PLATFORM_XLIB_KHR)
elseif(CUBE_WSI_SELECTION STREQUAL "WAYLAND")
if(NOT BUILD_WSI_WAYLAND_SUPPORT)
message(FATAL_ERROR "Selected Wayland for vkcube build but not building Wayland support")
endif()
- set(CUBE_INCLUDE_DIRS ${WAYLAND_CLIENT_INCLUDE_DIR} ${CUBE_INCLUDE_DIRS})
- link_libraries(${WAYLAND_CLIENT_LIBRARIES})
+ link_libraries(PkgConfig::WAYLAND_CLIENT)
set(CUBE_PLATFORM VK_USE_PLATFORM_WAYLAND_KHR)
set(XDG_SHELL_PROTOCOL ${WAYLAND_PROTOCOLS_PATH}/stable/xdg-shell/xdg-shell.xml)
set(OPTIONAL_WAYLAND_DATA_FILES
@@ -162,8 +129,7 @@
if(NOT BUILD_WSI_DIRECTFB_SUPPORT)
message(FATAL_ERROR "Selected DIRECTFB for vkcube build but not building DirectFB support")
endif()
- set(CUBE_INCLUDE_DIRS ${DIRECTFB_INCLUDE_DIR} ${CUBE_INCLUDE_DIRS})
- link_libraries(${DIRECTFB_LIBRARIES})
+ link_libraries(PkgConfig::DirectFB)
set(CUBE_PLATFORM VK_USE_PLATFORM_DIRECTFB_EXT)
elseif(CUBE_WSI_SELECTION STREQUAL "DISPLAY")
set(CUBE_PLATFORM VK_USE_PLATFORM_DISPLAY_KHR)
@@ -176,92 +142,84 @@
message(FATAL_ERROR "Unsupported Platform!")
endif()
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+if (COMPILE_CUBE_SHADERS)
+ # Try to find glslang in system paths or in an SDK if the VULKAN_SDK env-var is set
+ find_program(GLSLANG_VALIDATOR names glslang glslangValidator HINTS $ENV{GLSLANG_INSTALL_DIR} $ENV{VULKAN_SDK}/bin $ENV{VULKAN_SDK}/Bin)
-if(WIN32)
- # Use static MSVCRT libraries
- foreach(configuration
- in
- CMAKE_C_FLAGS_DEBUG
- CMAKE_C_FLAGS_MINSIZEREL
- CMAKE_C_FLAGS_RELEASE
- CMAKE_C_FLAGS_RELWITHDEBINFO
- CMAKE_CXX_FLAGS_DEBUG
- CMAKE_CXX_FLAGS_MINSIZEREL
- CMAKE_CXX_FLAGS_RELEASE
- CMAKE_CXX_FLAGS_RELWITHDEBINFO)
- if(${configuration} MATCHES "/MD")
- string(REGEX
- REPLACE "/MD"
- "/MT"
- ${configuration}
- "${${configuration}}")
- endif()
- endforeach()
+ add_custom_command(COMMENT "Compiling cube vertex shader"
+ OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/cube.vert.inc
+ COMMAND ${GLSLANG_VALIDATOR} -V -x -o ${CMAKE_CURRENT_SOURCE_DIR}/cube.vert.inc
+ ${PROJECT_SOURCE_DIR}/cube/cube.vert
+ MAIN_DEPENDENCY ${PROJECT_SOURCE_DIR}/cube/cube.vert
+ DEPENDS ${PROJECT_SOURCE_DIR}/cube/cube.vert ${GLSLANG_VALIDATOR})
+ add_custom_command(COMMENT "Compiling cube fragment shader"
+ OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/cube.frag.inc
+ COMMAND ${GLSLANG_VALIDATOR} -V -x -o ${CMAKE_CURRENT_SOURCE_DIR}/cube.frag.inc
+ ${PROJECT_SOURCE_DIR}/cube/cube.frag
+ MAIN_DEPENDENCY ${PROJECT_SOURCE_DIR}/cube/cube.frag
+ DEPENDS ${PROJECT_SOURCE_DIR}/cube/cube.frag ${GLSLANG_VALIDATOR})
endif()
-add_custom_command(COMMENT "Compiling cube vertex shader"
- OUTPUT cube.vert.inc
- COMMAND ${GLSLANG_VALIDATOR} -V -x -o ${CMAKE_CURRENT_BINARY_DIR}/cube.vert.inc
- ${PROJECT_SOURCE_DIR}/cube/cube.vert
- MAIN_DEPENDENCY ${PROJECT_SOURCE_DIR}/cube/cube.vert
- DEPENDS ${PROJECT_SOURCE_DIR}/cube/cube.vert ${GLSLANG_VALIDATOR})
-add_custom_command(COMMENT "Compiling cube fragment shader"
- OUTPUT cube.frag.inc
- COMMAND ${GLSLANG_VALIDATOR} -V -x -o ${CMAKE_CURRENT_BINARY_DIR}/cube.frag.inc
- ${PROJECT_SOURCE_DIR}/cube/cube.frag
- MAIN_DEPENDENCY ${PROJECT_SOURCE_DIR}/cube/cube.frag
- DEPENDS ${PROJECT_SOURCE_DIR}/cube/cube.frag ${GLSLANG_VALIDATOR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-
if(WIN32)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_USE_MATH_DEFINES")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_USE_MATH_DEFINES")
+ add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
+ # vkcube / vkcube make use of M_PI and various other math defines.
+ add_compile_definitions(_USE_MATH_DEFINES)
endif()
-include_directories(${CUBE_INCLUDE_DIRS})
-
# ----------------------------------------------------------------------------
# vkcube
if(APPLE)
include(macOS/cube/cube.cmake)
-elseif(NOT WIN32)
- if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})
- add_executable(vkcube
- cube.c
- ${PROJECT_SOURCE_DIR}/cube/cube.vert
- ${PROJECT_SOURCE_DIR}/cube/cube.frag
- cube.vert.inc
- cube.frag.inc
- ${OPTIONAL_WAYLAND_DATA_FILES})
- target_link_libraries(vkcube Vulkan::Vulkan)
- target_compile_definitions(vkcube PUBLIC ${CUBE_PLATFORM})
- include(CheckLibraryExists)
- CHECK_LIBRARY_EXISTS("rt" clock_gettime "" NEED_RT)
- if (NEED_RT)
- target_link_libraries(vkcube rt)
- endif()
- endif()
-else()
- if(CMAKE_CL_64)
- set(LIB_DIR "Win64")
- else()
- set(LIB_DIR "Win32")
- endif()
+elseif (ANDROID)
+ add_library(vkcube MODULE)
- add_executable(vkcube
- WIN32
- cube.c
- ${PROJECT_SOURCE_DIR}/cube/cube.vert
- ${PROJECT_SOURCE_DIR}/cube/cube.frag
- cube.vert.inc
- cube.frag.inc)
- target_link_libraries(vkcube Vulkan::Vulkan)
+ target_sources(vkcube PRIVATE cube.c)
+
+ add_subdirectory(android)
+
+ target_link_libraries(vkcube PRIVATE Vulkan::Headers)
+elseif(CMAKE_SYSTEM_NAME MATCHES "Linux|BSD")
+ add_executable(vkcube)
+ target_sources(vkcube PRIVATE
+ cube.c
+ ${PROJECT_SOURCE_DIR}/cube/cube.vert
+ ${PROJECT_SOURCE_DIR}/cube/cube.frag
+ cube.vert.inc
+ cube.frag.inc
+ ${OPTIONAL_WAYLAND_DATA_FILES}
+ )
+ target_compile_definitions(vkcube PUBLIC ${CUBE_PLATFORM})
+ include(CheckLibraryExists)
+ CHECK_LIBRARY_EXISTS("rt" clock_gettime "" NEED_RT)
+ if (NEED_RT)
+ target_link_libraries(vkcube PRIVATE rt)
+ endif()
+ target_link_libraries(vkcube PRIVATE Vulkan::Headers Vulkan::Loader)
+elseif(WIN32)
+ add_executable(vkcube WIN32)
+ target_sources(vkcube PRIVATE
+ cube.c
+ ${PROJECT_SOURCE_DIR}/cube/cube.vert
+ ${PROJECT_SOURCE_DIR}/cube/cube.frag
+ cube.vert.inc
+ cube.frag.inc
+ )
+ target_link_libraries(vkcube PRIVATE Vulkan::Headers Vulkan::Loader)
+else()
+ message(FATAL_ERROR "Unsupported Platform!")
endif()
-if(APPLE)
+if (ENABLE_ADDRESS_SANITIZER)
+ target_compile_options(vkcube PUBLIC -fsanitize=address)
+ target_link_options(vkcube PUBLIC -fsanitize=address)
+endif()
+
+target_include_directories(vkcube PRIVATE .)
+
+if (ANDROID)
+ install(TARGETS vkcube DESTINATION ${CMAKE_INSTALL_LIBDIR})
+elseif(APPLE)
# Keep RPATH so fixup_bundle can use it to find libraries
set_target_properties(vkcube PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
install(TARGETS vkcube BUNDLE DESTINATION "cube")
@@ -271,7 +229,11 @@
fixup_bundle(\${CMAKE_INSTALL_PREFIX}/cube/vkcube.app \"\" \"${Vulkan_LIBRARY_DIR}\")
")
else()
- install(TARGETS vkcube RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ install(TARGETS vkcube)
+endif()
+
+if (ANDROID)
+ return()
endif()
# ----------------------------------------------------------------------------
@@ -279,25 +241,22 @@
if(APPLE)
include(macOS/cubepp/cubepp.cmake)
-elseif(NOT WIN32)
- if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})
- add_executable(vkcubepp
- cube.cpp
- ${PROJECT_SOURCE_DIR}/cube/cube.vert
- ${PROJECT_SOURCE_DIR}/cube/cube.frag
- cube.vert.inc
- cube.frag.inc
- ${OPTIONAL_WAYLAND_DATA_FILES})
- target_link_libraries(vkcubepp Vulkan::Vulkan)
- target_compile_definitions(vkcubepp PUBLIC ${CUBE_PLATFORM})
- endif()
-else()
- if(CMAKE_CL_64)
- set(LIB_DIR "Win64")
- else()
- set(LIB_DIR "Win32")
- endif()
+elseif(CMAKE_SYSTEM_NAME MATCHES "Linux|BSD")
+ add_executable(vkcubepp
+ cube.cpp
+ ${PROJECT_SOURCE_DIR}/cube/cube.vert
+ ${PROJECT_SOURCE_DIR}/cube/cube.frag
+ cube.vert.inc
+ cube.frag.inc
+ ${OPTIONAL_WAYLAND_DATA_FILES})
+ target_link_libraries(vkcubepp Vulkan::Headers Vulkan::Loader)
+ target_compile_definitions(vkcubepp PUBLIC ${CUBE_PLATFORM})
+ if (ENABLE_ADDRESS_SANITIZER)
+ target_compile_options(vkcubepp PUBLIC -fsanitize=address)
+ target_link_options(vkcubepp PUBLIC -fsanitize=address)
+ endif ()
+else()
add_executable(vkcubepp
WIN32
cube.cpp
@@ -305,8 +264,9 @@
${PROJECT_SOURCE_DIR}/cube/cube.frag
cube.vert.inc
cube.frag.inc)
- target_link_libraries(vkcubepp Vulkan::Vulkan)
+ target_link_libraries(vkcubepp Vulkan::Headers Vulkan::Loader)
endif()
+target_include_directories(vkcubepp PRIVATE .)
if(APPLE)
# Keep RPATH so fixup_bundle can use it to find libraries
@@ -318,38 +278,47 @@
fixup_bundle(\${CMAKE_INSTALL_PREFIX}/cube/vkcubepp.app \"\" \"${Vulkan_LIBRARY_DIR}\")
")
else()
- install(TARGETS vkcubepp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ install(TARGETS vkcubepp)
endif()
# ----------------------------------------------------------------------------
# vkcube-wayland
-if(UNIX AND NOT APPLE) # i.e. Linux
+if (CMAKE_SYSTEM_NAME MATCHES "Linux|BSD")
if(BUILD_WSI_WAYLAND_SUPPORT AND EXISTS ${WAYLAND_PROTOCOLS_PATH}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml)
- set(CUBE_INCLUDE_DIRS ${WAYLAND_CLIENT_INCLUDE_DIR} ${CUBE_INCLUDE_DIRS})
- link_libraries(${WAYLAND_CLIENT_LIBRARIES})
- set(OPTIONAL_WAYLAND_DATA_FILES
+ add_executable(vkcube-wayland)
+
+ target_sources(vkcube-wayland PRIVATE
+ cube.c
+ ${PROJECT_SOURCE_DIR}/cube/cube.vert
+ ${PROJECT_SOURCE_DIR}/cube/cube.frag
+ cube.vert.inc
+ cube.frag.inc
${CMAKE_CURRENT_BINARY_DIR}/xdg-shell-code.c
${CMAKE_CURRENT_BINARY_DIR}/xdg-shell-client-header.h
${CMAKE_CURRENT_BINARY_DIR}/xdg-decoration-code.c
- ${CMAKE_CURRENT_BINARY_DIR}/xdg-decoration-client-header.h)
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})
- add_executable(vkcube-wayland
- cube.c
- ${PROJECT_SOURCE_DIR}/cube/cube.vert
- ${PROJECT_SOURCE_DIR}/cube/cube.frag
- cube.vert.inc
- cube.frag.inc
- ${OPTIONAL_WAYLAND_DATA_FILES})
- target_link_libraries(vkcube-wayland Vulkan::Vulkan)
- target_compile_definitions(vkcube-wayland PUBLIC VK_USE_PLATFORM_WAYLAND_KHR)
- include(CheckLibraryExists)
- CHECK_LIBRARY_EXISTS("rt" clock_gettime "" NEED_RT)
- if (NEED_RT)
- target_link_libraries(vkcube-wayland rt)
- endif()
+ ${CMAKE_CURRENT_BINARY_DIR}/xdg-decoration-client-header.h
+ )
+ target_include_directories(vkcube-wayland PRIVATE
+ ${CMAKE_CURRENT_BINARY_DIR}
+ .
+ )
+ target_link_libraries(vkcube-wayland PRIVATE
+ Vulkan::Headers
+ Vulkan::Loader
+ PkgConfig::WAYLAND_CLIENT
+ )
+ target_compile_definitions(vkcube-wayland PRIVATE VK_USE_PLATFORM_WAYLAND_KHR)
+ include(CheckLibraryExists)
+ CHECK_LIBRARY_EXISTS("rt" clock_gettime "" NEED_RT)
+ if (NEED_RT)
+ target_link_libraries(vkcube-wayland PRIVATE rt)
endif()
- install(TARGETS vkcube-wayland RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ install(TARGETS vkcube-wayland)
+
+ if (ENABLE_ADDRESS_SANITIZER)
+ target_compile_options(vkcube-wayland PUBLIC -fsanitize=address)
+ target_link_options(vkcube-wayland PUBLIC -fsanitize=address)
+ endif ()
endif()
endif()
diff --git a/cube/android/cube/AndroidManifest.xml b/cube/android/AndroidManifest.xml
similarity index 84%
rename from cube/android/cube/AndroidManifest.xml
rename to cube/android/AndroidManifest.xml
index 1bf9080..fbec106 100644
--- a/cube/android/cube/AndroidManifest.xml
+++ b/cube/android/AndroidManifest.xml
@@ -6,15 +6,14 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.INTERNET"/>
- <!-- This is the platform API where NativeActivity was introduced. -->
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="23"/>
<!-- This .apk has no Java code itself, so set hasCode to false. -->
- <application android:label="@string/app_name" android:hasCode="false" android:debuggable='true'>
+ <application android:label="VkCube" android:hasCode="false" android:debuggable='true'>
<!-- Our activity is the built-in NativeActivity framework class.
This will take care of integrating with our NDK code. -->
- <activity android:name="android.app.NativeActivity" android:label="@string/app_name" android:exported="true">
+ <activity android:name="android.app.NativeActivity" android:label="VkCube" android:exported="true">
<!-- Tell NativeActivity the name of or .so -->
<meta-data android:name="android.app.lib_name" android:value="VkCube"/>
<intent-filter>
diff --git a/cube/android/CMakeLists.txt b/cube/android/CMakeLists.txt
new file mode 100644
index 0000000..5783fa9
--- /dev/null
+++ b/cube/android/CMakeLists.txt
@@ -0,0 +1,64 @@
+# ~~~
+# Copyright (c) 2023 Valve Corporation
+# Copyright (c) 2023 LunarG, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ~~~
+
+target_sources(vkcube PRIVATE
+ android_util.cpp
+ android_util.h
+ vulkan_wrapper.cpp
+ vulkan_wrapper.h
+)
+
+target_include_directories(vkcube PRIVATE
+ include
+ .
+)
+
+target_compile_options(vkcube PRIVATE
+ --include=${CMAKE_CURRENT_SOURCE_DIR}/vulkan_wrapper.h
+)
+
+set_directory_properties(PROPERTIES "COMPILE_OPTIONS" "") # Disable compiler warnings for android glue
+
+set(native_app_glue_dir "${CMAKE_ANDROID_NDK}/sources/android/native_app_glue")
+
+if (NOT EXISTS ${native_app_glue_dir})
+ message(FATAL_ERROR "Couldn't find Android Native Glue directory!")
+endif()
+
+# https://stackoverflow.com/questions/57189936/compiling-native-app-glue-c-results-in-an-invalid-library-file/76963564#76963564
+add_library(android_glue OBJECT)
+
+target_include_directories(android_glue PUBLIC ${native_app_glue_dir})
+target_sources(android_glue PRIVATE
+ ${native_app_glue_dir}/android_native_app_glue.c
+ ${native_app_glue_dir}/android_native_app_glue.h
+)
+
+set_target_properties(vkcube PROPERTIES OUTPUT_NAME "VkCube")
+
+target_link_libraries(vkcube PRIVATE
+ android_glue
+ log
+ android
+)
+
+# https://stackoverflow.com/questions/76631917/cmake-how-to-install-shared-stl-libraries-for-android/76656492#76656492
+if ("${CMAKE_ANDROID_STL_TYPE}" MATCHES "shared")
+ file(READ "${CMAKE_ANDROID_NDK}/meta/abis.json" JSON_FILE)
+ string(JSON TRIPLE GET "${JSON_FILE}" "${CMAKE_ANDROID_ARCH_ABI}" "triple")
+ install(FILES "${CMAKE_SYSROOT}/usr/lib/${TRIPLE}/libc++_shared.so" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+endif()
diff --git a/common/README.md b/cube/android/README.md
similarity index 86%
rename from common/README.md
rename to cube/android/README.md
index 3e496be..75b1747 100644
--- a/common/README.md
+++ b/cube/android/README.md
@@ -22,7 +22,7 @@
Then run the script:
popd
- ./generate_vulkan_wrapper.py ../common/vulkan_wrapper.h
- ./generate_vulkan_wrapper.py ../common/vulkan_wrapper.cpp
+ ./generate_vulkan_wrapper.py ../cube/android/vulkan_wrapper.h
+ ./generate_vulkan_wrapper.py ../cube/android/vulkan_wrapper.cpp
clang-format -i vulkan_wrapper.h
clang-format -i vulkan_wrapper.cpp
diff --git a/common/android_util.cpp b/cube/android/android_util.cpp
similarity index 100%
rename from common/android_util.cpp
rename to cube/android/android_util.cpp
diff --git a/common/android_util.h b/cube/android/android_util.h
similarity index 100%
rename from common/android_util.h
rename to cube/android/android_util.h
diff --git a/cube/android/cube-with-layers/AndroidManifest.xml b/cube/android/cube-with-layers/AndroidManifest.xml
deleted file mode 100644
index 50b216e..0000000
--- a/cube/android/cube-with-layers/AndroidManifest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.VkCubeWithLayers" android:versionCode="1" android:versionName="1.0">
-
- <!-- Allow this app to read and write files (for use by tracing libraries). -->
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <uses-permission android:name="android.permission.INTERNET"/>
-
- <!-- This is the platform API where NativeActivity was introduced. -->
- <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="23"/>
-
- <!-- This .apk has no Java code itself, so set hasCode to false. -->
- <application android:label="@string/app_name" android:hasCode="false" android:debuggable='true'>
-
- <!-- Our activity is the built-in NativeActivity framework class.
- This will take care of integrating with our NDK code. -->
- <activity android:name="android.app.NativeActivity" android:label="@string/app_name" android:exported="true">
- <!-- Tell NativeActivity the name of or .so -->
- <meta-data android:name="android.app.lib_name" android:value="VkCube"/>
- <intent-filter>
- <action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.LAUNCHER"/>
- </intent-filter>
- </activity>
- </application>
-
-</manifest>
diff --git a/cube/android/cube-with-layers/custom_rules.xml b/cube/android/cube-with-layers/custom_rules.xml
deleted file mode 100644
index 0ca5933..0000000
--- a/cube/android/cube-with-layers/custom_rules.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="NativeActivity" default="help">
-
-<property name="cubeWithLayersDir" location="../libs-with-layers" />
-<property name="cubeDir" location="../libs" />
-<property name="layersDir" location="../../../build-android/libs" />
-
-<echo>VkCubeWithLayers: Creating libs-with-layers</echo>
-<mkdir dir="${cubeWithLayersDir}"/>
-
-<echo>VkCubeWithLayers: Copying libs from demos/android</echo>
-<copy todir="${cubeWithLayersDir}">
-<fileset dir="${cubeDir}"/>
-</copy>
-
-<echo>VkCubeWithLayers: Copying layers from build-android</echo>
-<copy todir="${cubeWithLayersDir}">
-<fileset dir="${layersDir}"/>
-</copy>
-
-<!-- Point ndk-build at the libs-with-layers common dir -->
-<echo>VkCubeWithLayers: Overriding native.libs.absolute.dir with ${cubeWithLayersDir}</echo>
-<property name="native.libs.absolute.dir" location="${cubeWithLayersDir}" />
-
-</project>
diff --git a/cube/android/cube-with-layers/res/values/strings.xml b/cube/android/cube-with-layers/res/values/strings.xml
deleted file mode 100644
index ecd779e..0000000
--- a/cube/android/cube-with-layers/res/values/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- This file contains resource definitions for displayed strings, allowing
- them to be changed based on the locale and options. -->
-
-<resources>
- <!-- Simple strings. -->
- <string name="app_name">VkCubeWithLayers</string>
-
-</resources>
diff --git a/cube/android/cube/custom_rules.xml b/cube/android/cube/custom_rules.xml
deleted file mode 100644
index 31eb31a..0000000
--- a/cube/android/cube/custom_rules.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="NativeActivity" default="help">
-<!-- Point ndk-build at the libs created in common dir -->
-<echo>vkcube: Overriding native.libs.absolute.dir with ../libs</echo>
-<property name="native.libs.absolute.dir" location="../libs" />
-</project>
diff --git a/cube/android/cube/res/values/strings.xml b/cube/android/cube/res/values/strings.xml
deleted file mode 100644
index 8adead2..0000000
--- a/cube/android/cube/res/values/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- This file contains resource definitions for displayed strings, allowing
- them to be changed based on the locale and options. -->
-
-<resources>
- <!-- Simple strings. -->
- <string name="app_name">VkCube</string>
-
-</resources>
diff --git a/cube/android/jni/Android.mk b/cube/android/jni/Android.mk
deleted file mode 100644
index cc4b93c..0000000
--- a/cube/android/jni/Android.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2015 The Android Open Source Project
-# Copyright (C) 2015 Valve Corporation
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(abspath $(call my-dir))
-SRC_DIR := $(LOCAL_PATH)/../../..
-DEMO_DIR := $(SRC_DIR)/cube
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := VkCube
-LOCAL_SRC_FILES += $(DEMO_DIR)/cube.c \
- $(SRC_DIR)/common/vulkan_wrapper.cpp \
- $(SRC_DIR)/common/android_util.cpp
-LOCAL_C_INCLUDES += $(SRC_DIR)/build-android/third_party/Vulkan-Headers/include \
- $(DEMO_DIR)/android/include \
- $(SRC_DIR)/libs \
- $(SRC_DIR)/common \
- $(SRC_DIR)/build-android/generated/include
-LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR --include=$(SRC_DIR)/common/vulkan_wrapper.h
-LOCAL_WHOLE_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_LDLIBS := -llog -landroid
-LOCAL_LDFLAGS := -u ANativeActivity_onCreate
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,android/native_app_glue)
diff --git a/cube/android/jni/Application.mk b/cube/android/jni/Application.mk
deleted file mode 100644
index a3d9754..0000000
--- a/cube/android/jni/Application.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2015 The Android Open Source Project
-# Copyright (C) 2015 Valve Corporation
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
-APP_PLATFORM := android-23
-APP_STL := c++_static
-APP_MODULES := VkCube
-APP_CPPFLAGS += -std=c++11 -fexceptions -Wall -Werror -Wextra -Wno-unused-parameter -DVK_NO_PROTOTYES -DGLM_FORCE_RADIANS
-APP_CFLAGS += -Wall -Werror -Wextra -Wno-unused-parameter -DVK_NO_PROTOTYES -DGLM_FORCE_RADIANS
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/common/vulkan_wrapper.cpp b/cube/android/vulkan_wrapper.cpp
similarity index 94%
rename from common/vulkan_wrapper.cpp
rename to cube/android/vulkan_wrapper.cpp
index 76a15b9..c663f9e 100644
--- a/common/vulkan_wrapper.cpp
+++ b/cube/android/vulkan_wrapper.cpp
@@ -328,6 +328,26 @@
reinterpret_cast<PFN_vkCreateDisplayPlaneSurfaceKHR>(dlsym(libvulkan, "vkCreateDisplayPlaneSurfaceKHR"));
vkCreateSharedSwapchainsKHR =
reinterpret_cast<PFN_vkCreateSharedSwapchainsKHR>(dlsym(libvulkan, "vkCreateSharedSwapchainsKHR"));
+ vkGetPhysicalDeviceVideoCapabilitiesKHR =
+ reinterpret_cast<PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR>(dlsym(libvulkan, "vkGetPhysicalDeviceVideoCapabilitiesKHR"));
+ vkGetPhysicalDeviceVideoFormatPropertiesKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR>(
+ dlsym(libvulkan, "vkGetPhysicalDeviceVideoFormatPropertiesKHR"));
+ vkCreateVideoSessionKHR = reinterpret_cast<PFN_vkCreateVideoSessionKHR>(dlsym(libvulkan, "vkCreateVideoSessionKHR"));
+ vkDestroyVideoSessionKHR = reinterpret_cast<PFN_vkDestroyVideoSessionKHR>(dlsym(libvulkan, "vkDestroyVideoSessionKHR"));
+ vkGetVideoSessionMemoryRequirementsKHR =
+ reinterpret_cast<PFN_vkGetVideoSessionMemoryRequirementsKHR>(dlsym(libvulkan, "vkGetVideoSessionMemoryRequirementsKHR"));
+ vkBindVideoSessionMemoryKHR =
+ reinterpret_cast<PFN_vkBindVideoSessionMemoryKHR>(dlsym(libvulkan, "vkBindVideoSessionMemoryKHR"));
+ vkCreateVideoSessionParametersKHR =
+ reinterpret_cast<PFN_vkCreateVideoSessionParametersKHR>(dlsym(libvulkan, "vkCreateVideoSessionParametersKHR"));
+ vkUpdateVideoSessionParametersKHR =
+ reinterpret_cast<PFN_vkUpdateVideoSessionParametersKHR>(dlsym(libvulkan, "vkUpdateVideoSessionParametersKHR"));
+ vkDestroyVideoSessionParametersKHR =
+ reinterpret_cast<PFN_vkDestroyVideoSessionParametersKHR>(dlsym(libvulkan, "vkDestroyVideoSessionParametersKHR"));
+ vkCmdBeginVideoCodingKHR = reinterpret_cast<PFN_vkCmdBeginVideoCodingKHR>(dlsym(libvulkan, "vkCmdBeginVideoCodingKHR"));
+ vkCmdEndVideoCodingKHR = reinterpret_cast<PFN_vkCmdEndVideoCodingKHR>(dlsym(libvulkan, "vkCmdEndVideoCodingKHR"));
+ vkCmdControlVideoCodingKHR = reinterpret_cast<PFN_vkCmdControlVideoCodingKHR>(dlsym(libvulkan, "vkCmdControlVideoCodingKHR"));
+ vkCmdDecodeVideoKHR = reinterpret_cast<PFN_vkCmdDecodeVideoKHR>(dlsym(libvulkan, "vkCmdDecodeVideoKHR"));
vkCmdBeginRenderingKHR = reinterpret_cast<PFN_vkCmdBeginRenderingKHR>(dlsym(libvulkan, "vkCmdBeginRenderingKHR"));
vkCmdEndRenderingKHR = reinterpret_cast<PFN_vkCmdEndRenderingKHR>(dlsym(libvulkan, "vkCmdEndRenderingKHR"));
vkGetPhysicalDeviceFeatures2KHR =
@@ -444,6 +464,8 @@
reinterpret_cast<PFN_vkGetPipelineExecutableStatisticsKHR>(dlsym(libvulkan, "vkGetPipelineExecutableStatisticsKHR"));
vkGetPipelineExecutableInternalRepresentationsKHR = reinterpret_cast<PFN_vkGetPipelineExecutableInternalRepresentationsKHR>(
dlsym(libvulkan, "vkGetPipelineExecutableInternalRepresentationsKHR"));
+ vkMapMemory2KHR = reinterpret_cast<PFN_vkMapMemory2KHR>(dlsym(libvulkan, "vkMapMemory2KHR"));
+ vkUnmapMemory2KHR = reinterpret_cast<PFN_vkUnmapMemory2KHR>(dlsym(libvulkan, "vkUnmapMemory2KHR"));
vkCmdSetEvent2KHR = reinterpret_cast<PFN_vkCmdSetEvent2KHR>(dlsym(libvulkan, "vkCmdSetEvent2KHR"));
vkCmdResetEvent2KHR = reinterpret_cast<PFN_vkCmdResetEvent2KHR>(dlsym(libvulkan, "vkCmdResetEvent2KHR"));
vkCmdWaitEvents2KHR = reinterpret_cast<PFN_vkCmdWaitEvents2KHR>(dlsym(libvulkan, "vkCmdWaitEvents2KHR"));
@@ -466,6 +488,15 @@
reinterpret_cast<PFN_vkGetDeviceImageMemoryRequirementsKHR>(dlsym(libvulkan, "vkGetDeviceImageMemoryRequirementsKHR"));
vkGetDeviceImageSparseMemoryRequirementsKHR = reinterpret_cast<PFN_vkGetDeviceImageSparseMemoryRequirementsKHR>(
dlsym(libvulkan, "vkGetDeviceImageSparseMemoryRequirementsKHR"));
+ vkCmdBindIndexBuffer2KHR = reinterpret_cast<PFN_vkCmdBindIndexBuffer2KHR>(dlsym(libvulkan, "vkCmdBindIndexBuffer2KHR"));
+ vkGetRenderingAreaGranularityKHR =
+ reinterpret_cast<PFN_vkGetRenderingAreaGranularityKHR>(dlsym(libvulkan, "vkGetRenderingAreaGranularityKHR"));
+ vkGetDeviceImageSubresourceLayoutKHR =
+ reinterpret_cast<PFN_vkGetDeviceImageSubresourceLayoutKHR>(dlsym(libvulkan, "vkGetDeviceImageSubresourceLayoutKHR"));
+ vkGetImageSubresourceLayout2KHR =
+ reinterpret_cast<PFN_vkGetImageSubresourceLayout2KHR>(dlsym(libvulkan, "vkGetImageSubresourceLayout2KHR"));
+ vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR>(
+ dlsym(libvulkan, "vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR"));
vkCreateAccelerationStructureKHR =
reinterpret_cast<PFN_vkCreateAccelerationStructureKHR>(dlsym(libvulkan, "vkCreateAccelerationStructureKHR"));
vkDestroyAccelerationStructureKHR =
@@ -557,32 +588,11 @@
#endif
#ifdef VK_ENABLE_BETA_EXTENSIONS
- vkGetPhysicalDeviceVideoCapabilitiesKHR =
- reinterpret_cast<PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR>(dlsym(libvulkan, "vkGetPhysicalDeviceVideoCapabilitiesKHR"));
- vkGetPhysicalDeviceVideoFormatPropertiesKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR>(
- dlsym(libvulkan, "vkGetPhysicalDeviceVideoFormatPropertiesKHR"));
- vkCreateVideoSessionKHR = reinterpret_cast<PFN_vkCreateVideoSessionKHR>(dlsym(libvulkan, "vkCreateVideoSessionKHR"));
- vkDestroyVideoSessionKHR = reinterpret_cast<PFN_vkDestroyVideoSessionKHR>(dlsym(libvulkan, "vkDestroyVideoSessionKHR"));
- vkGetVideoSessionMemoryRequirementsKHR =
- reinterpret_cast<PFN_vkGetVideoSessionMemoryRequirementsKHR>(dlsym(libvulkan, "vkGetVideoSessionMemoryRequirementsKHR"));
- vkBindVideoSessionMemoryKHR =
- reinterpret_cast<PFN_vkBindVideoSessionMemoryKHR>(dlsym(libvulkan, "vkBindVideoSessionMemoryKHR"));
- vkCreateVideoSessionParametersKHR =
- reinterpret_cast<PFN_vkCreateVideoSessionParametersKHR>(dlsym(libvulkan, "vkCreateVideoSessionParametersKHR"));
- vkUpdateVideoSessionParametersKHR =
- reinterpret_cast<PFN_vkUpdateVideoSessionParametersKHR>(dlsym(libvulkan, "vkUpdateVideoSessionParametersKHR"));
- vkDestroyVideoSessionParametersKHR =
- reinterpret_cast<PFN_vkDestroyVideoSessionParametersKHR>(dlsym(libvulkan, "vkDestroyVideoSessionParametersKHR"));
- vkCmdBeginVideoCodingKHR = reinterpret_cast<PFN_vkCmdBeginVideoCodingKHR>(dlsym(libvulkan, "vkCmdBeginVideoCodingKHR"));
- vkCmdEndVideoCodingKHR = reinterpret_cast<PFN_vkCmdEndVideoCodingKHR>(dlsym(libvulkan, "vkCmdEndVideoCodingKHR"));
- vkCmdControlVideoCodingKHR = reinterpret_cast<PFN_vkCmdControlVideoCodingKHR>(dlsym(libvulkan, "vkCmdControlVideoCodingKHR"));
-#endif
-
-#ifdef VK_ENABLE_BETA_EXTENSIONS
- vkCmdDecodeVideoKHR = reinterpret_cast<PFN_vkCmdDecodeVideoKHR>(dlsym(libvulkan, "vkCmdDecodeVideoKHR"));
-#endif
-
-#ifdef VK_ENABLE_BETA_EXTENSIONS
+ vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR =
+ reinterpret_cast<PFN_vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR>(
+ dlsym(libvulkan, "vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR"));
+ vkGetEncodedVideoSessionParametersKHR =
+ reinterpret_cast<PFN_vkGetEncodedVideoSessionParametersKHR>(dlsym(libvulkan, "vkGetEncodedVideoSessionParametersKHR"));
vkCmdEncodeVideoKHR = reinterpret_cast<PFN_vkCmdEncodeVideoKHR>(dlsym(libvulkan, "vkCmdEncodeVideoKHR"));
#endif
return 1;
@@ -826,6 +836,19 @@
PFN_vkGetDisplayPlaneCapabilitiesKHR vkGetDisplayPlaneCapabilitiesKHR;
PFN_vkCreateDisplayPlaneSurfaceKHR vkCreateDisplayPlaneSurfaceKHR;
PFN_vkCreateSharedSwapchainsKHR vkCreateSharedSwapchainsKHR;
+PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR vkGetPhysicalDeviceVideoCapabilitiesKHR;
+PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR vkGetPhysicalDeviceVideoFormatPropertiesKHR;
+PFN_vkCreateVideoSessionKHR vkCreateVideoSessionKHR;
+PFN_vkDestroyVideoSessionKHR vkDestroyVideoSessionKHR;
+PFN_vkGetVideoSessionMemoryRequirementsKHR vkGetVideoSessionMemoryRequirementsKHR;
+PFN_vkBindVideoSessionMemoryKHR vkBindVideoSessionMemoryKHR;
+PFN_vkCreateVideoSessionParametersKHR vkCreateVideoSessionParametersKHR;
+PFN_vkUpdateVideoSessionParametersKHR vkUpdateVideoSessionParametersKHR;
+PFN_vkDestroyVideoSessionParametersKHR vkDestroyVideoSessionParametersKHR;
+PFN_vkCmdBeginVideoCodingKHR vkCmdBeginVideoCodingKHR;
+PFN_vkCmdEndVideoCodingKHR vkCmdEndVideoCodingKHR;
+PFN_vkCmdControlVideoCodingKHR vkCmdControlVideoCodingKHR;
+PFN_vkCmdDecodeVideoKHR vkCmdDecodeVideoKHR;
PFN_vkCmdBeginRenderingKHR vkCmdBeginRenderingKHR;
PFN_vkCmdEndRenderingKHR vkCmdEndRenderingKHR;
PFN_vkGetPhysicalDeviceFeatures2KHR vkGetPhysicalDeviceFeatures2KHR;
@@ -896,6 +919,8 @@
PFN_vkGetPipelineExecutablePropertiesKHR vkGetPipelineExecutablePropertiesKHR;
PFN_vkGetPipelineExecutableStatisticsKHR vkGetPipelineExecutableStatisticsKHR;
PFN_vkGetPipelineExecutableInternalRepresentationsKHR vkGetPipelineExecutableInternalRepresentationsKHR;
+PFN_vkMapMemory2KHR vkMapMemory2KHR;
+PFN_vkUnmapMemory2KHR vkUnmapMemory2KHR;
PFN_vkCmdSetEvent2KHR vkCmdSetEvent2KHR;
PFN_vkCmdResetEvent2KHR vkCmdResetEvent2KHR;
PFN_vkCmdWaitEvents2KHR vkCmdWaitEvents2KHR;
@@ -914,6 +939,11 @@
PFN_vkGetDeviceBufferMemoryRequirementsKHR vkGetDeviceBufferMemoryRequirementsKHR;
PFN_vkGetDeviceImageMemoryRequirementsKHR vkGetDeviceImageMemoryRequirementsKHR;
PFN_vkGetDeviceImageSparseMemoryRequirementsKHR vkGetDeviceImageSparseMemoryRequirementsKHR;
+PFN_vkCmdBindIndexBuffer2KHR vkCmdBindIndexBuffer2KHR;
+PFN_vkGetRenderingAreaGranularityKHR vkGetRenderingAreaGranularityKHR;
+PFN_vkGetDeviceImageSubresourceLayoutKHR vkGetDeviceImageSubresourceLayoutKHR;
+PFN_vkGetImageSubresourceLayout2KHR vkGetImageSubresourceLayout2KHR;
+PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR;
PFN_vkCreateDebugReportCallbackEXT vkCreateDebugReportCallbackEXT;
PFN_vkDestroyDebugReportCallbackEXT vkDestroyDebugReportCallbackEXT;
PFN_vkDebugReportMessageEXT vkDebugReportMessageEXT;
@@ -951,6 +981,8 @@
PFN_vkGetRefreshCycleDurationGOOGLE vkGetRefreshCycleDurationGOOGLE;
PFN_vkGetPastPresentationTimingGOOGLE vkGetPastPresentationTimingGOOGLE;
PFN_vkCmdSetDiscardRectangleEXT vkCmdSetDiscardRectangleEXT;
+PFN_vkCmdSetDiscardRectangleEnableEXT vkCmdSetDiscardRectangleEnableEXT;
+PFN_vkCmdSetDiscardRectangleModeEXT vkCmdSetDiscardRectangleModeEXT;
PFN_vkSetHdrMetadataEXT vkSetHdrMetadataEXT;
PFN_vkSetDebugUtilsObjectNameEXT vkSetDebugUtilsObjectNameEXT;
PFN_vkSetDebugUtilsObjectTagEXT vkSetDebugUtilsObjectTagEXT;
@@ -993,6 +1025,7 @@
PFN_vkCmdDrawMeshTasksNV vkCmdDrawMeshTasksNV;
PFN_vkCmdDrawMeshTasksIndirectNV vkCmdDrawMeshTasksIndirectNV;
PFN_vkCmdDrawMeshTasksIndirectCountNV vkCmdDrawMeshTasksIndirectCountNV;
+PFN_vkCmdSetExclusiveScissorEnableNV vkCmdSetExclusiveScissorEnableNV;
PFN_vkCmdSetExclusiveScissorNV vkCmdSetExclusiveScissorNV;
PFN_vkCmdSetCheckpointNV vkCmdSetCheckpointNV;
PFN_vkGetQueueCheckpointDataNV vkGetQueueCheckpointDataNV;
@@ -1026,23 +1059,38 @@
PFN_vkCmdSetDepthBoundsTestEnableEXT vkCmdSetDepthBoundsTestEnableEXT;
PFN_vkCmdSetStencilTestEnableEXT vkCmdSetStencilTestEnableEXT;
PFN_vkCmdSetStencilOpEXT vkCmdSetStencilOpEXT;
+PFN_vkCopyMemoryToImageEXT vkCopyMemoryToImageEXT;
+PFN_vkCopyImageToMemoryEXT vkCopyImageToMemoryEXT;
+PFN_vkCopyImageToImageEXT vkCopyImageToImageEXT;
+PFN_vkTransitionImageLayoutEXT vkTransitionImageLayoutEXT;
+PFN_vkGetImageSubresourceLayout2EXT vkGetImageSubresourceLayout2EXT;
+PFN_vkReleaseSwapchainImagesEXT vkReleaseSwapchainImagesEXT;
PFN_vkGetGeneratedCommandsMemoryRequirementsNV vkGetGeneratedCommandsMemoryRequirementsNV;
PFN_vkCmdPreprocessGeneratedCommandsNV vkCmdPreprocessGeneratedCommandsNV;
PFN_vkCmdExecuteGeneratedCommandsNV vkCmdExecuteGeneratedCommandsNV;
PFN_vkCmdBindPipelineShaderGroupNV vkCmdBindPipelineShaderGroupNV;
PFN_vkCreateIndirectCommandsLayoutNV vkCreateIndirectCommandsLayoutNV;
PFN_vkDestroyIndirectCommandsLayoutNV vkDestroyIndirectCommandsLayoutNV;
+PFN_vkCmdSetDepthBias2EXT vkCmdSetDepthBias2EXT;
PFN_vkAcquireDrmDisplayEXT vkAcquireDrmDisplayEXT;
PFN_vkGetDrmDisplayEXT vkGetDrmDisplayEXT;
PFN_vkCreatePrivateDataSlotEXT vkCreatePrivateDataSlotEXT;
PFN_vkDestroyPrivateDataSlotEXT vkDestroyPrivateDataSlotEXT;
PFN_vkSetPrivateDataEXT vkSetPrivateDataEXT;
PFN_vkGetPrivateDataEXT vkGetPrivateDataEXT;
+PFN_vkGetDescriptorSetLayoutSizeEXT vkGetDescriptorSetLayoutSizeEXT;
+PFN_vkGetDescriptorSetLayoutBindingOffsetEXT vkGetDescriptorSetLayoutBindingOffsetEXT;
+PFN_vkGetDescriptorEXT vkGetDescriptorEXT;
+PFN_vkCmdBindDescriptorBuffersEXT vkCmdBindDescriptorBuffersEXT;
+PFN_vkCmdSetDescriptorBufferOffsetsEXT vkCmdSetDescriptorBufferOffsetsEXT;
+PFN_vkCmdBindDescriptorBufferEmbeddedSamplersEXT vkCmdBindDescriptorBufferEmbeddedSamplersEXT;
+PFN_vkGetBufferOpaqueCaptureDescriptorDataEXT vkGetBufferOpaqueCaptureDescriptorDataEXT;
+PFN_vkGetImageOpaqueCaptureDescriptorDataEXT vkGetImageOpaqueCaptureDescriptorDataEXT;
+PFN_vkGetImageViewOpaqueCaptureDescriptorDataEXT vkGetImageViewOpaqueCaptureDescriptorDataEXT;
+PFN_vkGetSamplerOpaqueCaptureDescriptorDataEXT vkGetSamplerOpaqueCaptureDescriptorDataEXT;
+PFN_vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT;
PFN_vkCmdSetFragmentShadingRateEnumNV vkCmdSetFragmentShadingRateEnumNV;
-PFN_vkGetImageSubresourceLayout2EXT vkGetImageSubresourceLayout2EXT;
PFN_vkGetDeviceFaultInfoEXT vkGetDeviceFaultInfoEXT;
-PFN_vkAcquireWinrtDisplayNV vkAcquireWinrtDisplayNV;
-PFN_vkGetWinrtDisplayNV vkGetWinrtDisplayNV;
PFN_vkCmdSetVertexInputEXT vkCmdSetVertexInputEXT;
PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI;
PFN_vkCmdSubpassShadingHUAWEI vkCmdSubpassShadingHUAWEI;
@@ -1071,9 +1119,18 @@
PFN_vkCmdWriteMicromapsPropertiesEXT vkCmdWriteMicromapsPropertiesEXT;
PFN_vkGetDeviceMicromapCompatibilityEXT vkGetDeviceMicromapCompatibilityEXT;
PFN_vkGetMicromapBuildSizesEXT vkGetMicromapBuildSizesEXT;
+PFN_vkCmdDrawClusterHUAWEI vkCmdDrawClusterHUAWEI;
+PFN_vkCmdDrawClusterIndirectHUAWEI vkCmdDrawClusterIndirectHUAWEI;
PFN_vkSetDeviceMemoryPriorityEXT vkSetDeviceMemoryPriorityEXT;
PFN_vkGetDescriptorSetLayoutHostMappingInfoVALVE vkGetDescriptorSetLayoutHostMappingInfoVALVE;
PFN_vkGetDescriptorSetHostMappingVALVE vkGetDescriptorSetHostMappingVALVE;
+PFN_vkCmdCopyMemoryIndirectNV vkCmdCopyMemoryIndirectNV;
+PFN_vkCmdCopyMemoryToImageIndirectNV vkCmdCopyMemoryToImageIndirectNV;
+PFN_vkCmdDecompressMemoryNV vkCmdDecompressMemoryNV;
+PFN_vkCmdDecompressMemoryIndirectCountNV vkCmdDecompressMemoryIndirectCountNV;
+PFN_vkGetPipelineIndirectMemoryRequirementsNV vkGetPipelineIndirectMemoryRequirementsNV;
+PFN_vkCmdUpdatePipelineIndirectBufferNV vkCmdUpdatePipelineIndirectBufferNV;
+PFN_vkGetPipelineIndirectDeviceAddressNV vkGetPipelineIndirectDeviceAddressNV;
PFN_vkCmdSetTessellationDomainOriginEXT vkCmdSetTessellationDomainOriginEXT;
PFN_vkCmdSetDepthClampEnableEXT vkCmdSetDepthClampEnableEXT;
PFN_vkCmdSetPolygonModeEXT vkCmdSetPolygonModeEXT;
@@ -1112,8 +1169,18 @@
PFN_vkDestroyOpticalFlowSessionNV vkDestroyOpticalFlowSessionNV;
PFN_vkBindOpticalFlowSessionImageNV vkBindOpticalFlowSessionImageNV;
PFN_vkCmdOpticalFlowExecuteNV vkCmdOpticalFlowExecuteNV;
+PFN_vkCreateShadersEXT vkCreateShadersEXT;
+PFN_vkDestroyShaderEXT vkDestroyShaderEXT;
+PFN_vkGetShaderBinaryDataEXT vkGetShaderBinaryDataEXT;
+PFN_vkCmdBindShadersEXT vkCmdBindShadersEXT;
PFN_vkGetFramebufferTilePropertiesQCOM vkGetFramebufferTilePropertiesQCOM;
PFN_vkGetDynamicRenderingTilePropertiesQCOM vkGetDynamicRenderingTilePropertiesQCOM;
+PFN_vkSetLatencySleepModeNV vkSetLatencySleepModeNV;
+PFN_vkLatencySleepNV vkLatencySleepNV;
+PFN_vkSetLatencyMarkerNV vkSetLatencyMarkerNV;
+PFN_vkGetLatencyTimingsNV vkGetLatencyTimingsNV;
+PFN_vkQueueNotifyOutOfBandNV vkQueueNotifyOutOfBandNV;
+PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT vkCmdSetAttachmentFeedbackLoopEnableEXT;
PFN_vkCreateAccelerationStructureKHR vkCreateAccelerationStructureKHR;
PFN_vkDestroyAccelerationStructureKHR vkDestroyAccelerationStructureKHR;
PFN_vkCmdBuildAccelerationStructuresKHR vkCmdBuildAccelerationStructuresKHR;
@@ -1227,6 +1294,11 @@
PFN_vkGetDeviceGroupSurfacePresentModes2EXT vkGetDeviceGroupSurfacePresentModes2EXT;
#endif
+#ifdef VK_USE_PLATFORM_WIN32_KHR
+PFN_vkAcquireWinrtDisplayNV vkAcquireWinrtDisplayNV;
+PFN_vkGetWinrtDisplayNV vkGetWinrtDisplayNV;
+#endif
+
#ifdef VK_USE_PLATFORM_XCB_KHR
PFN_vkCreateXcbSurfaceKHR vkCreateXcbSurfaceKHR;
PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR vkGetPhysicalDeviceXcbPresentationSupportKHR;
@@ -1256,29 +1328,26 @@
PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX vkGetPhysicalDeviceScreenPresentationSupportQNX;
#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR vkGetPhysicalDeviceVideoCapabilitiesKHR;
-PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR vkGetPhysicalDeviceVideoFormatPropertiesKHR;
-PFN_vkCreateVideoSessionKHR vkCreateVideoSessionKHR;
-PFN_vkDestroyVideoSessionKHR vkDestroyVideoSessionKHR;
-PFN_vkGetVideoSessionMemoryRequirementsKHR vkGetVideoSessionMemoryRequirementsKHR;
-PFN_vkBindVideoSessionMemoryKHR vkBindVideoSessionMemoryKHR;
-PFN_vkCreateVideoSessionParametersKHR vkCreateVideoSessionParametersKHR;
-PFN_vkUpdateVideoSessionParametersKHR vkUpdateVideoSessionParametersKHR;
-PFN_vkDestroyVideoSessionParametersKHR vkDestroyVideoSessionParametersKHR;
-PFN_vkCmdBeginVideoCodingKHR vkCmdBeginVideoCodingKHR;
-PFN_vkCmdEndVideoCodingKHR vkCmdEndVideoCodingKHR;
-PFN_vkCmdControlVideoCodingKHR vkCmdControlVideoCodingKHR;
+#ifdef VK_USE_PLATFORM_SCREEN_QNX
+PFN_vkGetScreenBufferPropertiesQNX vkGetScreenBufferPropertiesQNX;
#endif
#ifdef VK_ENABLE_BETA_EXTENSIONS
-PFN_vkCmdDecodeVideoKHR vkCmdDecodeVideoKHR;
-#endif
-
-#ifdef VK_ENABLE_BETA_EXTENSIONS
+PFN_vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR;
+PFN_vkGetEncodedVideoSessionParametersKHR vkGetEncodedVideoSessionParametersKHR;
PFN_vkCmdEncodeVideoKHR vkCmdEncodeVideoKHR;
#endif
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+PFN_vkCreateExecutionGraphPipelinesAMDX vkCreateExecutionGraphPipelinesAMDX;
+PFN_vkGetExecutionGraphPipelineScratchSizeAMDX vkGetExecutionGraphPipelineScratchSizeAMDX;
+PFN_vkGetExecutionGraphPipelineNodeIndexAMDX vkGetExecutionGraphPipelineNodeIndexAMDX;
+PFN_vkCmdInitializeGraphScratchMemoryAMDX vkCmdInitializeGraphScratchMemoryAMDX;
+PFN_vkCmdDispatchGraphAMDX vkCmdDispatchGraphAMDX;
+PFN_vkCmdDispatchGraphIndirectAMDX vkCmdDispatchGraphIndirectAMDX;
+PFN_vkCmdDispatchGraphIndirectCountAMDX vkCmdDispatchGraphIndirectCountAMDX;
+#endif
+
#ifdef __cplusplus
}
#endif
diff --git a/common/vulkan_wrapper.h b/cube/android/vulkan_wrapper.h
similarity index 96%
rename from common/vulkan_wrapper.h
rename to cube/android/vulkan_wrapper.h
index b5c35fa..678fdcf 100644
--- a/common/vulkan_wrapper.h
+++ b/cube/android/vulkan_wrapper.h
@@ -282,6 +282,23 @@
// VK_KHR_display_swapchain
extern PFN_vkCreateSharedSwapchainsKHR vkCreateSharedSwapchainsKHR;
+// VK_KHR_video_queue
+extern PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR vkGetPhysicalDeviceVideoCapabilitiesKHR;
+extern PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR vkGetPhysicalDeviceVideoFormatPropertiesKHR;
+extern PFN_vkCreateVideoSessionKHR vkCreateVideoSessionKHR;
+extern PFN_vkDestroyVideoSessionKHR vkDestroyVideoSessionKHR;
+extern PFN_vkGetVideoSessionMemoryRequirementsKHR vkGetVideoSessionMemoryRequirementsKHR;
+extern PFN_vkBindVideoSessionMemoryKHR vkBindVideoSessionMemoryKHR;
+extern PFN_vkCreateVideoSessionParametersKHR vkCreateVideoSessionParametersKHR;
+extern PFN_vkUpdateVideoSessionParametersKHR vkUpdateVideoSessionParametersKHR;
+extern PFN_vkDestroyVideoSessionParametersKHR vkDestroyVideoSessionParametersKHR;
+extern PFN_vkCmdBeginVideoCodingKHR vkCmdBeginVideoCodingKHR;
+extern PFN_vkCmdEndVideoCodingKHR vkCmdEndVideoCodingKHR;
+extern PFN_vkCmdControlVideoCodingKHR vkCmdControlVideoCodingKHR;
+
+// VK_KHR_video_decode_queue
+extern PFN_vkCmdDecodeVideoKHR vkCmdDecodeVideoKHR;
+
// VK_KHR_dynamic_rendering
extern PFN_vkCmdBeginRenderingKHR vkCmdBeginRenderingKHR;
extern PFN_vkCmdEndRenderingKHR vkCmdEndRenderingKHR;
@@ -411,6 +428,10 @@
extern PFN_vkGetPipelineExecutableStatisticsKHR vkGetPipelineExecutableStatisticsKHR;
extern PFN_vkGetPipelineExecutableInternalRepresentationsKHR vkGetPipelineExecutableInternalRepresentationsKHR;
+// VK_KHR_map_memory2
+extern PFN_vkMapMemory2KHR vkMapMemory2KHR;
+extern PFN_vkUnmapMemory2KHR vkUnmapMemory2KHR;
+
// VK_KHR_synchronization2
extern PFN_vkCmdSetEvent2KHR vkCmdSetEvent2KHR;
extern PFN_vkCmdResetEvent2KHR vkCmdResetEvent2KHR;
@@ -437,6 +458,15 @@
extern PFN_vkGetDeviceImageMemoryRequirementsKHR vkGetDeviceImageMemoryRequirementsKHR;
extern PFN_vkGetDeviceImageSparseMemoryRequirementsKHR vkGetDeviceImageSparseMemoryRequirementsKHR;
+// VK_KHR_maintenance5
+extern PFN_vkCmdBindIndexBuffer2KHR vkCmdBindIndexBuffer2KHR;
+extern PFN_vkGetRenderingAreaGranularityKHR vkGetRenderingAreaGranularityKHR;
+extern PFN_vkGetDeviceImageSubresourceLayoutKHR vkGetDeviceImageSubresourceLayoutKHR;
+extern PFN_vkGetImageSubresourceLayout2KHR vkGetImageSubresourceLayout2KHR;
+
+// VK_KHR_cooperative_matrix
+extern PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR;
+
// VK_KHR_acceleration_structure
extern PFN_vkCreateAccelerationStructureKHR vkCreateAccelerationStructureKHR;
extern PFN_vkDestroyAccelerationStructureKHR vkDestroyAccelerationStructureKHR;
@@ -511,28 +541,9 @@
#endif
#ifdef VK_ENABLE_BETA_EXTENSIONS
-// VK_KHR_video_queue
-extern PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR vkGetPhysicalDeviceVideoCapabilitiesKHR;
-extern PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR vkGetPhysicalDeviceVideoFormatPropertiesKHR;
-extern PFN_vkCreateVideoSessionKHR vkCreateVideoSessionKHR;
-extern PFN_vkDestroyVideoSessionKHR vkDestroyVideoSessionKHR;
-extern PFN_vkGetVideoSessionMemoryRequirementsKHR vkGetVideoSessionMemoryRequirementsKHR;
-extern PFN_vkBindVideoSessionMemoryKHR vkBindVideoSessionMemoryKHR;
-extern PFN_vkCreateVideoSessionParametersKHR vkCreateVideoSessionParametersKHR;
-extern PFN_vkUpdateVideoSessionParametersKHR vkUpdateVideoSessionParametersKHR;
-extern PFN_vkDestroyVideoSessionParametersKHR vkDestroyVideoSessionParametersKHR;
-extern PFN_vkCmdBeginVideoCodingKHR vkCmdBeginVideoCodingKHR;
-extern PFN_vkCmdEndVideoCodingKHR vkCmdEndVideoCodingKHR;
-extern PFN_vkCmdControlVideoCodingKHR vkCmdControlVideoCodingKHR;
-#endif
-
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-// VK_KHR_video_decode_queue
-extern PFN_vkCmdDecodeVideoKHR vkCmdDecodeVideoKHR;
-#endif
-
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// VK_KHR_video_encode_queue
+extern PFN_vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR;
+extern PFN_vkGetEncodedVideoSessionParametersKHR vkGetEncodedVideoSessionParametersKHR;
extern PFN_vkCmdEncodeVideoKHR vkCmdEncodeVideoKHR;
#endif
diff --git a/cube/cube.c b/cube/cube.c
index 5cd6786..fc10edc 100644
--- a/cube/cube.c
+++ b/cube/cube.c
@@ -33,6 +33,7 @@
#include <stdbool.h>
#include <assert.h>
#include <signal.h>
+#include <errno.h>
#if defined(VK_USE_PLATFORM_XLIB_KHR) || defined(VK_USE_PLATFORM_XCB_KHR)
#include <X11/Xutil.h>
#elif defined(VK_USE_PLATFORM_WAYLAND_KHR)
@@ -54,7 +55,6 @@
#include <vulkan/vulkan.h>
#endif
-#include <vulkan/vk_sdk_platform.h>
#include "linmath.h"
#include "object_type_string_helper.h"
@@ -360,12 +360,18 @@
struct ANativeWindow *window;
#elif defined(VK_USE_PLATFORM_METAL_EXT)
void *caMetalLayer;
+#elif defined(VK_USE_PLATFORM_SCREEN_QNX)
+ screen_context_t screen_context;
+ screen_window_t screen_window;
+ screen_event_t screen_event;
#endif
+
VkSurfaceKHR surface;
bool prepared;
bool use_staging_buffer;
bool separate_present_queue;
bool is_minimized;
+ bool invalid_gpu_selection;
int32_t gpu_number;
bool VK_KHR_incremental_present_enabled;
@@ -521,21 +527,30 @@
}
sprintf(message, "%s - Message Id Number: %d | Message Id Name: %s\n\t%s\n", prefix, pCallbackData->messageIdNumber,
- pCallbackData->pMessageIdName, pCallbackData->pMessage);
+ pCallbackData->pMessageIdName == NULL ? "" : pCallbackData->pMessageIdName, pCallbackData->pMessage);
if (pCallbackData->objectCount > 0) {
char tmp_message[500];
sprintf(tmp_message, "\n\tObjects - %d\n", pCallbackData->objectCount);
strcat(message, tmp_message);
for (uint32_t object = 0; object < pCallbackData->objectCount; ++object) {
- if (NULL != pCallbackData->pObjects[object].pObjectName && strlen(pCallbackData->pObjects[object].pObjectName) > 0) {
- sprintf(tmp_message, "\t\tObject[%d] - %s, Handle %p, Name \"%s\"\n", object,
- string_VkObjectType(pCallbackData->pObjects[object].objectType),
- (void *)(pCallbackData->pObjects[object].objectHandle), pCallbackData->pObjects[object].pObjectName);
+ sprintf(tmp_message, "\t\tObject[%d] - %s", object, string_VkObjectType(pCallbackData->pObjects[object].objectType));
+ strcat(message, tmp_message);
+
+ VkObjectType t = pCallbackData->pObjects[object].objectType;
+ if (t == VK_OBJECT_TYPE_INSTANCE || t == VK_OBJECT_TYPE_PHYSICAL_DEVICE || t == VK_OBJECT_TYPE_DEVICE ||
+ t == VK_OBJECT_TYPE_COMMAND_BUFFER || t == VK_OBJECT_TYPE_QUEUE) {
+ sprintf(tmp_message, ", Handle %p", (void *)(uintptr_t)(pCallbackData->pObjects[object].objectHandle));
+ strcat(message, tmp_message);
} else {
- sprintf(tmp_message, "\t\tObject[%d] - %s, Handle %p\n", object,
- string_VkObjectType(pCallbackData->pObjects[object].objectType),
- (void *)(pCallbackData->pObjects[object].objectHandle));
+ sprintf(tmp_message, ", Handle Ox%" PRIx64, (pCallbackData->pObjects[object].objectHandle));
+ strcat(message, tmp_message);
}
+
+ if (NULL != pCallbackData->pObjects[object].pObjectName && strlen(pCallbackData->pObjects[object].pObjectName) > 0) {
+ sprintf(tmp_message, ", Name \"%s\"", pCallbackData->pObjects[object].pObjectName);
+ strcat(message, tmp_message);
+ }
+ sprintf(tmp_message, "\n");
strcat(message, tmp_message);
}
}
@@ -623,6 +638,67 @@
static void demo_resize(struct demo *demo);
static void demo_create_surface(struct demo *demo);
+#if defined(__GNUC__) || defined(__clang__)
+#define DECORATE_PRINTF(_fmt_argnum, _first_param_num) __attribute__((format(printf, _fmt_argnum, _first_param_num)))
+#else
+#define DECORATE_PRINTF(_fmt_num, _first_param_num)
+#endif
+
+DECORATE_PRINTF(4, 5)
+static void demo_name_object(struct demo *demo, VkObjectType object_type, uint64_t vulkan_handle, const char *format, ...) {
+ if (!demo->validate) {
+ return;
+ }
+ VkResult U_ASSERT_ONLY err;
+ char name[1024];
+ va_list argptr;
+ va_start(argptr, format);
+ vsnprintf(name, sizeof(name), format, argptr);
+ va_end(argptr);
+ name[sizeof(name) - 1] = '\0';
+
+ VkDebugUtilsObjectNameInfoEXT obj_name = {
+ .sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT,
+ .pNext = NULL,
+ .objectType = object_type,
+ .objectHandle = vulkan_handle,
+ .pObjectName = name,
+ };
+ err = demo->SetDebugUtilsObjectNameEXT(demo->device, &obj_name);
+ assert(!err);
+}
+
+DECORATE_PRINTF(4, 5)
+static void demo_push_cb_label(struct demo *demo, VkCommandBuffer cb, const float *color, const char *format, ...) {
+ if (!demo->validate) {
+ return;
+ }
+ char name[1024];
+ va_list argptr;
+ va_start(argptr, format);
+ vsnprintf(name, sizeof(name), format, argptr);
+ va_end(argptr);
+ name[sizeof(name) - 1] = '\0';
+
+ VkDebugUtilsLabelEXT label = {
+ .sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT,
+ .pNext = NULL,
+ .pLabelName = name,
+ };
+ if (color) {
+ memcpy(label.color, color, sizeof(label.color));
+ }
+
+ demo->CmdBeginDebugUtilsLabelEXT(cb, &label);
+}
+
+static void demo_pop_cb_label(struct demo *demo, VkCommandBuffer cb) {
+ if (!demo->validate) {
+ return;
+ }
+ demo->CmdEndDebugUtilsLabelEXT(cb);
+}
+
static bool memory_type_from_properties(struct demo *demo, uint32_t typeBits, VkFlags requirements_mask, uint32_t *typeIndex) {
// Search memtypes to find first index with those properties
for (uint32_t i = 0; i < VK_MAX_MEMORY_TYPES; i++) {
@@ -657,6 +733,7 @@
}
err = vkCreateFence(demo->device, &fence_ci, NULL, &fence);
assert(!err);
+ demo_name_object(demo, VK_OBJECT_TYPE_FENCE, (uint64_t)fence, "InitFence");
const VkCommandBuffer cmd_bufs[] = {demo->cmd};
VkSubmitInfo submit_info = {.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
@@ -733,8 +810,6 @@
}
static void demo_draw_build_cmd(struct demo *demo, VkCommandBuffer cmd_buf) {
- VkDebugUtilsLabelEXT label;
- memset(&label, 0, sizeof(label));
const VkCommandBufferBeginInfo cmd_buf_info = {
.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
.pNext = NULL,
@@ -761,40 +836,16 @@
err = vkBeginCommandBuffer(cmd_buf, &cmd_buf_info);
- if (demo->validate) {
- // Set a name for the command buffer
- VkDebugUtilsObjectNameInfoEXT cmd_buf_name = {
- .sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT,
- .pNext = NULL,
- .objectType = VK_OBJECT_TYPE_COMMAND_BUFFER,
- .objectHandle = (uint64_t)cmd_buf,
- .pObjectName = "CubeDrawCommandBuf",
- };
- demo->SetDebugUtilsObjectNameEXT(demo->device, &cmd_buf_name);
+ demo_name_object(demo, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)cmd_buf, "CubeDrawCommandBuf");
- label.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT;
- label.pNext = NULL;
- label.pLabelName = "DrawBegin";
- label.color[0] = 0.4f;
- label.color[1] = 0.3f;
- label.color[2] = 0.2f;
- label.color[3] = 0.1f;
- demo->CmdBeginDebugUtilsLabelEXT(cmd_buf, &label);
- }
+ const float begin_color[4] = {0.4f, 0.3f, 0.2f, 0.1f};
+ demo_push_cb_label(demo, cmd_buf, begin_color, "DrawBegin");
assert(!err);
vkCmdBeginRenderPass(cmd_buf, &rp_begin, VK_SUBPASS_CONTENTS_INLINE);
- if (demo->validate) {
- label.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT;
- label.pNext = NULL;
- label.pLabelName = "InsideRenderPass";
- label.color[0] = 8.4f;
- label.color[1] = 7.3f;
- label.color[2] = 6.2f;
- label.color[3] = 7.1f;
- demo->CmdBeginDebugUtilsLabelEXT(cmd_buf, &label);
- }
+ const float renderpass_color[4] = {8.4f, 7.3f, 6.2f, 7.1f};
+ demo_push_cb_label(demo, cmd_buf, renderpass_color, "InsideRenderPass");
vkCmdBindPipeline(cmd_buf, VK_PIPELINE_BIND_POINT_GRAPHICS, demo->pipeline);
vkCmdBindDescriptorSets(cmd_buf, VK_PIPELINE_BIND_POINT_GRAPHICS, demo->pipeline_layout, 0, 1,
@@ -823,28 +874,15 @@
scissor.offset.y = 0;
vkCmdSetScissor(cmd_buf, 0, 1, &scissor);
- if (demo->validate) {
- label.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT;
- label.pNext = NULL;
- label.pLabelName = "ActualDraw";
- label.color[0] = -0.4f;
- label.color[1] = -0.3f;
- label.color[2] = -0.2f;
- label.color[3] = -0.1f;
- demo->CmdBeginDebugUtilsLabelEXT(cmd_buf, &label);
- }
-
+ const float draw_color[4] = {-0.4f, -0.3f, -0.2f, -0.1f};
+ demo_push_cb_label(demo, cmd_buf, draw_color, "ActualDraw");
vkCmdDraw(cmd_buf, 12 * 3, 1, 0, 0);
- if (demo->validate) {
- demo->CmdEndDebugUtilsLabelEXT(cmd_buf);
- }
+ demo_pop_cb_label(demo, cmd_buf);
// Note that ending the renderpass changes the image's layout from
// COLOR_ATTACHMENT_OPTIMAL to PRESENT_SRC_KHR
vkCmdEndRenderPass(cmd_buf);
- if (demo->validate) {
- demo->CmdEndDebugUtilsLabelEXT(cmd_buf);
- }
+ demo_pop_cb_label(demo, cmd_buf);
if (demo->separate_present_queue) {
// We have to transfer ownership from the graphics queue family to the
@@ -866,9 +904,7 @@
vkCmdPipelineBarrier(cmd_buf, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, 0, 0, NULL, 0,
NULL, 1, &image_ownership_barrier);
}
- if (demo->validate) {
- demo->CmdEndDebugUtilsLabelEXT(cmd_buf);
- }
+ demo_pop_cb_label(demo, cmd_buf);
err = vkEndCommandBuffer(cmd_buf);
assert(!err);
}
@@ -1393,6 +1429,9 @@
assert(demo->swapchain_image_resources);
for (i = 0; i < demo->swapchainImageCount; i++) {
+ demo_name_object(demo, VK_OBJECT_TYPE_IMAGE, (uint64_t)swapchainImages[i], "SwapchainImage(%u)", i);
+ }
+ for (i = 0; i < demo->swapchainImageCount; i++) {
VkImageViewCreateInfo color_image_view = {
.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
.pNext = NULL,
@@ -1416,6 +1455,8 @@
err = vkCreateImageView(demo->device, &color_image_view, NULL, &demo->swapchain_image_resources[i].view);
assert(!err);
+ demo_name_object(demo, VK_OBJECT_TYPE_IMAGE_VIEW, (uint64_t)demo->swapchain_image_resources[i].view, "SwapchainView(%u)",
+ i);
}
if (demo->VK_GOOGLE_display_timing_enabled) {
@@ -1482,6 +1523,7 @@
/* create image */
err = vkCreateImage(demo->device, &image, NULL, &demo->depth.image);
assert(!err);
+ demo_name_object(demo, VK_OBJECT_TYPE_IMAGE, (uint64_t)demo->depth.image, "DepthImage");
vkGetImageMemoryRequirements(demo->device, demo->depth.image, &mem_reqs);
assert(!err);
@@ -1498,6 +1540,7 @@
/* allocate memory */
err = vkAllocateMemory(demo->device, &demo->depth.mem_alloc, NULL, &demo->depth.mem);
assert(!err);
+ demo_name_object(demo, VK_OBJECT_TYPE_DEVICE_MEMORY, (uint64_t)demo->depth.mem, "DepthMem");
/* bind memory */
err = vkBindImageMemory(demo->device, demo->depth.image, demo->depth.mem, 0);
@@ -1507,6 +1550,7 @@
view.image = demo->depth.image;
err = vkCreateImageView(demo->device, &view, NULL, &demo->depth.view);
assert(!err);
+ demo_name_object(demo, VK_OBJECT_TYPE_IMAGE_VIEW, (uint64_t)demo->depth.view, "DepthView");
}
/* Convert ppm image data from header file into RGBA texture image */
@@ -1568,6 +1612,7 @@
err = vkCreateBuffer(demo->device, &buffer_create_info, NULL, &tex_obj->buffer);
assert(!err);
+ demo_name_object(demo, VK_OBJECT_TYPE_BUFFER, (uint64_t)tex_obj->buffer, "TexBuffer(%s)", filename);
VkMemoryRequirements mem_reqs;
vkGetBufferMemoryRequirements(demo->device, tex_obj->buffer, &mem_reqs);
@@ -1583,6 +1628,7 @@
err = vkAllocateMemory(demo->device, &tex_obj->mem_alloc, NULL, &(tex_obj->mem));
assert(!err);
+ demo_name_object(demo, VK_OBJECT_TYPE_DEVICE_MEMORY, (uint64_t)tex_obj->mem, "TexBufMemory(%s)", filename);
/* bind memory */
err = vkBindBufferMemory(demo->device, tex_obj->buffer, tex_obj->mem, 0);
@@ -1637,6 +1683,7 @@
err = vkCreateImage(demo->device, &image_create_info, NULL, &tex_obj->image);
assert(!err);
+ demo_name_object(demo, VK_OBJECT_TYPE_IMAGE, (uint64_t)tex_obj->image, "TexImage(%s)", filename);
vkGetImageMemoryRequirements(demo->device, tex_obj->image, &mem_reqs);
@@ -1651,6 +1698,7 @@
/* allocate memory */
err = vkAllocateMemory(demo->device, &tex_obj->mem_alloc, NULL, &(tex_obj->mem));
assert(!err);
+ demo_name_object(demo, VK_OBJECT_TYPE_DEVICE_MEMORY, (uint64_t)tex_obj->mem, "TexImageMem(%s)", filename);
/* bind memory */
err = vkBindImageMemory(demo->device, tex_obj->image, tex_obj->mem, 0);
@@ -1698,6 +1746,7 @@
VkResult U_ASSERT_ONLY err;
if ((props.linearTilingFeatures & VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT) && !demo->use_staging_buffer) {
+ demo_push_cb_label(demo, demo->cmd, NULL, "DirectTexture(%u)", i);
/* Device can texture using linear textures */
demo_prepare_texture_image(demo, tex_files[i], &demo->textures[i], VK_IMAGE_TILING_LINEAR, VK_IMAGE_USAGE_SAMPLED_BIT,
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
@@ -1707,8 +1756,10 @@
demo->textures[i].imageLayout, 0, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
demo->staging_texture.image = 0;
+ demo_pop_cb_label(demo, demo->cmd); // "DirectTexture"
} else if (props.optimalTilingFeatures & VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT) {
/* Must use staging buffer to copy linear texture to optimized */
+ demo_push_cb_label(demo, demo->cmd, NULL, "StagingTexture(%u)", i);
memset(&demo->staging_texture, 0, sizeof(demo->staging_texture));
demo_prepare_texture_buffer(demo, tex_files[i], &demo->staging_texture);
@@ -1721,6 +1772,8 @@
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 0, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
VK_PIPELINE_STAGE_TRANSFER_BIT);
+ demo_push_cb_label(demo, demo->cmd, NULL, "StagingBufferCopy(%u)", i);
+
VkBufferImageCopy copy_region = {
.bufferOffset = 0,
.bufferRowLength = demo->staging_texture.tex_width,
@@ -1732,10 +1785,12 @@
vkCmdCopyBufferToImage(demo->cmd, demo->staging_texture.buffer, demo->textures[i].image,
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, ©_region);
+ demo_pop_cb_label(demo, demo->cmd); // "StagingBufferCopy"
demo_set_image_layout(demo, demo->textures[i].image, VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
demo->textures[i].imageLayout, VK_ACCESS_TRANSFER_WRITE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
+ demo_pop_cb_label(demo, demo->cmd); // "StagingTexture"
} else {
/* Can't support VK_FORMAT_R8G8B8A8_UNORM !? */
@@ -1781,10 +1836,12 @@
/* create sampler */
err = vkCreateSampler(demo->device, &sampler, NULL, &demo->textures[i].sampler);
assert(!err);
+ demo_name_object(demo, VK_OBJECT_TYPE_SAMPLER, (uint64_t)demo->textures[i].sampler, "Sampler(%u)", i);
/* create image view */
view.image = demo->textures[i].image;
err = vkCreateImageView(demo->device, &view, NULL, &demo->textures[i].view);
+ demo_name_object(demo, VK_OBJECT_TYPE_IMAGE_VIEW, (uint64_t)demo->textures[i].view, "TexImageView(%u)", i);
assert(!err);
}
}
@@ -1822,6 +1879,8 @@
for (unsigned int i = 0; i < demo->swapchainImageCount; i++) {
err = vkCreateBuffer(demo->device, &buf_info, NULL, &demo->swapchain_image_resources[i].uniform_buffer);
assert(!err);
+ demo_name_object(demo, VK_OBJECT_TYPE_BUFFER, (uint64_t)demo->swapchain_image_resources[i].uniform_buffer,
+ "SwapchainUniformBuf(%u)", i);
vkGetBufferMemoryRequirements(demo->device, demo->swapchain_image_resources[i].uniform_buffer, &mem_reqs);
@@ -1837,6 +1896,8 @@
err = vkAllocateMemory(demo->device, &mem_alloc, NULL, &demo->swapchain_image_resources[i].uniform_memory);
assert(!err);
+ demo_name_object(demo, VK_OBJECT_TYPE_DEVICE_MEMORY, (uint64_t)demo->swapchain_image_resources[i].uniform_memory,
+ "SwapchainUniformMem(%u)", i);
err = vkMapMemory(demo->device, demo->swapchain_image_resources[i].uniform_memory, 0, VK_WHOLE_SIZE, 0,
&demo->swapchain_image_resources[i].uniform_memory_ptr);
@@ -1989,7 +2050,7 @@
assert(!err);
}
-static VkShaderModule demo_prepare_shader_module(struct demo *demo, const uint32_t *code, size_t size) {
+static VkShaderModule demo_prepare_shader_module(const char *name, struct demo *demo, const uint32_t *code, size_t size) {
VkShaderModule module;
VkShaderModuleCreateInfo moduleCreateInfo;
VkResult U_ASSERT_ONLY err;
@@ -2002,6 +2063,7 @@
err = vkCreateShaderModule(demo->device, &moduleCreateInfo, NULL, &module);
assert(!err);
+ demo_name_object(demo, VK_OBJECT_TYPE_SHADER_MODULE, (uint64_t)module, "%s", name);
return module;
}
@@ -2010,14 +2072,14 @@
const uint32_t vs_code[] = {
#include "cube.vert.inc"
};
- demo->vert_shader_module = demo_prepare_shader_module(demo, vs_code, sizeof(vs_code));
+ demo->vert_shader_module = demo_prepare_shader_module("cube.vert", demo, vs_code, sizeof(vs_code));
}
static void demo_prepare_fs(struct demo *demo) {
const uint32_t fs_code[] = {
#include "cube.frag.inc"
};
- demo->frag_shader_module = demo_prepare_shader_module(demo, fs_code, sizeof(fs_code));
+ demo->frag_shader_module = demo_prepare_shader_module("cube.frag", demo, fs_code, sizeof(fs_code));
}
static void demo_prepare_pipeline(struct demo *demo) {
@@ -2231,6 +2293,8 @@
attachments[0] = demo->swapchain_image_resources[i].view;
err = vkCreateFramebuffer(demo->device, &fb_info, NULL, &demo->swapchain_image_resources[i].framebuffer);
assert(!err);
+ demo_name_object(demo, VK_OBJECT_TYPE_FRAMEBUFFER, (uint64_t)demo->swapchain_image_resources[i].framebuffer,
+ "Framebuffer(%u)", i);
}
}
@@ -2263,6 +2327,7 @@
};
err = vkAllocateCommandBuffers(demo->device, &cmd, &demo->cmd);
assert(!err);
+ demo_name_object(demo, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)demo->cmd, "PrepareCB");
VkCommandBufferBeginInfo cmd_buf_info = {
.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
.pNext = NULL,
@@ -2270,6 +2335,7 @@
.pInheritanceInfo = NULL,
};
err = vkBeginCommandBuffer(demo->cmd, &cmd_buf_info);
+ demo_push_cb_label(demo, demo->cmd, NULL, "Prepare");
assert(!err);
demo_prepare_depth(demo);
@@ -2306,6 +2372,8 @@
&demo->swapchain_image_resources[i].graphics_to_present_cmd);
assert(!err);
demo_build_image_ownership_cmd(demo, i);
+ demo_name_object(demo, VK_OBJECT_TYPE_COMMAND_BUFFER,
+ (uint64_t)demo->swapchain_image_resources[i].graphics_to_present_cmd, "GfxToPresent(%u)", i);
}
}
@@ -2323,6 +2391,7 @@
* Prepare functions above may generate pipeline commands
* that need to be flushed before beginning the render loop.
*/
+ demo_pop_cb_label(demo, demo->cmd); // "Prepare"
demo_flush_init_cmd(demo);
if (demo->staging_texture.buffer) {
demo_destroy_texture(demo, &demo->staging_texture);
@@ -2422,6 +2491,10 @@
demo->event_buffer->Release(demo->event_buffer);
demo->window->Release(demo->window);
demo->dfb->Release(demo->dfb);
+#elif defined(VK_USE_PLATFORM_SCREEN_QNX)
+ screen_destroy_event(demo->screen_event);
+ screen_destroy_window(demo->screen_window);
+ screen_destroy_context(demo->screen_context);
#endif
vkDestroyInstance(demo->inst, NULL);
@@ -3094,6 +3167,170 @@
}
}
}
+#elif defined(VK_USE_PLATFORM_SCREEN_QNX)
+
+#include <sys/keycodes.h>
+
+static void demo_run(struct demo *demo) {
+ int size[2] = { 0, 0 };
+ screen_window_t win;
+ int val;
+ int rc;
+
+ while (!demo->quit) {
+ while (!screen_get_event(demo->screen_context, demo->screen_event, demo->pause ? ~0 : 0)) {
+ rc = screen_get_event_property_iv(demo->screen_event, SCREEN_PROPERTY_TYPE, &val);
+ if (rc) {
+ printf("Cannot get SCREEN_PROPERTY_TYPE of the event! (%s)\n", strerror(errno));
+ fflush(stdout);
+ demo->quit = true;
+ break;
+ }
+ if (val == SCREEN_EVENT_NONE) {
+ break;
+ }
+ switch (val) {
+ case SCREEN_EVENT_KEYBOARD:
+ rc = screen_get_event_property_iv(demo->screen_event, SCREEN_PROPERTY_FLAGS, &val);
+ if (rc) {
+ printf("Cannot get SCREEN_PROPERTY_FLAGS of the event! (%s)\n", strerror(errno));
+ fflush(stdout);
+ demo->quit = true;
+ break;
+ }
+ if (val & KEY_DOWN) {
+ rc = screen_get_event_property_iv(demo->screen_event, SCREEN_PROPERTY_SYM, &val);
+ if (rc) {
+ printf("Cannot get SCREEN_PROPERTY_SYM of the event! (%s)\n", strerror(errno));
+ fflush(stdout);
+ demo->quit = true;
+ break;
+ }
+ switch (val) {
+ case KEYCODE_ESCAPE:
+ demo->quit = true;
+ break;
+ case KEYCODE_SPACE:
+ demo->pause = !demo->pause;
+ break;
+ case KEYCODE_LEFT:
+ demo->spin_angle -= demo->spin_increment;
+ break;
+ case KEYCODE_RIGHT:
+ demo->spin_angle += demo->spin_increment;
+ break;
+ default:
+ break;
+ }
+ }
+ break;
+ case SCREEN_EVENT_PROPERTY:
+ rc = screen_get_event_property_pv(demo->screen_event, SCREEN_PROPERTY_WINDOW, (void **)&win);
+ if (rc) {
+ printf("Cannot get SCREEN_PROPERTY_WINDOW of the event! (%s)\n", strerror(errno));
+ fflush(stdout);
+ demo->quit = true;
+ break;
+ }
+ rc = screen_get_event_property_iv(demo->screen_event, SCREEN_PROPERTY_NAME, &val);
+ if (rc) {
+ printf("Cannot get SCREEN_PROPERTY_NAME of the event! (%s)\n", strerror(errno));
+ fflush(stdout);
+ demo->quit = true;
+ break;
+ }
+ if (win == demo->screen_window) {
+ switch(val) {
+ case SCREEN_PROPERTY_SIZE:
+ rc = screen_get_window_property_iv(win, SCREEN_PROPERTY_SIZE, size);
+ if (rc) {
+ printf("Cannot get SCREEN_PROPERTY_SIZE of the window in the event! (%s)\n", strerror(errno));
+ fflush(stdout);
+ demo->quit = true;
+ break;
+ }
+ demo->width = size[0];
+ demo->height = size[1];
+ demo_resize(demo);
+ break;
+ default:
+ /* We are not interested in any other events for now */
+ break;
+ }
+ }
+ break;
+ }
+ }
+
+ if (demo->pause) {
+ } else {
+ demo_draw(demo);
+ demo->curFrame++;
+ if (demo->frameCount != INT32_MAX && demo->curFrame == demo->frameCount) {
+ demo->quit = true;
+ }
+ }
+ }
+}
+
+static void demo_create_window(struct demo *demo) {
+ const char *idstr = APP_SHORT_NAME;
+ int size[2];
+ int usage = SCREEN_USAGE_VULKAN;
+ int rc;
+
+ rc = screen_create_context(&demo->screen_context, 0);
+ if (rc) {
+ printf("Cannot create QNX Screen context!\n");
+ fflush(stdout);
+ exit(EXIT_FAILURE);
+ }
+ rc = screen_create_window(&demo->screen_window, demo->screen_context);
+ if (rc) {
+ printf("Cannot create QNX Screen window!\n");
+ fflush(stdout);
+ exit(EXIT_FAILURE);
+ }
+ rc = screen_create_event(&demo->screen_event);
+ if (rc) {
+ printf("Cannot create QNX Screen event!\n");
+ fflush(stdout);
+ exit(EXIT_FAILURE);
+ }
+
+ /* Set window caption */
+ screen_set_window_property_cv(demo->screen_window, SCREEN_PROPERTY_ID_STRING, strlen(idstr), idstr);
+
+ /* Setup VULKAN usage flags */
+ rc = screen_set_window_property_iv(demo->screen_window, SCREEN_PROPERTY_USAGE, &usage);
+ if (rc) {
+ printf("Cannot set SCREEN_USAGE_VULKAN flag!\n");
+ fflush(stdout);
+ exit(EXIT_FAILURE);
+ }
+
+ /* Setup window size */
+ if ((demo->width == 0) || (demo->height == 0)) {
+ /* Obtain automatically set window size provided by WM */
+ rc = screen_get_window_property_iv(demo->screen_window, SCREEN_PROPERTY_SIZE, size);
+ if (rc) {
+ printf("Cannot obtain current window size!\n");
+ fflush(stdout);
+ exit(EXIT_FAILURE);
+ }
+ demo->width = size[0];
+ demo->height = size[1];
+ } else {
+ size[0] = demo->width;
+ size[1] = demo->height;
+ rc = screen_set_window_property_iv(demo->screen_window, SCREEN_PROPERTY_SIZE, size);
+ if (rc) {
+ printf("Cannot set window size!\n");
+ fflush(stdout);
+ exit(EXIT_FAILURE);
+ }
+ }
+}
#endif
/*
@@ -3236,6 +3473,11 @@
platformSurfaceExtFound = 1;
demo->extension_names[demo->enabled_extension_count++] = VK_EXT_METAL_SURFACE_EXTENSION_NAME;
}
+#elif defined(VK_USE_PLATFORM_SCREEN_QNX)
+ if (!strcmp(VK_QNX_SCREEN_SURFACE_EXTENSION_NAME, instance_extensions[i].extensionName)) {
+ platformSurfaceExtFound = 1;
+ demo->extension_names[demo->enabled_extension_count++] = VK_QNX_SCREEN_SURFACE_EXTENSION_NAME;
+ }
#endif
if (!strcmp(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, instance_extensions[i].extensionName)) {
demo->extension_names[demo->enabled_extension_count++] = VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME;
@@ -3313,6 +3555,12 @@
"Do you have a compatible Vulkan installable client driver (ICD) installed?\n"
"Please look at the Getting Started guide for additional information.\n",
"vkCreateInstance Failure");
+#elif defined(VK_USE_PLATFORM_SCREEN_QNX)
+ ERR_EXIT("vkEnumerateInstanceExtensionProperties failed to find the " VK_QNX_SCREEN_SURFACE_EXTENSION_NAME
+ " extension.\n\n"
+ "Do you have a compatible Vulkan installable client driver (ICD) installed?\n"
+ "Please look at the Getting Started guide for additional information.\n",
+ "vkCreateInstance Failure");
#endif
}
const VkApplicationInfo app = {
@@ -3391,7 +3639,7 @@
VkPhysicalDevice *physical_devices = malloc(sizeof(VkPhysicalDevice) * gpu_count);
err = vkEnumeratePhysicalDevices(demo->inst, &gpu_count, physical_devices);
assert(!err);
- if (demo->gpu_number >= 0 && !((uint32_t)demo->gpu_number < gpu_count)) {
+ if (demo->invalid_gpu_selection || (demo->gpu_number >= 0 && !((uint32_t)demo->gpu_number < gpu_count))) {
fprintf(stderr, "GPU %d specified is not present, GPU count = %u\n", demo->gpu_number, gpu_count);
ERR_EXIT("Specified GPU number is not present", "User Error");
}
@@ -3681,6 +3929,15 @@
surface.pLayer = demo->caMetalLayer;
err = vkCreateMetalSurfaceEXT(demo->inst, &surface, NULL, &demo->surface);
+#elif defined(VK_USE_PLATFORM_SCREEN_QNX)
+ VkScreenSurfaceCreateInfoQNX createInfo;
+ createInfo.sType = VK_STRUCTURE_TYPE_SCREEN_SURFACE_CREATE_INFO_QNX;
+ createInfo.pNext = NULL;
+ createInfo.flags = 0;
+ createInfo.context = demo->screen_context;
+ createInfo.window = demo->screen_window;
+
+ err = vkCreateScreenSurfaceQNX(demo->inst, &createInfo, NULL, &demo->surface);
#endif
assert(!err);
}
@@ -3692,7 +3949,10 @@
if (format == VK_FORMAT_R8G8B8A8_UNORM || format == VK_FORMAT_B8G8R8A8_UNORM ||
format == VK_FORMAT_A2B10G10R10_UNORM_PACK32 || format == VK_FORMAT_A2R10G10B10_UNORM_PACK32 ||
+ format == VK_FORMAT_A1R5G5B5_UNORM_PACK16 || format == VK_FORMAT_R5G6B5_UNORM_PACK16 ||
format == VK_FORMAT_R16G16B16A16_SFLOAT) {
+
+
return surfaceFormats[i];
}
}
@@ -3806,13 +4066,16 @@
err = vkCreateSemaphore(demo->device, &semaphoreCreateInfo, NULL, &demo->image_acquired_semaphores[i]);
assert(!err);
+ demo_name_object(demo, VK_OBJECT_TYPE_SEMAPHORE, (uint64_t)demo->image_acquired_semaphores[i], "AcquireSem(%u)", i);
err = vkCreateSemaphore(demo->device, &semaphoreCreateInfo, NULL, &demo->draw_complete_semaphores[i]);
assert(!err);
+ demo_name_object(demo, VK_OBJECT_TYPE_SEMAPHORE, (uint64_t)demo->draw_complete_semaphores[i], "DrawCompleteSem(%u)", i);
if (demo->separate_present_queue) {
err = vkCreateSemaphore(demo->device, &semaphoreCreateInfo, NULL, &demo->image_ownership_semaphores[i]);
assert(!err);
+ demo_name_object(demo, VK_OBJECT_TYPE_SEMAPHORE, (uint64_t)demo->image_ownership_semaphores[i], "ImageOwnerSem(%u)", i);
}
}
demo->frame_index = 0;
@@ -4019,13 +4282,27 @@
i++;
continue;
}
- if (strcmp(argv[i], "--width") == 0 && i < argc - 1 && sscanf(argv[i + 1], "%d", &demo->width) == 1 && demo->width > 0) {
- i++;
- continue;
+ if (strcmp(argv[i], "--width") == 0) {
+ if (i < argc - 1 && sscanf(argv[i + 1], "%d", &demo->width) == 1) {
+ if (demo->width > 0) {
+ i++;
+ continue;
+ } else {
+ ERR_EXIT("The --width parameter must be greater than 0", "User Error");
+ }
+ }
+ ERR_EXIT("The --width parameter must be followed by a number", "User Error");
}
- if (strcmp(argv[i], "--height") == 0 && i < argc - 1 && sscanf(argv[i + 1], "%d", &demo->height) == 1 && demo->height > 0) {
- i++;
- continue;
+ if (strcmp(argv[i], "--height") == 0) {
+ if (i < argc - 1 && sscanf(argv[i + 1], "%d", &demo->height) == 1) {
+ if (demo->height > 0) {
+ i++;
+ continue;
+ } else {
+ ERR_EXIT("The --height parameter must be greater than 0", "User Error");
+ }
+ }
+ ERR_EXIT("The --height parameter must be followed by a number", "User Error");
}
if (strcmp(argv[i], "--suppress_popups") == 0) {
demo->suppress_popups = true;
@@ -4041,7 +4318,7 @@
}
if ((strcmp(argv[i], "--gpu_number") == 0) && (i < argc - 1)) {
demo->gpu_number = atoi(argv[i + 1]);
- assert(demo->gpu_number >= 0);
+ if (demo->gpu_number < 0) demo->invalid_gpu_selection = true;
i++;
continue;
}
@@ -4306,6 +4583,8 @@
demo_create_window(&demo);
#elif defined(VK_USE_PLATFORM_DIRECTFB_EXT)
demo_create_directfb_window(&demo);
+#elif defined(VK_USE_PLATFORM_SCREEN_QNX)
+ demo_create_window(&demo);
#endif
demo_init_vk_swapchain(&demo);
@@ -4322,6 +4601,8 @@
demo_run_directfb(&demo);
#elif defined(VK_USE_PLATFORM_DISPLAY_KHR)
demo_run_display(&demo);
+#elif defined(VK_USE_PLATFORM_SCREEN_QNX)
+ demo_run(&demo);
#endif
demo_cleanup(&demo);
diff --git a/cube/cube.cpp b/cube/cube.cpp
index a887383..cc698ba 100644
--- a/cube/cube.cpp
+++ b/cube/cube.cpp
@@ -49,7 +49,7 @@
#define VULKAN_HPP_NO_EXCEPTIONS
#define VULKAN_HPP_TYPESAFE_CONVERSION
-#include <vulkan/vk_sdk_platform.h>
+#include <vulkan/vulkan.hpp>
#include <vulkan/vulkan.hpp>
@@ -297,6 +297,9 @@
#elif defined(VK_USE_PLATFORM_DISPLAY_KHR)
vk::Result create_display_surface();
void run_display();
+#elif defined(VK_USE_PLATFORM_SCREEN_QNX)
+ void run();
+ void create_window();
#elif defined(VK_USE_PLATFORM_FUCHSIA)
void create_flatland_view();
vk::Result create_imagepipe_surface();
@@ -337,6 +340,10 @@
IDirectFBEventBuffer *event_buffer = nullptr;
#elif defined(VK_USE_PLATFORM_METAL_EXT)
void *caMetalLayer;
+#elif defined(VK_USE_PLATFORM_SCREEN_QNX)
+ screen_context_t screen_context = nullptr;
+ screen_window_t screen_window = nullptr;
+ screen_event_t screen_event = nullptr;
#elif defined(VK_USE_PLATFORM_FUCHSIA) && FUCHSIA_USE_SCENIC
zx::channel view_creation_token_handle;
async::Loop loop{&kAsyncLoopConfigAttachToCurrentThread};
@@ -348,8 +355,8 @@
vk::SurfaceKHR surface;
bool prepared = false;
bool use_staging_buffer = false;
- bool use_xlib = false;
bool separate_present_queue = false;
+ bool invalid_gpu_selection = false;
int32_t gpu_number = 0;
bool protected_output = false;
@@ -437,6 +444,7 @@
bool use_break = false;
bool suppress_popups = false;
bool force_errors = false;
+ bool is_minimized = false;
uint32_t current_buffer = 0;
};
@@ -601,8 +609,9 @@
prepared = false;
auto result = device.waitIdle();
VERIFY(result == vk::Result::eSuccess);
-
- destroy_swapchain_related_resources();
+ if (!is_minimized){
+ destroy_swapchain_related_resources();
+ }
// Wait for fences from present operations
for (uint32_t i = 0; i < FRAME_LAG; i++) {
device.destroyFence(fences[i]);
@@ -644,6 +653,10 @@
event_buffer->Release(event_buffer);
window->Release(window);
dfb->Release(dfb);
+#elif defined(VK_USE_PLATFORM_SCREEN_QNX)
+ screen_destroy_event(screen_event);
+ screen_destroy_window(screen_window);
+ screen_destroy_context(screen_context);
#endif
if (use_debug_messenger) {
inst.destroyDebugUtilsMessengerEXT(debug_messenger);
@@ -685,7 +698,8 @@
void Demo::draw() {
// Ensure no more than FRAME_LAG renderings are outstanding
- device.waitForFences(fences[frame_index], VK_TRUE, UINT64_MAX);
+ const vk::Result wait_result = device.waitForFences(fences[frame_index], VK_TRUE, UINT64_MAX);
+ VERIFY(wait_result == vk::Result::eSuccess || wait_result == vk::Result::eTimeout);
device.resetFences({fences[frame_index]});
vk::Result acquire_result;
@@ -741,14 +755,15 @@
VERIFY(change_owner_result == vk::Result::eSuccess);
}
+ const auto presentInfo = vk::PresentInfoKHR()
+ .setWaitSemaphores(separate_present_queue ? image_ownership_semaphores[frame_index]
+ : draw_complete_semaphores[frame_index])
+ .setSwapchains(swapchain)
+ .setImageIndices(current_buffer);
+
// If we are using separate queues we have to wait for image ownership,
// otherwise wait for draw complete
- auto present_result =
- present_queue.presentKHR(vk::PresentInfoKHR()
- .setWaitSemaphores(separate_present_queue ? image_ownership_semaphores[frame_index]
- : draw_complete_semaphores[frame_index])
- .setSwapchains(swapchain)
- .setImageIndices(current_buffer));
+ auto present_result = present_queue.presentKHR(&presentInfo);
frame_index += 1;
frame_index %= FRAME_LAG;
if (present_result == vk::Result::eErrorOutOfDateKHR) {
@@ -896,10 +911,8 @@
frameCount = UINT32_MAX;
width = 500;
height = 500;
- use_xlib = false;
- /* For cube demo we just grab the first physical device by default */
- gpu_number = 0;
- protected_output = false;
+ /* Autodetect suitable / best GPU by default */
+ gpu_number = -1;
for (int i = 1; i < argc; i++) {
if (strcmp(argv[i], "--use_staging") == 0) {
@@ -928,13 +941,31 @@
i++;
continue;
}
- if (strcmp(argv[i], "--width") == 0 && i < argc - 1 && sscanf(argv[i + 1], "%" SCNu32, &width) == 1) {
- i++;
- continue;
+ if (strcmp(argv[i], "--width") == 0) {
+ int32_t in_width = 0;
+ if (i < argc - 1 && sscanf(argv[i + 1], "%d", &in_width) == 1) {
+ if (in_width > 0) {
+ width = static_cast<uint32_t>(in_width);
+ i++;
+ continue;
+ } else {
+ ERR_EXIT("The --width parameter must be greater than 0", "User Error");
+ }
+ }
+ ERR_EXIT("The --width parameter must be followed by a number", "User Error");
}
- if (strcmp(argv[i], "--height") == 0 && i < argc - 1 && sscanf(argv[i + 1], "%" SCNu32, &height) == 1) {
- i++;
- continue;
+ if (strcmp(argv[i], "--height") == 0) {
+ int32_t in_height = 0;
+ if (i < argc - 1 && sscanf(argv[i + 1], "%d", &in_height) == 1) {
+ if (in_height > 0) {
+ height = static_cast<uint32_t>(in_height);
+ i++;
+ continue;
+ } else {
+ ERR_EXIT("The --height parameter must be greater than 0", "User Error");
+ }
+ }
+ ERR_EXIT("The --height parameter must be followed by a number", "User Error");
}
if (strcmp(argv[i], "--suppress_popups") == 0) {
suppress_popups = true;
@@ -942,7 +973,7 @@
}
if ((strcmp(argv[i], "--gpu_number") == 0) && (i < argc - 1)) {
gpu_number = atoi(argv[i + 1]);
- assert(gpu_number >= 0);
+ if (gpu_number < 0) invalid_gpu_selection = true;
i++;
continue;
}
@@ -978,9 +1009,7 @@
exit(1);
}
- if (!use_xlib) {
- init_connection();
- }
+ init_connection();
init_vk();
@@ -1081,20 +1110,27 @@
}
message << " - Message Id Number: " << std::to_string(pCallbackData->messageIdNumber);
- message << " | Message Id Name: " << pCallbackData->pMessageIdName << "\n\t" << pCallbackData->pMessage << "\n";
+ message << " | Message Id Name: " << (pCallbackData->pMessageIdName == nullptr ? "" : pCallbackData->pMessageIdName) << "\n\t"
+ << pCallbackData->pMessage << "\n";
if (pCallbackData->objectCount > 0) {
message << "\n\tObjects - " << pCallbackData->objectCount << "\n";
for (uint32_t object = 0; object < pCallbackData->objectCount; ++object) {
- if (NULL != pCallbackData->pObjects[object].pObjectName && strlen(pCallbackData->pObjects[object].pObjectName) > 0) {
- message << "\t\tObject[" << object << "] - "
- << vk::to_string(vk::ObjectType(pCallbackData->pObjects[object].objectType)) << ", Handle "
- << pCallbackData->pObjects[object].objectHandle << ", Name \""
- << pCallbackData->pObjects[object].pObjectName << "\"\n";
+ message << "\t\tObject[" << object << "] - "
+ << vk::to_string(vk::ObjectType(pCallbackData->pObjects[object].objectType)) << ", Handle ";
+
+ // Print handle correctly if it is a dispatchable handle - aka a pointer
+ VkObjectType t = pCallbackData->pObjects[object].objectType;
+ if (t == VK_OBJECT_TYPE_INSTANCE || t == VK_OBJECT_TYPE_PHYSICAL_DEVICE || t == VK_OBJECT_TYPE_DEVICE ||
+ t == VK_OBJECT_TYPE_COMMAND_BUFFER || t == VK_OBJECT_TYPE_QUEUE) {
+ message << reinterpret_cast<void*>(static_cast<uintptr_t>(pCallbackData->pObjects[object].objectHandle));
} else {
- message << "\t\tObject[" << object << "] - "
- << vk::to_string(vk::ObjectType(pCallbackData->pObjects[object].objectType)) << ", Handle "
- << pCallbackData->pObjects[object].objectHandle << "\n";
+ message << pCallbackData->pObjects[object].objectHandle;
+ }
+ if (NULL != pCallbackData->pObjects[object].pObjectName && strlen(pCallbackData->pObjects[object].pObjectName) > 0) {
+ message << ", Name \"" << pCallbackData->pObjects[object].pObjectName << "\"\n";
+ } else {
+ message << "\n";
}
}
}
@@ -1232,6 +1268,11 @@
platformSurfaceExtFound = 1;
enabled_instance_extensions.push_back(VK_EXT_METAL_SURFACE_EXTENSION_NAME);
}
+#elif defined(VK_USE_PLATFORM_SCREEN_QNX)
+ else if (!strcmp(VK_QNX_SCREEN_SURFACE_EXTENSION_NAME, extension.extensionName)) {
+ platformSurfaceExtFound = 1;
+ enabled_instance_extensions.push_back(VK_QNX_SCREEN_SURFACE_EXTENSION_NAME);
+ }
#elif defined(VK_USE_PLATFORM_FUCHSIA)
else if (!strcmp(VK_FUCHSIA_IMAGEPIPE_SURFACE_EXTENSION_NAME, extension.extensionName)) {
platformSurfaceExtFound = 1;
@@ -1292,6 +1333,13 @@
"look at the Getting Started guide for additional "
"information.\n",
"vkCreateInstance Failure");
+#elif defined(VK_USE_PLATFORM_SCREEN_QNX)
+ ERR_EXIT("vkEnumerateInstanceExtensionProperties failed to find the " VK_QNX_SCREEN_SURFACE_EXTENSION_NAME
+ " extension.\n\nDo you have a compatible "
+ "Vulkan installable client driver (ICD) installed?\nPlease "
+ "look at the Getting Started guide for additional "
+ "information.\n",
+ "vkCreateInstance Failure");
#elif defined(VK_USE_PLATFORM_FUCHSIA)
ERR_EXIT("vkEnumerateInstanceExtensionProperties failed to find the " VK_FUCHSIA_IMAGEPIPE_SURFACE_EXTENSION_NAME
" extension.\n\nDo you have a compatible "
@@ -1315,7 +1363,7 @@
.setApplicationVersion(0)
.setPEngineName(APP_SHORT_NAME)
.setEngineVersion(0)
- .setApiVersion(protected_output ? VK_MAKE_VERSION(1, 1, 0) : VK_MAKE_VERSION(1, 0, 0));
+ .setApiVersion(VK_API_VERSION_1_0);
auto const inst_info = vk::InstanceCreateInfo()
.setFlags(portabilityEnumerationActive ? vk::InstanceCreateFlagBits::eEnumeratePortabilityKHR
: static_cast<vk::InstanceCreateFlagBits>(0))
@@ -1367,7 +1415,7 @@
"vkEnumeratePhysicalDevices Failure");
}
- if (gpu_number >= 0 && !(static_cast<uint32_t>(gpu_number) < physical_devices.size())) {
+ if (invalid_gpu_selection || (gpu_number >= 0 && !(static_cast<uint32_t>(gpu_number) < physical_devices.size()))) {
fprintf(stderr, "GPU %d specified is not present, GPU count = %zu\n", gpu_number, physical_devices.size());
ERR_EXIT("Specified GPU number is not present", "User Error");
}
@@ -1508,6 +1556,13 @@
auto result = create_display_surface();
VERIFY(result == vk::Result::eSuccess);
}
+#elif defined(VK_USE_PLATFORM_SCREEN_QNX)
+ {
+ auto const createInfo = vk::ScreenSurfaceCreateInfoQNX().setContext(screen_context).setWindow(screen_window);
+
+ auto result = inst.createScreenSurfaceQNX(&createInfo, nullptr, &surface);
+ VERIFY(result == vk::Result::eSuccess);
+ }
#elif defined(VK_USE_PLATFORM_FUCHSIA)
{
auto createInfo = vk::ImagePipeSurfaceCreateInfoFUCHSIA();
@@ -1516,7 +1571,6 @@
// ViewCreationToken during this process.
createInfo.setImagePipeHandle(view_creation_token_handle.release());
#endif
-
auto result = inst.createImagePipeSurfaceFUCHSIA(&createInfo, nullptr, &surface);
VERIFY(result == vk::Result::eSuccess);
}
@@ -1628,9 +1682,12 @@
}
void Demo::prepare() {
- prepare_init_cmd();
-
prepare_buffers();
+ if (is_minimized) {
+ prepared = false;
+ return;
+ }
+ prepare_init_cmd();
prepare_depth();
prepare_textures();
prepare_cube_data_buffers();
@@ -1713,6 +1770,12 @@
height = surfCapabilities.currentExtent.height;
}
+ if (width==0||height==0){
+ is_minimized = true;
+ return;
+ } else {
+ is_minimized = false;
+ }
// The FIFO present mode is guaranteed by the spec to be supported
// and to have no tearing. It's a great default present mode to use.
vk::PresentModeKHR swapchainPresentMode = vk::PresentModeKHR::eFifo;
@@ -2111,7 +2174,7 @@
.setPDynamicState(&dynamicStateInfo)
.setLayout(pipeline_layout)
.setRenderPass(render_pass));
- VERIFY(result == vk::Result::eSuccess);
+ VERIFY(pipline_return.result == vk::Result::eSuccess);
pipeline = pipline_return.value.at(0);
device.destroyShaderModule(frag_shader_module);
@@ -2423,6 +2486,9 @@
void Demo::resize() {
// Don't react to resize until after first initialization.
if (!prepared) {
+ if(is_minimized) {
+ prepare();
+ }
return;
}
@@ -2568,6 +2634,7 @@
if (format == vk::Format::eR8G8B8A8Unorm || format == vk::Format::eB8G8R8A8Unorm ||
format == vk::Format::eA2B10G10R10UnormPack32 || format == vk::Format::eA2R10G10B10UnormPack32 ||
+ format == vk::Format::eA1R5G5B5UnormPack16 || format == vk::Format::eR5G6B5UnormPack16 ||
format == vk::Format::eR16G16B16A16Sfloat) {
return surface_format;
}
@@ -3121,6 +3188,171 @@
}
}
}
+#elif defined(VK_USE_PLATFORM_SCREEN_QNX)
+#include <sys/keycodes.h>
+
+void Demo::run()
+{
+ int size[2] = { 0, 0 };
+ screen_window_t win;
+ int val;
+ int rc;
+
+ while (!quit) {
+ while (!screen_get_event(screen_context, screen_event, pause ? ~0 : 0)) {
+ rc = screen_get_event_property_iv(screen_event, SCREEN_PROPERTY_TYPE, &val);
+ if (rc) {
+ printf("Cannot get SCREEN_PROPERTY_TYPE of the event! (%s)\n", strerror(errno));
+ fflush(stdout);
+ quit = true;
+ break;
+ }
+ if (val == SCREEN_EVENT_NONE) {
+ break;
+ }
+ switch (val) {
+ case SCREEN_EVENT_KEYBOARD:
+ rc = screen_get_event_property_iv(screen_event, SCREEN_PROPERTY_FLAGS, &val);
+ if (rc) {
+ printf("Cannot get SCREEN_PROPERTY_FLAGS of the event! (%s)\n", strerror(errno));
+ fflush(stdout);
+ quit = true;
+ break;
+ }
+ if (val & KEY_DOWN) {
+ rc = screen_get_event_property_iv(screen_event, SCREEN_PROPERTY_SYM, &val);
+ if (rc) {
+ printf("Cannot get SCREEN_PROPERTY_SYM of the event! (%s)\n", strerror(errno));
+ fflush(stdout);
+ quit = true;
+ break;
+ }
+ switch (val) {
+ case KEYCODE_ESCAPE:
+ quit = true;
+ break;
+ case KEYCODE_SPACE:
+ pause = !pause;
+ break;
+ case KEYCODE_LEFT:
+ spin_angle -= spin_increment;
+ break;
+ case KEYCODE_RIGHT:
+ spin_angle += spin_increment;
+ break;
+ default:
+ break;
+ }
+ }
+ break;
+ case SCREEN_EVENT_PROPERTY:
+ rc = screen_get_event_property_pv(screen_event, SCREEN_PROPERTY_WINDOW, (void **)&win);
+ if (rc) {
+ printf("Cannot get SCREEN_PROPERTY_WINDOW of the event! (%s)\n", strerror(errno));
+ fflush(stdout);
+ quit = true;
+ break;
+ }
+ rc = screen_get_event_property_iv(screen_event, SCREEN_PROPERTY_NAME, &val);
+ if (rc) {
+ printf("Cannot get SCREEN_PROPERTY_NAME of the event! (%s)\n", strerror(errno));
+ fflush(stdout);
+ quit = true;
+ break;
+ }
+ if (win == screen_window) {
+ switch(val) {
+ case SCREEN_PROPERTY_SIZE:
+ rc = screen_get_window_property_iv(win, SCREEN_PROPERTY_SIZE, size);
+ if (rc) {
+ printf("Cannot get SCREEN_PROPERTY_SIZE of the window in the event! (%s)\n", strerror(errno));
+ fflush(stdout);
+ quit = true;
+ break;
+ }
+ width = size[0];
+ height = size[1];
+ resize();
+ break;
+ default:
+ /* We are not interested in any other events for now */
+ break;
+ }
+ }
+ break;
+ }
+ }
+
+ if (pause) {
+ } else {
+ update_data_buffer();
+ draw();
+ curFrame++;
+ if (frameCount != UINT32_MAX && curFrame == frameCount) {
+ quit = true;
+ }
+ }
+ }
+}
+
+void Demo::create_window()
+{
+ const char *idstr = APP_SHORT_NAME;
+ int size[2];
+ int usage = SCREEN_USAGE_VULKAN;
+ int rc;
+
+ rc = screen_create_context(&screen_context, 0);
+ if (rc) {
+ printf("Cannot create QNX Screen context!\n");
+ fflush(stdout);
+ exit(EXIT_FAILURE);
+ }
+ rc = screen_create_window(&screen_window, screen_context);
+ if (rc) {
+ printf("Cannot create QNX Screen window!\n");
+ fflush(stdout);
+ exit(EXIT_FAILURE);
+ }
+ rc = screen_create_event(&screen_event);
+ if (rc) {
+ printf("Cannot create QNX Screen event!\n");
+ fflush(stdout);
+ exit(EXIT_FAILURE);
+ }
+
+ /* Set window caption */
+ screen_set_window_property_cv(screen_window, SCREEN_PROPERTY_ID_STRING, strlen(idstr), idstr);
+
+ /* Setup VULKAN usage flags */
+ rc = screen_set_window_property_iv(screen_window, SCREEN_PROPERTY_USAGE, &usage);
+ if (rc) {
+ printf("Cannot set SCREEN_USAGE_VULKAN flag!\n");
+ fflush(stdout);
+ exit(EXIT_FAILURE);
+ }
+
+ /* Setup window size */
+ if ((width == 0) || (height == 0)) {
+ rc = screen_get_window_property_iv(screen_window, SCREEN_PROPERTY_SIZE, size);
+ if (rc) {
+ printf("Cannot obtain current window size!\n");
+ fflush(stdout);
+ exit(EXIT_FAILURE);
+ }
+ width = size[0];
+ height = size[1];
+ } else {
+ size[0] = width;
+ size[1] = height;
+ rc = screen_set_window_property_iv(screen_window, SCREEN_PROPERTY_SIZE, size);
+ if (rc) {
+ printf("Cannot set window size!\n");
+ fflush(stdout);
+ exit(EXIT_FAILURE);
+ }
+ }
+}
#elif defined(__Fuchsia__)
#if FUCHSIA_USE_SCENIC
@@ -3191,6 +3423,8 @@
}
}
+
+
#endif
#if _WIN32
@@ -3337,7 +3571,7 @@
return static_cast<int>(msg.wParam);
}
-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__Fuchsia__)
+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__QNX__) || defined(__Fuchsia__)
int main(int argc, char **argv) {
Demo demo;
@@ -3347,7 +3581,6 @@
#if defined(VK_USE_PLATFORM_XCB_KHR)
demo.create_xcb_window();
#elif defined(VK_USE_PLATFORM_XLIB_KHR)
- demo.use_xlib = true;
demo.create_xlib_window();
#elif defined(VK_USE_PLATFORM_WAYLAND_KHR)
demo.create_window();
@@ -3355,6 +3588,8 @@
demo.create_flatland_view();
#elif defined(VK_USE_PLATFORM_DIRECTFB_EXT)
demo.create_directfb_window();
+#elif defined(VK_USE_PLATFORM_SCREEN_QNX)
+ demo.create_window();
#endif
demo.init_vk_swapchain();
@@ -3371,6 +3606,8 @@
demo.run_directfb();
#elif defined(VK_USE_PLATFORM_DISPLAY_KHR)
demo.run_display();
+#elif defined(VK_USE_PLATFORM_SCREEN_QNX)
+ demo.run();
#elif defined(VK_USE_PLATFORM_FUCHSIA)
demo.run();
#endif
diff --git a/cube/cube.frag.inc b/cube/cube.frag.inc
new file mode 100644
index 0000000..98ff521
--- /dev/null
+++ b/cube/cube.frag.inc
@@ -0,0 +1,41 @@
+ // 7.9.2888
+ 0x07230203,0x00010000,0x00080007,0x00000030,0x00000000,0x00020011,0x00000001,0x0006000b,
+ 0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
+ 0x0008000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000000b,0x00000022,0x0000002a,
+ 0x00030010,0x00000004,0x00000007,0x00030003,0x00000002,0x00000190,0x00090004,0x415f4c47,
+ 0x735f4252,0x72617065,0x5f657461,0x64616873,0x6f5f7265,0x63656a62,0x00007374,0x00090004,
+ 0x415f4c47,0x735f4252,0x69646168,0x6c5f676e,0x75676e61,0x5f656761,0x70303234,0x006b6361,
+ 0x00040005,0x00000004,0x6e69616d,0x00000000,0x00030005,0x00000009,0x00005864,0x00050005,
+ 0x0000000b,0x67617266,0x736f705f,0x00000000,0x00030005,0x0000000e,0x00005964,0x00040005,
+ 0x00000011,0x6d726f6e,0x00006c61,0x00040005,0x00000017,0x6867696c,0x00000074,0x00050005,
+ 0x00000022,0x61724675,0x6c6f4367,0x0000726f,0x00030005,0x00000027,0x00786574,0x00050005,
+ 0x0000002a,0x63786574,0x64726f6f,0x00000000,0x00040047,0x0000000b,0x0000001e,0x00000001,
+ 0x00040047,0x00000022,0x0000001e,0x00000000,0x00040047,0x00000027,0x00000022,0x00000000,
+ 0x00040047,0x00000027,0x00000021,0x00000001,0x00040047,0x0000002a,0x0000001e,0x00000000,
+ 0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,
+ 0x00040017,0x00000007,0x00000006,0x00000003,0x00040020,0x00000008,0x00000007,0x00000007,
+ 0x00040020,0x0000000a,0x00000001,0x00000007,0x0004003b,0x0000000a,0x0000000b,0x00000001,
+ 0x00040020,0x00000016,0x00000007,0x00000006,0x0004002b,0x00000006,0x00000018,0x00000000,
+ 0x0004002b,0x00000006,0x00000019,0x3ed91687,0x0004002b,0x00000006,0x0000001a,0x3f10e560,
+ 0x0004002b,0x00000006,0x0000001b,0x3f34fdf4,0x0006002c,0x00000007,0x0000001c,0x00000019,
+ 0x0000001a,0x0000001b,0x00040017,0x00000020,0x00000006,0x00000004,0x00040020,0x00000021,
+ 0x00000003,0x00000020,0x0004003b,0x00000021,0x00000022,0x00000003,0x00090019,0x00000024,
+ 0x00000006,0x00000001,0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,
+ 0x00000025,0x00000024,0x00040020,0x00000026,0x00000000,0x00000025,0x0004003b,0x00000026,
+ 0x00000027,0x00000000,0x00040020,0x00000029,0x00000001,0x00000020,0x0004003b,0x00000029,
+ 0x0000002a,0x00000001,0x00040017,0x0000002b,0x00000006,0x00000002,0x00050036,0x00000002,
+ 0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,
+ 0x00000007,0x0004003b,0x00000008,0x0000000e,0x00000007,0x0004003b,0x00000008,0x00000011,
+ 0x00000007,0x0004003b,0x00000016,0x00000017,0x00000007,0x0004003d,0x00000007,0x0000000c,
+ 0x0000000b,0x000400cf,0x00000007,0x0000000d,0x0000000c,0x0003003e,0x00000009,0x0000000d,
+ 0x0004003d,0x00000007,0x0000000f,0x0000000b,0x000400d0,0x00000007,0x00000010,0x0000000f,
+ 0x0003003e,0x0000000e,0x00000010,0x0004003d,0x00000007,0x00000012,0x00000009,0x0004003d,
+ 0x00000007,0x00000013,0x0000000e,0x0007000c,0x00000007,0x00000014,0x00000001,0x00000044,
+ 0x00000012,0x00000013,0x0006000c,0x00000007,0x00000015,0x00000001,0x00000045,0x00000014,
+ 0x0003003e,0x00000011,0x00000015,0x0004003d,0x00000007,0x0000001d,0x00000011,0x00050094,
+ 0x00000006,0x0000001e,0x0000001c,0x0000001d,0x0007000c,0x00000006,0x0000001f,0x00000001,
+ 0x00000028,0x00000018,0x0000001e,0x0003003e,0x00000017,0x0000001f,0x0004003d,0x00000006,
+ 0x00000023,0x00000017,0x0004003d,0x00000025,0x00000028,0x00000027,0x0004003d,0x00000020,
+ 0x0000002c,0x0000002a,0x0007004f,0x0000002b,0x0000002d,0x0000002c,0x0000002c,0x00000000,
+ 0x00000001,0x00050057,0x00000020,0x0000002e,0x00000028,0x0000002d,0x0005008e,0x00000020,
+ 0x0000002f,0x0000002e,0x00000023,0x0003003e,0x00000022,0x0000002f,0x000100fd,0x00010038
diff --git a/cube/cube.vert.inc b/cube/cube.vert.inc
new file mode 100644
index 0000000..5d029c6
--- /dev/null
+++ b/cube/cube.vert.inc
@@ -0,0 +1,50 @@
+ // 7.9.2888
+ 0x07230203,0x00010000,0x00080007,0x0000002f,0x00000000,0x00020011,0x00000001,0x0006000b,
+ 0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
+ 0x0009000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00000015,0x0000001e,
+ 0x0000002b,0x00030003,0x00000002,0x00000190,0x00090004,0x415f4c47,0x735f4252,0x72617065,
+ 0x5f657461,0x64616873,0x6f5f7265,0x63656a62,0x00007374,0x00090004,0x415f4c47,0x735f4252,
+ 0x69646168,0x6c5f676e,0x75676e61,0x5f656761,0x70303234,0x006b6361,0x00040005,0x00000004,
+ 0x6e69616d,0x00000000,0x00050005,0x00000009,0x63786574,0x64726f6f,0x00000000,0x00030005,
+ 0x0000000f,0x00667562,0x00040006,0x0000000f,0x00000000,0x0050564d,0x00060006,0x0000000f,
+ 0x00000001,0x69736f70,0x6e6f6974,0x00000000,0x00050006,0x0000000f,0x00000002,0x72747461,
+ 0x00000000,0x00040005,0x00000011,0x66756275,0x00000000,0x00060005,0x00000015,0x565f6c67,
+ 0x65747265,0x646e4978,0x00007865,0x00060005,0x0000001c,0x505f6c67,0x65567265,0x78657472,
+ 0x00000000,0x00060006,0x0000001c,0x00000000,0x505f6c67,0x7469736f,0x006e6f69,0x00070006,
+ 0x0000001c,0x00000001,0x505f6c67,0x746e696f,0x657a6953,0x00000000,0x00070006,0x0000001c,
+ 0x00000002,0x435f6c67,0x4470696c,0x61747369,0x0065636e,0x00030005,0x0000001e,0x00000000,
+ 0x00050005,0x0000002b,0x67617266,0x736f705f,0x00000000,0x00040047,0x00000009,0x0000001e,
+ 0x00000000,0x00040047,0x0000000d,0x00000006,0x00000010,0x00040047,0x0000000e,0x00000006,
+ 0x00000010,0x00040048,0x0000000f,0x00000000,0x00000005,0x00050048,0x0000000f,0x00000000,
+ 0x00000023,0x00000000,0x00050048,0x0000000f,0x00000000,0x00000007,0x00000010,0x00050048,
+ 0x0000000f,0x00000001,0x00000023,0x00000040,0x00050048,0x0000000f,0x00000002,0x00000023,
+ 0x00000280,0x00030047,0x0000000f,0x00000002,0x00040047,0x00000011,0x00000022,0x00000000,
+ 0x00040047,0x00000011,0x00000021,0x00000000,0x00040047,0x00000015,0x0000000b,0x0000002a,
+ 0x00050048,0x0000001c,0x00000000,0x0000000b,0x00000000,0x00050048,0x0000001c,0x00000001,
+ 0x0000000b,0x00000001,0x00050048,0x0000001c,0x00000002,0x0000000b,0x00000003,0x00030047,
+ 0x0000001c,0x00000002,0x00040047,0x0000002b,0x0000001e,0x00000001,0x00020013,0x00000002,
+ 0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,0x00000007,
+ 0x00000006,0x00000004,0x00040020,0x00000008,0x00000003,0x00000007,0x0004003b,0x00000008,
+ 0x00000009,0x00000003,0x00040018,0x0000000a,0x00000007,0x00000004,0x00040015,0x0000000b,
+ 0x00000020,0x00000000,0x0004002b,0x0000000b,0x0000000c,0x00000024,0x0004001c,0x0000000d,
+ 0x00000007,0x0000000c,0x0004001c,0x0000000e,0x00000007,0x0000000c,0x0005001e,0x0000000f,
+ 0x0000000a,0x0000000d,0x0000000e,0x00040020,0x00000010,0x00000002,0x0000000f,0x0004003b,
+ 0x00000010,0x00000011,0x00000002,0x00040015,0x00000012,0x00000020,0x00000001,0x0004002b,
+ 0x00000012,0x00000013,0x00000002,0x00040020,0x00000014,0x00000001,0x00000012,0x0004003b,
+ 0x00000014,0x00000015,0x00000001,0x00040020,0x00000017,0x00000002,0x00000007,0x0004002b,
+ 0x0000000b,0x0000001a,0x00000001,0x0004001c,0x0000001b,0x00000006,0x0000001a,0x0005001e,
+ 0x0000001c,0x00000007,0x00000006,0x0000001b,0x00040020,0x0000001d,0x00000003,0x0000001c,
+ 0x0004003b,0x0000001d,0x0000001e,0x00000003,0x0004002b,0x00000012,0x0000001f,0x00000000,
+ 0x00040020,0x00000020,0x00000002,0x0000000a,0x0004002b,0x00000012,0x00000023,0x00000001,
+ 0x00040017,0x00000029,0x00000006,0x00000003,0x00040020,0x0000002a,0x00000003,0x00000029,
+ 0x0004003b,0x0000002a,0x0000002b,0x00000003,0x00050036,0x00000002,0x00000004,0x00000000,
+ 0x00000003,0x000200f8,0x00000005,0x0004003d,0x00000012,0x00000016,0x00000015,0x00060041,
+ 0x00000017,0x00000018,0x00000011,0x00000013,0x00000016,0x0004003d,0x00000007,0x00000019,
+ 0x00000018,0x0003003e,0x00000009,0x00000019,0x00050041,0x00000020,0x00000021,0x00000011,
+ 0x0000001f,0x0004003d,0x0000000a,0x00000022,0x00000021,0x0004003d,0x00000012,0x00000024,
+ 0x00000015,0x00060041,0x00000017,0x00000025,0x00000011,0x00000023,0x00000024,0x0004003d,
+ 0x00000007,0x00000026,0x00000025,0x00050091,0x00000007,0x00000027,0x00000022,0x00000026,
+ 0x00050041,0x00000008,0x00000028,0x0000001e,0x0000001f,0x0003003e,0x00000028,0x00000027,
+ 0x00050041,0x00000008,0x0000002c,0x0000001e,0x0000001f,0x0004003d,0x00000007,0x0000002d,
+ 0x0000002c,0x0008004f,0x00000029,0x0000002e,0x0000002d,0x0000002d,0x00000000,0x00000001,
+ 0x00000002,0x0003003e,0x0000002b,0x0000002e,0x000100fd,0x00010038
diff --git a/cube/macOS/cube/cube.cmake b/cube/macOS/cube/cube.cmake
index 9b823f9..a3c5624 100644
--- a/cube/macOS/cube/cube.cmake
+++ b/cube/macOS/cube/cube.cmake
@@ -28,14 +28,14 @@
${CMAKE_CURRENT_SOURCE_DIR}/macOS/cube/Resources/VulkanIcon.icns)
# Have Xcode handle the Storyboard
-if(${CMAKE_GENERATOR} MATCHES "^Xcode.*")
+if(XCODE)
set(cube_RESOURCES ${cube_RESOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cube/Resources/Main.storyboard)
endif()
add_executable(vkcube MACOSX_BUNDLE ${cube_SRCS} ${cube_HDRS} ${cube_RESOURCES} cube.vert.inc cube.frag.inc)
# Handle the Storyboard ourselves
-if(NOT ${CMAKE_GENERATOR} MATCHES "^Xcode.*")
+if(NOT XCODE)
# Compile the storyboard file with the ibtool.
add_custom_command(TARGET vkcube POST_BUILD
COMMAND ${IBTOOL}
@@ -55,7 +55,10 @@
target_include_directories(vkcube PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MOLTENVK_DIR}/MoltenVK/include)
# We do this so vulkaninfo is linked to an individual library and NOT a framework.
-target_link_libraries(vkcube ${Vulkan_LIBRARY} "-framework Cocoa -framework QuartzCore")
+target_link_libraries(vkcube Vulkan::Loader "-framework Cocoa -framework QuartzCore")
+
+# Disable warnings about sprintf
+target_compile_options(vkcube PRIVATE -Wno-deprecated-declarations)
set_target_properties(vkcube PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cube/Info.plist)
@@ -70,7 +73,7 @@
"Resources/vulkan/icd.d")
# Copy the MoltenVK lib into the bundle.
-if(${CMAKE_GENERATOR} MATCHES "^Xcode.*")
+if(XCODE)
add_custom_command(TARGET vkcube POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib"
${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vkcube.app/Contents/Frameworks/libMoltenVK.dylib
diff --git a/cube/macOS/cubepp/cubepp.cmake b/cube/macOS/cubepp/cubepp.cmake
index eae4de3..e6a3e48 100644
--- a/cube/macOS/cubepp/cubepp.cmake
+++ b/cube/macOS/cubepp/cubepp.cmake
@@ -30,14 +30,14 @@
${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/Resources/VulkanIcon.icns)
# Have Xcode handle the Storyboard
-if(${CMAKE_GENERATOR} MATCHES "^Xcode.*")
+if(XCODE)
set(cubepp_RESOURCES ${cubepp_RESOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/Resources/Main.storyboard)
endif()
add_executable(vkcubepp MACOSX_BUNDLE ${cubepp_SRCS} ${cubepp_HDRS} ${cubepp_RESOURCES} cube.vert.inc cube.frag.inc)
# Handle the Storyboard ourselves
-if(NOT ${CMAKE_GENERATOR} MATCHES "^Xcode.*")
+if(NOT XCODE)
# Compile the storyboard file with the ibtool.
add_custom_command(TARGET vkcubepp POST_BUILD
COMMAND ${IBTOOL}
@@ -57,7 +57,7 @@
target_include_directories(vkcubepp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MOLTENVK_DIR}/MoltenVK/include)
# We do this so vulkaninfo is linked to an individual library and NOT a framework.
-target_link_libraries(vkcubepp ${Vulkan_LIBRARY} "-framework Cocoa -framework QuartzCore")
+target_link_libraries(vkcubepp Vulkan::Loader "-framework Cocoa -framework QuartzCore")
set_target_properties(vkcubepp PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/Info.plist)
@@ -72,7 +72,7 @@
"Resources/vulkan/icd.d")
# Copy the MoltenVK lib into the bundle.
-if(${CMAKE_GENERATOR} MATCHES "^Xcode.*")
+if(XCODE)
add_custom_command(TARGET vkcubepp POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib"
${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vkcubepp.app/Contents/Frameworks/libMoltenVK.dylib
diff --git a/external/x64/lib/vulkan-1.lib b/external/x64/lib/vulkan-1.lib
deleted file mode 100644
index 3e23a7b..0000000
--- a/external/x64/lib/vulkan-1.lib
+++ /dev/null
Binary files differ
diff --git a/external/x86/lib/vulkan-1.lib b/external/x86/lib/vulkan-1.lib
deleted file mode 100644
index 3caa7ba..0000000
--- a/external/x86/lib/vulkan-1.lib
+++ /dev/null
Binary files differ
diff --git a/icd/CMakeLists.txt b/icd/CMakeLists.txt
index 5daa9ab..52ec92f 100644
--- a/icd/CMakeLists.txt
+++ b/icd/CMakeLists.txt
@@ -1,6 +1,7 @@
# ~~~
# Copyright (c) 2014-2018 Valve Corporation
# Copyright (c) 2014-2018 LunarG, Inc.
+# Copyright (c) 2023-2023 RasterGrid Kft.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,16 +16,25 @@
# limitations under the License.
# ~~~
+if (ANDROID)
+ return()
+endif()
+
+# These variables enable downstream users to customize the CMake targets
+# based on the target API variant (e.g. Vulkan SC)
+set(MOCK_ICD_NAME VkICD_mock_icd)
+set(GENERATED generated)
+
+option(BUILD_MOCK_ANDROID_SUPPORT "Build with Android Platform headers" OFF)
+
if(WIN32)
add_definitions(-DVK_USE_PLATFORM_WIN32_KHR -DVK_USE_PLATFORM_WIN32_KHX -DWIN32_LEAN_AND_MEAN)
-elseif(ANDROID)
- add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR -DVK_USE_PLATFORM_ANDROID_KHX)
elseif(APPLE)
add_definitions(-DVK_USE_PLATFORM_MACOS_MVK)
-elseif(UNIX AND NOT APPLE) # i.e. Linux
+elseif(BUILD_MOCK_ANDROID_SUPPORT)
+ add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR)
+elseif(CMAKE_SYSTEM_NAME MATCHES "Linux|BSD")
if(BUILD_WSI_XCB_SUPPORT)
- find_package(XCB REQUIRED)
- include_directories(${XCB_INCLUDE_DIR})
add_definitions(-DVK_USE_PLATFORM_XCB_KHR -DVK_USE_PLATFORM_XCB_KHX)
endif()
@@ -39,141 +49,102 @@
message(FATAL_ERROR "Unsupported Platform!")
endif()
-# Copy or link the JSON files to the binary directory for ease of use in the build tree.
-set(ICD_JSON_FILES VkICD_mock_icd)
-if(WIN32)
- # extra setup for out-of-tree builds
- if(NOT (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR))
- if(CMAKE_GENERATOR MATCHES "^Visual Studio.*")
- foreach(config_file ${ICD_JSON_FILES})
- file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/windows/${config_file}.json src_json)
- file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${config_file}.json dst_json)
- add_custom_target(${config_file}-json ALL COMMAND copy ${src_json} ${dst_json} VERBATIM)
- set_target_properties(${config_file}-json PROPERTIES FOLDER ${TOOLS_HELPER_FOLDER})
- endforeach(config_file)
- else()
- foreach(config_file ${ICD_JSON_FILES})
- file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/windows/${config_file}.json src_json)
- file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/${config_file}.json dst_json)
- add_custom_target(${config_file}-json ALL COMMAND copy ${src_json} ${dst_json} VERBATIM)
- endforeach(config_file)
- endif()
+add_library(VkICD_mock_icd MODULE)
+target_sources(VkICD_mock_icd PRIVATE mock_icd.cpp)
+target_link_libraries(VkICD_mock_icd PRIVATE Vulkan::Headers)
+
+target_include_directories(VkICD_mock_icd PRIVATE
+ ${GENERATED}
+ .
+)
+
+if(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU|Clang")
+ target_compile_options(VkICD_mock_icd PRIVATE
+ -Wpointer-arith
+ -Wno-unused-function
+ -Wno-sign-compare
+ )
+
+ if (ENABLE_ADDRESS_SANITIZER)
+ target_compile_options(VkICD_mock_icd PUBLIC -fsanitize=address)
+ target_link_options(VkICD_mock_icd PUBLIC -fsanitize=address)
endif()
+endif()
+
+if(MSVC)
+ target_compile_options(VkICD_mock_icd PRIVATE /bigobj)
+ target_compile_definitions(VkICD_mock_icd PRIVATE _CRT_SECURE_NO_WARNINGS)
+ target_link_options(VkICD_mock_icd PRIVATE /DEF:${CMAKE_CURRENT_SOURCE_DIR}/${MOCK_ICD_NAME}.def)
+elseif(MINGW)
+ target_sources(VkICD_mock_icd PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/${MOCK_ICD_NAME}.def)
+else()
+ if(APPLE)
+ set_target_properties(VkICD_mock_icd PROPERTIES SUFFIX ".dylib")
+ endif()
+ message(DEBUG "Mock ICD Functions are exported via EXPORT")
+endif()
+
+set_target_properties(VkICD_mock_icd PROPERTIES OUTPUT_NAME ${MOCK_ICD_NAME})
+
+if (DEFINED GIT_BRANCH_NAME AND DEFINED GIT_TAG_INFO)
+ target_compile_definitions(VkICD_mock_icd PRIVATE GIT_BRANCH_NAME="${GIT_BRANCH_NAME}" GIT_TAG_INFO="${GIT_TAG_INFO}")
+endif()
+
+# There are 2 primary deliverables for the mock driver.
+# - The actual library (lib)VkICD_mock_icd.(dll|so|dylib)
+# - The respective json file, VkICD_mock_icd.json
+# This code generates the appropriate json for both local testing and the installation.
+# NOTE: For WIN32 the JSON and dll MUST be placed in the same location, due to Win32 using a relative path for installation.
+set(INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${MOCK_ICD_NAME}.json.in")
+set(INTERMEDIATE_FILE "${CMAKE_CURRENT_BINARY_DIR}/json/mock_icd.json")
+set(OUTPUT_FILE_FINAL_NAME "${MOCK_ICD_NAME}.json")
+set(LAYER_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
+if (WIN32)
+ set(LAYER_INSTALL_DIR ${CMAKE_INSTALL_BINDIR}) # WIN32/MINGW expect the dll in the `bin` dir, this matches our WIN32 SDK process
+endif()
+
+if (WIN32)
+ set(JSON_LIBRARY_PATH ".\\\\${MOCK_ICD_NAME}.dll")
elseif(APPLE)
- # extra setup for out-of-tree builds
- if(NOT (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR))
- if(CMAKE_GENERATOR MATCHES "^Xcode.*")
- add_custom_target(mk_icd_config_dir ALL
- COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>)
- foreach(config_file ${ICD_JSON_FILES})
- add_custom_target(${config_file}-json ALL
- DEPENDS mk_icd_config_dir
- COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/macos/${config_file}.json
- $<CONFIG> ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${config_file}.json
- VERBATIM)
- endforeach(config_file)
- else()
- foreach(config_file ${ICD_JSON_FILES})
- add_custom_target(${config_file}-json ALL
- COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/macos/${config_file}.json
- ${config_file}.json
- VERBATIM)
- endforeach(config_file)
- endif()
+ set(JSON_LIBRARY_PATH "./lib${MOCK_ICD_NAME}.dylib")
+else()
+ set(JSON_LIBRARY_PATH "./lib${MOCK_ICD_NAME}.so")
+endif()
+
+configure_file(${INPUT_FILE} ${INTERMEDIATE_FILE} @ONLY)
+
+# To support both multi/single configuration generators just copy the json to the correct directory
+add_custom_command(TARGET VkICD_mock_icd POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${INTERMEDIATE_FILE} $<TARGET_FILE_DIR:VkICD_mock_icd>/${OUTPUT_FILE_FINAL_NAME}
+)
+
+# Installing the Mock ICD to system directories is probably not desired since this ICD is not a very complete implementation.
+# Require the user to ask that it be installed if they really want it.
+option(INSTALL_ICD "Install Mock icd")
+if (INSTALL_ICD)
+ message(NOTICE "INSTALL_ICD enabled!")
+else()
+ return()
+endif()
+
+# For UNIX-based systems, `library_path` should not contain a relative path (indicated by "./") before installing to system directories
+# This json isn't used for regular local development, it's used for installation
+if (UNIX)
+ set(UNIX_INTERMEDIATE_FILE "${CMAKE_CURRENT_BINARY_DIR}/json/unix_install_mock_icd.json")
+
+ if(APPLE)
+ set(JSON_LIBRARY_PATH "lib${MOCK_ICD_NAME}.dylib")
+ else()
+ set(JSON_LIBRARY_PATH "lib${MOCK_ICD_NAME}.so")
endif()
-else()
- # extra setup for out-of-tree builds
- if(NOT (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR))
- foreach(config_file ${ICD_JSON_FILES})
- add_custom_target(${config_file}-json ALL
- COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/linux/${config_file}.json
- ${config_file}.json
- VERBATIM)
- endforeach(config_file)
- endif()
+
+ configure_file(${INPUT_FILE} ${UNIX_INTERMEDIATE_FILE} @ONLY)
+
+ install(FILES ${UNIX_INTERMEDIATE_FILE} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/vulkan/icd.d RENAME ${OUTPUT_FILE_FINAL_NAME})
endif()
-# For ICD with a direct dependency on a project with the same name, use it.
-if(NOT (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR))
- foreach(config_file ${ICD_JSON_FILES})
- add_dependencies(${config_file}-json ${config_file})
- endforeach(config_file)
-endif()
-add_custom_target(generate_icd_files DEPENDS mock_icd.h mock_icd.cpp)
-set_target_properties(generate_icd_files PROPERTIES FOLDER ${TOOLS_HELPER_FOLDER})
-
-if(WIN32)
- macro(add_vk_icd target)
- file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/VkICD_${target}.def DEF_FILE)
- add_custom_target(copy-${target}-def-file ALL
- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DEF_FILE} VkICD_${target}.def
- VERBATIM)
- set_target_properties(copy-${target}-def-file PROPERTIES FOLDER ${TOOLS_HELPER_FOLDER})
- add_library(VkICD_${target} SHARED ${ARGN} VkICD_${target}.def)
- if(INSTALL_ICD)
- install(TARGETS VkICD_${target} DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
- endmacro()
-elseif(APPLE)
- macro(add_vk_icd target)
- add_library(VkICD_${target} SHARED ${ARGN})
- set_target_properties(VkICD_${target} PROPERTIES LINK_FLAGS "-Wl")
- if(INSTALL_ICD)
- install(TARGETS VkICD_${target} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
- endif()
- endmacro()
-else()
- macro(add_vk_icd target)
- add_library(VkICD_${target} SHARED ${ARGN})
- set_target_properties(VkICD_${target} PROPERTIES LINK_FLAGS "-Wl,-export-dynamic,-Bsymbolic,--exclude-libs,ALL")
- if((UNIX AND NOT APPLE) AND INSTALL_ICD) # i.e. Linux
- install(TARGETS VkICD_${target} DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
- endmacro()
+if (WIN32)
+ install(FILES ${INTERMEDIATE_FILE} DESTINATION ${LAYER_INSTALL_DIR} RENAME ${OUTPUT_FILE_FINAL_NAME})
endif()
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
- ${VulkanHeaders_INCLUDE_DIR}
- ${WAYLAND_CLIENT_INCLUDE_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}
- ${PROJECT_BINARY_DIR}
- ${CMAKE_BINARY_DIR})
-
-if(WIN32)
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_CRT_SECURE_NO_WARNINGS")
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D_CRT_SECURE_NO_WARNINGS")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -D_CRT_SECURE_NO_WARNINGS")
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -D_CRT_SECURE_NO_WARNINGS")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_CRT_SECURE_NO_WARNINGS /bigobj")
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_CRT_SECURE_NO_WARNINGS /bigobj")
- # Turn off transitional "changed behavior" warning message for Visual Studio versions prior to 2015. The changed behavior is
- # that constructor initializers are now fixed to clear the struct members.
- add_compile_options("$<$<AND:$<CXX_COMPILER_ID:MSVC>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,19>>:/wd4351>")
-else()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpointer-arith -Wno-unused-function -Wno-sign-compare")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith -Wno-unused-function -Wno-sign-compare")
-endif()
-
-add_vk_icd(mock_icd generated/mock_icd.cpp generated/mock_icd.h)
-
-# JSON file(s) install targets. For Linux, need to remove the "./" from the library path before installing to system directories.
-if((UNIX AND NOT APPLE) AND INSTALL_ICD) # i.e. Linux
- foreach(config_file ${ICD_JSON_FILES})
- add_custom_target(${config_file}-staging-json ALL
- COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/staging-json
- COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/linux/${config_file}.json ${CMAKE_CURRENT_BINARY_DIR}/staging-json
- COMMAND sed -i -e "/\"library_path\":/s$./libVkICD$libVkICD$"
- ${CMAKE_CURRENT_BINARY_DIR}/staging-json/${config_file}.json
- VERBATIM
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/linux/${config_file}.json)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/staging-json/${config_file}.json
- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/vulkan/icd.d)
- endforeach(config_file)
-endif()
-
-# Windows uses the JSON file as-is.
-if(WIN32 AND INSTALL_ICD)
- foreach(config_file ${ICD_JSON_FILES})
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/windows/${config_file}.json DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endforeach(config_file)
-endif()
+install(TARGETS VkICD_mock_icd DESTINATION ${LAYER_INSTALL_DIR})
diff --git a/icd/VkICD_mock_icd.json.in b/icd/VkICD_mock_icd.json.in
new file mode 100644
index 0000000..2ff4340
--- /dev/null
+++ b/icd/VkICD_mock_icd.json.in
@@ -0,0 +1,7 @@
+{
+ "file_format_version": "1.0.1",
+ "ICD": {
+ "library_path": "@JSON_LIBRARY_PATH@",
+ "api_version": "1.3.268"
+ }
+}
\ No newline at end of file
diff --git a/icd/generated/mock_icd.h b/icd/generated/function_declarations.h
similarity index 90%
rename from icd/generated/mock_icd.h
rename to icd/generated/function_declarations.h
index 78f2be5..9c7a65d 100644
--- a/icd/generated/mock_icd.h
+++ b/icd/generated/function_declarations.h
@@ -1,8 +1,5 @@
-#ifndef __mock_icd_h_
-#define __mock_icd_h_ 1
-
/*
-** Copyright (c) 2015-2018 The Khronos Group Inc.
+** Copyright (c) 2015-2018, 2023 The Khronos Group Inc.
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -22,32 +19,17 @@
**
*/
-#include <unordered_map>
-#include <mutex>
-#include <string>
+
+#pragma once
+
+#include <stdint.h>
#include <cstring>
-#include "vulkan/vk_icd.h"
+#include <string>
+#include <unordered_map>
+#include <vulkan/vulkan.h>
+
namespace vkmock {
-
-using mutex_t = std::mutex;
-using lock_guard_t = std::lock_guard<mutex_t>;
-using unique_lock_t = std::unique_lock<mutex_t>;
-
-static mutex_t global_lock;
-static uint64_t global_unique_handle = 1;
-static const uint32_t SUPPORTED_LOADER_ICD_INTERFACE_VERSION = 5;
-static uint32_t loader_interface_version = 0;
-static bool negotiate_loader_icd_interface_called = false;
-static void* CreateDispObjHandle() {
- auto handle = new VK_LOADER_DATA;
- set_loader_magic_value(handle);
- return handle;
-}
-static void DestroyDispObjHandle(void* handle) {
- delete reinterpret_cast<VK_LOADER_DATA*>(handle);
-}
-
// Map of instance extension name to version
static const std::unordered_map<std::string, uint32_t> instance_extension_map = {
{"VK_KHR_surface", 25},
@@ -81,11 +63,13 @@
{"VK_KHR_surface_protected_capabilities", 1},
{"VK_EXT_validation_features", 5},
{"VK_EXT_headless_surface", 1},
+ {"VK_EXT_surface_maintenance1", 1},
{"VK_EXT_acquire_drm_display", 1},
{"VK_EXT_directfb_surface", 1},
{"VK_QNX_screen_surface", 1},
{"VK_KHR_portability_enumeration", 1},
{"VK_GOOGLE_surfaceless_query", 2},
+ {"VK_LUNARG_direct_driver_loading", 1},
};
// Map of device extension name to version
static const std::unordered_map<std::string, uint32_t> device_extension_map = {
@@ -99,8 +83,8 @@
{"VK_AMD_shader_trinary_minmax", 1},
{"VK_AMD_shader_explicit_vertex_parameter", 1},
{"VK_EXT_debug_marker", 4},
- {"VK_KHR_video_queue", 7},
- {"VK_KHR_video_decode_queue", 6},
+ {"VK_KHR_video_queue", 8},
+ {"VK_KHR_video_decode_queue", 7},
{"VK_AMD_gcn_shader", 1},
{"VK_NV_dedicated_allocation", 1},
{"VK_EXT_transform_feedback", 1},
@@ -110,9 +94,9 @@
{"VK_AMD_negative_viewport_height", 1},
{"VK_AMD_gpu_shader_half_float", 2},
{"VK_AMD_shader_ballot", 1},
- {"VK_EXT_video_encode_h264", 9},
- {"VK_EXT_video_encode_h265", 9},
- {"VK_EXT_video_decode_h264", 7},
+ {"VK_EXT_video_encode_h264", 12},
+ {"VK_EXT_video_encode_h265", 12},
+ {"VK_KHR_video_decode_h264", 8},
{"VK_AMD_texture_gather_bias_lod", 1},
{"VK_AMD_shader_info", 1},
{"VK_KHR_dynamic_rendering", 1},
@@ -152,7 +136,7 @@
{"VK_NV_viewport_array2", 1},
{"VK_NVX_multiview_per_view_attributes", 1},
{"VK_NV_viewport_swizzle", 1},
- {"VK_EXT_discard_rectangles", 1},
+ {"VK_EXT_discard_rectangles", 2},
{"VK_EXT_conservative_rasterization", 1},
{"VK_EXT_depth_clip_enable", 1},
{"VK_EXT_hdr_metadata", 2},
@@ -172,6 +156,7 @@
{"VK_EXT_sampler_filter_minmax", 2},
{"VK_KHR_storage_buffer_storage_class", 1},
{"VK_AMD_gpu_shader_int16", 2},
+ {"VK_AMDX_shader_enqueue", 1},
{"VK_AMD_mixed_attachment_samples", 1},
{"VK_AMD_shader_fragment_mask", 1},
{"VK_EXT_inline_uniform_block", 1},
@@ -211,7 +196,7 @@
{"VK_AMD_pipeline_compiler_control", 1},
{"VK_EXT_calibrated_timestamps", 2},
{"VK_AMD_shader_core_properties", 2},
- {"VK_EXT_video_decode_h265", 5},
+ {"VK_KHR_video_decode_h265", 7},
{"VK_KHR_global_priority", 1},
{"VK_AMD_memory_overallocation_behavior", 1},
{"VK_EXT_vertex_attribute_divisor", 3},
@@ -226,7 +211,7 @@
{"VK_NV_mesh_shader", 1},
{"VK_NV_fragment_shader_barycentric", 1},
{"VK_NV_shader_image_footprint", 2},
- {"VK_NV_scissor_exclusive", 1},
+ {"VK_NV_scissor_exclusive", 2},
{"VK_NV_device_diagnostic_checkpoints", 2},
{"VK_KHR_timeline_semaphore", 2},
{"VK_INTEL_shader_integer_functions2", 1},
@@ -268,13 +253,17 @@
{"VK_EXT_extended_dynamic_state", 1},
{"VK_KHR_deferred_host_operations", 4},
{"VK_KHR_pipeline_executable_properties", 1},
+ {"VK_EXT_host_image_copy", 1},
+ {"VK_KHR_map_memory2", 1},
{"VK_EXT_shader_atomic_float2", 1},
+ {"VK_EXT_swapchain_maintenance1", 1},
{"VK_EXT_shader_demote_to_helper_invocation", 1},
{"VK_NV_device_generated_commands", 3},
{"VK_NV_inherited_viewport_scissor", 1},
{"VK_KHR_shader_integer_dot_product", 1},
{"VK_EXT_texel_buffer_alignment", 1},
{"VK_QCOM_render_pass_transform", 3},
+ {"VK_EXT_depth_bias_control", 1},
{"VK_EXT_device_memory_report", 2},
{"VK_EXT_robustness2", 1},
{"VK_EXT_custom_border_color", 12},
@@ -285,11 +274,13 @@
{"VK_KHR_present_id", 1},
{"VK_EXT_private_data", 1},
{"VK_EXT_pipeline_creation_cache_control", 3},
- {"VK_KHR_video_encode_queue", 7},
+ {"VK_KHR_video_encode_queue", 10},
{"VK_NV_device_diagnostics_config", 2},
{"VK_QCOM_render_pass_store_ops", 2},
+ {"VK_NV_low_latency", 1},
{"VK_EXT_metal_objects", 1},
{"VK_KHR_synchronization2", 1},
+ {"VK_EXT_descriptor_buffer", 1},
{"VK_EXT_graphics_pipeline_library", 1},
{"VK_AMD_shader_early_and_late_fragment_tests", 1},
{"VK_KHR_fragment_shader_barycentric", 1},
@@ -307,7 +298,7 @@
{"VK_EXT_image_compression_control", 1},
{"VK_EXT_attachment_feedback_loop_layout", 2},
{"VK_EXT_4444_formats", 1},
- {"VK_EXT_device_fault", 1},
+ {"VK_EXT_device_fault", 2},
{"VK_ARM_rasterization_order_attachment_access", 1},
{"VK_EXT_rgba10x6_formats", 1},
{"VK_NV_acquire_winrt_display", 1},
@@ -321,10 +312,11 @@
{"VK_FUCHSIA_external_memory", 1},
{"VK_FUCHSIA_external_semaphore", 1},
{"VK_FUCHSIA_buffer_collection", 2},
- {"VK_HUAWEI_subpass_shading", 2},
+ {"VK_HUAWEI_subpass_shading", 3},
{"VK_HUAWEI_invocation_mask", 1},
{"VK_NV_external_memory_rdma", 1},
{"VK_EXT_pipeline_properties", 1},
+ {"VK_EXT_frame_boundary", 1},
{"VK_EXT_multisampled_render_to_single_sampled", 1},
{"VK_EXT_extended_dynamic_state2", 1},
{"VK_EXT_color_write_enable", 1},
@@ -334,18 +326,28 @@
{"VK_EXT_image_view_min_lod", 1},
{"VK_EXT_multi_draw", 1},
{"VK_EXT_image_2d_view_of_3d", 1},
+ {"VK_EXT_shader_tile_image", 1},
{"VK_EXT_opacity_micromap", 2},
+ {"VK_NV_displacement_micromap", 2},
{"VK_EXT_load_store_op_none", 1},
+ {"VK_HUAWEI_cluster_culling_shader", 2},
{"VK_EXT_border_color_swizzle", 1},
{"VK_EXT_pageable_device_local_memory", 1},
{"VK_KHR_maintenance4", 2},
+ {"VK_ARM_shader_core_properties", 1},
+ {"VK_EXT_image_sliced_view_of_3d", 1},
{"VK_VALVE_descriptor_set_host_mapping", 1},
{"VK_EXT_depth_clamp_zero_one", 1},
{"VK_EXT_non_seamless_cube_map", 1},
{"VK_QCOM_fragment_density_map_offset", 1},
+ {"VK_NV_copy_memory_indirect", 1},
+ {"VK_NV_memory_decompression", 1},
+ {"VK_NV_device_generated_commands_compute", 2},
{"VK_NV_linear_color_attachment", 1},
{"VK_EXT_image_compression_control_swapchain", 1},
{"VK_QCOM_image_processing", 1},
+ {"VK_EXT_nested_command_buffer", 1},
+ {"VK_EXT_external_memory_acquire_unmodified", 1},
{"VK_EXT_extended_dynamic_state3", 2},
{"VK_EXT_subpass_merge_feedback", 2},
{"VK_EXT_shader_module_identifier", 1},
@@ -353,10 +355,30 @@
{"VK_NV_optical_flow", 1},
{"VK_EXT_legacy_dithering", 1},
{"VK_EXT_pipeline_protected_access", 1},
+ {"VK_ANDROID_external_format_resolve", 1},
+ {"VK_KHR_maintenance5", 1},
+ {"VK_KHR_ray_tracing_position_fetch", 1},
+ {"VK_EXT_shader_object", 1},
{"VK_QCOM_tile_properties", 1},
{"VK_SEC_amigo_profiling", 1},
+ {"VK_QCOM_multiview_per_view_viewports", 1},
+ {"VK_NV_ray_tracing_invocation_reorder", 1},
+ {"VK_NV_extended_sparse_address_space", 1},
{"VK_EXT_mutable_descriptor_type", 1},
- {"VK_ARM_shader_core_builtins", 1},
+ {"VK_ARM_shader_core_builtins", 2},
+ {"VK_EXT_pipeline_library_group_handles", 1},
+ {"VK_EXT_dynamic_rendering_unused_attachments", 1},
+ {"VK_NV_low_latency2", 1},
+ {"VK_KHR_cooperative_matrix", 2},
+ {"VK_QCOM_multiview_per_view_render_areas", 1},
+ {"VK_QCOM_image_processing2", 1},
+ {"VK_QCOM_filter_cubic_weights", 1},
+ {"VK_QCOM_ycbcr_degamma", 1},
+ {"VK_QCOM_filter_cubic_clamp", 1},
+ {"VK_EXT_attachment_feedback_loop_dynamic_state", 1},
+ {"VK_QNX_external_memory_screen_buffer", 1},
+ {"VK_MSFT_layered_driver", 1},
+ {"VK_NV_descriptor_pool_overallocation", 1},
};
@@ -1751,7 +1773,6 @@
#endif /* VK_USE_PLATFORM_WIN32_KHR */
-#ifdef VK_ENABLE_BETA_EXTENSIONS
static VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceVideoCapabilitiesKHR(
VkPhysicalDevice physicalDevice,
@@ -1814,14 +1835,12 @@
static VKAPI_ATTR void VKAPI_CALL CmdControlVideoCodingKHR(
VkCommandBuffer commandBuffer,
const VkVideoCodingControlInfoKHR* pCodingControlInfo);
-#endif /* VK_ENABLE_BETA_EXTENSIONS */
-#ifdef VK_ENABLE_BETA_EXTENSIONS
static VKAPI_ATTR void VKAPI_CALL CmdDecodeVideoKHR(
VkCommandBuffer commandBuffer,
const VkVideoDecodeInfoKHR* pDecodeInfo);
-#endif /* VK_ENABLE_BETA_EXTENSIONS */
+
static VKAPI_ATTR void VKAPI_CALL CmdBeginRenderingKHR(
@@ -2196,6 +2215,7 @@
+
static VKAPI_ATTR VkResult VKAPI_CALL GetSemaphoreCounterValueKHR(
VkDevice device,
VkSemaphore semaphore,
@@ -2290,11 +2310,33 @@
VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations);
+static VKAPI_ATTR VkResult VKAPI_CALL MapMemory2KHR(
+ VkDevice device,
+ const VkMemoryMapInfoKHR* pMemoryMapInfo,
+ void** ppData);
+
+static VKAPI_ATTR VkResult VKAPI_CALL UnmapMemory2KHR(
+ VkDevice device,
+ const VkMemoryUnmapInfoKHR* pMemoryUnmapInfo);
+
+
#ifdef VK_ENABLE_BETA_EXTENSIONS
+static VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR(
+ VkPhysicalDevice physicalDevice,
+ const VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR* pQualityLevelInfo,
+ VkVideoEncodeQualityLevelPropertiesKHR* pQualityLevelProperties);
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetEncodedVideoSessionParametersKHR(
+ VkDevice device,
+ const VkVideoEncodeSessionParametersGetInfoKHR* pVideoSessionParametersInfo,
+ VkVideoEncodeSessionParametersFeedbackInfoKHR* pFeedbackInfo,
+ size_t* pDataSize,
+ void* pData);
+
static VKAPI_ATTR void VKAPI_CALL CmdEncodeVideoKHR(
VkCommandBuffer commandBuffer,
const VkVideoEncodeInfoKHR* pEncodeInfo);
@@ -2399,6 +2441,37 @@
VkSparseImageMemoryRequirements2* pSparseMemoryRequirements);
+static VKAPI_ATTR void VKAPI_CALL CmdBindIndexBuffer2KHR(
+ VkCommandBuffer commandBuffer,
+ VkBuffer buffer,
+ VkDeviceSize offset,
+ VkDeviceSize size,
+ VkIndexType indexType);
+
+static VKAPI_ATTR void VKAPI_CALL GetRenderingAreaGranularityKHR(
+ VkDevice device,
+ const VkRenderingAreaInfoKHR* pRenderingAreaInfo,
+ VkExtent2D* pGranularity);
+
+static VKAPI_ATTR void VKAPI_CALL GetDeviceImageSubresourceLayoutKHR(
+ VkDevice device,
+ const VkDeviceImageSubresourceInfoKHR* pInfo,
+ VkSubresourceLayout2KHR* pLayout);
+
+static VKAPI_ATTR void VKAPI_CALL GetImageSubresourceLayout2KHR(
+ VkDevice device,
+ VkImage image,
+ const VkImageSubresource2KHR* pSubresource,
+ VkSubresourceLayout2KHR* pLayout);
+
+
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceCooperativeMatrixPropertiesKHR(
+ VkPhysicalDevice physicalDevice,
+ uint32_t* pPropertyCount,
+ VkCooperativeMatrixPropertiesKHR* pProperties);
+
+
static VKAPI_ATTR VkResult VKAPI_CALL CreateDebugReportCallbackEXT(
VkInstance instance,
const VkDebugReportCallbackCreateInfoEXT* pCreateInfo,
@@ -2558,9 +2631,6 @@
#ifdef VK_ENABLE_BETA_EXTENSIONS
#endif /* VK_ENABLE_BETA_EXTENSIONS */
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-#endif /* VK_ENABLE_BETA_EXTENSIONS */
-
static VKAPI_ATTR VkResult VKAPI_CALL GetShaderInfoAMD(
@@ -2711,6 +2781,14 @@
uint32_t discardRectangleCount,
const VkRect2D* pDiscardRectangles);
+static VKAPI_ATTR void VKAPI_CALL CmdSetDiscardRectangleEnableEXT(
+ VkCommandBuffer commandBuffer,
+ VkBool32 discardRectangleEnable);
+
+static VKAPI_ATTR void VKAPI_CALL CmdSetDiscardRectangleModeEXT(
+ VkCommandBuffer commandBuffer,
+ VkDiscardRectangleModeEXT discardRectangleMode);
+
@@ -2804,6 +2882,47 @@
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+
+static VKAPI_ATTR VkResult VKAPI_CALL CreateExecutionGraphPipelinesAMDX(
+ VkDevice device,
+ VkPipelineCache pipelineCache,
+ uint32_t createInfoCount,
+ const VkExecutionGraphPipelineCreateInfoAMDX* pCreateInfos,
+ const VkAllocationCallbacks* pAllocator,
+ VkPipeline* pPipelines);
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetExecutionGraphPipelineScratchSizeAMDX(
+ VkDevice device,
+ VkPipeline executionGraph,
+ VkExecutionGraphPipelineScratchSizeAMDX* pSizeInfo);
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetExecutionGraphPipelineNodeIndexAMDX(
+ VkDevice device,
+ VkPipeline executionGraph,
+ const VkPipelineShaderStageNodeCreateInfoAMDX* pNodeInfo,
+ uint32_t* pNodeIndex);
+
+static VKAPI_ATTR void VKAPI_CALL CmdInitializeGraphScratchMemoryAMDX(
+ VkCommandBuffer commandBuffer,
+ VkDeviceAddress scratch);
+
+static VKAPI_ATTR void VKAPI_CALL CmdDispatchGraphAMDX(
+ VkCommandBuffer commandBuffer,
+ VkDeviceAddress scratch,
+ const VkDispatchGraphCountInfoAMDX* pCountInfo);
+
+static VKAPI_ATTR void VKAPI_CALL CmdDispatchGraphIndirectAMDX(
+ VkCommandBuffer commandBuffer,
+ VkDeviceAddress scratch,
+ const VkDispatchGraphCountInfoAMDX* pCountInfo);
+
+static VKAPI_ATTR void VKAPI_CALL CmdDispatchGraphIndirectCountAMDX(
+ VkCommandBuffer commandBuffer,
+ VkDeviceAddress scratch,
+ VkDeviceAddress countInfo);
+#endif /* VK_ENABLE_BETA_EXTENSIONS */
+
@@ -3007,9 +3126,6 @@
uint64_t* pMaxDeviation);
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-#endif /* VK_ENABLE_BETA_EXTENSIONS */
-
#ifdef VK_USE_PLATFORM_GGP
@@ -3043,6 +3159,12 @@
+static VKAPI_ATTR void VKAPI_CALL CmdSetExclusiveScissorEnableNV(
+ VkCommandBuffer commandBuffer,
+ uint32_t firstExclusiveScissor,
+ uint32_t exclusiveScissorCount,
+ const VkBool32* pExclusiveScissorEnables);
+
static VKAPI_ATTR void VKAPI_CALL CmdSetExclusiveScissorNV(
VkCommandBuffer commandBuffer,
uint32_t firstExclusiveScissor,
@@ -3267,6 +3389,36 @@
VkCompareOp compareOp);
+static VKAPI_ATTR VkResult VKAPI_CALL CopyMemoryToImageEXT(
+ VkDevice device,
+ const VkCopyMemoryToImageInfoEXT* pCopyMemoryToImageInfo);
+
+static VKAPI_ATTR VkResult VKAPI_CALL CopyImageToMemoryEXT(
+ VkDevice device,
+ const VkCopyImageToMemoryInfoEXT* pCopyImageToMemoryInfo);
+
+static VKAPI_ATTR VkResult VKAPI_CALL CopyImageToImageEXT(
+ VkDevice device,
+ const VkCopyImageToImageInfoEXT* pCopyImageToImageInfo);
+
+static VKAPI_ATTR VkResult VKAPI_CALL TransitionImageLayoutEXT(
+ VkDevice device,
+ uint32_t transitionCount,
+ const VkHostImageLayoutTransitionInfoEXT* pTransitions);
+
+static VKAPI_ATTR void VKAPI_CALL GetImageSubresourceLayout2EXT(
+ VkDevice device,
+ VkImage image,
+ const VkImageSubresource2KHR* pSubresource,
+ VkSubresourceLayout2KHR* pLayout);
+
+
+
+
+static VKAPI_ATTR VkResult VKAPI_CALL ReleaseSwapchainImagesEXT(
+ VkDevice device,
+ const VkReleaseSwapchainImagesInfoEXT* pReleaseInfo);
+
static VKAPI_ATTR void VKAPI_CALL GetGeneratedCommandsMemoryRequirementsNV(
@@ -3304,6 +3456,11 @@
+static VKAPI_ATTR void VKAPI_CALL CmdSetDepthBias2EXT(
+ VkCommandBuffer commandBuffer,
+ const VkDepthBiasInfoEXT* pDepthBiasInfo);
+
+
static VKAPI_ATTR VkResult VKAPI_CALL AcquireDrmDisplayEXT(
VkPhysicalDevice physicalDevice,
@@ -3349,6 +3506,7 @@
+
#ifdef VK_USE_PLATFORM_METAL_EXT
static VKAPI_ATTR void VKAPI_CALL ExportMetalObjectsEXT(
@@ -3357,6 +3515,69 @@
#endif /* VK_USE_PLATFORM_METAL_EXT */
+static VKAPI_ATTR void VKAPI_CALL GetDescriptorSetLayoutSizeEXT(
+ VkDevice device,
+ VkDescriptorSetLayout layout,
+ VkDeviceSize* pLayoutSizeInBytes);
+
+static VKAPI_ATTR void VKAPI_CALL GetDescriptorSetLayoutBindingOffsetEXT(
+ VkDevice device,
+ VkDescriptorSetLayout layout,
+ uint32_t binding,
+ VkDeviceSize* pOffset);
+
+static VKAPI_ATTR void VKAPI_CALL GetDescriptorEXT(
+ VkDevice device,
+ const VkDescriptorGetInfoEXT* pDescriptorInfo,
+ size_t dataSize,
+ void* pDescriptor);
+
+static VKAPI_ATTR void VKAPI_CALL CmdBindDescriptorBuffersEXT(
+ VkCommandBuffer commandBuffer,
+ uint32_t bufferCount,
+ const VkDescriptorBufferBindingInfoEXT* pBindingInfos);
+
+static VKAPI_ATTR void VKAPI_CALL CmdSetDescriptorBufferOffsetsEXT(
+ VkCommandBuffer commandBuffer,
+ VkPipelineBindPoint pipelineBindPoint,
+ VkPipelineLayout layout,
+ uint32_t firstSet,
+ uint32_t setCount,
+ const uint32_t* pBufferIndices,
+ const VkDeviceSize* pOffsets);
+
+static VKAPI_ATTR void VKAPI_CALL CmdBindDescriptorBufferEmbeddedSamplersEXT(
+ VkCommandBuffer commandBuffer,
+ VkPipelineBindPoint pipelineBindPoint,
+ VkPipelineLayout layout,
+ uint32_t set);
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetBufferOpaqueCaptureDescriptorDataEXT(
+ VkDevice device,
+ const VkBufferCaptureDescriptorDataInfoEXT* pInfo,
+ void* pData);
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetImageOpaqueCaptureDescriptorDataEXT(
+ VkDevice device,
+ const VkImageCaptureDescriptorDataInfoEXT* pInfo,
+ void* pData);
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetImageViewOpaqueCaptureDescriptorDataEXT(
+ VkDevice device,
+ const VkImageViewCaptureDescriptorDataInfoEXT* pInfo,
+ void* pData);
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetSamplerOpaqueCaptureDescriptorDataEXT(
+ VkDevice device,
+ const VkSamplerCaptureDescriptorDataInfoEXT* pInfo,
+ void* pData);
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetAccelerationStructureOpaqueCaptureDescriptorDataEXT(
+ VkDevice device,
+ const VkAccelerationStructureCaptureDescriptorDataInfoEXT* pInfo,
+ void* pData);
+
+
static VKAPI_ATTR void VKAPI_CALL CmdSetFragmentShadingRateEnumNV(
@@ -3370,12 +3591,6 @@
-static VKAPI_ATTR void VKAPI_CALL GetImageSubresourceLayout2EXT(
- VkDevice device,
- VkImage image,
- const VkImageSubresource2EXT* pSubresource,
- VkSubresourceLayout2EXT* pLayout);
-
@@ -3509,6 +3724,7 @@
+
static VKAPI_ATTR void VKAPI_CALL CmdSetPatchControlPointsEXT(
VkCommandBuffer commandBuffer,
uint32_t patchControlPoints);
@@ -3572,6 +3788,7 @@
+
static VKAPI_ATTR VkResult VKAPI_CALL CreateMicromapEXT(
VkDevice device,
const VkMicromapCreateInfoEXT* pCreateInfo,
@@ -3649,6 +3866,21 @@
const VkMicromapBuildInfoEXT* pBuildInfo,
VkMicromapBuildSizesInfoEXT* pSizeInfo);
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+#endif /* VK_ENABLE_BETA_EXTENSIONS */
+
+
+
+static VKAPI_ATTR void VKAPI_CALL CmdDrawClusterHUAWEI(
+ VkCommandBuffer commandBuffer,
+ uint32_t groupCountX,
+ uint32_t groupCountY,
+ uint32_t groupCountZ);
+
+static VKAPI_ATTR void VKAPI_CALL CmdDrawClusterIndirectHUAWEI(
+ VkCommandBuffer commandBuffer,
+ VkBuffer buffer,
+ VkDeviceSize offset);
@@ -3658,6 +3890,8 @@
float priority);
+
+
static VKAPI_ATTR void VKAPI_CALL GetDescriptorSetLayoutHostMappingInfoVALVE(
VkDevice device,
const VkDescriptorSetBindingReferenceVALVE* pBindingReference,
@@ -3672,6 +3906,51 @@
+static VKAPI_ATTR void VKAPI_CALL CmdCopyMemoryIndirectNV(
+ VkCommandBuffer commandBuffer,
+ VkDeviceAddress copyBufferAddress,
+ uint32_t copyCount,
+ uint32_t stride);
+
+static VKAPI_ATTR void VKAPI_CALL CmdCopyMemoryToImageIndirectNV(
+ VkCommandBuffer commandBuffer,
+ VkDeviceAddress copyBufferAddress,
+ uint32_t copyCount,
+ uint32_t stride,
+ VkImage dstImage,
+ VkImageLayout dstImageLayout,
+ const VkImageSubresourceLayers* pImageSubresources);
+
+
+static VKAPI_ATTR void VKAPI_CALL CmdDecompressMemoryNV(
+ VkCommandBuffer commandBuffer,
+ uint32_t decompressRegionCount,
+ const VkDecompressMemoryRegionNV* pDecompressMemoryRegions);
+
+static VKAPI_ATTR void VKAPI_CALL CmdDecompressMemoryIndirectCountNV(
+ VkCommandBuffer commandBuffer,
+ VkDeviceAddress indirectCommandsAddress,
+ VkDeviceAddress indirectCommandsCountAddress,
+ uint32_t stride);
+
+
+static VKAPI_ATTR void VKAPI_CALL GetPipelineIndirectMemoryRequirementsNV(
+ VkDevice device,
+ const VkComputePipelineCreateInfo* pCreateInfo,
+ VkMemoryRequirements2* pMemoryRequirements);
+
+static VKAPI_ATTR void VKAPI_CALL CmdUpdatePipelineIndirectBufferNV(
+ VkCommandBuffer commandBuffer,
+ VkPipelineBindPoint pipelineBindPoint,
+ VkPipeline pipeline);
+
+static VKAPI_ATTR VkDeviceAddress VKAPI_CALL GetPipelineIndirectDeviceAddressNV(
+ VkDevice device,
+ const VkPipelineIndirectDeviceAddressInfoNV* pInfo);
+
+
+
+
@@ -3814,6 +4093,7 @@
+
static VKAPI_ATTR void VKAPI_CALL GetShaderModuleIdentifierEXT(
VkDevice device,
VkShaderModule shaderModule,
@@ -3857,6 +4137,34 @@
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+#endif /* VK_USE_PLATFORM_ANDROID_KHR */
+
+
+static VKAPI_ATTR VkResult VKAPI_CALL CreateShadersEXT(
+ VkDevice device,
+ uint32_t createInfoCount,
+ const VkShaderCreateInfoEXT* pCreateInfos,
+ const VkAllocationCallbacks* pAllocator,
+ VkShaderEXT* pShaders);
+
+static VKAPI_ATTR void VKAPI_CALL DestroyShaderEXT(
+ VkDevice device,
+ VkShaderEXT shader,
+ const VkAllocationCallbacks* pAllocator);
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetShaderBinaryDataEXT(
+ VkDevice device,
+ VkShaderEXT shader,
+ size_t* pDataSize,
+ void* pData);
+
+static VKAPI_ATTR void VKAPI_CALL CmdBindShadersEXT(
+ VkCommandBuffer commandBuffer,
+ uint32_t stageCount,
+ const VkShaderStageFlagBits* pStages,
+ const VkShaderEXT* pShaders);
+
static VKAPI_ATTR VkResult VKAPI_CALL GetFramebufferTilePropertiesQCOM(
VkDevice device,
@@ -3873,6 +4181,57 @@
+
+
+
+
+
+static VKAPI_ATTR VkResult VKAPI_CALL SetLatencySleepModeNV(
+ VkDevice device,
+ VkSwapchainKHR swapchain,
+ const VkLatencySleepModeInfoNV* pSleepModeInfo);
+
+static VKAPI_ATTR VkResult VKAPI_CALL LatencySleepNV(
+ VkDevice device,
+ VkSwapchainKHR swapchain,
+ const VkLatencySleepInfoNV* pSleepInfo);
+
+static VKAPI_ATTR void VKAPI_CALL SetLatencyMarkerNV(
+ VkDevice device,
+ VkSwapchainKHR swapchain,
+ const VkSetLatencyMarkerInfoNV* pLatencyMarkerInfo);
+
+static VKAPI_ATTR void VKAPI_CALL GetLatencyTimingsNV(
+ VkDevice device,
+ VkSwapchainKHR swapchain,
+ uint32_t* pTimingCount,
+ VkGetLatencyMarkerInfoNV* pLatencyMarkerInfo);
+
+static VKAPI_ATTR void VKAPI_CALL QueueNotifyOutOfBandNV(
+ VkQueue queue,
+ const VkOutOfBandQueueTypeInfoNV* pQueueTypeInfo);
+
+
+
+
+
+
+
+static VKAPI_ATTR void VKAPI_CALL CmdSetAttachmentFeedbackLoopEnableEXT(
+ VkCommandBuffer commandBuffer,
+ VkImageAspectFlags aspectMask);
+
+#ifdef VK_USE_PLATFORM_SCREEN_QNX
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetScreenBufferPropertiesQNX(
+ VkDevice device,
+ const struct _screen_buffer* buffer,
+ VkScreenBufferPropertiesQNX* pProperties);
+#endif /* VK_USE_PLATFORM_SCREEN_QNX */
+
+
+
+
static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR(
VkDevice device,
const VkAccelerationStructureCreateInfoKHR* pCreateInfo,
@@ -4301,45 +4660,19 @@
#ifdef VK_USE_PLATFORM_WIN32_KHR
{"vkGetPhysicalDeviceWin32PresentationSupportKHR", (void*)GetPhysicalDeviceWin32PresentationSupportKHR},
#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
{"vkGetPhysicalDeviceVideoCapabilitiesKHR", (void*)GetPhysicalDeviceVideoCapabilitiesKHR},
-#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
{"vkGetPhysicalDeviceVideoFormatPropertiesKHR", (void*)GetPhysicalDeviceVideoFormatPropertiesKHR},
-#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
{"vkCreateVideoSessionKHR", (void*)CreateVideoSessionKHR},
-#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
{"vkDestroyVideoSessionKHR", (void*)DestroyVideoSessionKHR},
-#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
{"vkGetVideoSessionMemoryRequirementsKHR", (void*)GetVideoSessionMemoryRequirementsKHR},
-#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
{"vkBindVideoSessionMemoryKHR", (void*)BindVideoSessionMemoryKHR},
-#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
{"vkCreateVideoSessionParametersKHR", (void*)CreateVideoSessionParametersKHR},
-#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
{"vkUpdateVideoSessionParametersKHR", (void*)UpdateVideoSessionParametersKHR},
-#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
{"vkDestroyVideoSessionParametersKHR", (void*)DestroyVideoSessionParametersKHR},
-#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
{"vkCmdBeginVideoCodingKHR", (void*)CmdBeginVideoCodingKHR},
-#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
{"vkCmdEndVideoCodingKHR", (void*)CmdEndVideoCodingKHR},
-#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
{"vkCmdControlVideoCodingKHR", (void*)CmdControlVideoCodingKHR},
-#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
{"vkCmdDecodeVideoKHR", (void*)CmdDecodeVideoKHR},
-#endif
{"vkCmdBeginRenderingKHR", (void*)CmdBeginRenderingKHR},
{"vkCmdEndRenderingKHR", (void*)CmdEndRenderingKHR},
{"vkGetPhysicalDeviceFeatures2KHR", (void*)GetPhysicalDeviceFeatures2KHR},
@@ -4428,6 +4761,14 @@
{"vkGetPipelineExecutablePropertiesKHR", (void*)GetPipelineExecutablePropertiesKHR},
{"vkGetPipelineExecutableStatisticsKHR", (void*)GetPipelineExecutableStatisticsKHR},
{"vkGetPipelineExecutableInternalRepresentationsKHR", (void*)GetPipelineExecutableInternalRepresentationsKHR},
+ {"vkMapMemory2KHR", (void*)MapMemory2KHR},
+ {"vkUnmapMemory2KHR", (void*)UnmapMemory2KHR},
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+ {"vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR", (void*)GetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR},
+#endif
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+ {"vkGetEncodedVideoSessionParametersKHR", (void*)GetEncodedVideoSessionParametersKHR},
+#endif
#ifdef VK_ENABLE_BETA_EXTENSIONS
{"vkCmdEncodeVideoKHR", (void*)CmdEncodeVideoKHR},
#endif
@@ -4449,6 +4790,11 @@
{"vkGetDeviceBufferMemoryRequirementsKHR", (void*)GetDeviceBufferMemoryRequirementsKHR},
{"vkGetDeviceImageMemoryRequirementsKHR", (void*)GetDeviceImageMemoryRequirementsKHR},
{"vkGetDeviceImageSparseMemoryRequirementsKHR", (void*)GetDeviceImageSparseMemoryRequirementsKHR},
+ {"vkCmdBindIndexBuffer2KHR", (void*)CmdBindIndexBuffer2KHR},
+ {"vkGetRenderingAreaGranularityKHR", (void*)GetRenderingAreaGranularityKHR},
+ {"vkGetDeviceImageSubresourceLayoutKHR", (void*)GetDeviceImageSubresourceLayoutKHR},
+ {"vkGetImageSubresourceLayout2KHR", (void*)GetImageSubresourceLayout2KHR},
+ {"vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR", (void*)GetPhysicalDeviceCooperativeMatrixPropertiesKHR},
{"vkCreateDebugReportCallbackEXT", (void*)CreateDebugReportCallbackEXT},
{"vkDestroyDebugReportCallbackEXT", (void*)DestroyDebugReportCallbackEXT},
{"vkDebugReportMessageEXT", (void*)DebugReportMessageEXT},
@@ -4501,6 +4847,8 @@
{"vkGetRefreshCycleDurationGOOGLE", (void*)GetRefreshCycleDurationGOOGLE},
{"vkGetPastPresentationTimingGOOGLE", (void*)GetPastPresentationTimingGOOGLE},
{"vkCmdSetDiscardRectangleEXT", (void*)CmdSetDiscardRectangleEXT},
+ {"vkCmdSetDiscardRectangleEnableEXT", (void*)CmdSetDiscardRectangleEnableEXT},
+ {"vkCmdSetDiscardRectangleModeEXT", (void*)CmdSetDiscardRectangleModeEXT},
{"vkSetHdrMetadataEXT", (void*)SetHdrMetadataEXT},
#ifdef VK_USE_PLATFORM_IOS_MVK
{"vkCreateIOSSurfaceMVK", (void*)CreateIOSSurfaceMVK},
@@ -4525,6 +4873,27 @@
#ifdef VK_USE_PLATFORM_ANDROID_KHR
{"vkGetMemoryAndroidHardwareBufferANDROID", (void*)GetMemoryAndroidHardwareBufferANDROID},
#endif
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+ {"vkCreateExecutionGraphPipelinesAMDX", (void*)CreateExecutionGraphPipelinesAMDX},
+#endif
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+ {"vkGetExecutionGraphPipelineScratchSizeAMDX", (void*)GetExecutionGraphPipelineScratchSizeAMDX},
+#endif
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+ {"vkGetExecutionGraphPipelineNodeIndexAMDX", (void*)GetExecutionGraphPipelineNodeIndexAMDX},
+#endif
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+ {"vkCmdInitializeGraphScratchMemoryAMDX", (void*)CmdInitializeGraphScratchMemoryAMDX},
+#endif
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+ {"vkCmdDispatchGraphAMDX", (void*)CmdDispatchGraphAMDX},
+#endif
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+ {"vkCmdDispatchGraphIndirectAMDX", (void*)CmdDispatchGraphIndirectAMDX},
+#endif
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+ {"vkCmdDispatchGraphIndirectCountAMDX", (void*)CmdDispatchGraphIndirectCountAMDX},
+#endif
{"vkCmdSetSampleLocationsEXT", (void*)CmdSetSampleLocationsEXT},
{"vkGetPhysicalDeviceMultisamplePropertiesEXT", (void*)GetPhysicalDeviceMultisamplePropertiesEXT},
{"vkGetImageDrmFormatModifierPropertiesEXT", (void*)GetImageDrmFormatModifierPropertiesEXT},
@@ -4555,6 +4924,7 @@
{"vkCmdDrawMeshTasksNV", (void*)CmdDrawMeshTasksNV},
{"vkCmdDrawMeshTasksIndirectNV", (void*)CmdDrawMeshTasksIndirectNV},
{"vkCmdDrawMeshTasksIndirectCountNV", (void*)CmdDrawMeshTasksIndirectCountNV},
+ {"vkCmdSetExclusiveScissorEnableNV", (void*)CmdSetExclusiveScissorEnableNV},
{"vkCmdSetExclusiveScissorNV", (void*)CmdSetExclusiveScissorNV},
{"vkCmdSetCheckpointNV", (void*)CmdSetCheckpointNV},
{"vkGetQueueCheckpointDataNV", (void*)GetQueueCheckpointDataNV},
@@ -4605,12 +4975,19 @@
{"vkCmdSetDepthBoundsTestEnableEXT", (void*)CmdSetDepthBoundsTestEnableEXT},
{"vkCmdSetStencilTestEnableEXT", (void*)CmdSetStencilTestEnableEXT},
{"vkCmdSetStencilOpEXT", (void*)CmdSetStencilOpEXT},
+ {"vkCopyMemoryToImageEXT", (void*)CopyMemoryToImageEXT},
+ {"vkCopyImageToMemoryEXT", (void*)CopyImageToMemoryEXT},
+ {"vkCopyImageToImageEXT", (void*)CopyImageToImageEXT},
+ {"vkTransitionImageLayoutEXT", (void*)TransitionImageLayoutEXT},
+ {"vkGetImageSubresourceLayout2EXT", (void*)GetImageSubresourceLayout2EXT},
+ {"vkReleaseSwapchainImagesEXT", (void*)ReleaseSwapchainImagesEXT},
{"vkGetGeneratedCommandsMemoryRequirementsNV", (void*)GetGeneratedCommandsMemoryRequirementsNV},
{"vkCmdPreprocessGeneratedCommandsNV", (void*)CmdPreprocessGeneratedCommandsNV},
{"vkCmdExecuteGeneratedCommandsNV", (void*)CmdExecuteGeneratedCommandsNV},
{"vkCmdBindPipelineShaderGroupNV", (void*)CmdBindPipelineShaderGroupNV},
{"vkCreateIndirectCommandsLayoutNV", (void*)CreateIndirectCommandsLayoutNV},
{"vkDestroyIndirectCommandsLayoutNV", (void*)DestroyIndirectCommandsLayoutNV},
+ {"vkCmdSetDepthBias2EXT", (void*)CmdSetDepthBias2EXT},
{"vkAcquireDrmDisplayEXT", (void*)AcquireDrmDisplayEXT},
{"vkGetDrmDisplayEXT", (void*)GetDrmDisplayEXT},
{"vkCreatePrivateDataSlotEXT", (void*)CreatePrivateDataSlotEXT},
@@ -4620,8 +4997,18 @@
#ifdef VK_USE_PLATFORM_METAL_EXT
{"vkExportMetalObjectsEXT", (void*)ExportMetalObjectsEXT},
#endif
+ {"vkGetDescriptorSetLayoutSizeEXT", (void*)GetDescriptorSetLayoutSizeEXT},
+ {"vkGetDescriptorSetLayoutBindingOffsetEXT", (void*)GetDescriptorSetLayoutBindingOffsetEXT},
+ {"vkGetDescriptorEXT", (void*)GetDescriptorEXT},
+ {"vkCmdBindDescriptorBuffersEXT", (void*)CmdBindDescriptorBuffersEXT},
+ {"vkCmdSetDescriptorBufferOffsetsEXT", (void*)CmdSetDescriptorBufferOffsetsEXT},
+ {"vkCmdBindDescriptorBufferEmbeddedSamplersEXT", (void*)CmdBindDescriptorBufferEmbeddedSamplersEXT},
+ {"vkGetBufferOpaqueCaptureDescriptorDataEXT", (void*)GetBufferOpaqueCaptureDescriptorDataEXT},
+ {"vkGetImageOpaqueCaptureDescriptorDataEXT", (void*)GetImageOpaqueCaptureDescriptorDataEXT},
+ {"vkGetImageViewOpaqueCaptureDescriptorDataEXT", (void*)GetImageViewOpaqueCaptureDescriptorDataEXT},
+ {"vkGetSamplerOpaqueCaptureDescriptorDataEXT", (void*)GetSamplerOpaqueCaptureDescriptorDataEXT},
+ {"vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT", (void*)GetAccelerationStructureOpaqueCaptureDescriptorDataEXT},
{"vkCmdSetFragmentShadingRateEnumNV", (void*)CmdSetFragmentShadingRateEnumNV},
- {"vkGetImageSubresourceLayout2EXT", (void*)GetImageSubresourceLayout2EXT},
{"vkGetDeviceFaultInfoEXT", (void*)GetDeviceFaultInfoEXT},
#ifdef VK_USE_PLATFORM_WIN32_KHR
{"vkAcquireWinrtDisplayNV", (void*)AcquireWinrtDisplayNV},
@@ -4696,9 +5083,18 @@
{"vkCmdWriteMicromapsPropertiesEXT", (void*)CmdWriteMicromapsPropertiesEXT},
{"vkGetDeviceMicromapCompatibilityEXT", (void*)GetDeviceMicromapCompatibilityEXT},
{"vkGetMicromapBuildSizesEXT", (void*)GetMicromapBuildSizesEXT},
+ {"vkCmdDrawClusterHUAWEI", (void*)CmdDrawClusterHUAWEI},
+ {"vkCmdDrawClusterIndirectHUAWEI", (void*)CmdDrawClusterIndirectHUAWEI},
{"vkSetDeviceMemoryPriorityEXT", (void*)SetDeviceMemoryPriorityEXT},
{"vkGetDescriptorSetLayoutHostMappingInfoVALVE", (void*)GetDescriptorSetLayoutHostMappingInfoVALVE},
{"vkGetDescriptorSetHostMappingVALVE", (void*)GetDescriptorSetHostMappingVALVE},
+ {"vkCmdCopyMemoryIndirectNV", (void*)CmdCopyMemoryIndirectNV},
+ {"vkCmdCopyMemoryToImageIndirectNV", (void*)CmdCopyMemoryToImageIndirectNV},
+ {"vkCmdDecompressMemoryNV", (void*)CmdDecompressMemoryNV},
+ {"vkCmdDecompressMemoryIndirectCountNV", (void*)CmdDecompressMemoryIndirectCountNV},
+ {"vkGetPipelineIndirectMemoryRequirementsNV", (void*)GetPipelineIndirectMemoryRequirementsNV},
+ {"vkCmdUpdatePipelineIndirectBufferNV", (void*)CmdUpdatePipelineIndirectBufferNV},
+ {"vkGetPipelineIndirectDeviceAddressNV", (void*)GetPipelineIndirectDeviceAddressNV},
{"vkCmdSetTessellationDomainOriginEXT", (void*)CmdSetTessellationDomainOriginEXT},
{"vkCmdSetDepthClampEnableEXT", (void*)CmdSetDepthClampEnableEXT},
{"vkCmdSetPolygonModeEXT", (void*)CmdSetPolygonModeEXT},
@@ -4737,8 +5133,21 @@
{"vkDestroyOpticalFlowSessionNV", (void*)DestroyOpticalFlowSessionNV},
{"vkBindOpticalFlowSessionImageNV", (void*)BindOpticalFlowSessionImageNV},
{"vkCmdOpticalFlowExecuteNV", (void*)CmdOpticalFlowExecuteNV},
+ {"vkCreateShadersEXT", (void*)CreateShadersEXT},
+ {"vkDestroyShaderEXT", (void*)DestroyShaderEXT},
+ {"vkGetShaderBinaryDataEXT", (void*)GetShaderBinaryDataEXT},
+ {"vkCmdBindShadersEXT", (void*)CmdBindShadersEXT},
{"vkGetFramebufferTilePropertiesQCOM", (void*)GetFramebufferTilePropertiesQCOM},
{"vkGetDynamicRenderingTilePropertiesQCOM", (void*)GetDynamicRenderingTilePropertiesQCOM},
+ {"vkSetLatencySleepModeNV", (void*)SetLatencySleepModeNV},
+ {"vkLatencySleepNV", (void*)LatencySleepNV},
+ {"vkSetLatencyMarkerNV", (void*)SetLatencyMarkerNV},
+ {"vkGetLatencyTimingsNV", (void*)GetLatencyTimingsNV},
+ {"vkQueueNotifyOutOfBandNV", (void*)QueueNotifyOutOfBandNV},
+ {"vkCmdSetAttachmentFeedbackLoopEnableEXT", (void*)CmdSetAttachmentFeedbackLoopEnableEXT},
+#ifdef VK_USE_PLATFORM_SCREEN_QNX
+ {"vkGetScreenBufferPropertiesQNX", (void*)GetScreenBufferPropertiesQNX},
+#endif
{"vkCreateAccelerationStructureKHR", (void*)CreateAccelerationStructureKHR},
{"vkDestroyAccelerationStructureKHR", (void*)DestroyAccelerationStructureKHR},
{"vkCmdBuildAccelerationStructuresKHR", (void*)CmdBuildAccelerationStructuresKHR},
@@ -4766,7 +5175,5 @@
{"vkCmdDrawMeshTasksIndirectCountEXT", (void*)CmdDrawMeshTasksIndirectCountEXT},
};
-
} // namespace vkmock
-#endif
diff --git a/icd/generated/mock_icd.cpp b/icd/generated/function_definitions.h
similarity index 84%
rename from icd/generated/mock_icd.cpp
rename to icd/generated/function_definitions.h
index e67e395..1fb9534 100644
--- a/icd/generated/mock_icd.cpp
+++ b/icd/generated/function_definitions.h
@@ -1,5 +1,5 @@
/*
-** Copyright (c) 2015-2018 The Khronos Group Inc.
+** Copyright (c) 2015-2018, 2023 The Khronos Group Inc.
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -19,164 +19,14 @@
**
*/
+#pragma once
+
#include "mock_icd.h"
-#include <stdlib.h>
-#include <algorithm>
-#include <array>
-#include <vector>
-#include "vk_typemap_helper.h"
+#include "function_declarations.h"
+
namespace vkmock {
-using std::unordered_map;
-
-static constexpr uint32_t icd_physical_device_count = 1;
-static constexpr uint32_t kSupportedVulkanAPIVersion = VK_API_VERSION_1_1;
-static unordered_map<VkInstance, std::array<VkPhysicalDevice, icd_physical_device_count>> physical_device_map;
-
-// Map device memory handle to any mapped allocations that we'll need to free on unmap
-static unordered_map<VkDeviceMemory, std::vector<void*>> mapped_memory_map;
-
-// Map device memory allocation handle to the size
-static unordered_map<VkDeviceMemory, VkDeviceSize> allocated_memory_size_map;
-
-static unordered_map<VkDevice, unordered_map<uint32_t, unordered_map<uint32_t, VkQueue>>> queue_map;
-static unordered_map<VkDevice, unordered_map<VkBuffer, VkBufferCreateInfo>> buffer_map;
-static unordered_map<VkDevice, unordered_map<VkImage, VkDeviceSize>> image_memory_size_map;
-static unordered_map<VkCommandPool, std::vector<VkCommandBuffer>> command_pool_buffer_map;
-
-static constexpr uint32_t icd_swapchain_image_count = 1;
-static unordered_map<VkSwapchainKHR, VkImage[icd_swapchain_image_count]> swapchain_image_map;
-
-// TODO: Would like to codegen this but limits aren't in XML
-static VkPhysicalDeviceLimits SetLimits(VkPhysicalDeviceLimits *limits) {
- limits->maxImageDimension1D = 4096;
- limits->maxImageDimension2D = 4096;
- limits->maxImageDimension3D = 256;
- limits->maxImageDimensionCube = 4096;
- limits->maxImageArrayLayers = 256;
- limits->maxTexelBufferElements = 65536;
- limits->maxUniformBufferRange = 16384;
- limits->maxStorageBufferRange = 134217728;
- limits->maxPushConstantsSize = 128;
- limits->maxMemoryAllocationCount = 4096;
- limits->maxSamplerAllocationCount = 4000;
- limits->bufferImageGranularity = 1;
- limits->sparseAddressSpaceSize = 2147483648;
- limits->maxBoundDescriptorSets = 4;
- limits->maxPerStageDescriptorSamplers = 16;
- limits->maxPerStageDescriptorUniformBuffers = 12;
- limits->maxPerStageDescriptorStorageBuffers = 4;
- limits->maxPerStageDescriptorSampledImages = 16;
- limits->maxPerStageDescriptorStorageImages = 4;
- limits->maxPerStageDescriptorInputAttachments = 4;
- limits->maxPerStageResources = 128;
- limits->maxDescriptorSetSamplers = 96;
- limits->maxDescriptorSetUniformBuffers = 72;
- limits->maxDescriptorSetUniformBuffersDynamic = 8;
- limits->maxDescriptorSetStorageBuffers = 24;
- limits->maxDescriptorSetStorageBuffersDynamic = 4;
- limits->maxDescriptorSetSampledImages = 96;
- limits->maxDescriptorSetStorageImages = 24;
- limits->maxDescriptorSetInputAttachments = 4;
- limits->maxVertexInputAttributes = 16;
- limits->maxVertexInputBindings = 16;
- limits->maxVertexInputAttributeOffset = 2047;
- limits->maxVertexInputBindingStride = 2048;
- limits->maxVertexOutputComponents = 64;
- limits->maxTessellationGenerationLevel = 64;
- limits->maxTessellationPatchSize = 32;
- limits->maxTessellationControlPerVertexInputComponents = 64;
- limits->maxTessellationControlPerVertexOutputComponents = 64;
- limits->maxTessellationControlPerPatchOutputComponents = 120;
- limits->maxTessellationControlTotalOutputComponents = 2048;
- limits->maxTessellationEvaluationInputComponents = 64;
- limits->maxTessellationEvaluationOutputComponents = 64;
- limits->maxGeometryShaderInvocations = 32;
- limits->maxGeometryInputComponents = 64;
- limits->maxGeometryOutputComponents = 64;
- limits->maxGeometryOutputVertices = 256;
- limits->maxGeometryTotalOutputComponents = 1024;
- limits->maxFragmentInputComponents = 64;
- limits->maxFragmentOutputAttachments = 4;
- limits->maxFragmentDualSrcAttachments = 1;
- limits->maxFragmentCombinedOutputResources = 4;
- limits->maxComputeSharedMemorySize = 16384;
- limits->maxComputeWorkGroupCount[0] = 65535;
- limits->maxComputeWorkGroupCount[1] = 65535;
- limits->maxComputeWorkGroupCount[2] = 65535;
- limits->maxComputeWorkGroupInvocations = 128;
- limits->maxComputeWorkGroupSize[0] = 128;
- limits->maxComputeWorkGroupSize[1] = 128;
- limits->maxComputeWorkGroupSize[2] = 64;
- limits->subPixelPrecisionBits = 4;
- limits->subTexelPrecisionBits = 4;
- limits->mipmapPrecisionBits = 4;
- limits->maxDrawIndexedIndexValue = UINT32_MAX;
- limits->maxDrawIndirectCount = UINT16_MAX;
- limits->maxSamplerLodBias = 2.0f;
- limits->maxSamplerAnisotropy = 16;
- limits->maxViewports = 16;
- limits->maxViewportDimensions[0] = 4096;
- limits->maxViewportDimensions[1] = 4096;
- limits->viewportBoundsRange[0] = -8192;
- limits->viewportBoundsRange[1] = 8191;
- limits->viewportSubPixelBits = 0;
- limits->minMemoryMapAlignment = 64;
- limits->minTexelBufferOffsetAlignment = 16;
- limits->minUniformBufferOffsetAlignment = 16;
- limits->minStorageBufferOffsetAlignment = 16;
- limits->minTexelOffset = -8;
- limits->maxTexelOffset = 7;
- limits->minTexelGatherOffset = -8;
- limits->maxTexelGatherOffset = 7;
- limits->minInterpolationOffset = 0.0f;
- limits->maxInterpolationOffset = 0.5f;
- limits->subPixelInterpolationOffsetBits = 4;
- limits->maxFramebufferWidth = 4096;
- limits->maxFramebufferHeight = 4096;
- limits->maxFramebufferLayers = 256;
- limits->framebufferColorSampleCounts = 0x7F;
- limits->framebufferDepthSampleCounts = 0x7F;
- limits->framebufferStencilSampleCounts = 0x7F;
- limits->framebufferNoAttachmentsSampleCounts = 0x7F;
- limits->maxColorAttachments = 4;
- limits->sampledImageColorSampleCounts = 0x7F;
- limits->sampledImageIntegerSampleCounts = 0x7F;
- limits->sampledImageDepthSampleCounts = 0x7F;
- limits->sampledImageStencilSampleCounts = 0x7F;
- limits->storageImageSampleCounts = 0x7F;
- limits->maxSampleMaskWords = 1;
- limits->timestampComputeAndGraphics = VK_TRUE;
- limits->timestampPeriod = 1;
- limits->maxClipDistances = 8;
- limits->maxCullDistances = 8;
- limits->maxCombinedClipAndCullDistances = 8;
- limits->discreteQueuePriorities = 2;
- limits->pointSizeRange[0] = 1.0f;
- limits->pointSizeRange[1] = 64.0f;
- limits->lineWidthRange[0] = 1.0f;
- limits->lineWidthRange[1] = 8.0f;
- limits->pointSizeGranularity = 1.0f;
- limits->lineWidthGranularity = 1.0f;
- limits->strictLines = VK_TRUE;
- limits->standardSampleLocations = VK_TRUE;
- limits->optimalBufferCopyOffsetAlignment = 1;
- limits->optimalBufferCopyRowPitchAlignment = 1;
- limits->nonCoherentAtomSize = 256;
-
- return *limits;
-}
-
-void SetBoolArrayTrue(VkBool32* bool_array, uint32_t num_bools)
-{
- for (uint32_t i = 0; i < num_bools; ++i) {
- bool_array[i] = VK_TRUE;
- }
-}
-
-
-
static VKAPI_ATTR VkResult VKAPI_CALL CreateInstance(
const VkInstanceCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
@@ -291,8 +141,7 @@
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceProperties* pProperties)
{
- // TODO: Just hard-coding some values for now
- pProperties->apiVersion = kSupportedVulkanAPIVersion;
+ pProperties->apiVersion = VK_HEADER_VERSION_COMPLETE;
pProperties->driverVersion = 1;
pProperties->vendorID = 0xba5eba11;
pProperties->deviceID = 0xf005ba11;
@@ -313,9 +162,9 @@
*pQueueFamilyPropertyCount = 1;
} else {
if (*pQueueFamilyPropertyCount) {
- pQueueFamilyProperties[0].queueFlags = VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT | VK_QUEUE_SPARSE_BINDING_BIT;
+ pQueueFamilyProperties[0].queueFlags = VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT | VK_QUEUE_SPARSE_BINDING_BIT | VK_QUEUE_PROTECTED_BIT;
pQueueFamilyProperties[0].queueCount = 1;
- pQueueFamilyProperties[0].timestampValidBits = 0;
+ pQueueFamilyProperties[0].timestampValidBits = 16;
pQueueFamilyProperties[0].minImageTransferGranularity = {1,1,1};
}
}
@@ -325,13 +174,27 @@
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceMemoryProperties* pMemoryProperties)
{
- pMemoryProperties->memoryTypeCount = 2;
+ pMemoryProperties->memoryTypeCount = 6;
+ // Host visible Coherent
pMemoryProperties->memoryTypes[0].propertyFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
pMemoryProperties->memoryTypes[0].heapIndex = 0;
- pMemoryProperties->memoryTypes[1].propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
- pMemoryProperties->memoryTypes[1].heapIndex = 1;
+ // Host visible Cached
+ pMemoryProperties->memoryTypes[1].propertyFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
+ pMemoryProperties->memoryTypes[1].heapIndex = 0;
+ // Device local and Host visible
+ pMemoryProperties->memoryTypes[2].propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
+ pMemoryProperties->memoryTypes[2].heapIndex = 1;
+ // Device local lazily
+ pMemoryProperties->memoryTypes[3].propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT;
+ pMemoryProperties->memoryTypes[3].heapIndex = 1;
+ // Device local protected
+ pMemoryProperties->memoryTypes[4].propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_PROTECTED_BIT;
+ pMemoryProperties->memoryTypes[4].heapIndex = 1;
+ // Device local only
+ pMemoryProperties->memoryTypes[5].propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
+ pMemoryProperties->memoryTypes[5].heapIndex = 1;
pMemoryProperties->memoryHeapCount = 2;
- pMemoryProperties->memoryHeaps[0].flags = 0;
+ pMemoryProperties->memoryHeaps[0].flags = VK_MEMORY_HEAP_MULTI_INSTANCE_BIT;
pMemoryProperties->memoryHeaps[0].size = 8000000000;
pMemoryProperties->memoryHeaps[1].flags = VK_MEMORY_HEAP_DEVICE_LOCAL_BIT;
pMemoryProperties->memoryHeaps[1].size = 8000000000;
@@ -387,6 +250,14 @@
}
}
+ for (auto& cp : command_pool_map[device]) {
+ for (auto& cb : command_pool_buffer_map[cp]) {
+ DestroyDispObjHandle((void*) cb);
+ }
+ command_pool_buffer_map.erase(cp);
+ }
+ command_pool_map[device].clear();
+
queue_map.erase(device);
buffer_map.erase(device);
image_memory_size_map.erase(device);
@@ -532,6 +403,7 @@
const VkAllocationCallbacks* pAllocator)
{
//Destroy object
+ unique_lock_t lock(global_lock);
allocated_memory_size_map.erase(memory);
}
@@ -623,6 +495,7 @@
pMemoryRequirements->alignment = 1;
pMemoryRequirements->memoryTypeBits = 0xFFFF;
// Return a better size based on the buffer size from the create info.
+ unique_lock_t lock(global_lock);
auto d_iter = buffer_map.find(device);
if (d_iter != buffer_map.end()) {
auto iter = d_iter->second.find(buffer);
@@ -640,6 +513,7 @@
pMemoryRequirements->size = 0;
pMemoryRequirements->alignment = 1;
+ unique_lock_t lock(global_lock);
auto d_iter = image_memory_size_map.find(device);
if(d_iter != image_memory_size_map.end()){
auto iter = d_iter->second.find(image);
@@ -657,7 +531,20 @@
uint32_t* pSparseMemoryRequirementCount,
VkSparseImageMemoryRequirements* pSparseMemoryRequirements)
{
-//Not a CREATE or DESTROY function
+ if (!pSparseMemoryRequirements) {
+ *pSparseMemoryRequirementCount = 1;
+ } else {
+ // arbitrary
+ pSparseMemoryRequirements->imageMipTailFirstLod = 0;
+ pSparseMemoryRequirements->imageMipTailSize = 8;
+ pSparseMemoryRequirements->imageMipTailOffset = 0;
+ pSparseMemoryRequirements->imageMipTailStride = 4;
+ pSparseMemoryRequirements->formatProperties.imageGranularity = {4, 4, 4};
+ pSparseMemoryRequirements->formatProperties.flags = VK_SPARSE_IMAGE_FORMAT_SINGLE_MIPTAIL_BIT;
+ // Would need to track the VkImage to know format for better value here
+ pSparseMemoryRequirements->formatProperties.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_METADATA_BIT;
+ }
+
}
static VKAPI_ATTR void VKAPI_CALL GetPhysicalDeviceSparseImageFormatProperties(
@@ -670,7 +557,31 @@
uint32_t* pPropertyCount,
VkSparseImageFormatProperties* pProperties)
{
-//Not a CREATE or DESTROY function
+ if (!pProperties) {
+ *pPropertyCount = 1;
+ } else {
+ // arbitrary
+ pProperties->imageGranularity = {4, 4, 4};
+ pProperties->flags = VK_SPARSE_IMAGE_FORMAT_SINGLE_MIPTAIL_BIT;
+ switch (format) {
+ case VK_FORMAT_D16_UNORM:
+ case VK_FORMAT_D32_SFLOAT:
+ pProperties->aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT;
+ break;
+ case VK_FORMAT_S8_UINT:
+ pProperties->aspectMask = VK_IMAGE_ASPECT_STENCIL_BIT;
+ break;
+ case VK_FORMAT_X8_D24_UNORM_PACK32:
+ case VK_FORMAT_D16_UNORM_S8_UINT:
+ case VK_FORMAT_D24_UNORM_S8_UINT:
+ case VK_FORMAT_D32_SFLOAT_S8_UINT:
+ pProperties->aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT;
+ break;
+ default:
+ pProperties->aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+ break;
+ }
+ }
}
static VKAPI_ATTR VkResult VKAPI_CALL QueueBindSparse(
@@ -833,7 +744,16 @@
{
unique_lock_t lock(global_lock);
*pBuffer = (VkBuffer)global_unique_handle++;
- buffer_map[device][*pBuffer] = *pCreateInfo;
+ buffer_map[device][*pBuffer] = {
+ pCreateInfo->size,
+ current_available_address
+ };
+ current_available_address += pCreateInfo->size;
+ // Always align to next 64-bit pointer
+ const uint64_t alignment = current_available_address % 64;
+ if (alignment != 0) {
+ current_available_address += (64 - alignment);
+ }
return VK_SUCCESS;
}
@@ -873,38 +793,7 @@
{
unique_lock_t lock(global_lock);
*pImage = (VkImage)global_unique_handle++;
- // TODO: A pixel size is 32 bytes. This accounts for the largest possible pixel size of any format. It could be changed to more accurate size if need be.
- image_memory_size_map[device][*pImage] = pCreateInfo->extent.width * pCreateInfo->extent.height * pCreateInfo->extent.depth *
- 32 * pCreateInfo->arrayLayers * (pCreateInfo->mipLevels > 1 ? 2 : 1);
- // plane count
- switch (pCreateInfo->format) {
- case VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM:
- case VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM:
- case VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM:
- case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16:
- case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16:
- case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16:
- case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16:
- case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16:
- case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16:
- case VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM:
- case VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM:
- case VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM:
- image_memory_size_map[device][*pImage] *= 3;
- break;
- case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM:
- case VK_FORMAT_G8_B8R8_2PLANE_422_UNORM:
- case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_420_UNORM_3PACK16:
- case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16:
- case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16:
- case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16:
- case VK_FORMAT_G16_B16R16_2PLANE_420_UNORM:
- case VK_FORMAT_G16_B16R16_2PLANE_422_UNORM:
- image_memory_size_map[device][*pImage] *= 2;
- break;
- default:
- break;
- }
+ image_memory_size_map[device][*pImage] = GetImageSizeFromCreateInfo(pCreateInfo);
return VK_SUCCESS;
}
@@ -1202,7 +1091,8 @@
VkRenderPass renderPass,
VkExtent2D* pGranularity)
{
-//Not a CREATE or DESTROY function
+ pGranularity->width = 1;
+ pGranularity->height = 1;
}
static VKAPI_ATTR VkResult VKAPI_CALL CreateCommandPool(
@@ -1213,6 +1103,7 @@
{
unique_lock_t lock(global_lock);
*pCommandPool = (VkCommandPool)global_unique_handle++;
+ command_pool_map[device].insert(*pCommandPool);
return VK_SUCCESS;
}
@@ -1231,6 +1122,7 @@
}
command_pool_buffer_map.erase(it);
}
+ command_pool_map[device].erase(commandPool);
}
static VKAPI_ATTR VkResult VKAPI_CALL ResetCommandPool(
@@ -1736,7 +1628,7 @@
uint32_t* pApiVersion)
{
- *pApiVersion = kSupportedVulkanAPIVersion;
+ *pApiVersion = VK_HEADER_VERSION_COMPLETE;
return VK_SUCCESS;
}
@@ -1792,8 +1684,7 @@
uint32_t* pPhysicalDeviceGroupCount,
VkPhysicalDeviceGroupProperties* pPhysicalDeviceGroupProperties)
{
-//Not a CREATE or DESTROY function
- return VK_SUCCESS;
+ return EnumeratePhysicalDeviceGroupsKHR(instance, pPhysicalDeviceGroupCount, pPhysicalDeviceGroupProperties);
}
static VKAPI_ATTR void VKAPI_CALL GetImageMemoryRequirements2(
@@ -1818,7 +1709,7 @@
uint32_t* pSparseMemoryRequirementCount,
VkSparseImageMemoryRequirements2* pSparseMemoryRequirements)
{
-//Not a CREATE or DESTROY function
+ GetImageSparseMemoryRequirements2KHR(device, pInfo, pSparseMemoryRequirementCount, pSparseMemoryRequirements);
}
static VKAPI_ATTR void VKAPI_CALL GetPhysicalDeviceFeatures2(
@@ -1872,7 +1763,7 @@
uint32_t* pPropertyCount,
VkSparseImageFormatProperties2* pProperties)
{
-//Not a CREATE or DESTROY function
+ GetPhysicalDeviceSparseImageFormatProperties2KHR(physicalDevice, pFormatInfo, pPropertyCount, pProperties);
}
static VKAPI_ATTR void VKAPI_CALL TrimCommandPool(
@@ -1944,10 +1835,24 @@
const VkPhysicalDeviceExternalBufferInfo* pExternalBufferInfo,
VkExternalBufferProperties* pExternalBufferProperties)
{
- // Hard-code support for all handle types and features
- pExternalBufferProperties->externalMemoryProperties.externalMemoryFeatures = 0x7;
- pExternalBufferProperties->externalMemoryProperties.exportFromImportedHandleTypes = 0x1FF;
- pExternalBufferProperties->externalMemoryProperties.compatibleHandleTypes = 0x1FF;
+ constexpr VkExternalMemoryHandleTypeFlags supported_flags = 0x1FF;
+ if (pExternalBufferInfo->handleType & VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID) {
+ // Can't have dedicated memory with AHB
+ pExternalBufferProperties->externalMemoryProperties.externalMemoryFeatures = VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT | VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT;
+ pExternalBufferProperties->externalMemoryProperties.exportFromImportedHandleTypes = pExternalBufferInfo->handleType;
+ pExternalBufferProperties->externalMemoryProperties.compatibleHandleTypes = pExternalBufferInfo->handleType;
+ } else if (pExternalBufferInfo->handleType & supported_flags) {
+ pExternalBufferProperties->externalMemoryProperties.externalMemoryFeatures = 0x7;
+ pExternalBufferProperties->externalMemoryProperties.exportFromImportedHandleTypes = supported_flags;
+ pExternalBufferProperties->externalMemoryProperties.compatibleHandleTypes = supported_flags;
+ } else {
+ pExternalBufferProperties->externalMemoryProperties.externalMemoryFeatures = 0;
+ pExternalBufferProperties->externalMemoryProperties.exportFromImportedHandleTypes = 0;
+ // According to spec, handle type is always compatible with itself. Even if export/import
+ // not supported, it's important to properly implement self-compatibility property since
+ // application's control flow can rely on this.
+ pExternalBufferProperties->externalMemoryProperties.compatibleHandleTypes = pExternalBufferInfo->handleType;
+ }
}
static VKAPI_ATTR void VKAPI_CALL GetPhysicalDeviceExternalFenceProperties(
@@ -1977,7 +1882,9 @@
const VkDescriptorSetLayoutCreateInfo* pCreateInfo,
VkDescriptorSetLayoutSupport* pSupport)
{
-//Not a CREATE or DESTROY function
+ if (pSupport) {
+ pSupport->supported = VK_TRUE;
+ }
}
@@ -2078,8 +1985,15 @@
VkDevice device,
const VkBufferDeviceAddressInfo* pInfo)
{
-//Not a CREATE or DESTROY function
- return VK_SUCCESS;
+ VkDeviceAddress address = 0;
+ auto d_iter = buffer_map.find(device);
+ if (d_iter != buffer_map.end()) {
+ auto iter = d_iter->second.find(pInfo->buffer);
+ if (iter != d_iter->second.end()) {
+ address = iter->second.address;
+ }
+ }
+ return address;
}
static VKAPI_ATTR uint64_t VKAPI_CALL GetBufferOpaqueCaptureAddress(
@@ -2375,7 +2289,12 @@
const VkDeviceBufferMemoryRequirements* pInfo,
VkMemoryRequirements2* pMemoryRequirements)
{
-//Not a CREATE or DESTROY function
+ // TODO: Just hard-coding reqs for now
+ pMemoryRequirements->memoryRequirements.alignment = 1;
+ pMemoryRequirements->memoryRequirements.memoryTypeBits = 0xFFFF;
+
+ // Return a size based on the buffer size from the create info.
+ pMemoryRequirements->memoryRequirements.size = ((pInfo->pCreateInfo->size + 4095) / 4096) * 4096;
}
static VKAPI_ATTR void VKAPI_CALL GetDeviceImageMemoryRequirements(
@@ -2383,7 +2302,10 @@
const VkDeviceImageMemoryRequirements* pInfo,
VkMemoryRequirements2* pMemoryRequirements)
{
-//Not a CREATE or DESTROY function
+ pMemoryRequirements->memoryRequirements.size = GetImageSizeFromCreateInfo(pInfo->pCreateInfo);
+ pMemoryRequirements->memoryRequirements.alignment = 1;
+ // Here we hard-code that the memory type at index 3 doesn't support this image.
+ pMemoryRequirements->memoryRequirements.memoryTypeBits = 0xFFFF & ~(0x1 << 3);
}
static VKAPI_ATTR void VKAPI_CALL GetDeviceImageSparseMemoryRequirements(
@@ -2792,14 +2714,25 @@
#endif /* VK_USE_PLATFORM_WIN32_KHR */
-#ifdef VK_ENABLE_BETA_EXTENSIONS
static VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceVideoCapabilitiesKHR(
VkPhysicalDevice physicalDevice,
const VkVideoProfileInfoKHR* pVideoProfile,
VkVideoCapabilitiesKHR* pCapabilities)
{
-//Not a CREATE or DESTROY function
+ // arbitrary
+ auto *decode_caps = lvl_find_mod_in_chain<VkVideoDecodeCapabilitiesKHR>(pCapabilities->pNext);
+ if (decode_caps) {
+ decode_caps->flags = VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_COINCIDE_BIT_KHR | VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_DISTINCT_BIT_KHR;
+ }
+ pCapabilities->flags = 0;
+ pCapabilities->minBitstreamBufferOffsetAlignment = 4;
+ pCapabilities->minBitstreamBufferSizeAlignment = 4;
+ pCapabilities->pictureAccessGranularity = {1, 1};
+ pCapabilities->minCodedExtent = {4, 4};
+ pCapabilities->maxCodedExtent = {16, 16};
+ pCapabilities->maxDpbSlots = 4;
+ pCapabilities->maxActiveReferencePictures = 4;
return VK_SUCCESS;
}
@@ -2809,7 +2742,22 @@
uint32_t* pVideoFormatPropertyCount,
VkVideoFormatPropertiesKHR* pVideoFormatProperties)
{
-//Not a CREATE or DESTROY function
+ if (!pVideoFormatProperties) {
+ *pVideoFormatPropertyCount = 2;
+ } else {
+ // arbitrary
+ pVideoFormatProperties[0].format = VK_FORMAT_R8G8B8A8_UNORM;
+ pVideoFormatProperties[0].imageCreateFlags = VK_IMAGE_TYPE_2D;
+ pVideoFormatProperties[0].imageType = VK_IMAGE_TYPE_2D;
+ pVideoFormatProperties[0].imageTiling = VK_IMAGE_TILING_OPTIMAL;
+ pVideoFormatProperties[0].imageUsageFlags = VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR | VK_IMAGE_USAGE_VIDEO_DECODE_SRC_BIT_KHR | VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR;
+ pVideoFormatProperties[1].format = VK_FORMAT_R8G8B8A8_SNORM;
+ pVideoFormatProperties[1].imageCreateFlags = VK_IMAGE_TYPE_2D;
+ pVideoFormatProperties[1].imageType = VK_IMAGE_TYPE_2D;
+ pVideoFormatProperties[1].imageTiling = VK_IMAGE_TILING_OPTIMAL;
+ pVideoFormatProperties[1].imageUsageFlags = VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR | VK_IMAGE_USAGE_VIDEO_DECODE_SRC_BIT_KHR | VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR;
+
+ }
return VK_SUCCESS;
}
@@ -2838,7 +2786,15 @@
uint32_t* pMemoryRequirementsCount,
VkVideoSessionMemoryRequirementsKHR* pMemoryRequirements)
{
-//Not a CREATE or DESTROY function
+ if (!pMemoryRequirements) {
+ *pMemoryRequirementsCount = 1;
+ } else {
+ // arbitrary
+ pMemoryRequirements[0].memoryBindIndex = 0;
+ pMemoryRequirements[0].memoryRequirements.size = 4096;
+ pMemoryRequirements[0].memoryRequirements.alignment = 1;
+ pMemoryRequirements[0].memoryRequirements.memoryTypeBits = 0xFFFF;
+ }
return VK_SUCCESS;
}
@@ -2900,9 +2856,7 @@
{
//Not a CREATE or DESTROY function
}
-#endif /* VK_ENABLE_BETA_EXTENSIONS */
-#ifdef VK_ENABLE_BETA_EXTENSIONS
static VKAPI_ATTR void VKAPI_CALL CmdDecodeVideoKHR(
VkCommandBuffer commandBuffer,
@@ -2910,7 +2864,7 @@
{
//Not a CREATE or DESTROY function
}
-#endif /* VK_ENABLE_BETA_EXTENSIONS */
+
static VKAPI_ATTR void VKAPI_CALL CmdBeginRenderingKHR(
@@ -2949,61 +2903,142 @@
feat_bools = (VkBool32*)&blendop_features->advancedBlendCoherentOperations;
SetBoolArrayTrue(feat_bools, num_bools);
}
+ const auto *host_image_copy_features = lvl_find_in_chain<VkPhysicalDeviceHostImageCopyFeaturesEXT>(pFeatures->pNext);
+ if (host_image_copy_features) {
+ feat_bools = (VkBool32*)&host_image_copy_features->hostImageCopy;
+ SetBoolArrayTrue(feat_bools, 1);
+ }
}
static VKAPI_ATTR void VKAPI_CALL GetPhysicalDeviceProperties2KHR(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceProperties2* pProperties)
{
+ // The only value that need to be set are those the Profile layer can't set
+ // see https://github.com/KhronosGroup/Vulkan-Profiles/issues/352
+ // All values set are arbitrary
GetPhysicalDeviceProperties(physicalDevice, &pProperties->properties);
- const auto *desc_idx_props = lvl_find_in_chain<VkPhysicalDeviceDescriptorIndexingPropertiesEXT>(pProperties->pNext);
- if (desc_idx_props) {
- VkPhysicalDeviceDescriptorIndexingPropertiesEXT* write_props = (VkPhysicalDeviceDescriptorIndexingPropertiesEXT*)desc_idx_props;
- write_props->maxUpdateAfterBindDescriptorsInAllPools = 500000;
- write_props->shaderUniformBufferArrayNonUniformIndexingNative = false;
- write_props->shaderSampledImageArrayNonUniformIndexingNative = false;
- write_props->shaderStorageBufferArrayNonUniformIndexingNative = false;
- write_props->shaderStorageImageArrayNonUniformIndexingNative = false;
- write_props->shaderInputAttachmentArrayNonUniformIndexingNative = false;
- write_props->robustBufferAccessUpdateAfterBind = true;
- write_props->quadDivergentImplicitLod = true;
- write_props->maxPerStageDescriptorUpdateAfterBindSamplers = 500000;
- write_props->maxPerStageDescriptorUpdateAfterBindUniformBuffers = 500000;
- write_props->maxPerStageDescriptorUpdateAfterBindStorageBuffers = 500000;
- write_props->maxPerStageDescriptorUpdateAfterBindSampledImages = 500000;
- write_props->maxPerStageDescriptorUpdateAfterBindStorageImages = 500000;
- write_props->maxPerStageDescriptorUpdateAfterBindInputAttachments = 500000;
- write_props->maxPerStageUpdateAfterBindResources = 500000;
- write_props->maxDescriptorSetUpdateAfterBindSamplers = 500000;
- write_props->maxDescriptorSetUpdateAfterBindUniformBuffers = 96;
- write_props->maxDescriptorSetUpdateAfterBindUniformBuffersDynamic = 8;
- write_props->maxDescriptorSetUpdateAfterBindStorageBuffers = 500000;
- write_props->maxDescriptorSetUpdateAfterBindStorageBuffersDynamic = 4;
- write_props->maxDescriptorSetUpdateAfterBindSampledImages = 500000;
- write_props->maxDescriptorSetUpdateAfterBindStorageImages = 500000;
- write_props->maxDescriptorSetUpdateAfterBindInputAttachments = 500000;
+
+ auto *props_11 = lvl_find_mod_in_chain<VkPhysicalDeviceVulkan11Properties>(pProperties->pNext);
+ if (props_11) {
+ props_11->protectedNoFault = VK_FALSE;
}
- const auto *push_descriptor_props = lvl_find_in_chain<VkPhysicalDevicePushDescriptorPropertiesKHR>(pProperties->pNext);
- if (push_descriptor_props) {
- VkPhysicalDevicePushDescriptorPropertiesKHR* write_props = (VkPhysicalDevicePushDescriptorPropertiesKHR*)push_descriptor_props;
- write_props->maxPushDescriptors = 256;
+ auto *props_12 = lvl_find_mod_in_chain<VkPhysicalDeviceVulkan12Properties>(pProperties->pNext);
+ if (props_12) {
+ props_12->denormBehaviorIndependence = VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL;
+ props_12->roundingModeIndependence = VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL;
}
- const auto *depth_stencil_resolve_props = lvl_find_in_chain<VkPhysicalDeviceDepthStencilResolvePropertiesKHR>(pProperties->pNext);
- if (depth_stencil_resolve_props) {
- VkPhysicalDeviceDepthStencilResolvePropertiesKHR* write_props = (VkPhysicalDeviceDepthStencilResolvePropertiesKHR*)depth_stencil_resolve_props;
- write_props->supportedDepthResolveModes = VK_RESOLVE_MODE_SAMPLE_ZERO_BIT_KHR;
- write_props->supportedStencilResolveModes = VK_RESOLVE_MODE_SAMPLE_ZERO_BIT_KHR;
+ auto *props_13 = lvl_find_mod_in_chain<VkPhysicalDeviceVulkan13Properties>(pProperties->pNext);
+ if (props_13) {
+ props_13->storageTexelBufferOffsetSingleTexelAlignment = VK_TRUE;
+ props_13->uniformTexelBufferOffsetSingleTexelAlignment = VK_TRUE;
+ props_13->storageTexelBufferOffsetAlignmentBytes = 16;
+ props_13->uniformTexelBufferOffsetAlignmentBytes = 16;
}
- const auto *fragment_density_map2_props = lvl_find_in_chain<VkPhysicalDeviceFragmentDensityMap2PropertiesEXT>(pProperties->pNext);
+ auto *protected_memory_props = lvl_find_mod_in_chain<VkPhysicalDeviceProtectedMemoryProperties>(pProperties->pNext);
+ if (protected_memory_props) {
+ protected_memory_props->protectedNoFault = VK_FALSE;
+ }
+
+ auto *float_controls_props = lvl_find_mod_in_chain<VkPhysicalDeviceFloatControlsProperties>(pProperties->pNext);
+ if (float_controls_props) {
+ float_controls_props->denormBehaviorIndependence = VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL;
+ float_controls_props->roundingModeIndependence = VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL;
+ }
+
+ auto *conservative_raster_props = lvl_find_mod_in_chain<VkPhysicalDeviceConservativeRasterizationPropertiesEXT>(pProperties->pNext);
+ if (conservative_raster_props) {
+ conservative_raster_props->primitiveOverestimationSize = 0.00195313f;
+ conservative_raster_props->conservativePointAndLineRasterization = VK_TRUE;
+ conservative_raster_props->degenerateTrianglesRasterized = VK_TRUE;
+ conservative_raster_props->degenerateLinesRasterized = VK_TRUE;
+ }
+
+ auto *rt_pipeline_props = lvl_find_mod_in_chain<VkPhysicalDeviceRayTracingPipelinePropertiesKHR>(pProperties->pNext);
+ if (rt_pipeline_props) {
+ rt_pipeline_props->shaderGroupHandleSize = 32;
+ rt_pipeline_props->shaderGroupBaseAlignment = 64;
+ rt_pipeline_props->shaderGroupHandleCaptureReplaySize = 32;
+ }
+
+ auto *rt_pipeline_nv_props = lvl_find_mod_in_chain<VkPhysicalDeviceRayTracingPropertiesNV>(pProperties->pNext);
+ if (rt_pipeline_nv_props) {
+ rt_pipeline_nv_props->shaderGroupHandleSize = 32;
+ rt_pipeline_nv_props->shaderGroupBaseAlignment = 64;
+ }
+
+ auto *texel_buffer_props = lvl_find_mod_in_chain<VkPhysicalDeviceTexelBufferAlignmentProperties>(pProperties->pNext);
+ if (texel_buffer_props) {
+ texel_buffer_props->storageTexelBufferOffsetSingleTexelAlignment = VK_TRUE;
+ texel_buffer_props->uniformTexelBufferOffsetSingleTexelAlignment = VK_TRUE;
+ texel_buffer_props->storageTexelBufferOffsetAlignmentBytes = 16;
+ texel_buffer_props->uniformTexelBufferOffsetAlignmentBytes = 16;
+ }
+
+ auto *descriptor_buffer_props = lvl_find_mod_in_chain<VkPhysicalDeviceDescriptorBufferPropertiesEXT>(pProperties->pNext);
+ if (descriptor_buffer_props) {
+ descriptor_buffer_props->combinedImageSamplerDescriptorSingleArray = VK_TRUE;
+ descriptor_buffer_props->bufferlessPushDescriptors = VK_TRUE;
+ descriptor_buffer_props->allowSamplerImageViewPostSubmitCreation = VK_TRUE;
+ descriptor_buffer_props->descriptorBufferOffsetAlignment = 4;
+ }
+
+ auto *mesh_shader_props = lvl_find_mod_in_chain<VkPhysicalDeviceMeshShaderPropertiesEXT>(pProperties->pNext);
+ if (mesh_shader_props) {
+ mesh_shader_props->meshOutputPerVertexGranularity = 32;
+ mesh_shader_props->meshOutputPerPrimitiveGranularity = 32;
+ mesh_shader_props->prefersLocalInvocationVertexOutput = VK_TRUE;
+ mesh_shader_props->prefersLocalInvocationPrimitiveOutput = VK_TRUE;
+ mesh_shader_props->prefersCompactVertexOutput = VK_TRUE;
+ mesh_shader_props->prefersCompactPrimitiveOutput = VK_TRUE;
+ }
+
+ auto *fragment_density_map2_props = lvl_find_mod_in_chain<VkPhysicalDeviceFragmentDensityMap2PropertiesEXT>(pProperties->pNext);
if (fragment_density_map2_props) {
- VkPhysicalDeviceFragmentDensityMap2PropertiesEXT* write_props = (VkPhysicalDeviceFragmentDensityMap2PropertiesEXT*)fragment_density_map2_props;
- write_props->subsampledLoads = VK_FALSE;
- write_props->subsampledCoarseReconstructionEarlyAccess = VK_FALSE;
- write_props->maxSubsampledArrayLayers = 2;
- write_props->maxDescriptorSetSubsampledSamplers = 1;
+ fragment_density_map2_props->subsampledLoads = VK_FALSE;
+ fragment_density_map2_props->subsampledCoarseReconstructionEarlyAccess = VK_FALSE;
+ fragment_density_map2_props->maxSubsampledArrayLayers = 2;
+ fragment_density_map2_props->maxDescriptorSetSubsampledSamplers = 1;
+ }
+
+ const uint32_t num_copy_layouts = 5;
+ const VkImageLayout HostCopyLayouts[]{
+ VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
+ VK_IMAGE_LAYOUT_GENERAL,
+ VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL,
+ VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL,
+ VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL,
+ };
+
+ auto *host_image_copy_props = lvl_find_mod_in_chain<VkPhysicalDeviceHostImageCopyPropertiesEXT>(pProperties->pNext);
+ if (host_image_copy_props){
+ if (host_image_copy_props->pCopyDstLayouts == nullptr) host_image_copy_props->copyDstLayoutCount = num_copy_layouts;
+ else {
+ uint32_t num_layouts = (std::min)(host_image_copy_props->copyDstLayoutCount, num_copy_layouts);
+ for (uint32_t i = 0; i < num_layouts; i++) {
+ host_image_copy_props->pCopyDstLayouts[i] = HostCopyLayouts[i];
+ }
+ }
+ if (host_image_copy_props->pCopySrcLayouts == nullptr) host_image_copy_props->copySrcLayoutCount = num_copy_layouts;
+ else {
+ uint32_t num_layouts = (std::min)(host_image_copy_props->copySrcLayoutCount, num_copy_layouts);
+ for (uint32_t i = 0; i < num_layouts; i++) {
+ host_image_copy_props->pCopySrcLayouts[i] = HostCopyLayouts[i];
+ }
+ }
+ }
+
+ auto *driver_properties = lvl_find_mod_in_chain<VkPhysicalDeviceDriverProperties>(pProperties->pNext);
+ if (driver_properties) {
+ std::strncpy(driver_properties->driverName, "Vulkan Mock Device", VK_MAX_DRIVER_NAME_SIZE);
+#if defined(GIT_BRANCH_NAME) && defined(GIT_TAG_INFO)
+ std::strncpy(driver_properties->driverInfo, "Branch: " GIT_BRANCH_NAME " Tag Info: " GIT_TAG_INFO, VK_MAX_DRIVER_INFO_SIZE);
+#else
+ std::strncpy(driver_properties->driverInfo, "Branch: --unknown-- Tag Info: --unknown--", VK_MAX_DRIVER_INFO_SIZE);
+#endif
}
}
@@ -3018,6 +3053,7 @@
props_3->linearTilingFeatures = pFormatProperties->formatProperties.linearTilingFeatures;
props_3->optimalTilingFeatures = pFormatProperties->formatProperties.optimalTilingFeatures;
props_3->bufferFeatures = pFormatProperties->formatProperties.bufferFeatures;
+ props_3->optimalTilingFeatures |= VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT_EXT;
}
}
@@ -3026,6 +3062,14 @@
const VkPhysicalDeviceImageFormatInfo2* pImageFormatInfo,
VkImageFormatProperties2* pImageFormatProperties)
{
+ auto *external_image_prop = lvl_find_mod_in_chain<VkExternalImageFormatProperties>(pImageFormatProperties->pNext);
+ auto *external_image_format = lvl_find_in_chain<VkPhysicalDeviceExternalImageFormatInfo>(pImageFormatInfo->pNext);
+ if (external_image_prop && external_image_format && external_image_format->handleType == VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID) {
+ external_image_prop->externalMemoryProperties.externalMemoryFeatures = VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT | VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT;
+ external_image_prop->externalMemoryProperties.compatibleHandleTypes = external_image_format->handleType;
+ external_image_prop->externalMemoryProperties.compatibleHandleTypes = external_image_format->handleType;
+ }
+
GetPhysicalDeviceImageFormatProperties(physicalDevice, pImageFormatInfo->format, pImageFormatInfo->type, pImageFormatInfo->tiling, pImageFormatInfo->usage, pImageFormatInfo->flags, &pImageFormatProperties->imageFormatProperties);
return VK_SUCCESS;
}
@@ -3055,7 +3099,11 @@
uint32_t* pPropertyCount,
VkSparseImageFormatProperties2* pProperties)
{
-//Not a CREATE or DESTROY function
+ if (pPropertyCount && pProperties) {
+ GetPhysicalDeviceSparseImageFormatProperties(physicalDevice, pFormatInfo->format, pFormatInfo->type, pFormatInfo->samples, pFormatInfo->usage, pFormatInfo->tiling, pPropertyCount, &pProperties->properties);
+ } else {
+ GetPhysicalDeviceSparseImageFormatProperties(physicalDevice, pFormatInfo->format, pFormatInfo->type, pFormatInfo->samples, pFormatInfo->usage, pFormatInfo->tiling, pPropertyCount, nullptr);
+ }
}
@@ -3104,7 +3152,14 @@
uint32_t* pPhysicalDeviceGroupCount,
VkPhysicalDeviceGroupProperties* pPhysicalDeviceGroupProperties)
{
-//Not a CREATE or DESTROY function
+ if (!pPhysicalDeviceGroupProperties) {
+ *pPhysicalDeviceGroupCount = 1;
+ } else {
+ // arbitrary
+ pPhysicalDeviceGroupProperties->physicalDeviceCount = 1;
+ pPhysicalDeviceGroupProperties->physicalDevices[0] = physical_device_map.at(instance)[0];
+ pPhysicalDeviceGroupProperties->subsetAllocation = VK_FALSE;
+ }
return VK_SUCCESS;
}
@@ -3335,7 +3390,7 @@
const VkFenceGetWin32HandleInfoKHR* pGetWin32HandleInfo,
HANDLE* pHandle)
{
-//Not a CREATE or DESTROY function
+ *pHandle = (HANDLE)0x12345678;
return VK_SUCCESS;
}
#endif /* VK_USE_PLATFORM_WIN32_KHR */
@@ -3354,7 +3409,7 @@
const VkFenceGetFdInfoKHR* pGetFdInfo,
int* pFd)
{
-//Not a CREATE or DESTROY function
+ *pFd = 0x42;
return VK_SUCCESS;
}
@@ -3366,7 +3421,33 @@
VkPerformanceCounterKHR* pCounters,
VkPerformanceCounterDescriptionKHR* pCounterDescriptions)
{
-//Not a CREATE or DESTROY function
+ if (!pCounters) {
+ *pCounterCount = 3;
+ } else {
+ if (*pCounterCount == 0){
+ return VK_INCOMPLETE;
+ }
+ // arbitrary
+ pCounters[0].unit = VK_PERFORMANCE_COUNTER_UNIT_GENERIC_KHR;
+ pCounters[0].scope = VK_QUERY_SCOPE_COMMAND_BUFFER_KHR;
+ pCounters[0].storage = VK_PERFORMANCE_COUNTER_STORAGE_INT32_KHR;
+ pCounters[0].uuid[0] = 0x01;
+ if (*pCounterCount == 1){
+ return VK_INCOMPLETE;
+ }
+ pCounters[1].unit = VK_PERFORMANCE_COUNTER_UNIT_GENERIC_KHR;
+ pCounters[1].scope = VK_QUERY_SCOPE_RENDER_PASS_KHR;
+ pCounters[1].storage = VK_PERFORMANCE_COUNTER_STORAGE_INT32_KHR;
+ pCounters[1].uuid[0] = 0x02;
+ if (*pCounterCount == 2){
+ return VK_INCOMPLETE;
+ }
+ pCounters[2].unit = VK_PERFORMANCE_COUNTER_UNIT_GENERIC_KHR;
+ pCounters[2].scope = VK_QUERY_SCOPE_COMMAND_KHR;
+ pCounters[2].storage = VK_PERFORMANCE_COUNTER_STORAGE_INT32_KHR;
+ pCounters[2].uuid[0] = 0x03;
+ *pCounterCount = 3;
+ }
return VK_SUCCESS;
}
@@ -3375,7 +3456,10 @@
const VkQueryPoolPerformanceCreateInfoKHR* pPerformanceQueryCreateInfo,
uint32_t* pNumPasses)
{
-//Not a CREATE or DESTROY function
+ if (pNumPasses) {
+ // arbitrary
+ *pNumPasses = 1;
+ }
}
static VKAPI_ATTR VkResult VKAPI_CALL AcquireProfilingLockKHR(
@@ -3400,6 +3484,18 @@
VkSurfaceCapabilities2KHR* pSurfaceCapabilities)
{
GetPhysicalDeviceSurfaceCapabilitiesKHR(physicalDevice, pSurfaceInfo->surface, &pSurfaceCapabilities->surfaceCapabilities);
+
+ auto *present_mode_compatibility = lvl_find_mod_in_chain<VkSurfacePresentModeCompatibilityEXT>(pSurfaceCapabilities->pNext);
+ if (present_mode_compatibility) {
+ if (!present_mode_compatibility->pPresentModes) {
+ present_mode_compatibility->presentModeCount = 3;
+ } else {
+ // arbitrary
+ present_mode_compatibility->pPresentModes[0] = VK_PRESENT_MODE_IMMEDIATE_KHR;
+ present_mode_compatibility->pPresentModes[1] = VK_PRESENT_MODE_FIFO_KHR;
+ present_mode_compatibility->pPresentModes[2] = VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR;
+ }
+ }
return VK_SUCCESS;
}
@@ -3492,7 +3588,11 @@
uint32_t* pSparseMemoryRequirementCount,
VkSparseImageMemoryRequirements2* pSparseMemoryRequirements)
{
-//Not a CREATE or DESTROY function
+ if (pSparseMemoryRequirementCount && pSparseMemoryRequirements) {
+ GetImageSparseMemoryRequirements(device, pInfo->image, pSparseMemoryRequirementCount, &pSparseMemoryRequirements->memoryRequirements);
+ } else {
+ GetImageSparseMemoryRequirements(device, pInfo->image, pSparseMemoryRequirementCount, nullptr);
+ }
}
@@ -3544,7 +3644,7 @@
const VkDescriptorSetLayoutCreateInfo* pCreateInfo,
VkDescriptorSetLayoutSupport* pSupport)
{
-//Not a CREATE or DESTROY function
+ GetDescriptorSetLayoutSupport(device, pCreateInfo, pSupport);
}
@@ -3582,6 +3682,7 @@
+
static VKAPI_ATTR VkResult VKAPI_CALL GetSemaphoreCounterValueKHR(
VkDevice device,
VkSemaphore semaphore,
@@ -3616,7 +3717,13 @@
uint32_t* pFragmentShadingRateCount,
VkPhysicalDeviceFragmentShadingRateKHR* pFragmentShadingRates)
{
-//Not a CREATE or DESTROY function
+ if (!pFragmentShadingRates) {
+ *pFragmentShadingRateCount = 1;
+ } else {
+ // arbitrary
+ pFragmentShadingRates->sampleCounts = VK_SAMPLE_COUNT_1_BIT | VK_SAMPLE_COUNT_4_BIT;
+ pFragmentShadingRates->fragmentSize = {8, 8};
+ }
return VK_SUCCESS;
}
@@ -3648,8 +3755,7 @@
VkDevice device,
const VkBufferDeviceAddressInfo* pInfo)
{
-//Not a CREATE or DESTROY function
- return VK_SUCCESS;
+ return GetBufferDeviceAddress(device, pInfo);
}
static VKAPI_ATTR uint64_t VKAPI_CALL GetBufferOpaqueCaptureAddressKHR(
@@ -3743,11 +3849,48 @@
}
+static VKAPI_ATTR VkResult VKAPI_CALL MapMemory2KHR(
+ VkDevice device,
+ const VkMemoryMapInfoKHR* pMemoryMapInfo,
+ void** ppData)
+{
+ return MapMemory(device, pMemoryMapInfo->memory, pMemoryMapInfo->offset, pMemoryMapInfo->size, pMemoryMapInfo->flags, ppData);
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL UnmapMemory2KHR(
+ VkDevice device,
+ const VkMemoryUnmapInfoKHR* pMemoryUnmapInfo)
+{
+ UnmapMemory(device, pMemoryUnmapInfo->memory);
+ return VK_SUCCESS;
+}
+
+
#ifdef VK_ENABLE_BETA_EXTENSIONS
+static VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR(
+ VkPhysicalDevice physicalDevice,
+ const VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR* pQualityLevelInfo,
+ VkVideoEncodeQualityLevelPropertiesKHR* pQualityLevelProperties)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetEncodedVideoSessionParametersKHR(
+ VkDevice device,
+ const VkVideoEncodeSessionParametersGetInfoKHR* pVideoSessionParametersInfo,
+ VkVideoEncodeSessionParametersFeedbackInfoKHR* pFeedbackInfo,
+ size_t* pDataSize,
+ void* pData)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+
static VKAPI_ATTR void VKAPI_CALL CmdEncodeVideoKHR(
VkCommandBuffer commandBuffer,
const VkVideoEncodeInfoKHR* pEncodeInfo)
@@ -3889,7 +4032,7 @@
const VkDeviceBufferMemoryRequirements* pInfo,
VkMemoryRequirements2* pMemoryRequirements)
{
-//Not a CREATE or DESTROY function
+ GetDeviceBufferMemoryRequirements(device, pInfo, pMemoryRequirements);
}
static VKAPI_ATTR void VKAPI_CALL GetDeviceImageMemoryRequirementsKHR(
@@ -3897,7 +4040,7 @@
const VkDeviceImageMemoryRequirements* pInfo,
VkMemoryRequirements2* pMemoryRequirements)
{
-//Not a CREATE or DESTROY function
+ GetDeviceImageMemoryRequirements(device, pInfo, pMemoryRequirements);
}
static VKAPI_ATTR void VKAPI_CALL GetDeviceImageSparseMemoryRequirementsKHR(
@@ -3910,6 +4053,69 @@
}
+static VKAPI_ATTR void VKAPI_CALL CmdBindIndexBuffer2KHR(
+ VkCommandBuffer commandBuffer,
+ VkBuffer buffer,
+ VkDeviceSize offset,
+ VkDeviceSize size,
+ VkIndexType indexType)
+{
+//Not a CREATE or DESTROY function
+}
+
+static VKAPI_ATTR void VKAPI_CALL GetRenderingAreaGranularityKHR(
+ VkDevice device,
+ const VkRenderingAreaInfoKHR* pRenderingAreaInfo,
+ VkExtent2D* pGranularity)
+{
+//Not a CREATE or DESTROY function
+}
+
+static VKAPI_ATTR void VKAPI_CALL GetDeviceImageSubresourceLayoutKHR(
+ VkDevice device,
+ const VkDeviceImageSubresourceInfoKHR* pInfo,
+ VkSubresourceLayout2KHR* pLayout)
+{
+//Not a CREATE or DESTROY function
+}
+
+static VKAPI_ATTR void VKAPI_CALL GetImageSubresourceLayout2KHR(
+ VkDevice device,
+ VkImage image,
+ const VkImageSubresource2KHR* pSubresource,
+ VkSubresourceLayout2KHR* pLayout)
+{
+//Not a CREATE or DESTROY function
+}
+
+
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceCooperativeMatrixPropertiesKHR(
+ VkPhysicalDevice physicalDevice,
+ uint32_t* pPropertyCount,
+ VkCooperativeMatrixPropertiesKHR* pProperties)
+{
+ if (!pProperties) {
+ *pPropertyCount = 2;
+ } else {
+ // arbitrary
+ pProperties[0].MSize = 16;
+ pProperties[0].NSize = 16;
+ pProperties[0].KSize = 16;
+ pProperties[0].AType = VK_COMPONENT_TYPE_UINT32_KHR;
+ pProperties[0].BType = VK_COMPONENT_TYPE_UINT32_KHR;
+ pProperties[0].CType = VK_COMPONENT_TYPE_UINT32_KHR;
+ pProperties[0].ResultType = VK_COMPONENT_TYPE_UINT32_KHR;
+ pProperties[0].saturatingAccumulation = VK_FALSE;
+ pProperties[0].scope = VK_SCOPE_SUBGROUP_KHR;
+
+ pProperties[1] = pProperties[0];
+ pProperties[1].scope = VK_SCOPE_DEVICE_KHR;
+ }
+ return VK_SUCCESS;
+}
+
+
static VKAPI_ATTR VkResult VKAPI_CALL CreateDebugReportCallbackEXT(
VkInstance instance,
const VkDebugReportCallbackCreateInfoEXT* pCreateInfo,
@@ -4148,9 +4354,6 @@
#ifdef VK_ENABLE_BETA_EXTENSIONS
#endif /* VK_ENABLE_BETA_EXTENSIONS */
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-#endif /* VK_ENABLE_BETA_EXTENSIONS */
-
static VKAPI_ATTR VkResult VKAPI_CALL GetShaderInfoAMD(
@@ -4375,6 +4578,20 @@
//Not a CREATE or DESTROY function
}
+static VKAPI_ATTR void VKAPI_CALL CmdSetDiscardRectangleEnableEXT(
+ VkCommandBuffer commandBuffer,
+ VkBool32 discardRectangleEnable)
+{
+//Not a CREATE or DESTROY function
+}
+
+static VKAPI_ATTR void VKAPI_CALL CmdSetDiscardRectangleModeEXT(
+ VkCommandBuffer commandBuffer,
+ VkDiscardRectangleModeEXT discardRectangleMode)
+{
+//Not a CREATE or DESTROY function
+}
+
@@ -4510,7 +4727,20 @@
const struct AHardwareBuffer* buffer,
VkAndroidHardwareBufferPropertiesANDROID* pProperties)
{
-//Not a CREATE or DESTROY function
+ pProperties->allocationSize = 65536;
+ pProperties->memoryTypeBits = 1 << 5; // DEVICE_LOCAL only type
+
+ auto *format_prop = lvl_find_mod_in_chain<VkAndroidHardwareBufferFormatPropertiesANDROID>(pProperties->pNext);
+ if (format_prop) {
+ // Likley using this format
+ format_prop->format = VK_FORMAT_R8G8B8A8_UNORM;
+ format_prop->externalFormat = 37;
+ }
+
+ auto *format_resolve_prop = lvl_find_mod_in_chain<VkAndroidHardwareBufferFormatResolvePropertiesANDROID>(pProperties->pNext);
+ if (format_resolve_prop) {
+ format_resolve_prop->colorAttachmentFormat = VK_FORMAT_R8G8B8A8_UNORM;
+ }
return VK_SUCCESS;
}
@@ -4526,6 +4756,74 @@
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+
+static VKAPI_ATTR VkResult VKAPI_CALL CreateExecutionGraphPipelinesAMDX(
+ VkDevice device,
+ VkPipelineCache pipelineCache,
+ uint32_t createInfoCount,
+ const VkExecutionGraphPipelineCreateInfoAMDX* pCreateInfos,
+ const VkAllocationCallbacks* pAllocator,
+ VkPipeline* pPipelines)
+{
+ unique_lock_t lock(global_lock);
+ for (uint32_t i = 0; i < createInfoCount; ++i) {
+ pPipelines[i] = (VkPipeline)global_unique_handle++;
+ }
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetExecutionGraphPipelineScratchSizeAMDX(
+ VkDevice device,
+ VkPipeline executionGraph,
+ VkExecutionGraphPipelineScratchSizeAMDX* pSizeInfo)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetExecutionGraphPipelineNodeIndexAMDX(
+ VkDevice device,
+ VkPipeline executionGraph,
+ const VkPipelineShaderStageNodeCreateInfoAMDX* pNodeInfo,
+ uint32_t* pNodeIndex)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR void VKAPI_CALL CmdInitializeGraphScratchMemoryAMDX(
+ VkCommandBuffer commandBuffer,
+ VkDeviceAddress scratch)
+{
+//Not a CREATE or DESTROY function
+}
+
+static VKAPI_ATTR void VKAPI_CALL CmdDispatchGraphAMDX(
+ VkCommandBuffer commandBuffer,
+ VkDeviceAddress scratch,
+ const VkDispatchGraphCountInfoAMDX* pCountInfo)
+{
+//Not a CREATE or DESTROY function
+}
+
+static VKAPI_ATTR void VKAPI_CALL CmdDispatchGraphIndirectAMDX(
+ VkCommandBuffer commandBuffer,
+ VkDeviceAddress scratch,
+ const VkDispatchGraphCountInfoAMDX* pCountInfo)
+{
+//Not a CREATE or DESTROY function
+}
+
+static VKAPI_ATTR void VKAPI_CALL CmdDispatchGraphIndirectCountAMDX(
+ VkCommandBuffer commandBuffer,
+ VkDeviceAddress scratch,
+ VkDeviceAddress countInfo)
+{
+//Not a CREATE or DESTROY function
+}
+#endif /* VK_ENABLE_BETA_EXTENSIONS */
+
@@ -4543,7 +4841,10 @@
VkSampleCountFlagBits samples,
VkMultisamplePropertiesEXT* pMultisampleProperties)
{
-//Not a CREATE or DESTROY function
+ if (pMultisampleProperties) {
+ // arbitrary
+ pMultisampleProperties->maxSampleLocationGridSize = {32, 32};
+ }
}
@@ -4656,7 +4957,10 @@
const VkAccelerationStructureMemoryRequirementsInfoNV* pInfo,
VkMemoryRequirements2KHR* pMemoryRequirements)
{
-//Not a CREATE or DESTROY function
+ // arbitrary
+ pMemoryRequirements->memoryRequirements.size = 4096;
+ pMemoryRequirements->memoryRequirements.alignment = 1;
+ pMemoryRequirements->memoryRequirements.memoryTypeBits = 0xFFFF;
}
static VKAPI_ATTR VkResult VKAPI_CALL BindAccelerationStructureMemoryNV(
@@ -4813,7 +5117,12 @@
uint32_t* pTimeDomainCount,
VkTimeDomainEXT* pTimeDomains)
{
-//Not a CREATE or DESTROY function
+ if (!pTimeDomains) {
+ *pTimeDomainCount = 1;
+ } else {
+ // arbitrary
+ *pTimeDomains = VK_TIME_DOMAIN_DEVICE_EXT;
+ }
return VK_SUCCESS;
}
@@ -4829,9 +5138,6 @@
}
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-#endif /* VK_ENABLE_BETA_EXTENSIONS */
-
#ifdef VK_USE_PLATFORM_GGP
@@ -4874,6 +5180,15 @@
+static VKAPI_ATTR void VKAPI_CALL CmdSetExclusiveScissorEnableNV(
+ VkCommandBuffer commandBuffer,
+ uint32_t firstExclusiveScissor,
+ uint32_t exclusiveScissorCount,
+ const VkBool32* pExclusiveScissorEnables)
+{
+//Not a CREATE or DESTROY function
+}
+
static VKAPI_ATTR void VKAPI_CALL CmdSetExclusiveScissorNV(
VkCommandBuffer commandBuffer,
uint32_t firstExclusiveScissor,
@@ -5027,8 +5342,7 @@
VkDevice device,
const VkBufferDeviceAddressInfo* pInfo)
{
-//Not a CREATE or DESTROY function
- return VK_SUCCESS;
+ return GetBufferDeviceAddress(device, pInfo);
}
@@ -5234,6 +5548,59 @@
}
+static VKAPI_ATTR VkResult VKAPI_CALL CopyMemoryToImageEXT(
+ VkDevice device,
+ const VkCopyMemoryToImageInfoEXT* pCopyMemoryToImageInfo)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL CopyImageToMemoryEXT(
+ VkDevice device,
+ const VkCopyImageToMemoryInfoEXT* pCopyImageToMemoryInfo)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL CopyImageToImageEXT(
+ VkDevice device,
+ const VkCopyImageToImageInfoEXT* pCopyImageToImageInfo)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL TransitionImageLayoutEXT(
+ VkDevice device,
+ uint32_t transitionCount,
+ const VkHostImageLayoutTransitionInfoEXT* pTransitions)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR void VKAPI_CALL GetImageSubresourceLayout2EXT(
+ VkDevice device,
+ VkImage image,
+ const VkImageSubresource2KHR* pSubresource,
+ VkSubresourceLayout2KHR* pLayout)
+{
+//Not a CREATE or DESTROY function
+}
+
+
+
+
+static VKAPI_ATTR VkResult VKAPI_CALL ReleaseSwapchainImagesEXT(
+ VkDevice device,
+ const VkReleaseSwapchainImagesInfoEXT* pReleaseInfo)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+
static VKAPI_ATTR void VKAPI_CALL GetGeneratedCommandsMemoryRequirementsNV(
@@ -5291,6 +5658,14 @@
+static VKAPI_ATTR void VKAPI_CALL CmdSetDepthBias2EXT(
+ VkCommandBuffer commandBuffer,
+ const VkDepthBiasInfoEXT* pDepthBiasInfo)
+{
+//Not a CREATE or DESTROY function
+}
+
+
static VKAPI_ATTR VkResult VKAPI_CALL AcquireDrmDisplayEXT(
VkPhysicalDevice physicalDevice,
@@ -5359,6 +5734,7 @@
+
#ifdef VK_USE_PLATFORM_METAL_EXT
static VKAPI_ATTR void VKAPI_CALL ExportMetalObjectsEXT(
@@ -5370,6 +5746,108 @@
#endif /* VK_USE_PLATFORM_METAL_EXT */
+static VKAPI_ATTR void VKAPI_CALL GetDescriptorSetLayoutSizeEXT(
+ VkDevice device,
+ VkDescriptorSetLayout layout,
+ VkDeviceSize* pLayoutSizeInBytes)
+{
+ // Need to give something non-zero
+ *pLayoutSizeInBytes = 4;
+}
+
+static VKAPI_ATTR void VKAPI_CALL GetDescriptorSetLayoutBindingOffsetEXT(
+ VkDevice device,
+ VkDescriptorSetLayout layout,
+ uint32_t binding,
+ VkDeviceSize* pOffset)
+{
+//Not a CREATE or DESTROY function
+}
+
+static VKAPI_ATTR void VKAPI_CALL GetDescriptorEXT(
+ VkDevice device,
+ const VkDescriptorGetInfoEXT* pDescriptorInfo,
+ size_t dataSize,
+ void* pDescriptor)
+{
+//Not a CREATE or DESTROY function
+}
+
+static VKAPI_ATTR void VKAPI_CALL CmdBindDescriptorBuffersEXT(
+ VkCommandBuffer commandBuffer,
+ uint32_t bufferCount,
+ const VkDescriptorBufferBindingInfoEXT* pBindingInfos)
+{
+//Not a CREATE or DESTROY function
+}
+
+static VKAPI_ATTR void VKAPI_CALL CmdSetDescriptorBufferOffsetsEXT(
+ VkCommandBuffer commandBuffer,
+ VkPipelineBindPoint pipelineBindPoint,
+ VkPipelineLayout layout,
+ uint32_t firstSet,
+ uint32_t setCount,
+ const uint32_t* pBufferIndices,
+ const VkDeviceSize* pOffsets)
+{
+//Not a CREATE or DESTROY function
+}
+
+static VKAPI_ATTR void VKAPI_CALL CmdBindDescriptorBufferEmbeddedSamplersEXT(
+ VkCommandBuffer commandBuffer,
+ VkPipelineBindPoint pipelineBindPoint,
+ VkPipelineLayout layout,
+ uint32_t set)
+{
+//Not a CREATE or DESTROY function
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetBufferOpaqueCaptureDescriptorDataEXT(
+ VkDevice device,
+ const VkBufferCaptureDescriptorDataInfoEXT* pInfo,
+ void* pData)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetImageOpaqueCaptureDescriptorDataEXT(
+ VkDevice device,
+ const VkImageCaptureDescriptorDataInfoEXT* pInfo,
+ void* pData)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetImageViewOpaqueCaptureDescriptorDataEXT(
+ VkDevice device,
+ const VkImageViewCaptureDescriptorDataInfoEXT* pInfo,
+ void* pData)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetSamplerOpaqueCaptureDescriptorDataEXT(
+ VkDevice device,
+ const VkSamplerCaptureDescriptorDataInfoEXT* pInfo,
+ void* pData)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetAccelerationStructureOpaqueCaptureDescriptorDataEXT(
+ VkDevice device,
+ const VkAccelerationStructureCaptureDescriptorDataInfoEXT* pInfo,
+ void* pData)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+
+
static VKAPI_ATTR void VKAPI_CALL CmdSetFragmentShadingRateEnumNV(
@@ -5386,15 +5864,6 @@
-static VKAPI_ATTR void VKAPI_CALL GetImageSubresourceLayout2EXT(
- VkDevice device,
- VkImage image,
- const VkImageSubresource2EXT* pSubresource,
- VkSubresourceLayout2EXT* pLayout)
-{
-//Not a CREATE or DESTROY function
-}
-
@@ -5606,6 +6075,7 @@
+
static VKAPI_ATTR void VKAPI_CALL CmdSetPatchControlPointsEXT(
VkCommandBuffer commandBuffer,
uint32_t patchControlPoints)
@@ -5702,6 +6172,7 @@
+
static VKAPI_ATTR VkResult VKAPI_CALL CreateMicromapEXT(
VkDevice device,
const VkMicromapCreateInfoEXT* pCreateInfo,
@@ -5828,6 +6299,27 @@
//Not a CREATE or DESTROY function
}
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+#endif /* VK_ENABLE_BETA_EXTENSIONS */
+
+
+
+static VKAPI_ATTR void VKAPI_CALL CmdDrawClusterHUAWEI(
+ VkCommandBuffer commandBuffer,
+ uint32_t groupCountX,
+ uint32_t groupCountY,
+ uint32_t groupCountZ)
+{
+//Not a CREATE or DESTROY function
+}
+
+static VKAPI_ATTR void VKAPI_CALL CmdDrawClusterIndirectHUAWEI(
+ VkCommandBuffer commandBuffer,
+ VkBuffer buffer,
+ VkDeviceSize offset)
+{
+//Not a CREATE or DESTROY function
+}
@@ -5840,6 +6332,8 @@
}
+
+
static VKAPI_ATTR void VKAPI_CALL GetDescriptorSetLayoutHostMappingInfoVALVE(
VkDevice device,
const VkDescriptorSetBindingReferenceVALVE* pBindingReference,
@@ -5860,6 +6354,73 @@
+static VKAPI_ATTR void VKAPI_CALL CmdCopyMemoryIndirectNV(
+ VkCommandBuffer commandBuffer,
+ VkDeviceAddress copyBufferAddress,
+ uint32_t copyCount,
+ uint32_t stride)
+{
+//Not a CREATE or DESTROY function
+}
+
+static VKAPI_ATTR void VKAPI_CALL CmdCopyMemoryToImageIndirectNV(
+ VkCommandBuffer commandBuffer,
+ VkDeviceAddress copyBufferAddress,
+ uint32_t copyCount,
+ uint32_t stride,
+ VkImage dstImage,
+ VkImageLayout dstImageLayout,
+ const VkImageSubresourceLayers* pImageSubresources)
+{
+//Not a CREATE or DESTROY function
+}
+
+
+static VKAPI_ATTR void VKAPI_CALL CmdDecompressMemoryNV(
+ VkCommandBuffer commandBuffer,
+ uint32_t decompressRegionCount,
+ const VkDecompressMemoryRegionNV* pDecompressMemoryRegions)
+{
+//Not a CREATE or DESTROY function
+}
+
+static VKAPI_ATTR void VKAPI_CALL CmdDecompressMemoryIndirectCountNV(
+ VkCommandBuffer commandBuffer,
+ VkDeviceAddress indirectCommandsAddress,
+ VkDeviceAddress indirectCommandsCountAddress,
+ uint32_t stride)
+{
+//Not a CREATE or DESTROY function
+}
+
+
+static VKAPI_ATTR void VKAPI_CALL GetPipelineIndirectMemoryRequirementsNV(
+ VkDevice device,
+ const VkComputePipelineCreateInfo* pCreateInfo,
+ VkMemoryRequirements2* pMemoryRequirements)
+{
+//Not a CREATE or DESTROY function
+}
+
+static VKAPI_ATTR void VKAPI_CALL CmdUpdatePipelineIndirectBufferNV(
+ VkCommandBuffer commandBuffer,
+ VkPipelineBindPoint pipelineBindPoint,
+ VkPipeline pipeline)
+{
+//Not a CREATE or DESTROY function
+}
+
+static VKAPI_ATTR VkDeviceAddress VKAPI_CALL GetPipelineIndirectDeviceAddressNV(
+ VkDevice device,
+ const VkPipelineIndirectDeviceAddressInfoNV* pInfo)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+
+
+
+
@@ -6095,12 +6656,17 @@
+
static VKAPI_ATTR void VKAPI_CALL GetShaderModuleIdentifierEXT(
VkDevice device,
VkShaderModule shaderModule,
VkShaderModuleIdentifierEXT* pIdentifier)
{
-//Not a CREATE or DESTROY function
+ if (pIdentifier) {
+ // arbitrary
+ pIdentifier->identifierSize = 1;
+ pIdentifier->identifier[0] = 0x01;
+ }
}
static VKAPI_ATTR void VKAPI_CALL GetShaderModuleCreateInfoIdentifierEXT(
@@ -6163,6 +6729,51 @@
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+#endif /* VK_USE_PLATFORM_ANDROID_KHR */
+
+
+static VKAPI_ATTR VkResult VKAPI_CALL CreateShadersEXT(
+ VkDevice device,
+ uint32_t createInfoCount,
+ const VkShaderCreateInfoEXT* pCreateInfos,
+ const VkAllocationCallbacks* pAllocator,
+ VkShaderEXT* pShaders)
+{
+ unique_lock_t lock(global_lock);
+ for (uint32_t i = 0; i < createInfoCount; ++i) {
+ pShaders[i] = (VkShaderEXT)global_unique_handle++;
+ }
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR void VKAPI_CALL DestroyShaderEXT(
+ VkDevice device,
+ VkShaderEXT shader,
+ const VkAllocationCallbacks* pAllocator)
+{
+//Destroy object
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetShaderBinaryDataEXT(
+ VkDevice device,
+ VkShaderEXT shader,
+ size_t* pDataSize,
+ void* pData)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR void VKAPI_CALL CmdBindShadersEXT(
+ VkCommandBuffer commandBuffer,
+ uint32_t stageCount,
+ const VkShaderStageFlagBits* pStages,
+ const VkShaderEXT* pShaders)
+{
+//Not a CREATE or DESTROY function
+}
+
static VKAPI_ATTR VkResult VKAPI_CALL GetFramebufferTilePropertiesQCOM(
VkDevice device,
@@ -6187,6 +6798,81 @@
+
+
+
+
+
+static VKAPI_ATTR VkResult VKAPI_CALL SetLatencySleepModeNV(
+ VkDevice device,
+ VkSwapchainKHR swapchain,
+ const VkLatencySleepModeInfoNV* pSleepModeInfo)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL LatencySleepNV(
+ VkDevice device,
+ VkSwapchainKHR swapchain,
+ const VkLatencySleepInfoNV* pSleepInfo)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR void VKAPI_CALL SetLatencyMarkerNV(
+ VkDevice device,
+ VkSwapchainKHR swapchain,
+ const VkSetLatencyMarkerInfoNV* pLatencyMarkerInfo)
+{
+//Not a CREATE or DESTROY function
+}
+
+static VKAPI_ATTR void VKAPI_CALL GetLatencyTimingsNV(
+ VkDevice device,
+ VkSwapchainKHR swapchain,
+ uint32_t* pTimingCount,
+ VkGetLatencyMarkerInfoNV* pLatencyMarkerInfo)
+{
+//Not a CREATE or DESTROY function
+}
+
+static VKAPI_ATTR void VKAPI_CALL QueueNotifyOutOfBandNV(
+ VkQueue queue,
+ const VkOutOfBandQueueTypeInfoNV* pQueueTypeInfo)
+{
+//Not a CREATE or DESTROY function
+}
+
+
+
+
+
+
+
+static VKAPI_ATTR void VKAPI_CALL CmdSetAttachmentFeedbackLoopEnableEXT(
+ VkCommandBuffer commandBuffer,
+ VkImageAspectFlags aspectMask)
+{
+//Not a CREATE or DESTROY function
+}
+
+#ifdef VK_USE_PLATFORM_SCREEN_QNX
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetScreenBufferPropertiesQNX(
+ VkDevice device,
+ const struct _screen_buffer* buffer,
+ VkScreenBufferPropertiesQNX* pProperties)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+#endif /* VK_USE_PLATFORM_SCREEN_QNX */
+
+
+
+
static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR(
VkDevice device,
const VkAccelerationStructureCreateInfoKHR* pCreateInfo,
@@ -6302,8 +6988,8 @@
VkDevice device,
const VkAccelerationStructureDeviceAddressInfoKHR* pInfo)
{
-//Not a CREATE or DESTROY function
- return VK_SUCCESS;
+ // arbitrary - need to be aligned to 256 bytes
+ return 0x262144;
}
static VKAPI_ATTR void VKAPI_CALL CmdWriteAccelerationStructuresPropertiesKHR(
@@ -6332,7 +7018,10 @@
const uint32_t* pMaxPrimitiveCounts,
VkAccelerationStructureBuildSizesInfoKHR* pSizeInfo)
{
-//Not a CREATE or DESTROY function
+ // arbitrary
+ pSizeInfo->accelerationStructureSize = 4;
+ pSizeInfo->updateScratchSize = 4;
+ pSizeInfo->buildScratchSize = 4;
}
@@ -6438,224 +7127,5 @@
//Not a CREATE or DESTROY function
}
-
-
-static VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL GetPhysicalDeviceProcAddr(VkInstance instance, const char *funcName) {
- // TODO: This function should only care about physical device functions and return nullptr for other functions
- const auto &item = name_to_funcptr_map.find(funcName);
- if (item != name_to_funcptr_map.end()) {
- return reinterpret_cast<PFN_vkVoidFunction>(item->second);
- }
- // Mock should intercept all functions so if we get here just return null
- return nullptr;
-}
-
} // namespace vkmock
-#if defined(__GNUC__) && __GNUC__ >= 4
-#define EXPORT __attribute__((visibility("default")))
-#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
-#define EXPORT __attribute__((visibility("default")))
-#else
-#define EXPORT
-#endif
-
-extern "C" {
-
-EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr(VkInstance instance, const char* pName) {
- if (!vkmock::negotiate_loader_icd_interface_called) {
- vkmock::loader_interface_version = 1;
- }
- return vkmock::GetInstanceProcAddr(instance, pName);
-}
-
-EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetPhysicalDeviceProcAddr(VkInstance instance, const char* pName) {
- return vkmock::GetPhysicalDeviceProcAddr(instance, pName);
-}
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion) {
- vkmock::negotiate_loader_icd_interface_called = true;
- vkmock::loader_interface_version = *pSupportedVersion;
- if (*pSupportedVersion > vkmock::SUPPORTED_LOADER_ICD_INTERFACE_VERSION) {
- *pSupportedVersion = vkmock::SUPPORTED_LOADER_ICD_INTERFACE_VERSION;
- }
- return VK_SUCCESS;
-}
-
-
-EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroySurfaceKHR(
- VkInstance instance,
- VkSurfaceKHR surface,
- const VkAllocationCallbacks* pAllocator)
-{
- vkmock::DestroySurfaceKHR(instance, surface, pAllocator);
-}
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceSupportKHR(
- VkPhysicalDevice physicalDevice,
- uint32_t queueFamilyIndex,
- VkSurfaceKHR surface,
- VkBool32* pSupported)
-{
- return vkmock::GetPhysicalDeviceSurfaceSupportKHR(physicalDevice, queueFamilyIndex, surface, pSupported);
-}
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceCapabilitiesKHR(
- VkPhysicalDevice physicalDevice,
- VkSurfaceKHR surface,
- VkSurfaceCapabilitiesKHR* pSurfaceCapabilities)
-{
- return vkmock::GetPhysicalDeviceSurfaceCapabilitiesKHR(physicalDevice, surface, pSurfaceCapabilities);
-}
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceFormatsKHR(
- VkPhysicalDevice physicalDevice,
- VkSurfaceKHR surface,
- uint32_t* pSurfaceFormatCount,
- VkSurfaceFormatKHR* pSurfaceFormats)
-{
- return vkmock::GetPhysicalDeviceSurfaceFormatsKHR(physicalDevice, surface, pSurfaceFormatCount, pSurfaceFormats);
-}
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfacePresentModesKHR(
- VkPhysicalDevice physicalDevice,
- VkSurfaceKHR surface,
- uint32_t* pPresentModeCount,
- VkPresentModeKHR* pPresentModes)
-{
- return vkmock::GetPhysicalDeviceSurfacePresentModesKHR(physicalDevice, surface, pPresentModeCount, pPresentModes);
-}
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateDisplayPlaneSurfaceKHR(
- VkInstance instance,
- const VkDisplaySurfaceCreateInfoKHR* pCreateInfo,
- const VkAllocationCallbacks* pAllocator,
- VkSurfaceKHR* pSurface)
-{
- return vkmock::CreateDisplayPlaneSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
-}
-
-#ifdef VK_USE_PLATFORM_XLIB_KHR
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateXlibSurfaceKHR(
- VkInstance instance,
- const VkXlibSurfaceCreateInfoKHR* pCreateInfo,
- const VkAllocationCallbacks* pAllocator,
- VkSurfaceKHR* pSurface)
-{
- return vkmock::CreateXlibSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
-}
-#endif /* VK_USE_PLATFORM_XLIB_KHR */
-
-#ifdef VK_USE_PLATFORM_XCB_KHR
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateXcbSurfaceKHR(
- VkInstance instance,
- const VkXcbSurfaceCreateInfoKHR* pCreateInfo,
- const VkAllocationCallbacks* pAllocator,
- VkSurfaceKHR* pSurface)
-{
- return vkmock::CreateXcbSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
-}
-#endif /* VK_USE_PLATFORM_XCB_KHR */
-
-#ifdef VK_USE_PLATFORM_WAYLAND_KHR
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateWaylandSurfaceKHR(
- VkInstance instance,
- const VkWaylandSurfaceCreateInfoKHR* pCreateInfo,
- const VkAllocationCallbacks* pAllocator,
- VkSurfaceKHR* pSurface)
-{
- return vkmock::CreateWaylandSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
-}
-#endif /* VK_USE_PLATFORM_WAYLAND_KHR */
-
-#ifdef VK_USE_PLATFORM_ANDROID_KHR
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateAndroidSurfaceKHR(
- VkInstance instance,
- const VkAndroidSurfaceCreateInfoKHR* pCreateInfo,
- const VkAllocationCallbacks* pAllocator,
- VkSurfaceKHR* pSurface)
-{
- return vkmock::CreateAndroidSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
-}
-#endif /* VK_USE_PLATFORM_ANDROID_KHR */
-
-#ifdef VK_USE_PLATFORM_WIN32_KHR
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateWin32SurfaceKHR(
- VkInstance instance,
- const VkWin32SurfaceCreateInfoKHR* pCreateInfo,
- const VkAllocationCallbacks* pAllocator,
- VkSurfaceKHR* pSurface)
-{
- return vkmock::CreateWin32SurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
-}
-#endif /* VK_USE_PLATFORM_WIN32_KHR */
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetDeviceGroupSurfacePresentModesKHR(
- VkDevice device,
- VkSurfaceKHR surface,
- VkDeviceGroupPresentModeFlagsKHR* pModes)
-{
- return vkmock::GetDeviceGroupSurfacePresentModesKHR(device, surface, pModes);
-}
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDevicePresentRectanglesKHR(
- VkPhysicalDevice physicalDevice,
- VkSurfaceKHR surface,
- uint32_t* pRectCount,
- VkRect2D* pRects)
-{
- return vkmock::GetPhysicalDevicePresentRectanglesKHR(physicalDevice, surface, pRectCount, pRects);
-}
-
-#ifdef VK_USE_PLATFORM_VI_NN
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateViSurfaceNN(
- VkInstance instance,
- const VkViSurfaceCreateInfoNN* pCreateInfo,
- const VkAllocationCallbacks* pAllocator,
- VkSurfaceKHR* pSurface)
-{
- return vkmock::CreateViSurfaceNN(instance, pCreateInfo, pAllocator, pSurface);
-}
-#endif /* VK_USE_PLATFORM_VI_NN */
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceCapabilities2EXT(
- VkPhysicalDevice physicalDevice,
- VkSurfaceKHR surface,
- VkSurfaceCapabilities2EXT* pSurfaceCapabilities)
-{
- return vkmock::GetPhysicalDeviceSurfaceCapabilities2EXT(physicalDevice, surface, pSurfaceCapabilities);
-}
-
-#ifdef VK_USE_PLATFORM_IOS_MVK
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateIOSSurfaceMVK(
- VkInstance instance,
- const VkIOSSurfaceCreateInfoMVK* pCreateInfo,
- const VkAllocationCallbacks* pAllocator,
- VkSurfaceKHR* pSurface)
-{
- return vkmock::CreateIOSSurfaceMVK(instance, pCreateInfo, pAllocator, pSurface);
-}
-#endif /* VK_USE_PLATFORM_IOS_MVK */
-
-#ifdef VK_USE_PLATFORM_MACOS_MVK
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateMacOSSurfaceMVK(
- VkInstance instance,
- const VkMacOSSurfaceCreateInfoMVK* pCreateInfo,
- const VkAllocationCallbacks* pAllocator,
- VkSurfaceKHR* pSurface)
-{
- return vkmock::CreateMacOSSurfaceMVK(instance, pCreateInfo, pAllocator, pSurface);
-}
-#endif /* VK_USE_PLATFORM_MACOS_MVK */
-
-} // end extern "C"
-
-
diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h
index 52968a5..eb406e1 100644
--- a/icd/generated/vk_typemap_helper.h
+++ b/icd/generated/vk_typemap_helper.h
@@ -2119,7 +2119,6 @@
};
#endif // VK_USE_PLATFORM_WIN32_KHR
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkQueueFamilyQueryResultStatusPropertiesKHR to id VK_STRUCTURE_TYPE_QUEUE_FAMILY_QUERY_RESULT_STATUS_PROPERTIES_KHR
template <> struct LvlTypeMap<VkQueueFamilyQueryResultStatusPropertiesKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_QUEUE_FAMILY_QUERY_RESULT_STATUS_PROPERTIES_KHR;
@@ -2129,8 +2128,6 @@
typedef VkQueueFamilyQueryResultStatusPropertiesKHR Type;
};
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkQueueFamilyVideoPropertiesKHR to id VK_STRUCTURE_TYPE_QUEUE_FAMILY_VIDEO_PROPERTIES_KHR
template <> struct LvlTypeMap<VkQueueFamilyVideoPropertiesKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_QUEUE_FAMILY_VIDEO_PROPERTIES_KHR;
@@ -2140,8 +2137,6 @@
typedef VkQueueFamilyVideoPropertiesKHR Type;
};
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkVideoProfileInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_PROFILE_INFO_KHR
template <> struct LvlTypeMap<VkVideoProfileInfoKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_PROFILE_INFO_KHR;
@@ -2151,8 +2146,6 @@
typedef VkVideoProfileInfoKHR Type;
};
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkVideoProfileListInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_PROFILE_LIST_INFO_KHR
template <> struct LvlTypeMap<VkVideoProfileListInfoKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_PROFILE_LIST_INFO_KHR;
@@ -2162,8 +2155,6 @@
typedef VkVideoProfileListInfoKHR Type;
};
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkVideoCapabilitiesKHR to id VK_STRUCTURE_TYPE_VIDEO_CAPABILITIES_KHR
template <> struct LvlTypeMap<VkVideoCapabilitiesKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_CAPABILITIES_KHR;
@@ -2173,8 +2164,6 @@
typedef VkVideoCapabilitiesKHR Type;
};
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkPhysicalDeviceVideoFormatInfoKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_FORMAT_INFO_KHR
template <> struct LvlTypeMap<VkPhysicalDeviceVideoFormatInfoKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_FORMAT_INFO_KHR;
@@ -2184,8 +2173,6 @@
typedef VkPhysicalDeviceVideoFormatInfoKHR Type;
};
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkVideoFormatPropertiesKHR to id VK_STRUCTURE_TYPE_VIDEO_FORMAT_PROPERTIES_KHR
template <> struct LvlTypeMap<VkVideoFormatPropertiesKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_FORMAT_PROPERTIES_KHR;
@@ -2195,8 +2182,6 @@
typedef VkVideoFormatPropertiesKHR Type;
};
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkVideoPictureResourceInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_PICTURE_RESOURCE_INFO_KHR
template <> struct LvlTypeMap<VkVideoPictureResourceInfoKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_PICTURE_RESOURCE_INFO_KHR;
@@ -2206,8 +2191,6 @@
typedef VkVideoPictureResourceInfoKHR Type;
};
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkVideoReferenceSlotInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_REFERENCE_SLOT_INFO_KHR
template <> struct LvlTypeMap<VkVideoReferenceSlotInfoKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_REFERENCE_SLOT_INFO_KHR;
@@ -2217,8 +2200,6 @@
typedef VkVideoReferenceSlotInfoKHR Type;
};
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkVideoSessionMemoryRequirementsKHR to id VK_STRUCTURE_TYPE_VIDEO_SESSION_MEMORY_REQUIREMENTS_KHR
template <> struct LvlTypeMap<VkVideoSessionMemoryRequirementsKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_SESSION_MEMORY_REQUIREMENTS_KHR;
@@ -2228,8 +2209,6 @@
typedef VkVideoSessionMemoryRequirementsKHR Type;
};
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkBindVideoSessionMemoryInfoKHR to id VK_STRUCTURE_TYPE_BIND_VIDEO_SESSION_MEMORY_INFO_KHR
template <> struct LvlTypeMap<VkBindVideoSessionMemoryInfoKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_BIND_VIDEO_SESSION_MEMORY_INFO_KHR;
@@ -2239,8 +2218,6 @@
typedef VkBindVideoSessionMemoryInfoKHR Type;
};
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkVideoSessionCreateInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_SESSION_CREATE_INFO_KHR
template <> struct LvlTypeMap<VkVideoSessionCreateInfoKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_SESSION_CREATE_INFO_KHR;
@@ -2250,8 +2227,6 @@
typedef VkVideoSessionCreateInfoKHR Type;
};
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkVideoSessionParametersCreateInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR
template <> struct LvlTypeMap<VkVideoSessionParametersCreateInfoKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR;
@@ -2261,8 +2236,6 @@
typedef VkVideoSessionParametersCreateInfoKHR Type;
};
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkVideoSessionParametersUpdateInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_UPDATE_INFO_KHR
template <> struct LvlTypeMap<VkVideoSessionParametersUpdateInfoKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_UPDATE_INFO_KHR;
@@ -2272,8 +2245,6 @@
typedef VkVideoSessionParametersUpdateInfoKHR Type;
};
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkVideoBeginCodingInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_BEGIN_CODING_INFO_KHR
template <> struct LvlTypeMap<VkVideoBeginCodingInfoKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_BEGIN_CODING_INFO_KHR;
@@ -2283,8 +2254,6 @@
typedef VkVideoBeginCodingInfoKHR Type;
};
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkVideoEndCodingInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_END_CODING_INFO_KHR
template <> struct LvlTypeMap<VkVideoEndCodingInfoKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_END_CODING_INFO_KHR;
@@ -2294,8 +2263,6 @@
typedef VkVideoEndCodingInfoKHR Type;
};
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkVideoCodingControlInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_CODING_CONTROL_INFO_KHR
template <> struct LvlTypeMap<VkVideoCodingControlInfoKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_CODING_CONTROL_INFO_KHR;
@@ -2305,8 +2272,6 @@
typedef VkVideoCodingControlInfoKHR Type;
};
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkVideoDecodeCapabilitiesKHR to id VK_STRUCTURE_TYPE_VIDEO_DECODE_CAPABILITIES_KHR
template <> struct LvlTypeMap<VkVideoDecodeCapabilitiesKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_CAPABILITIES_KHR;
@@ -2316,8 +2281,6 @@
typedef VkVideoDecodeCapabilitiesKHR Type;
};
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkVideoDecodeUsageInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_DECODE_USAGE_INFO_KHR
template <> struct LvlTypeMap<VkVideoDecodeUsageInfoKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_USAGE_INFO_KHR;
@@ -2327,8 +2290,6 @@
typedef VkVideoDecodeUsageInfoKHR Type;
};
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkVideoDecodeInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_DECODE_INFO_KHR
template <> struct LvlTypeMap<VkVideoDecodeInfoKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_INFO_KHR;
@@ -2338,7 +2299,60 @@
typedef VkVideoDecodeInfoKHR Type;
};
-#endif // VK_ENABLE_BETA_EXTENSIONS
+// Map type VkVideoDecodeH264ProfileInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PROFILE_INFO_KHR
+template <> struct LvlTypeMap<VkVideoDecodeH264ProfileInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PROFILE_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PROFILE_INFO_KHR> {
+ typedef VkVideoDecodeH264ProfileInfoKHR Type;
+};
+
+// Map type VkVideoDecodeH264CapabilitiesKHR to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_CAPABILITIES_KHR
+template <> struct LvlTypeMap<VkVideoDecodeH264CapabilitiesKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_CAPABILITIES_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_CAPABILITIES_KHR> {
+ typedef VkVideoDecodeH264CapabilitiesKHR Type;
+};
+
+// Map type VkVideoDecodeH264SessionParametersAddInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_ADD_INFO_KHR
+template <> struct LvlTypeMap<VkVideoDecodeH264SessionParametersAddInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_ADD_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_ADD_INFO_KHR> {
+ typedef VkVideoDecodeH264SessionParametersAddInfoKHR Type;
+};
+
+// Map type VkVideoDecodeH264SessionParametersCreateInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_CREATE_INFO_KHR
+template <> struct LvlTypeMap<VkVideoDecodeH264SessionParametersCreateInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_CREATE_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_CREATE_INFO_KHR> {
+ typedef VkVideoDecodeH264SessionParametersCreateInfoKHR Type;
+};
+
+// Map type VkVideoDecodeH264PictureInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PICTURE_INFO_KHR
+template <> struct LvlTypeMap<VkVideoDecodeH264PictureInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PICTURE_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PICTURE_INFO_KHR> {
+ typedef VkVideoDecodeH264PictureInfoKHR Type;
+};
+
+// Map type VkVideoDecodeH264DpbSlotInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO_KHR
+template <> struct LvlTypeMap<VkVideoDecodeH264DpbSlotInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO_KHR> {
+ typedef VkVideoDecodeH264DpbSlotInfoKHR Type;
+};
+
// Map type VkRenderingFragmentShadingRateAttachmentInfoKHR to id VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR
template <> struct LvlTypeMap<VkRenderingFragmentShadingRateAttachmentInfoKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR;
@@ -2763,6 +2777,60 @@
typedef VkPhysicalDeviceShaderClockFeaturesKHR Type;
};
+// Map type VkVideoDecodeH265ProfileInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PROFILE_INFO_KHR
+template <> struct LvlTypeMap<VkVideoDecodeH265ProfileInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PROFILE_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PROFILE_INFO_KHR> {
+ typedef VkVideoDecodeH265ProfileInfoKHR Type;
+};
+
+// Map type VkVideoDecodeH265CapabilitiesKHR to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_CAPABILITIES_KHR
+template <> struct LvlTypeMap<VkVideoDecodeH265CapabilitiesKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_CAPABILITIES_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_CAPABILITIES_KHR> {
+ typedef VkVideoDecodeH265CapabilitiesKHR Type;
+};
+
+// Map type VkVideoDecodeH265SessionParametersAddInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_ADD_INFO_KHR
+template <> struct LvlTypeMap<VkVideoDecodeH265SessionParametersAddInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_ADD_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_ADD_INFO_KHR> {
+ typedef VkVideoDecodeH265SessionParametersAddInfoKHR Type;
+};
+
+// Map type VkVideoDecodeH265SessionParametersCreateInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_KHR
+template <> struct LvlTypeMap<VkVideoDecodeH265SessionParametersCreateInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_KHR> {
+ typedef VkVideoDecodeH265SessionParametersCreateInfoKHR Type;
+};
+
+// Map type VkVideoDecodeH265PictureInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PICTURE_INFO_KHR
+template <> struct LvlTypeMap<VkVideoDecodeH265PictureInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PICTURE_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PICTURE_INFO_KHR> {
+ typedef VkVideoDecodeH265PictureInfoKHR Type;
+};
+
+// Map type VkVideoDecodeH265DpbSlotInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_DPB_SLOT_INFO_KHR
+template <> struct LvlTypeMap<VkVideoDecodeH265DpbSlotInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_DPB_SLOT_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_DPB_SLOT_INFO_KHR> {
+ typedef VkVideoDecodeH265DpbSlotInfoKHR Type;
+};
+
// Map type VkDeviceQueueGlobalPriorityCreateInfoKHR to id VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR
template <> struct LvlTypeMap<VkDeviceQueueGlobalPriorityCreateInfoKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR;
@@ -2907,6 +2975,24 @@
typedef VkPipelineExecutableInternalRepresentationKHR Type;
};
+// Map type VkMemoryMapInfoKHR to id VK_STRUCTURE_TYPE_MEMORY_MAP_INFO_KHR
+template <> struct LvlTypeMap<VkMemoryMapInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_MEMORY_MAP_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_MEMORY_MAP_INFO_KHR> {
+ typedef VkMemoryMapInfoKHR Type;
+};
+
+// Map type VkMemoryUnmapInfoKHR to id VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO_KHR
+template <> struct LvlTypeMap<VkMemoryUnmapInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO_KHR> {
+ typedef VkMemoryUnmapInfoKHR Type;
+};
+
// Map type VkPipelineLibraryCreateInfoKHR to id VK_STRUCTURE_TYPE_PIPELINE_LIBRARY_CREATE_INFO_KHR
template <> struct LvlTypeMap<VkPipelineLibraryCreateInfoKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_LIBRARY_CREATE_INFO_KHR;
@@ -2957,6 +3043,17 @@
#endif // VK_ENABLE_BETA_EXTENSIONS
#ifdef VK_ENABLE_BETA_EXTENSIONS
+// Map type VkQueryPoolVideoEncodeFeedbackCreateInfoKHR to id VK_STRUCTURE_TYPE_QUERY_POOL_VIDEO_ENCODE_FEEDBACK_CREATE_INFO_KHR
+template <> struct LvlTypeMap<VkQueryPoolVideoEncodeFeedbackCreateInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_QUERY_POOL_VIDEO_ENCODE_FEEDBACK_CREATE_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_QUERY_POOL_VIDEO_ENCODE_FEEDBACK_CREATE_INFO_KHR> {
+ typedef VkQueryPoolVideoEncodeFeedbackCreateInfoKHR Type;
+};
+
+#endif // VK_ENABLE_BETA_EXTENSIONS
+#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkVideoEncodeUsageInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_USAGE_INFO_KHR
template <> struct LvlTypeMap<VkVideoEncodeUsageInfoKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_USAGE_INFO_KHR;
@@ -2989,6 +3086,61 @@
};
#endif // VK_ENABLE_BETA_EXTENSIONS
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+// Map type VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_QUALITY_LEVEL_INFO_KHR
+template <> struct LvlTypeMap<VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_QUALITY_LEVEL_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_QUALITY_LEVEL_INFO_KHR> {
+ typedef VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR Type;
+};
+
+#endif // VK_ENABLE_BETA_EXTENSIONS
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+// Map type VkVideoEncodeQualityLevelPropertiesKHR to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUALITY_LEVEL_PROPERTIES_KHR
+template <> struct LvlTypeMap<VkVideoEncodeQualityLevelPropertiesKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUALITY_LEVEL_PROPERTIES_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUALITY_LEVEL_PROPERTIES_KHR> {
+ typedef VkVideoEncodeQualityLevelPropertiesKHR Type;
+};
+
+#endif // VK_ENABLE_BETA_EXTENSIONS
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+// Map type VkVideoEncodeQualityLevelInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUALITY_LEVEL_INFO_KHR
+template <> struct LvlTypeMap<VkVideoEncodeQualityLevelInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUALITY_LEVEL_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUALITY_LEVEL_INFO_KHR> {
+ typedef VkVideoEncodeQualityLevelInfoKHR Type;
+};
+
+#endif // VK_ENABLE_BETA_EXTENSIONS
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+// Map type VkVideoEncodeSessionParametersGetInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_PARAMETERS_GET_INFO_KHR
+template <> struct LvlTypeMap<VkVideoEncodeSessionParametersGetInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_PARAMETERS_GET_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_PARAMETERS_GET_INFO_KHR> {
+ typedef VkVideoEncodeSessionParametersGetInfoKHR Type;
+};
+
+#endif // VK_ENABLE_BETA_EXTENSIONS
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+// Map type VkVideoEncodeSessionParametersFeedbackInfoKHR to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_PARAMETERS_FEEDBACK_INFO_KHR
+template <> struct LvlTypeMap<VkVideoEncodeSessionParametersFeedbackInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_PARAMETERS_FEEDBACK_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_PARAMETERS_FEEDBACK_INFO_KHR> {
+ typedef VkVideoEncodeSessionParametersFeedbackInfoKHR Type;
+};
+
+#endif // VK_ENABLE_BETA_EXTENSIONS
// Map type VkQueueFamilyCheckpointProperties2NV to id VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV
template <> struct LvlTypeMap<VkQueueFamilyCheckpointProperties2NV> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV;
@@ -3052,6 +3204,114 @@
typedef VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR Type;
};
+// Map type VkPhysicalDeviceMaintenance5FeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES_KHR
+template <> struct LvlTypeMap<VkPhysicalDeviceMaintenance5FeaturesKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES_KHR> {
+ typedef VkPhysicalDeviceMaintenance5FeaturesKHR Type;
+};
+
+// Map type VkPhysicalDeviceMaintenance5PropertiesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES_KHR
+template <> struct LvlTypeMap<VkPhysicalDeviceMaintenance5PropertiesKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES_KHR> {
+ typedef VkPhysicalDeviceMaintenance5PropertiesKHR Type;
+};
+
+// Map type VkRenderingAreaInfoKHR to id VK_STRUCTURE_TYPE_RENDERING_AREA_INFO_KHR
+template <> struct LvlTypeMap<VkRenderingAreaInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDERING_AREA_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_RENDERING_AREA_INFO_KHR> {
+ typedef VkRenderingAreaInfoKHR Type;
+};
+
+// Map type VkImageSubresource2KHR to id VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2_KHR
+template <> struct LvlTypeMap<VkImageSubresource2KHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2_KHR> {
+ typedef VkImageSubresource2KHR Type;
+};
+
+// Map type VkDeviceImageSubresourceInfoKHR to id VK_STRUCTURE_TYPE_DEVICE_IMAGE_SUBRESOURCE_INFO_KHR
+template <> struct LvlTypeMap<VkDeviceImageSubresourceInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_DEVICE_IMAGE_SUBRESOURCE_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_DEVICE_IMAGE_SUBRESOURCE_INFO_KHR> {
+ typedef VkDeviceImageSubresourceInfoKHR Type;
+};
+
+// Map type VkSubresourceLayout2KHR to id VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2_KHR
+template <> struct LvlTypeMap<VkSubresourceLayout2KHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2_KHR> {
+ typedef VkSubresourceLayout2KHR Type;
+};
+
+// Map type VkPipelineCreateFlags2CreateInfoKHR to id VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO_KHR
+template <> struct LvlTypeMap<VkPipelineCreateFlags2CreateInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO_KHR> {
+ typedef VkPipelineCreateFlags2CreateInfoKHR Type;
+};
+
+// Map type VkBufferUsageFlags2CreateInfoKHR to id VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO_KHR
+template <> struct LvlTypeMap<VkBufferUsageFlags2CreateInfoKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO_KHR> {
+ typedef VkBufferUsageFlags2CreateInfoKHR Type;
+};
+
+// Map type VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_POSITION_FETCH_FEATURES_KHR
+template <> struct LvlTypeMap<VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_POSITION_FETCH_FEATURES_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_POSITION_FETCH_FEATURES_KHR> {
+ typedef VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR Type;
+};
+
+// Map type VkCooperativeMatrixPropertiesKHR to id VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_PROPERTIES_KHR
+template <> struct LvlTypeMap<VkCooperativeMatrixPropertiesKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_PROPERTIES_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_PROPERTIES_KHR> {
+ typedef VkCooperativeMatrixPropertiesKHR Type;
+};
+
+// Map type VkPhysicalDeviceCooperativeMatrixFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_FEATURES_KHR
+template <> struct LvlTypeMap<VkPhysicalDeviceCooperativeMatrixFeaturesKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_FEATURES_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_FEATURES_KHR> {
+ typedef VkPhysicalDeviceCooperativeMatrixFeaturesKHR Type;
+};
+
+// Map type VkPhysicalDeviceCooperativeMatrixPropertiesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_PROPERTIES_KHR
+template <> struct LvlTypeMap<VkPhysicalDeviceCooperativeMatrixPropertiesKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_PROPERTIES_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_PROPERTIES_KHR> {
+ typedef VkPhysicalDeviceCooperativeMatrixPropertiesKHR Type;
+};
+
// Map type VkDebugReportCallbackCreateInfoEXT to id VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT
template <> struct LvlTypeMap<VkDebugReportCallbackCreateInfoEXT> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT;
@@ -3208,6 +3468,28 @@
#endif // VK_ENABLE_BETA_EXTENSIONS
#ifdef VK_ENABLE_BETA_EXTENSIONS
+// Map type VkVideoEncodeH264QualityLevelPropertiesEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_QUALITY_LEVEL_PROPERTIES_EXT
+template <> struct LvlTypeMap<VkVideoEncodeH264QualityLevelPropertiesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_QUALITY_LEVEL_PROPERTIES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_QUALITY_LEVEL_PROPERTIES_EXT> {
+ typedef VkVideoEncodeH264QualityLevelPropertiesEXT Type;
+};
+
+#endif // VK_ENABLE_BETA_EXTENSIONS
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+// Map type VkVideoEncodeH264SessionCreateInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_CREATE_INFO_EXT
+template <> struct LvlTypeMap<VkVideoEncodeH264SessionCreateInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_CREATE_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_CREATE_INFO_EXT> {
+ typedef VkVideoEncodeH264SessionCreateInfoEXT Type;
+};
+
+#endif // VK_ENABLE_BETA_EXTENSIONS
+#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkVideoEncodeH264SessionParametersAddInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_ADD_INFO_EXT
template <> struct LvlTypeMap<VkVideoEncodeH264SessionParametersAddInfoEXT> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_ADD_INFO_EXT;
@@ -3230,24 +3512,24 @@
#endif // VK_ENABLE_BETA_EXTENSIONS
#ifdef VK_ENABLE_BETA_EXTENSIONS
-// Map type VkVideoEncodeH264DpbSlotInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_DPB_SLOT_INFO_EXT
-template <> struct LvlTypeMap<VkVideoEncodeH264DpbSlotInfoEXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_DPB_SLOT_INFO_EXT;
+// Map type VkVideoEncodeH264SessionParametersGetInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_GET_INFO_EXT
+template <> struct LvlTypeMap<VkVideoEncodeH264SessionParametersGetInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_GET_INFO_EXT;
};
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_DPB_SLOT_INFO_EXT> {
- typedef VkVideoEncodeH264DpbSlotInfoEXT Type;
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_GET_INFO_EXT> {
+ typedef VkVideoEncodeH264SessionParametersGetInfoEXT Type;
};
#endif // VK_ENABLE_BETA_EXTENSIONS
#ifdef VK_ENABLE_BETA_EXTENSIONS
-// Map type VkVideoEncodeH264ReferenceListsInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_REFERENCE_LISTS_INFO_EXT
-template <> struct LvlTypeMap<VkVideoEncodeH264ReferenceListsInfoEXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_REFERENCE_LISTS_INFO_EXT;
+// Map type VkVideoEncodeH264SessionParametersFeedbackInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_FEEDBACK_INFO_EXT
+template <> struct LvlTypeMap<VkVideoEncodeH264SessionParametersFeedbackInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_FEEDBACK_INFO_EXT;
};
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_REFERENCE_LISTS_INFO_EXT> {
- typedef VkVideoEncodeH264ReferenceListsInfoEXT Type;
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_FEEDBACK_INFO_EXT> {
+ typedef VkVideoEncodeH264SessionParametersFeedbackInfoEXT Type;
};
#endif // VK_ENABLE_BETA_EXTENSIONS
@@ -3263,24 +3545,24 @@
#endif // VK_ENABLE_BETA_EXTENSIONS
#ifdef VK_ENABLE_BETA_EXTENSIONS
-// Map type VkVideoEncodeH264VclFrameInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_VCL_FRAME_INFO_EXT
-template <> struct LvlTypeMap<VkVideoEncodeH264VclFrameInfoEXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_VCL_FRAME_INFO_EXT;
+// Map type VkVideoEncodeH264PictureInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PICTURE_INFO_EXT
+template <> struct LvlTypeMap<VkVideoEncodeH264PictureInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PICTURE_INFO_EXT;
};
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_VCL_FRAME_INFO_EXT> {
- typedef VkVideoEncodeH264VclFrameInfoEXT Type;
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PICTURE_INFO_EXT> {
+ typedef VkVideoEncodeH264PictureInfoEXT Type;
};
#endif // VK_ENABLE_BETA_EXTENSIONS
#ifdef VK_ENABLE_BETA_EXTENSIONS
-// Map type VkVideoEncodeH264EmitPictureParametersInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_EMIT_PICTURE_PARAMETERS_INFO_EXT
-template <> struct LvlTypeMap<VkVideoEncodeH264EmitPictureParametersInfoEXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_EMIT_PICTURE_PARAMETERS_INFO_EXT;
+// Map type VkVideoEncodeH264DpbSlotInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_DPB_SLOT_INFO_EXT
+template <> struct LvlTypeMap<VkVideoEncodeH264DpbSlotInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_DPB_SLOT_INFO_EXT;
};
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_EMIT_PICTURE_PARAMETERS_INFO_EXT> {
- typedef VkVideoEncodeH264EmitPictureParametersInfoEXT Type;
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_DPB_SLOT_INFO_EXT> {
+ typedef VkVideoEncodeH264DpbSlotInfoEXT Type;
};
#endif // VK_ENABLE_BETA_EXTENSIONS
@@ -3318,6 +3600,17 @@
#endif // VK_ENABLE_BETA_EXTENSIONS
#ifdef VK_ENABLE_BETA_EXTENSIONS
+// Map type VkVideoEncodeH264GopRemainingFrameInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_GOP_REMAINING_FRAME_INFO_EXT
+template <> struct LvlTypeMap<VkVideoEncodeH264GopRemainingFrameInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_GOP_REMAINING_FRAME_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_GOP_REMAINING_FRAME_INFO_EXT> {
+ typedef VkVideoEncodeH264GopRemainingFrameInfoEXT Type;
+};
+
+#endif // VK_ENABLE_BETA_EXTENSIONS
+#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkVideoEncodeH265CapabilitiesEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_CAPABILITIES_EXT
template <> struct LvlTypeMap<VkVideoEncodeH265CapabilitiesEXT> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_CAPABILITIES_EXT;
@@ -3329,6 +3622,28 @@
#endif // VK_ENABLE_BETA_EXTENSIONS
#ifdef VK_ENABLE_BETA_EXTENSIONS
+// Map type VkVideoEncodeH265SessionCreateInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_CREATE_INFO_EXT
+template <> struct LvlTypeMap<VkVideoEncodeH265SessionCreateInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_CREATE_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_CREATE_INFO_EXT> {
+ typedef VkVideoEncodeH265SessionCreateInfoEXT Type;
+};
+
+#endif // VK_ENABLE_BETA_EXTENSIONS
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+// Map type VkVideoEncodeH265QualityLevelPropertiesEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_QUALITY_LEVEL_PROPERTIES_EXT
+template <> struct LvlTypeMap<VkVideoEncodeH265QualityLevelPropertiesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_QUALITY_LEVEL_PROPERTIES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_QUALITY_LEVEL_PROPERTIES_EXT> {
+ typedef VkVideoEncodeH265QualityLevelPropertiesEXT Type;
+};
+
+#endif // VK_ENABLE_BETA_EXTENSIONS
+#ifdef VK_ENABLE_BETA_EXTENSIONS
// Map type VkVideoEncodeH265SessionParametersAddInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_ADD_INFO_EXT
template <> struct LvlTypeMap<VkVideoEncodeH265SessionParametersAddInfoEXT> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_ADD_INFO_EXT;
@@ -3351,24 +3666,24 @@
#endif // VK_ENABLE_BETA_EXTENSIONS
#ifdef VK_ENABLE_BETA_EXTENSIONS
-// Map type VkVideoEncodeH265DpbSlotInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_DPB_SLOT_INFO_EXT
-template <> struct LvlTypeMap<VkVideoEncodeH265DpbSlotInfoEXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_DPB_SLOT_INFO_EXT;
+// Map type VkVideoEncodeH265SessionParametersGetInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_GET_INFO_EXT
+template <> struct LvlTypeMap<VkVideoEncodeH265SessionParametersGetInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_GET_INFO_EXT;
};
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_DPB_SLOT_INFO_EXT> {
- typedef VkVideoEncodeH265DpbSlotInfoEXT Type;
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_GET_INFO_EXT> {
+ typedef VkVideoEncodeH265SessionParametersGetInfoEXT Type;
};
#endif // VK_ENABLE_BETA_EXTENSIONS
#ifdef VK_ENABLE_BETA_EXTENSIONS
-// Map type VkVideoEncodeH265ReferenceListsInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_REFERENCE_LISTS_INFO_EXT
-template <> struct LvlTypeMap<VkVideoEncodeH265ReferenceListsInfoEXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_REFERENCE_LISTS_INFO_EXT;
+// Map type VkVideoEncodeH265SessionParametersFeedbackInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_FEEDBACK_INFO_EXT
+template <> struct LvlTypeMap<VkVideoEncodeH265SessionParametersFeedbackInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_FEEDBACK_INFO_EXT;
};
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_REFERENCE_LISTS_INFO_EXT> {
- typedef VkVideoEncodeH265ReferenceListsInfoEXT Type;
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_FEEDBACK_INFO_EXT> {
+ typedef VkVideoEncodeH265SessionParametersFeedbackInfoEXT Type;
};
#endif // VK_ENABLE_BETA_EXTENSIONS
@@ -3384,24 +3699,24 @@
#endif // VK_ENABLE_BETA_EXTENSIONS
#ifdef VK_ENABLE_BETA_EXTENSIONS
-// Map type VkVideoEncodeH265VclFrameInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_VCL_FRAME_INFO_EXT
-template <> struct LvlTypeMap<VkVideoEncodeH265VclFrameInfoEXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_VCL_FRAME_INFO_EXT;
+// Map type VkVideoEncodeH265PictureInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PICTURE_INFO_EXT
+template <> struct LvlTypeMap<VkVideoEncodeH265PictureInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PICTURE_INFO_EXT;
};
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_VCL_FRAME_INFO_EXT> {
- typedef VkVideoEncodeH265VclFrameInfoEXT Type;
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PICTURE_INFO_EXT> {
+ typedef VkVideoEncodeH265PictureInfoEXT Type;
};
#endif // VK_ENABLE_BETA_EXTENSIONS
#ifdef VK_ENABLE_BETA_EXTENSIONS
-// Map type VkVideoEncodeH265EmitPictureParametersInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_EMIT_PICTURE_PARAMETERS_INFO_EXT
-template <> struct LvlTypeMap<VkVideoEncodeH265EmitPictureParametersInfoEXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_EMIT_PICTURE_PARAMETERS_INFO_EXT;
+// Map type VkVideoEncodeH265DpbSlotInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_DPB_SLOT_INFO_EXT
+template <> struct LvlTypeMap<VkVideoEncodeH265DpbSlotInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_DPB_SLOT_INFO_EXT;
};
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_EMIT_PICTURE_PARAMETERS_INFO_EXT> {
- typedef VkVideoEncodeH265EmitPictureParametersInfoEXT Type;
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_DPB_SLOT_INFO_EXT> {
+ typedef VkVideoEncodeH265DpbSlotInfoEXT Type;
};
#endif // VK_ENABLE_BETA_EXTENSIONS
@@ -3439,68 +3754,13 @@
#endif // VK_ENABLE_BETA_EXTENSIONS
#ifdef VK_ENABLE_BETA_EXTENSIONS
-// Map type VkVideoDecodeH264ProfileInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PROFILE_INFO_EXT
-template <> struct LvlTypeMap<VkVideoDecodeH264ProfileInfoEXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PROFILE_INFO_EXT;
+// Map type VkVideoEncodeH265GopRemainingFrameInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_GOP_REMAINING_FRAME_INFO_EXT
+template <> struct LvlTypeMap<VkVideoEncodeH265GopRemainingFrameInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_GOP_REMAINING_FRAME_INFO_EXT;
};
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PROFILE_INFO_EXT> {
- typedef VkVideoDecodeH264ProfileInfoEXT Type;
-};
-
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-// Map type VkVideoDecodeH264CapabilitiesEXT to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_CAPABILITIES_EXT
-template <> struct LvlTypeMap<VkVideoDecodeH264CapabilitiesEXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_CAPABILITIES_EXT;
-};
-
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_CAPABILITIES_EXT> {
- typedef VkVideoDecodeH264CapabilitiesEXT Type;
-};
-
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-// Map type VkVideoDecodeH264SessionParametersAddInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_ADD_INFO_EXT
-template <> struct LvlTypeMap<VkVideoDecodeH264SessionParametersAddInfoEXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_ADD_INFO_EXT;
-};
-
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_ADD_INFO_EXT> {
- typedef VkVideoDecodeH264SessionParametersAddInfoEXT Type;
-};
-
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-// Map type VkVideoDecodeH264SessionParametersCreateInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_CREATE_INFO_EXT
-template <> struct LvlTypeMap<VkVideoDecodeH264SessionParametersCreateInfoEXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_CREATE_INFO_EXT;
-};
-
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_CREATE_INFO_EXT> {
- typedef VkVideoDecodeH264SessionParametersCreateInfoEXT Type;
-};
-
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-// Map type VkVideoDecodeH264PictureInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PICTURE_INFO_EXT
-template <> struct LvlTypeMap<VkVideoDecodeH264PictureInfoEXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PICTURE_INFO_EXT;
-};
-
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PICTURE_INFO_EXT> {
- typedef VkVideoDecodeH264PictureInfoEXT Type;
-};
-
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-// Map type VkVideoDecodeH264DpbSlotInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO_EXT
-template <> struct LvlTypeMap<VkVideoDecodeH264DpbSlotInfoEXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO_EXT;
-};
-
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO_EXT> {
- typedef VkVideoDecodeH264DpbSlotInfoEXT Type;
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_GOP_REMAINING_FRAME_INFO_EXT> {
+ typedef VkVideoEncodeH265GopRemainingFrameInfoEXT Type;
};
#endif // VK_ENABLE_BETA_EXTENSIONS
@@ -3964,6 +4224,61 @@
};
#endif // VK_USE_PLATFORM_ANDROID_KHR
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+// Map type VkPhysicalDeviceShaderEnqueueFeaturesAMDX to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ENQUEUE_FEATURES_AMDX
+template <> struct LvlTypeMap<VkPhysicalDeviceShaderEnqueueFeaturesAMDX> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ENQUEUE_FEATURES_AMDX;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ENQUEUE_FEATURES_AMDX> {
+ typedef VkPhysicalDeviceShaderEnqueueFeaturesAMDX Type;
+};
+
+#endif // VK_ENABLE_BETA_EXTENSIONS
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+// Map type VkPhysicalDeviceShaderEnqueuePropertiesAMDX to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ENQUEUE_PROPERTIES_AMDX
+template <> struct LvlTypeMap<VkPhysicalDeviceShaderEnqueuePropertiesAMDX> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ENQUEUE_PROPERTIES_AMDX;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ENQUEUE_PROPERTIES_AMDX> {
+ typedef VkPhysicalDeviceShaderEnqueuePropertiesAMDX Type;
+};
+
+#endif // VK_ENABLE_BETA_EXTENSIONS
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+// Map type VkExecutionGraphPipelineScratchSizeAMDX to id VK_STRUCTURE_TYPE_EXECUTION_GRAPH_PIPELINE_SCRATCH_SIZE_AMDX
+template <> struct LvlTypeMap<VkExecutionGraphPipelineScratchSizeAMDX> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_EXECUTION_GRAPH_PIPELINE_SCRATCH_SIZE_AMDX;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_EXECUTION_GRAPH_PIPELINE_SCRATCH_SIZE_AMDX> {
+ typedef VkExecutionGraphPipelineScratchSizeAMDX Type;
+};
+
+#endif // VK_ENABLE_BETA_EXTENSIONS
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+// Map type VkExecutionGraphPipelineCreateInfoAMDX to id VK_STRUCTURE_TYPE_EXECUTION_GRAPH_PIPELINE_CREATE_INFO_AMDX
+template <> struct LvlTypeMap<VkExecutionGraphPipelineCreateInfoAMDX> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_EXECUTION_GRAPH_PIPELINE_CREATE_INFO_AMDX;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_EXECUTION_GRAPH_PIPELINE_CREATE_INFO_AMDX> {
+ typedef VkExecutionGraphPipelineCreateInfoAMDX Type;
+};
+
+#endif // VK_ENABLE_BETA_EXTENSIONS
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+// Map type VkPipelineShaderStageNodeCreateInfoAMDX to id VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_NODE_CREATE_INFO_AMDX
+template <> struct LvlTypeMap<VkPipelineShaderStageNodeCreateInfoAMDX> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_NODE_CREATE_INFO_AMDX;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_NODE_CREATE_INFO_AMDX> {
+ typedef VkPipelineShaderStageNodeCreateInfoAMDX Type;
+};
+
+#endif // VK_ENABLE_BETA_EXTENSIONS
// Map type VkSampleLocationsInfoEXT to id VK_STRUCTURE_TYPE_SAMPLE_LOCATIONS_INFO_EXT
template <> struct LvlTypeMap<VkSampleLocationsInfoEXT> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_SAMPLE_LOCATIONS_INFO_EXT;
@@ -4369,72 +4684,6 @@
typedef VkPhysicalDeviceShaderCorePropertiesAMD Type;
};
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-// Map type VkVideoDecodeH265ProfileInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PROFILE_INFO_EXT
-template <> struct LvlTypeMap<VkVideoDecodeH265ProfileInfoEXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PROFILE_INFO_EXT;
-};
-
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PROFILE_INFO_EXT> {
- typedef VkVideoDecodeH265ProfileInfoEXT Type;
-};
-
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-// Map type VkVideoDecodeH265CapabilitiesEXT to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_CAPABILITIES_EXT
-template <> struct LvlTypeMap<VkVideoDecodeH265CapabilitiesEXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_CAPABILITIES_EXT;
-};
-
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_CAPABILITIES_EXT> {
- typedef VkVideoDecodeH265CapabilitiesEXT Type;
-};
-
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-// Map type VkVideoDecodeH265SessionParametersAddInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_ADD_INFO_EXT
-template <> struct LvlTypeMap<VkVideoDecodeH265SessionParametersAddInfoEXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_ADD_INFO_EXT;
-};
-
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_ADD_INFO_EXT> {
- typedef VkVideoDecodeH265SessionParametersAddInfoEXT Type;
-};
-
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-// Map type VkVideoDecodeH265SessionParametersCreateInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_EXT
-template <> struct LvlTypeMap<VkVideoDecodeH265SessionParametersCreateInfoEXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_EXT;
-};
-
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_EXT> {
- typedef VkVideoDecodeH265SessionParametersCreateInfoEXT Type;
-};
-
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-// Map type VkVideoDecodeH265PictureInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PICTURE_INFO_EXT
-template <> struct LvlTypeMap<VkVideoDecodeH265PictureInfoEXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PICTURE_INFO_EXT;
-};
-
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PICTURE_INFO_EXT> {
- typedef VkVideoDecodeH265PictureInfoEXT Type;
-};
-
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-// Map type VkVideoDecodeH265DpbSlotInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_DPB_SLOT_INFO_EXT
-template <> struct LvlTypeMap<VkVideoDecodeH265DpbSlotInfoEXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_DPB_SLOT_INFO_EXT;
-};
-
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_DPB_SLOT_INFO_EXT> {
- typedef VkVideoDecodeH265DpbSlotInfoEXT Type;
-};
-
-#endif // VK_ENABLE_BETA_EXTENSIONS
// Map type VkDeviceMemoryOverallocationCreateInfoAMD to id VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD
template <> struct LvlTypeMap<VkDeviceMemoryOverallocationCreateInfoAMD> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD;
@@ -4978,6 +5227,96 @@
typedef VkPhysicalDeviceExtendedDynamicStateFeaturesEXT Type;
};
+// Map type VkPhysicalDeviceHostImageCopyFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_FEATURES_EXT
+template <> struct LvlTypeMap<VkPhysicalDeviceHostImageCopyFeaturesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_FEATURES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_FEATURES_EXT> {
+ typedef VkPhysicalDeviceHostImageCopyFeaturesEXT Type;
+};
+
+// Map type VkPhysicalDeviceHostImageCopyPropertiesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_PROPERTIES_EXT
+template <> struct LvlTypeMap<VkPhysicalDeviceHostImageCopyPropertiesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_PROPERTIES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_PROPERTIES_EXT> {
+ typedef VkPhysicalDeviceHostImageCopyPropertiesEXT Type;
+};
+
+// Map type VkMemoryToImageCopyEXT to id VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY_EXT
+template <> struct LvlTypeMap<VkMemoryToImageCopyEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY_EXT> {
+ typedef VkMemoryToImageCopyEXT Type;
+};
+
+// Map type VkImageToMemoryCopyEXT to id VK_STRUCTURE_TYPE_IMAGE_TO_MEMORY_COPY_EXT
+template <> struct LvlTypeMap<VkImageToMemoryCopyEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_IMAGE_TO_MEMORY_COPY_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_IMAGE_TO_MEMORY_COPY_EXT> {
+ typedef VkImageToMemoryCopyEXT Type;
+};
+
+// Map type VkCopyMemoryToImageInfoEXT to id VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INFO_EXT
+template <> struct LvlTypeMap<VkCopyMemoryToImageInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INFO_EXT> {
+ typedef VkCopyMemoryToImageInfoEXT Type;
+};
+
+// Map type VkCopyImageToMemoryInfoEXT to id VK_STRUCTURE_TYPE_COPY_IMAGE_TO_MEMORY_INFO_EXT
+template <> struct LvlTypeMap<VkCopyImageToMemoryInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_COPY_IMAGE_TO_MEMORY_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_COPY_IMAGE_TO_MEMORY_INFO_EXT> {
+ typedef VkCopyImageToMemoryInfoEXT Type;
+};
+
+// Map type VkCopyImageToImageInfoEXT to id VK_STRUCTURE_TYPE_COPY_IMAGE_TO_IMAGE_INFO_EXT
+template <> struct LvlTypeMap<VkCopyImageToImageInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_COPY_IMAGE_TO_IMAGE_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_COPY_IMAGE_TO_IMAGE_INFO_EXT> {
+ typedef VkCopyImageToImageInfoEXT Type;
+};
+
+// Map type VkHostImageLayoutTransitionInfoEXT to id VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO_EXT
+template <> struct LvlTypeMap<VkHostImageLayoutTransitionInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO_EXT> {
+ typedef VkHostImageLayoutTransitionInfoEXT Type;
+};
+
+// Map type VkSubresourceHostMemcpySizeEXT to id VK_STRUCTURE_TYPE_SUBRESOURCE_HOST_MEMCPY_SIZE_EXT
+template <> struct LvlTypeMap<VkSubresourceHostMemcpySizeEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_SUBRESOURCE_HOST_MEMCPY_SIZE_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SUBRESOURCE_HOST_MEMCPY_SIZE_EXT> {
+ typedef VkSubresourceHostMemcpySizeEXT Type;
+};
+
+// Map type VkHostImageCopyDevicePerformanceQueryEXT to id VK_STRUCTURE_TYPE_HOST_IMAGE_COPY_DEVICE_PERFORMANCE_QUERY_EXT
+template <> struct LvlTypeMap<VkHostImageCopyDevicePerformanceQueryEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_HOST_IMAGE_COPY_DEVICE_PERFORMANCE_QUERY_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_HOST_IMAGE_COPY_DEVICE_PERFORMANCE_QUERY_EXT> {
+ typedef VkHostImageCopyDevicePerformanceQueryEXT Type;
+};
+
// Map type VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_2_FEATURES_EXT
template <> struct LvlTypeMap<VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_2_FEATURES_EXT;
@@ -4987,6 +5326,87 @@
typedef VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT Type;
};
+// Map type VkSurfacePresentModeEXT to id VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_EXT
+template <> struct LvlTypeMap<VkSurfacePresentModeEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_EXT> {
+ typedef VkSurfacePresentModeEXT Type;
+};
+
+// Map type VkSurfacePresentScalingCapabilitiesEXT to id VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_EXT
+template <> struct LvlTypeMap<VkSurfacePresentScalingCapabilitiesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_EXT> {
+ typedef VkSurfacePresentScalingCapabilitiesEXT Type;
+};
+
+// Map type VkSurfacePresentModeCompatibilityEXT to id VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_EXT
+template <> struct LvlTypeMap<VkSurfacePresentModeCompatibilityEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_EXT> {
+ typedef VkSurfacePresentModeCompatibilityEXT Type;
+};
+
+// Map type VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_EXT
+template <> struct LvlTypeMap<VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_EXT> {
+ typedef VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT Type;
+};
+
+// Map type VkSwapchainPresentFenceInfoEXT to id VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_FENCE_INFO_EXT
+template <> struct LvlTypeMap<VkSwapchainPresentFenceInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_FENCE_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_FENCE_INFO_EXT> {
+ typedef VkSwapchainPresentFenceInfoEXT Type;
+};
+
+// Map type VkSwapchainPresentModesCreateInfoEXT to id VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODES_CREATE_INFO_EXT
+template <> struct LvlTypeMap<VkSwapchainPresentModesCreateInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODES_CREATE_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODES_CREATE_INFO_EXT> {
+ typedef VkSwapchainPresentModesCreateInfoEXT Type;
+};
+
+// Map type VkSwapchainPresentModeInfoEXT to id VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODE_INFO_EXT
+template <> struct LvlTypeMap<VkSwapchainPresentModeInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODE_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODE_INFO_EXT> {
+ typedef VkSwapchainPresentModeInfoEXT Type;
+};
+
+// Map type VkSwapchainPresentScalingCreateInfoEXT to id VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_SCALING_CREATE_INFO_EXT
+template <> struct LvlTypeMap<VkSwapchainPresentScalingCreateInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_SCALING_CREATE_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_SCALING_CREATE_INFO_EXT> {
+ typedef VkSwapchainPresentScalingCreateInfoEXT Type;
+};
+
+// Map type VkReleaseSwapchainImagesInfoEXT to id VK_STRUCTURE_TYPE_RELEASE_SWAPCHAIN_IMAGES_INFO_EXT
+template <> struct LvlTypeMap<VkReleaseSwapchainImagesInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_RELEASE_SWAPCHAIN_IMAGES_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_RELEASE_SWAPCHAIN_IMAGES_INFO_EXT> {
+ typedef VkReleaseSwapchainImagesInfoEXT Type;
+};
+
// Map type VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_NV
template <> struct LvlTypeMap<VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_NV;
@@ -5104,6 +5524,33 @@
typedef VkCommandBufferInheritanceRenderPassTransformInfoQCOM Type;
};
+// Map type VkPhysicalDeviceDepthBiasControlFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_BIAS_CONTROL_FEATURES_EXT
+template <> struct LvlTypeMap<VkPhysicalDeviceDepthBiasControlFeaturesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_BIAS_CONTROL_FEATURES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_BIAS_CONTROL_FEATURES_EXT> {
+ typedef VkPhysicalDeviceDepthBiasControlFeaturesEXT Type;
+};
+
+// Map type VkDepthBiasInfoEXT to id VK_STRUCTURE_TYPE_DEPTH_BIAS_INFO_EXT
+template <> struct LvlTypeMap<VkDepthBiasInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_DEPTH_BIAS_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_DEPTH_BIAS_INFO_EXT> {
+ typedef VkDepthBiasInfoEXT Type;
+};
+
+// Map type VkDepthBiasRepresentationInfoEXT to id VK_STRUCTURE_TYPE_DEPTH_BIAS_REPRESENTATION_INFO_EXT
+template <> struct LvlTypeMap<VkDepthBiasRepresentationInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_DEPTH_BIAS_REPRESENTATION_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_DEPTH_BIAS_REPRESENTATION_INFO_EXT> {
+ typedef VkDepthBiasRepresentationInfoEXT Type;
+};
+
// Map type VkPhysicalDeviceDeviceMemoryReportFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_MEMORY_REPORT_FEATURES_EXT
template <> struct LvlTypeMap<VkPhysicalDeviceDeviceMemoryReportFeaturesEXT> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_MEMORY_REPORT_FEATURES_EXT;
@@ -5221,6 +5668,15 @@
typedef VkDeviceDiagnosticsConfigCreateInfoNV Type;
};
+// Map type VkQueryLowLatencySupportNV to id VK_STRUCTURE_TYPE_QUERY_LOW_LATENCY_SUPPORT_NV
+template <> struct LvlTypeMap<VkQueryLowLatencySupportNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_QUERY_LOW_LATENCY_SUPPORT_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_QUERY_LOW_LATENCY_SUPPORT_NV> {
+ typedef VkQueryLowLatencySupportNV Type;
+};
+
#ifdef VK_USE_PLATFORM_METAL_EXT
// Map type VkExportMetalObjectCreateInfoEXT to id VK_STRUCTURE_TYPE_EXPORT_METAL_OBJECT_CREATE_INFO_EXT
template <> struct LvlTypeMap<VkExportMetalObjectCreateInfoEXT> {
@@ -5353,6 +5809,123 @@
};
#endif // VK_USE_PLATFORM_METAL_EXT
+// Map type VkPhysicalDeviceDescriptorBufferPropertiesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_PROPERTIES_EXT
+template <> struct LvlTypeMap<VkPhysicalDeviceDescriptorBufferPropertiesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_PROPERTIES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_PROPERTIES_EXT> {
+ typedef VkPhysicalDeviceDescriptorBufferPropertiesEXT Type;
+};
+
+// Map type VkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_DENSITY_MAP_PROPERTIES_EXT
+template <> struct LvlTypeMap<VkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_DENSITY_MAP_PROPERTIES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_DENSITY_MAP_PROPERTIES_EXT> {
+ typedef VkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT Type;
+};
+
+// Map type VkPhysicalDeviceDescriptorBufferFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_FEATURES_EXT
+template <> struct LvlTypeMap<VkPhysicalDeviceDescriptorBufferFeaturesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_FEATURES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_FEATURES_EXT> {
+ typedef VkPhysicalDeviceDescriptorBufferFeaturesEXT Type;
+};
+
+// Map type VkDescriptorAddressInfoEXT to id VK_STRUCTURE_TYPE_DESCRIPTOR_ADDRESS_INFO_EXT
+template <> struct LvlTypeMap<VkDescriptorAddressInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_DESCRIPTOR_ADDRESS_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_DESCRIPTOR_ADDRESS_INFO_EXT> {
+ typedef VkDescriptorAddressInfoEXT Type;
+};
+
+// Map type VkDescriptorBufferBindingInfoEXT to id VK_STRUCTURE_TYPE_DESCRIPTOR_BUFFER_BINDING_INFO_EXT
+template <> struct LvlTypeMap<VkDescriptorBufferBindingInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_DESCRIPTOR_BUFFER_BINDING_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_DESCRIPTOR_BUFFER_BINDING_INFO_EXT> {
+ typedef VkDescriptorBufferBindingInfoEXT Type;
+};
+
+// Map type VkDescriptorBufferBindingPushDescriptorBufferHandleEXT to id VK_STRUCTURE_TYPE_DESCRIPTOR_BUFFER_BINDING_PUSH_DESCRIPTOR_BUFFER_HANDLE_EXT
+template <> struct LvlTypeMap<VkDescriptorBufferBindingPushDescriptorBufferHandleEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_DESCRIPTOR_BUFFER_BINDING_PUSH_DESCRIPTOR_BUFFER_HANDLE_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_DESCRIPTOR_BUFFER_BINDING_PUSH_DESCRIPTOR_BUFFER_HANDLE_EXT> {
+ typedef VkDescriptorBufferBindingPushDescriptorBufferHandleEXT Type;
+};
+
+// Map type VkDescriptorGetInfoEXT to id VK_STRUCTURE_TYPE_DESCRIPTOR_GET_INFO_EXT
+template <> struct LvlTypeMap<VkDescriptorGetInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_DESCRIPTOR_GET_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_DESCRIPTOR_GET_INFO_EXT> {
+ typedef VkDescriptorGetInfoEXT Type;
+};
+
+// Map type VkBufferCaptureDescriptorDataInfoEXT to id VK_STRUCTURE_TYPE_BUFFER_CAPTURE_DESCRIPTOR_DATA_INFO_EXT
+template <> struct LvlTypeMap<VkBufferCaptureDescriptorDataInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_BUFFER_CAPTURE_DESCRIPTOR_DATA_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_BUFFER_CAPTURE_DESCRIPTOR_DATA_INFO_EXT> {
+ typedef VkBufferCaptureDescriptorDataInfoEXT Type;
+};
+
+// Map type VkImageCaptureDescriptorDataInfoEXT to id VK_STRUCTURE_TYPE_IMAGE_CAPTURE_DESCRIPTOR_DATA_INFO_EXT
+template <> struct LvlTypeMap<VkImageCaptureDescriptorDataInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_IMAGE_CAPTURE_DESCRIPTOR_DATA_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_IMAGE_CAPTURE_DESCRIPTOR_DATA_INFO_EXT> {
+ typedef VkImageCaptureDescriptorDataInfoEXT Type;
+};
+
+// Map type VkImageViewCaptureDescriptorDataInfoEXT to id VK_STRUCTURE_TYPE_IMAGE_VIEW_CAPTURE_DESCRIPTOR_DATA_INFO_EXT
+template <> struct LvlTypeMap<VkImageViewCaptureDescriptorDataInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CAPTURE_DESCRIPTOR_DATA_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_IMAGE_VIEW_CAPTURE_DESCRIPTOR_DATA_INFO_EXT> {
+ typedef VkImageViewCaptureDescriptorDataInfoEXT Type;
+};
+
+// Map type VkSamplerCaptureDescriptorDataInfoEXT to id VK_STRUCTURE_TYPE_SAMPLER_CAPTURE_DESCRIPTOR_DATA_INFO_EXT
+template <> struct LvlTypeMap<VkSamplerCaptureDescriptorDataInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_SAMPLER_CAPTURE_DESCRIPTOR_DATA_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SAMPLER_CAPTURE_DESCRIPTOR_DATA_INFO_EXT> {
+ typedef VkSamplerCaptureDescriptorDataInfoEXT Type;
+};
+
+// Map type VkOpaqueCaptureDescriptorDataCreateInfoEXT to id VK_STRUCTURE_TYPE_OPAQUE_CAPTURE_DESCRIPTOR_DATA_CREATE_INFO_EXT
+template <> struct LvlTypeMap<VkOpaqueCaptureDescriptorDataCreateInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_OPAQUE_CAPTURE_DESCRIPTOR_DATA_CREATE_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_OPAQUE_CAPTURE_DESCRIPTOR_DATA_CREATE_INFO_EXT> {
+ typedef VkOpaqueCaptureDescriptorDataCreateInfoEXT Type;
+};
+
+// Map type VkAccelerationStructureCaptureDescriptorDataInfoEXT to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CAPTURE_DESCRIPTOR_DATA_INFO_EXT
+template <> struct LvlTypeMap<VkAccelerationStructureCaptureDescriptorDataInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CAPTURE_DESCRIPTOR_DATA_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CAPTURE_DESCRIPTOR_DATA_INFO_EXT> {
+ typedef VkAccelerationStructureCaptureDescriptorDataInfoEXT Type;
+};
+
// Map type VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GRAPHICS_PIPELINE_LIBRARY_FEATURES_EXT
template <> struct LvlTypeMap<VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GRAPHICS_PIPELINE_LIBRARY_FEATURES_EXT;
@@ -5497,24 +6070,6 @@
typedef VkImageCompressionControlEXT Type;
};
-// Map type VkSubresourceLayout2EXT to id VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2_EXT
-template <> struct LvlTypeMap<VkSubresourceLayout2EXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2_EXT;
-};
-
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2_EXT> {
- typedef VkSubresourceLayout2EXT Type;
-};
-
-// Map type VkImageSubresource2EXT to id VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2_EXT
-template <> struct LvlTypeMap<VkImageSubresource2EXT> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2_EXT;
-};
-
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2_EXT> {
- typedef VkImageSubresource2EXT Type;
-};
-
// Map type VkImageCompressionPropertiesEXT to id VK_STRUCTURE_TYPE_IMAGE_COMPRESSION_PROPERTIES_EXT
template <> struct LvlTypeMap<VkImageCompressionPropertiesEXT> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_IMAGE_COMPRESSION_PROPERTIES_EXT;
@@ -5934,6 +6489,24 @@
typedef VkPhysicalDevicePipelinePropertiesFeaturesEXT Type;
};
+// Map type VkPhysicalDeviceFrameBoundaryFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAME_BOUNDARY_FEATURES_EXT
+template <> struct LvlTypeMap<VkPhysicalDeviceFrameBoundaryFeaturesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAME_BOUNDARY_FEATURES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAME_BOUNDARY_FEATURES_EXT> {
+ typedef VkPhysicalDeviceFrameBoundaryFeaturesEXT Type;
+};
+
+// Map type VkFrameBoundaryEXT to id VK_STRUCTURE_TYPE_FRAME_BOUNDARY_EXT
+template <> struct LvlTypeMap<VkFrameBoundaryEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_FRAME_BOUNDARY_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_FRAME_BOUNDARY_EXT> {
+ typedef VkFrameBoundaryEXT Type;
+};
+
// Map type VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_FEATURES_EXT
template <> struct LvlTypeMap<VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_FEATURES_EXT;
@@ -6053,6 +6626,24 @@
typedef VkPhysicalDeviceImage2DViewOf3DFeaturesEXT Type;
};
+// Map type VkPhysicalDeviceShaderTileImageFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TILE_IMAGE_FEATURES_EXT
+template <> struct LvlTypeMap<VkPhysicalDeviceShaderTileImageFeaturesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TILE_IMAGE_FEATURES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TILE_IMAGE_FEATURES_EXT> {
+ typedef VkPhysicalDeviceShaderTileImageFeaturesEXT Type;
+};
+
+// Map type VkPhysicalDeviceShaderTileImagePropertiesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TILE_IMAGE_PROPERTIES_EXT
+template <> struct LvlTypeMap<VkPhysicalDeviceShaderTileImagePropertiesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TILE_IMAGE_PROPERTIES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TILE_IMAGE_PROPERTIES_EXT> {
+ typedef VkPhysicalDeviceShaderTileImagePropertiesEXT Type;
+};
+
// Map type VkMicromapBuildInfoEXT to id VK_STRUCTURE_TYPE_MICROMAP_BUILD_INFO_EXT
template <> struct LvlTypeMap<VkMicromapBuildInfoEXT> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_MICROMAP_BUILD_INFO_EXT;
@@ -6143,6 +6734,57 @@
typedef VkAccelerationStructureTrianglesOpacityMicromapEXT Type;
};
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+// Map type VkPhysicalDeviceDisplacementMicromapFeaturesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISPLACEMENT_MICROMAP_FEATURES_NV
+template <> struct LvlTypeMap<VkPhysicalDeviceDisplacementMicromapFeaturesNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISPLACEMENT_MICROMAP_FEATURES_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISPLACEMENT_MICROMAP_FEATURES_NV> {
+ typedef VkPhysicalDeviceDisplacementMicromapFeaturesNV Type;
+};
+
+#endif // VK_ENABLE_BETA_EXTENSIONS
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+// Map type VkPhysicalDeviceDisplacementMicromapPropertiesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISPLACEMENT_MICROMAP_PROPERTIES_NV
+template <> struct LvlTypeMap<VkPhysicalDeviceDisplacementMicromapPropertiesNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISPLACEMENT_MICROMAP_PROPERTIES_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISPLACEMENT_MICROMAP_PROPERTIES_NV> {
+ typedef VkPhysicalDeviceDisplacementMicromapPropertiesNV Type;
+};
+
+#endif // VK_ENABLE_BETA_EXTENSIONS
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+// Map type VkAccelerationStructureTrianglesDisplacementMicromapNV to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_TRIANGLES_DISPLACEMENT_MICROMAP_NV
+template <> struct LvlTypeMap<VkAccelerationStructureTrianglesDisplacementMicromapNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_TRIANGLES_DISPLACEMENT_MICROMAP_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_TRIANGLES_DISPLACEMENT_MICROMAP_NV> {
+ typedef VkAccelerationStructureTrianglesDisplacementMicromapNV Type;
+};
+
+#endif // VK_ENABLE_BETA_EXTENSIONS
+// Map type VkPhysicalDeviceClusterCullingShaderFeaturesHUAWEI to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_FEATURES_HUAWEI
+template <> struct LvlTypeMap<VkPhysicalDeviceClusterCullingShaderFeaturesHUAWEI> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_FEATURES_HUAWEI;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_FEATURES_HUAWEI> {
+ typedef VkPhysicalDeviceClusterCullingShaderFeaturesHUAWEI Type;
+};
+
+// Map type VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_PROPERTIES_HUAWEI
+template <> struct LvlTypeMap<VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_PROPERTIES_HUAWEI;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_PROPERTIES_HUAWEI> {
+ typedef VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI Type;
+};
+
// Map type VkPhysicalDeviceBorderColorSwizzleFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT
template <> struct LvlTypeMap<VkPhysicalDeviceBorderColorSwizzleFeaturesEXT> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT;
@@ -6170,6 +6812,33 @@
typedef VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT Type;
};
+// Map type VkPhysicalDeviceShaderCorePropertiesARM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_ARM
+template <> struct LvlTypeMap<VkPhysicalDeviceShaderCorePropertiesARM> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_ARM;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_ARM> {
+ typedef VkPhysicalDeviceShaderCorePropertiesARM Type;
+};
+
+// Map type VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_SLICED_VIEW_OF_3D_FEATURES_EXT
+template <> struct LvlTypeMap<VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_SLICED_VIEW_OF_3D_FEATURES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_SLICED_VIEW_OF_3D_FEATURES_EXT> {
+ typedef VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT Type;
+};
+
+// Map type VkImageViewSlicedCreateInfoEXT to id VK_STRUCTURE_TYPE_IMAGE_VIEW_SLICED_CREATE_INFO_EXT
+template <> struct LvlTypeMap<VkImageViewSlicedCreateInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_IMAGE_VIEW_SLICED_CREATE_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_IMAGE_VIEW_SLICED_CREATE_INFO_EXT> {
+ typedef VkImageViewSlicedCreateInfoEXT Type;
+};
+
// Map type VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_SET_HOST_MAPPING_FEATURES_VALVE
template <> struct LvlTypeMap<VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_SET_HOST_MAPPING_FEATURES_VALVE;
@@ -6242,6 +6911,69 @@
typedef VkSubpassFragmentDensityMapOffsetEndInfoQCOM Type;
};
+// Map type VkPhysicalDeviceCopyMemoryIndirectFeaturesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_FEATURES_NV
+template <> struct LvlTypeMap<VkPhysicalDeviceCopyMemoryIndirectFeaturesNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_FEATURES_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_FEATURES_NV> {
+ typedef VkPhysicalDeviceCopyMemoryIndirectFeaturesNV Type;
+};
+
+// Map type VkPhysicalDeviceCopyMemoryIndirectPropertiesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_PROPERTIES_NV
+template <> struct LvlTypeMap<VkPhysicalDeviceCopyMemoryIndirectPropertiesNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_PROPERTIES_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_PROPERTIES_NV> {
+ typedef VkPhysicalDeviceCopyMemoryIndirectPropertiesNV Type;
+};
+
+// Map type VkPhysicalDeviceMemoryDecompressionFeaturesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_FEATURES_NV
+template <> struct LvlTypeMap<VkPhysicalDeviceMemoryDecompressionFeaturesNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_FEATURES_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_FEATURES_NV> {
+ typedef VkPhysicalDeviceMemoryDecompressionFeaturesNV Type;
+};
+
+// Map type VkPhysicalDeviceMemoryDecompressionPropertiesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_NV
+template <> struct LvlTypeMap<VkPhysicalDeviceMemoryDecompressionPropertiesNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_NV> {
+ typedef VkPhysicalDeviceMemoryDecompressionPropertiesNV Type;
+};
+
+// Map type VkPhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_COMPUTE_FEATURES_NV
+template <> struct LvlTypeMap<VkPhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_COMPUTE_FEATURES_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_COMPUTE_FEATURES_NV> {
+ typedef VkPhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV Type;
+};
+
+// Map type VkComputePipelineIndirectBufferInfoNV to id VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_INDIRECT_BUFFER_INFO_NV
+template <> struct LvlTypeMap<VkComputePipelineIndirectBufferInfoNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_INDIRECT_BUFFER_INFO_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_INDIRECT_BUFFER_INFO_NV> {
+ typedef VkComputePipelineIndirectBufferInfoNV Type;
+};
+
+// Map type VkPipelineIndirectDeviceAddressInfoNV to id VK_STRUCTURE_TYPE_PIPELINE_INDIRECT_DEVICE_ADDRESS_INFO_NV
+template <> struct LvlTypeMap<VkPipelineIndirectDeviceAddressInfoNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_INDIRECT_DEVICE_ADDRESS_INFO_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PIPELINE_INDIRECT_DEVICE_ADDRESS_INFO_NV> {
+ typedef VkPipelineIndirectDeviceAddressInfoNV Type;
+};
+
// Map type VkPhysicalDeviceLinearColorAttachmentFeaturesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINEAR_COLOR_ATTACHMENT_FEATURES_NV
template <> struct LvlTypeMap<VkPhysicalDeviceLinearColorAttachmentFeaturesNV> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINEAR_COLOR_ATTACHMENT_FEATURES_NV;
@@ -6287,6 +7019,33 @@
typedef VkPhysicalDeviceImageProcessingPropertiesQCOM Type;
};
+// Map type VkPhysicalDeviceNestedCommandBufferFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_FEATURES_EXT
+template <> struct LvlTypeMap<VkPhysicalDeviceNestedCommandBufferFeaturesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_FEATURES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_FEATURES_EXT> {
+ typedef VkPhysicalDeviceNestedCommandBufferFeaturesEXT Type;
+};
+
+// Map type VkPhysicalDeviceNestedCommandBufferPropertiesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_PROPERTIES_EXT
+template <> struct LvlTypeMap<VkPhysicalDeviceNestedCommandBufferPropertiesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_PROPERTIES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_PROPERTIES_EXT> {
+ typedef VkPhysicalDeviceNestedCommandBufferPropertiesEXT Type;
+};
+
+// Map type VkExternalMemoryAcquireUnmodifiedEXT to id VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_ACQUIRE_UNMODIFIED_EXT
+template <> struct LvlTypeMap<VkExternalMemoryAcquireUnmodifiedEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_ACQUIRE_UNMODIFIED_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_ACQUIRE_UNMODIFIED_EXT> {
+ typedef VkExternalMemoryAcquireUnmodifiedEXT Type;
+};
+
// Map type VkPhysicalDeviceExtendedDynamicState3FeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_3_FEATURES_EXT
template <> struct LvlTypeMap<VkPhysicalDeviceExtendedDynamicState3FeaturesEXT> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_3_FEATURES_EXT;
@@ -6341,6 +7100,24 @@
typedef VkRenderPassSubpassFeedbackCreateInfoEXT Type;
};
+// Map type VkDirectDriverLoadingInfoLUNARG to id VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_INFO_LUNARG
+template <> struct LvlTypeMap<VkDirectDriverLoadingInfoLUNARG> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_INFO_LUNARG;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_INFO_LUNARG> {
+ typedef VkDirectDriverLoadingInfoLUNARG Type;
+};
+
+// Map type VkDirectDriverLoadingListLUNARG to id VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_LIST_LUNARG
+template <> struct LvlTypeMap<VkDirectDriverLoadingListLUNARG> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_LIST_LUNARG;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_LIST_LUNARG> {
+ typedef VkDirectDriverLoadingListLUNARG Type;
+};
+
// Map type VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MODULE_IDENTIFIER_FEATURES_EXT
template <> struct LvlTypeMap<VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MODULE_IDENTIFIER_FEATURES_EXT;
@@ -6458,6 +7235,66 @@
typedef VkPhysicalDevicePipelineProtectedAccessFeaturesEXT Type;
};
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+// Map type VkPhysicalDeviceExternalFormatResolveFeaturesANDROID to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_FEATURES_ANDROID
+template <> struct LvlTypeMap<VkPhysicalDeviceExternalFormatResolveFeaturesANDROID> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_FEATURES_ANDROID;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_FEATURES_ANDROID> {
+ typedef VkPhysicalDeviceExternalFormatResolveFeaturesANDROID Type;
+};
+
+#endif // VK_USE_PLATFORM_ANDROID_KHR
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+// Map type VkPhysicalDeviceExternalFormatResolvePropertiesANDROID to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_PROPERTIES_ANDROID
+template <> struct LvlTypeMap<VkPhysicalDeviceExternalFormatResolvePropertiesANDROID> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_PROPERTIES_ANDROID;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_PROPERTIES_ANDROID> {
+ typedef VkPhysicalDeviceExternalFormatResolvePropertiesANDROID Type;
+};
+
+#endif // VK_USE_PLATFORM_ANDROID_KHR
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+// Map type VkAndroidHardwareBufferFormatResolvePropertiesANDROID to id VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_RESOLVE_PROPERTIES_ANDROID
+template <> struct LvlTypeMap<VkAndroidHardwareBufferFormatResolvePropertiesANDROID> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_RESOLVE_PROPERTIES_ANDROID;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_RESOLVE_PROPERTIES_ANDROID> {
+ typedef VkAndroidHardwareBufferFormatResolvePropertiesANDROID Type;
+};
+
+#endif // VK_USE_PLATFORM_ANDROID_KHR
+// Map type VkPhysicalDeviceShaderObjectFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_FEATURES_EXT
+template <> struct LvlTypeMap<VkPhysicalDeviceShaderObjectFeaturesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_FEATURES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_FEATURES_EXT> {
+ typedef VkPhysicalDeviceShaderObjectFeaturesEXT Type;
+};
+
+// Map type VkPhysicalDeviceShaderObjectPropertiesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_PROPERTIES_EXT
+template <> struct LvlTypeMap<VkPhysicalDeviceShaderObjectPropertiesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_PROPERTIES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_PROPERTIES_EXT> {
+ typedef VkPhysicalDeviceShaderObjectPropertiesEXT Type;
+};
+
+// Map type VkShaderCreateInfoEXT to id VK_STRUCTURE_TYPE_SHADER_CREATE_INFO_EXT
+template <> struct LvlTypeMap<VkShaderCreateInfoEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_SHADER_CREATE_INFO_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SHADER_CREATE_INFO_EXT> {
+ typedef VkShaderCreateInfoEXT Type;
+};
+
// Map type VkPhysicalDeviceTilePropertiesFeaturesQCOM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_PROPERTIES_FEATURES_QCOM
template <> struct LvlTypeMap<VkPhysicalDeviceTilePropertiesFeaturesQCOM> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_PROPERTIES_FEATURES_QCOM;
@@ -6494,6 +7331,51 @@
typedef VkAmigoProfilingSubmitInfoSEC Type;
};
+// Map type VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM
+template <> struct LvlTypeMap<VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM> {
+ typedef VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM Type;
+};
+
+// Map type VkPhysicalDeviceRayTracingInvocationReorderPropertiesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_NV
+template <> struct LvlTypeMap<VkPhysicalDeviceRayTracingInvocationReorderPropertiesNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_NV> {
+ typedef VkPhysicalDeviceRayTracingInvocationReorderPropertiesNV Type;
+};
+
+// Map type VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_NV
+template <> struct LvlTypeMap<VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_NV> {
+ typedef VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV Type;
+};
+
+// Map type VkPhysicalDeviceExtendedSparseAddressSpaceFeaturesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_FEATURES_NV
+template <> struct LvlTypeMap<VkPhysicalDeviceExtendedSparseAddressSpaceFeaturesNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_FEATURES_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_FEATURES_NV> {
+ typedef VkPhysicalDeviceExtendedSparseAddressSpaceFeaturesNV Type;
+};
+
+// Map type VkPhysicalDeviceExtendedSparseAddressSpacePropertiesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_PROPERTIES_NV
+template <> struct LvlTypeMap<VkPhysicalDeviceExtendedSparseAddressSpacePropertiesNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_PROPERTIES_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_PROPERTIES_NV> {
+ typedef VkPhysicalDeviceExtendedSparseAddressSpacePropertiesNV Type;
+};
+
// Map type VkPhysicalDeviceShaderCoreBuiltinsFeaturesARM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_FEATURES_ARM
template <> struct LvlTypeMap<VkPhysicalDeviceShaderCoreBuiltinsFeaturesARM> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_FEATURES_ARM;
@@ -6512,6 +7394,286 @@
typedef VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM Type;
};
+// Map type VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_LIBRARY_GROUP_HANDLES_FEATURES_EXT
+template <> struct LvlTypeMap<VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_LIBRARY_GROUP_HANDLES_FEATURES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_LIBRARY_GROUP_HANDLES_FEATURES_EXT> {
+ typedef VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT Type;
+};
+
+// Map type VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_UNUSED_ATTACHMENTS_FEATURES_EXT
+template <> struct LvlTypeMap<VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_UNUSED_ATTACHMENTS_FEATURES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_UNUSED_ATTACHMENTS_FEATURES_EXT> {
+ typedef VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT Type;
+};
+
+// Map type VkLatencySleepModeInfoNV to id VK_STRUCTURE_TYPE_LATENCY_SLEEP_MODE_INFO_NV
+template <> struct LvlTypeMap<VkLatencySleepModeInfoNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_LATENCY_SLEEP_MODE_INFO_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_LATENCY_SLEEP_MODE_INFO_NV> {
+ typedef VkLatencySleepModeInfoNV Type;
+};
+
+// Map type VkLatencySleepInfoNV to id VK_STRUCTURE_TYPE_LATENCY_SLEEP_INFO_NV
+template <> struct LvlTypeMap<VkLatencySleepInfoNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_LATENCY_SLEEP_INFO_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_LATENCY_SLEEP_INFO_NV> {
+ typedef VkLatencySleepInfoNV Type;
+};
+
+// Map type VkSetLatencyMarkerInfoNV to id VK_STRUCTURE_TYPE_SET_LATENCY_MARKER_INFO_NV
+template <> struct LvlTypeMap<VkSetLatencyMarkerInfoNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_SET_LATENCY_MARKER_INFO_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SET_LATENCY_MARKER_INFO_NV> {
+ typedef VkSetLatencyMarkerInfoNV Type;
+};
+
+// Map type VkLatencyTimingsFrameReportNV to id VK_STRUCTURE_TYPE_LATENCY_TIMINGS_FRAME_REPORT_NV
+template <> struct LvlTypeMap<VkLatencyTimingsFrameReportNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_LATENCY_TIMINGS_FRAME_REPORT_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_LATENCY_TIMINGS_FRAME_REPORT_NV> {
+ typedef VkLatencyTimingsFrameReportNV Type;
+};
+
+// Map type VkGetLatencyMarkerInfoNV to id VK_STRUCTURE_TYPE_GET_LATENCY_MARKER_INFO_NV
+template <> struct LvlTypeMap<VkGetLatencyMarkerInfoNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_GET_LATENCY_MARKER_INFO_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_GET_LATENCY_MARKER_INFO_NV> {
+ typedef VkGetLatencyMarkerInfoNV Type;
+};
+
+// Map type VkLatencySubmissionPresentIdNV to id VK_STRUCTURE_TYPE_LATENCY_SUBMISSION_PRESENT_ID_NV
+template <> struct LvlTypeMap<VkLatencySubmissionPresentIdNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_LATENCY_SUBMISSION_PRESENT_ID_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_LATENCY_SUBMISSION_PRESENT_ID_NV> {
+ typedef VkLatencySubmissionPresentIdNV Type;
+};
+
+// Map type VkSwapchainLatencyCreateInfoNV to id VK_STRUCTURE_TYPE_SWAPCHAIN_LATENCY_CREATE_INFO_NV
+template <> struct LvlTypeMap<VkSwapchainLatencyCreateInfoNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_SWAPCHAIN_LATENCY_CREATE_INFO_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SWAPCHAIN_LATENCY_CREATE_INFO_NV> {
+ typedef VkSwapchainLatencyCreateInfoNV Type;
+};
+
+// Map type VkOutOfBandQueueTypeInfoNV to id VK_STRUCTURE_TYPE_OUT_OF_BAND_QUEUE_TYPE_INFO_NV
+template <> struct LvlTypeMap<VkOutOfBandQueueTypeInfoNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_OUT_OF_BAND_QUEUE_TYPE_INFO_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_OUT_OF_BAND_QUEUE_TYPE_INFO_NV> {
+ typedef VkOutOfBandQueueTypeInfoNV Type;
+};
+
+// Map type VkLatencySurfaceCapabilitiesNV to id VK_STRUCTURE_TYPE_LATENCY_SURFACE_CAPABILITIES_NV
+template <> struct LvlTypeMap<VkLatencySurfaceCapabilitiesNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_LATENCY_SURFACE_CAPABILITIES_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_LATENCY_SURFACE_CAPABILITIES_NV> {
+ typedef VkLatencySurfaceCapabilitiesNV Type;
+};
+
+// Map type VkPhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_RENDER_AREAS_FEATURES_QCOM
+template <> struct LvlTypeMap<VkPhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_RENDER_AREAS_FEATURES_QCOM;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_RENDER_AREAS_FEATURES_QCOM> {
+ typedef VkPhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM Type;
+};
+
+// Map type VkMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM to id VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_RENDER_AREAS_RENDER_PASS_BEGIN_INFO_QCOM
+template <> struct LvlTypeMap<VkMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_RENDER_AREAS_RENDER_PASS_BEGIN_INFO_QCOM;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_RENDER_AREAS_RENDER_PASS_BEGIN_INFO_QCOM> {
+ typedef VkMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM Type;
+};
+
+// Map type VkPhysicalDeviceImageProcessing2FeaturesQCOM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_2_FEATURES_QCOM
+template <> struct LvlTypeMap<VkPhysicalDeviceImageProcessing2FeaturesQCOM> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_2_FEATURES_QCOM;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_2_FEATURES_QCOM> {
+ typedef VkPhysicalDeviceImageProcessing2FeaturesQCOM Type;
+};
+
+// Map type VkPhysicalDeviceImageProcessing2PropertiesQCOM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_2_PROPERTIES_QCOM
+template <> struct LvlTypeMap<VkPhysicalDeviceImageProcessing2PropertiesQCOM> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_2_PROPERTIES_QCOM;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_2_PROPERTIES_QCOM> {
+ typedef VkPhysicalDeviceImageProcessing2PropertiesQCOM Type;
+};
+
+// Map type VkSamplerBlockMatchWindowCreateInfoQCOM to id VK_STRUCTURE_TYPE_SAMPLER_BLOCK_MATCH_WINDOW_CREATE_INFO_QCOM
+template <> struct LvlTypeMap<VkSamplerBlockMatchWindowCreateInfoQCOM> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_SAMPLER_BLOCK_MATCH_WINDOW_CREATE_INFO_QCOM;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SAMPLER_BLOCK_MATCH_WINDOW_CREATE_INFO_QCOM> {
+ typedef VkSamplerBlockMatchWindowCreateInfoQCOM Type;
+};
+
+// Map type VkPhysicalDeviceCubicWeightsFeaturesQCOM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUBIC_WEIGHTS_FEATURES_QCOM
+template <> struct LvlTypeMap<VkPhysicalDeviceCubicWeightsFeaturesQCOM> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUBIC_WEIGHTS_FEATURES_QCOM;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUBIC_WEIGHTS_FEATURES_QCOM> {
+ typedef VkPhysicalDeviceCubicWeightsFeaturesQCOM Type;
+};
+
+// Map type VkSamplerCubicWeightsCreateInfoQCOM to id VK_STRUCTURE_TYPE_SAMPLER_CUBIC_WEIGHTS_CREATE_INFO_QCOM
+template <> struct LvlTypeMap<VkSamplerCubicWeightsCreateInfoQCOM> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_SAMPLER_CUBIC_WEIGHTS_CREATE_INFO_QCOM;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SAMPLER_CUBIC_WEIGHTS_CREATE_INFO_QCOM> {
+ typedef VkSamplerCubicWeightsCreateInfoQCOM Type;
+};
+
+// Map type VkBlitImageCubicWeightsInfoQCOM to id VK_STRUCTURE_TYPE_BLIT_IMAGE_CUBIC_WEIGHTS_INFO_QCOM
+template <> struct LvlTypeMap<VkBlitImageCubicWeightsInfoQCOM> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_BLIT_IMAGE_CUBIC_WEIGHTS_INFO_QCOM;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_BLIT_IMAGE_CUBIC_WEIGHTS_INFO_QCOM> {
+ typedef VkBlitImageCubicWeightsInfoQCOM Type;
+};
+
+// Map type VkPhysicalDeviceYcbcrDegammaFeaturesQCOM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_YCBCR_DEGAMMA_FEATURES_QCOM
+template <> struct LvlTypeMap<VkPhysicalDeviceYcbcrDegammaFeaturesQCOM> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_YCBCR_DEGAMMA_FEATURES_QCOM;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_YCBCR_DEGAMMA_FEATURES_QCOM> {
+ typedef VkPhysicalDeviceYcbcrDegammaFeaturesQCOM Type;
+};
+
+// Map type VkSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM to id VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_YCBCR_DEGAMMA_CREATE_INFO_QCOM
+template <> struct LvlTypeMap<VkSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_YCBCR_DEGAMMA_CREATE_INFO_QCOM;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_YCBCR_DEGAMMA_CREATE_INFO_QCOM> {
+ typedef VkSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM Type;
+};
+
+// Map type VkPhysicalDeviceCubicClampFeaturesQCOM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUBIC_CLAMP_FEATURES_QCOM
+template <> struct LvlTypeMap<VkPhysicalDeviceCubicClampFeaturesQCOM> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUBIC_CLAMP_FEATURES_QCOM;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUBIC_CLAMP_FEATURES_QCOM> {
+ typedef VkPhysicalDeviceCubicClampFeaturesQCOM Type;
+};
+
+// Map type VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ATTACHMENT_FEEDBACK_LOOP_DYNAMIC_STATE_FEATURES_EXT
+template <> struct LvlTypeMap<VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ATTACHMENT_FEEDBACK_LOOP_DYNAMIC_STATE_FEATURES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ATTACHMENT_FEEDBACK_LOOP_DYNAMIC_STATE_FEATURES_EXT> {
+ typedef VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT Type;
+};
+
+#ifdef VK_USE_PLATFORM_SCREEN_QNX
+// Map type VkScreenBufferPropertiesQNX to id VK_STRUCTURE_TYPE_SCREEN_BUFFER_PROPERTIES_QNX
+template <> struct LvlTypeMap<VkScreenBufferPropertiesQNX> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_SCREEN_BUFFER_PROPERTIES_QNX;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SCREEN_BUFFER_PROPERTIES_QNX> {
+ typedef VkScreenBufferPropertiesQNX Type;
+};
+
+#endif // VK_USE_PLATFORM_SCREEN_QNX
+#ifdef VK_USE_PLATFORM_SCREEN_QNX
+// Map type VkScreenBufferFormatPropertiesQNX to id VK_STRUCTURE_TYPE_SCREEN_BUFFER_FORMAT_PROPERTIES_QNX
+template <> struct LvlTypeMap<VkScreenBufferFormatPropertiesQNX> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_SCREEN_BUFFER_FORMAT_PROPERTIES_QNX;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SCREEN_BUFFER_FORMAT_PROPERTIES_QNX> {
+ typedef VkScreenBufferFormatPropertiesQNX Type;
+};
+
+#endif // VK_USE_PLATFORM_SCREEN_QNX
+#ifdef VK_USE_PLATFORM_SCREEN_QNX
+// Map type VkImportScreenBufferInfoQNX to id VK_STRUCTURE_TYPE_IMPORT_SCREEN_BUFFER_INFO_QNX
+template <> struct LvlTypeMap<VkImportScreenBufferInfoQNX> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_IMPORT_SCREEN_BUFFER_INFO_QNX;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_IMPORT_SCREEN_BUFFER_INFO_QNX> {
+ typedef VkImportScreenBufferInfoQNX Type;
+};
+
+#endif // VK_USE_PLATFORM_SCREEN_QNX
+#ifdef VK_USE_PLATFORM_SCREEN_QNX
+// Map type VkExternalFormatQNX to id VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_QNX
+template <> struct LvlTypeMap<VkExternalFormatQNX> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_QNX;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_QNX> {
+ typedef VkExternalFormatQNX Type;
+};
+
+#endif // VK_USE_PLATFORM_SCREEN_QNX
+#ifdef VK_USE_PLATFORM_SCREEN_QNX
+// Map type VkPhysicalDeviceExternalMemoryScreenBufferFeaturesQNX to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_SCREEN_BUFFER_FEATURES_QNX
+template <> struct LvlTypeMap<VkPhysicalDeviceExternalMemoryScreenBufferFeaturesQNX> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_SCREEN_BUFFER_FEATURES_QNX;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_SCREEN_BUFFER_FEATURES_QNX> {
+ typedef VkPhysicalDeviceExternalMemoryScreenBufferFeaturesQNX Type;
+};
+
+#endif // VK_USE_PLATFORM_SCREEN_QNX
+// Map type VkPhysicalDeviceLayeredDriverPropertiesMSFT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_DRIVER_PROPERTIES_MSFT
+template <> struct LvlTypeMap<VkPhysicalDeviceLayeredDriverPropertiesMSFT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_DRIVER_PROPERTIES_MSFT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_DRIVER_PROPERTIES_MSFT> {
+ typedef VkPhysicalDeviceLayeredDriverPropertiesMSFT Type;
+};
+
+// Map type VkPhysicalDeviceDescriptorPoolOverallocationFeaturesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_POOL_OVERALLOCATION_FEATURES_NV
+template <> struct LvlTypeMap<VkPhysicalDeviceDescriptorPoolOverallocationFeaturesNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_POOL_OVERALLOCATION_FEATURES_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_POOL_OVERALLOCATION_FEATURES_NV> {
+ typedef VkPhysicalDeviceDescriptorPoolOverallocationFeaturesNV Type;
+};
+
// Map type VkAccelerationStructureGeometryTrianglesDataKHR to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR
template <> struct LvlTypeMap<VkAccelerationStructureGeometryTrianglesDataKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR;
diff --git a/icd/linux/VkICD_mock_icd.json b/icd/linux/VkICD_mock_icd.json
deleted file mode 100644
index bf32f8e..0000000
--- a/icd/linux/VkICD_mock_icd.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "file_format_version" : "1.0.1",
- "ICD": {
- "library_path": "./libVkICD_mock_icd.so",
- "api_version": "1.1.97"
- }
-}
-
-
-
-
-
diff --git a/icd/macos/VkICD_mock_icd.json b/icd/macos/VkICD_mock_icd.json
deleted file mode 100644
index 7101986..0000000
--- a/icd/macos/VkICD_mock_icd.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "file_format_version" : "1.0.1",
- "ICD": {
- "library_path": "./libVkICD_mock_icd.dylib",
- "api_version": "1.1.97"
- }
-}
-
diff --git a/icd/mock_icd.cpp b/icd/mock_icd.cpp
new file mode 100644
index 0000000..182c2d8
--- /dev/null
+++ b/icd/mock_icd.cpp
@@ -0,0 +1,182 @@
+/*
+** Copyright (c) 2015-2018, 2023 The Khronos Group Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+
+#include "mock_icd.h"
+#include "function_definitions.h"
+
+namespace vkmock {
+
+static VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL GetPhysicalDeviceProcAddr(VkInstance instance, const char* funcName) {
+ // TODO: This function should only care about physical device functions and return nullptr for other functions
+ const auto& item = name_to_funcptr_map.find(funcName);
+ if (item != name_to_funcptr_map.end()) {
+ return reinterpret_cast<PFN_vkVoidFunction>(item->second);
+ }
+ // Mock should intercept all functions so if we get here just return null
+ return nullptr;
+}
+
+#if defined(__GNUC__) && __GNUC__ >= 4
+#define EXPORT __attribute__((visibility("default")))
+#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
+#define EXPORT __attribute__((visibility("default")))
+#else
+#define EXPORT
+#endif
+
+} // namespace vkmock
+
+extern "C" {
+
+EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr(VkInstance instance, const char* pName) {
+ if (!vkmock::negotiate_loader_icd_interface_called) {
+ vkmock::loader_interface_version = 1;
+ }
+ return vkmock::GetInstanceProcAddr(instance, pName);
+}
+
+EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetPhysicalDeviceProcAddr(VkInstance instance, const char* pName) {
+ return vkmock::GetPhysicalDeviceProcAddr(instance, pName);
+}
+
+EXPORT VKAPI_ATTR VkResult VKAPI_CALL vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion) {
+ vkmock::negotiate_loader_icd_interface_called = true;
+ vkmock::loader_interface_version = *pSupportedVersion;
+ if (*pSupportedVersion > vkmock::SUPPORTED_LOADER_ICD_INTERFACE_VERSION) {
+ *pSupportedVersion = vkmock::SUPPORTED_LOADER_ICD_INTERFACE_VERSION;
+ }
+ return VK_SUCCESS;
+}
+
+EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface,
+ const VkAllocationCallbacks* pAllocator) {
+ vkmock::DestroySurfaceKHR(instance, surface, pAllocator);
+}
+
+EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice physicalDevice,
+ uint32_t queueFamilyIndex, VkSurfaceKHR surface,
+ VkBool32* pSupported) {
+ return vkmock::GetPhysicalDeviceSurfaceSupportKHR(physicalDevice, queueFamilyIndex, surface, pSupported);
+}
+
+EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice,
+ VkSurfaceKHR surface,
+ VkSurfaceCapabilitiesKHR* pSurfaceCapabilities) {
+ return vkmock::GetPhysicalDeviceSurfaceCapabilitiesKHR(physicalDevice, surface, pSurfaceCapabilities);
+}
+
+EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface,
+ uint32_t* pSurfaceFormatCount,
+ VkSurfaceFormatKHR* pSurfaceFormats) {
+ return vkmock::GetPhysicalDeviceSurfaceFormatsKHR(physicalDevice, surface, pSurfaceFormatCount, pSurfaceFormats);
+}
+
+EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice physicalDevice,
+ VkSurfaceKHR surface, uint32_t* pPresentModeCount,
+ VkPresentModeKHR* pPresentModes) {
+ return vkmock::GetPhysicalDeviceSurfacePresentModesKHR(physicalDevice, surface, pPresentModeCount, pPresentModes);
+}
+
+EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateDisplayPlaneSurfaceKHR(VkInstance instance,
+ const VkDisplaySurfaceCreateInfoKHR* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator,
+ VkSurfaceKHR* pSurface) {
+ return vkmock::CreateDisplayPlaneSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
+}
+
+#ifdef VK_USE_PLATFORM_XLIB_KHR
+
+EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateXlibSurfaceKHR(VkInstance instance, const VkXlibSurfaceCreateInfoKHR* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) {
+ return vkmock::CreateXlibSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
+}
+#endif /* VK_USE_PLATFORM_XLIB_KHR */
+
+#ifdef VK_USE_PLATFORM_XCB_KHR
+
+EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateXcbSurfaceKHR(VkInstance instance, const VkXcbSurfaceCreateInfoKHR* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) {
+ return vkmock::CreateXcbSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
+}
+#endif /* VK_USE_PLATFORM_XCB_KHR */
+
+#ifdef VK_USE_PLATFORM_WAYLAND_KHR
+
+EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateWaylandSurfaceKHR(VkInstance instance,
+ const VkWaylandSurfaceCreateInfoKHR* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) {
+ return vkmock::CreateWaylandSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
+}
+#endif /* VK_USE_PLATFORM_WAYLAND_KHR */
+
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+
+EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateAndroidSurfaceKHR(VkInstance instance,
+ const VkAndroidSurfaceCreateInfoKHR* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) {
+ return vkmock::CreateAndroidSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
+}
+#endif /* VK_USE_PLATFORM_ANDROID_KHR */
+
+#ifdef VK_USE_PLATFORM_WIN32_KHR
+
+EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateWin32SurfaceKHR(VkInstance instance, const VkWin32SurfaceCreateInfoKHR* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) {
+ return vkmock::CreateWin32SurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
+}
+#endif /* VK_USE_PLATFORM_WIN32_KHR */
+
+EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetDeviceGroupSurfacePresentModesKHR(VkDevice device, VkSurfaceKHR surface,
+ VkDeviceGroupPresentModeFlagsKHR* pModes) {
+ return vkmock::GetDeviceGroupSurfacePresentModesKHR(device, surface, pModes);
+}
+
+EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDevicePresentRectanglesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface,
+ uint32_t* pRectCount, VkRect2D* pRects) {
+ return vkmock::GetPhysicalDevicePresentRectanglesKHR(physicalDevice, surface, pRectCount, pRects);
+}
+
+#ifdef VK_USE_PLATFORM_VI_NN
+
+EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateViSurfaceNN(VkInstance instance, const VkViSurfaceCreateInfoNN* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) {
+ return vkmock::CreateViSurfaceNN(instance, pCreateInfo, pAllocator, pSurface);
+}
+#endif /* VK_USE_PLATFORM_VI_NN */
+
+EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceCapabilities2EXT(VkPhysicalDevice physicalDevice,
+ VkSurfaceKHR surface,
+ VkSurfaceCapabilities2EXT* pSurfaceCapabilities) {
+ return vkmock::GetPhysicalDeviceSurfaceCapabilities2EXT(physicalDevice, surface, pSurfaceCapabilities);
+}
+
+#ifdef VK_USE_PLATFORM_IOS_MVK
+
+EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateIOSSurfaceMVK(VkInstance instance, const VkIOSSurfaceCreateInfoMVK* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) {
+ return vkmock::CreateIOSSurfaceMVK(instance, pCreateInfo, pAllocator, pSurface);
+}
+#endif /* VK_USE_PLATFORM_IOS_MVK */
+
+#ifdef VK_USE_PLATFORM_MACOS_MVK
+
+EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateMacOSSurfaceMVK(VkInstance instance, const VkMacOSSurfaceCreateInfoMVK* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) {
+ return vkmock::CreateMacOSSurfaceMVK(instance, pCreateInfo, pAllocator, pSurface);
+}
+#endif /* VK_USE_PLATFORM_MACOS_MVK */
+
+} // end extern "C"
diff --git a/icd/mock_icd.h b/icd/mock_icd.h
new file mode 100644
index 0000000..fce0afc
--- /dev/null
+++ b/icd/mock_icd.h
@@ -0,0 +1,242 @@
+/*
+** Copyright (c) 2015-2018, 2023 The Khronos Group Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+
+#pragma once
+
+#include <stdlib.h>
+#include <cstring>
+
+#include <algorithm>
+#include <array>
+#include <mutex>
+#include <unordered_set>
+#include <unordered_map>
+#include <string>
+#include <vector>
+
+#include "vulkan/vk_icd.h"
+#include "vk_typemap_helper.h"
+
+namespace vkmock {
+
+using mutex_t = std::mutex;
+using lock_guard_t = std::lock_guard<mutex_t>;
+using unique_lock_t = std::unique_lock<mutex_t>;
+
+static mutex_t global_lock;
+static uint64_t global_unique_handle = 1;
+static const uint32_t SUPPORTED_LOADER_ICD_INTERFACE_VERSION = 5;
+static uint32_t loader_interface_version = 0;
+static bool negotiate_loader_icd_interface_called = false;
+static void* CreateDispObjHandle() {
+ auto handle = new VK_LOADER_DATA;
+ set_loader_magic_value(handle);
+ return handle;
+}
+static void DestroyDispObjHandle(void* handle) { delete reinterpret_cast<VK_LOADER_DATA*>(handle); }
+
+static constexpr uint32_t icd_physical_device_count = 1;
+static std::unordered_map<VkInstance, std::array<VkPhysicalDevice, icd_physical_device_count>> physical_device_map;
+
+// Map device memory handle to any mapped allocations that we'll need to free on unmap
+static std::unordered_map<VkDeviceMemory, std::vector<void*>> mapped_memory_map;
+
+// Map device memory allocation handle to the size
+static std::unordered_map<VkDeviceMemory, VkDeviceSize> allocated_memory_size_map;
+
+static std::unordered_map<VkDevice, std::unordered_map<uint32_t, std::unordered_map<uint32_t, VkQueue>>> queue_map;
+static VkDeviceAddress current_available_address = 0x10000000;
+struct BufferState {
+ VkDeviceSize size;
+ VkDeviceAddress address;
+};
+static std::unordered_map<VkDevice, std::unordered_map<VkBuffer, BufferState>> buffer_map;
+static std::unordered_map<VkDevice, std::unordered_map<VkImage, VkDeviceSize>> image_memory_size_map;
+static std::unordered_map<VkDevice, std::unordered_set<VkCommandPool>> command_pool_map;
+static std::unordered_map<VkCommandPool, std::vector<VkCommandBuffer>> command_pool_buffer_map;
+
+static constexpr uint32_t icd_swapchain_image_count = 1;
+static std::unordered_map<VkSwapchainKHR, VkImage[icd_swapchain_image_count]> swapchain_image_map;
+
+// TODO: Would like to codegen this but limits aren't in XML
+static VkPhysicalDeviceLimits SetLimits(VkPhysicalDeviceLimits* limits) {
+ limits->maxImageDimension1D = 4096;
+ limits->maxImageDimension2D = 4096;
+ limits->maxImageDimension3D = 256;
+ limits->maxImageDimensionCube = 4096;
+ limits->maxImageArrayLayers = 256;
+ limits->maxTexelBufferElements = 65536;
+ limits->maxUniformBufferRange = 16384;
+ limits->maxStorageBufferRange = 134217728;
+ limits->maxPushConstantsSize = 128;
+ limits->maxMemoryAllocationCount = 4096;
+ limits->maxSamplerAllocationCount = 4000;
+ limits->bufferImageGranularity = 1;
+ limits->sparseAddressSpaceSize = 2147483648;
+ limits->maxBoundDescriptorSets = 4;
+ limits->maxPerStageDescriptorSamplers = 16;
+ limits->maxPerStageDescriptorUniformBuffers = 12;
+ limits->maxPerStageDescriptorStorageBuffers = 4;
+ limits->maxPerStageDescriptorSampledImages = 16;
+ limits->maxPerStageDescriptorStorageImages = 4;
+ limits->maxPerStageDescriptorInputAttachments = 4;
+ limits->maxPerStageResources = 128;
+ limits->maxDescriptorSetSamplers = 96;
+ limits->maxDescriptorSetUniformBuffers = 72;
+ limits->maxDescriptorSetUniformBuffersDynamic = 8;
+ limits->maxDescriptorSetStorageBuffers = 24;
+ limits->maxDescriptorSetStorageBuffersDynamic = 4;
+ limits->maxDescriptorSetSampledImages = 96;
+ limits->maxDescriptorSetStorageImages = 24;
+ limits->maxDescriptorSetInputAttachments = 4;
+ limits->maxVertexInputAttributes = 16;
+ limits->maxVertexInputBindings = 16;
+ limits->maxVertexInputAttributeOffset = 2047;
+ limits->maxVertexInputBindingStride = 2048;
+ limits->maxVertexOutputComponents = 64;
+ limits->maxTessellationGenerationLevel = 64;
+ limits->maxTessellationPatchSize = 32;
+ limits->maxTessellationControlPerVertexInputComponents = 64;
+ limits->maxTessellationControlPerVertexOutputComponents = 64;
+ limits->maxTessellationControlPerPatchOutputComponents = 120;
+ limits->maxTessellationControlTotalOutputComponents = 2048;
+ limits->maxTessellationEvaluationInputComponents = 64;
+ limits->maxTessellationEvaluationOutputComponents = 64;
+ limits->maxGeometryShaderInvocations = 32;
+ limits->maxGeometryInputComponents = 64;
+ limits->maxGeometryOutputComponents = 64;
+ limits->maxGeometryOutputVertices = 256;
+ limits->maxGeometryTotalOutputComponents = 1024;
+ limits->maxFragmentInputComponents = 64;
+ limits->maxFragmentOutputAttachments = 4;
+ limits->maxFragmentDualSrcAttachments = 1;
+ limits->maxFragmentCombinedOutputResources = 4;
+ limits->maxComputeSharedMemorySize = 16384;
+ limits->maxComputeWorkGroupCount[0] = 65535;
+ limits->maxComputeWorkGroupCount[1] = 65535;
+ limits->maxComputeWorkGroupCount[2] = 65535;
+ limits->maxComputeWorkGroupInvocations = 128;
+ limits->maxComputeWorkGroupSize[0] = 128;
+ limits->maxComputeWorkGroupSize[1] = 128;
+ limits->maxComputeWorkGroupSize[2] = 64;
+ limits->subPixelPrecisionBits = 4;
+ limits->subTexelPrecisionBits = 4;
+ limits->mipmapPrecisionBits = 4;
+ limits->maxDrawIndexedIndexValue = UINT32_MAX;
+ limits->maxDrawIndirectCount = UINT16_MAX;
+ limits->maxSamplerLodBias = 2.0f;
+ limits->maxSamplerAnisotropy = 16;
+ limits->maxViewports = 16;
+ limits->maxViewportDimensions[0] = 4096;
+ limits->maxViewportDimensions[1] = 4096;
+ limits->viewportBoundsRange[0] = -8192;
+ limits->viewportBoundsRange[1] = 8191;
+ limits->viewportSubPixelBits = 0;
+ limits->minMemoryMapAlignment = 64;
+ limits->minTexelBufferOffsetAlignment = 16;
+ limits->minUniformBufferOffsetAlignment = 16;
+ limits->minStorageBufferOffsetAlignment = 16;
+ limits->minTexelOffset = -8;
+ limits->maxTexelOffset = 7;
+ limits->minTexelGatherOffset = -8;
+ limits->maxTexelGatherOffset = 7;
+ limits->minInterpolationOffset = 0.0f;
+ limits->maxInterpolationOffset = 0.5f;
+ limits->subPixelInterpolationOffsetBits = 4;
+ limits->maxFramebufferWidth = 4096;
+ limits->maxFramebufferHeight = 4096;
+ limits->maxFramebufferLayers = 256;
+ limits->framebufferColorSampleCounts = 0x7F;
+ limits->framebufferDepthSampleCounts = 0x7F;
+ limits->framebufferStencilSampleCounts = 0x7F;
+ limits->framebufferNoAttachmentsSampleCounts = 0x7F;
+ limits->maxColorAttachments = 4;
+ limits->sampledImageColorSampleCounts = 0x7F;
+ limits->sampledImageIntegerSampleCounts = 0x7F;
+ limits->sampledImageDepthSampleCounts = 0x7F;
+ limits->sampledImageStencilSampleCounts = 0x7F;
+ limits->storageImageSampleCounts = 0x7F;
+ limits->maxSampleMaskWords = 1;
+ limits->timestampComputeAndGraphics = VK_TRUE;
+ limits->timestampPeriod = 1;
+ limits->maxClipDistances = 8;
+ limits->maxCullDistances = 8;
+ limits->maxCombinedClipAndCullDistances = 8;
+ limits->discreteQueuePriorities = 2;
+ limits->pointSizeRange[0] = 1.0f;
+ limits->pointSizeRange[1] = 64.0f;
+ limits->lineWidthRange[0] = 1.0f;
+ limits->lineWidthRange[1] = 8.0f;
+ limits->pointSizeGranularity = 1.0f;
+ limits->lineWidthGranularity = 1.0f;
+ limits->strictLines = VK_TRUE;
+ limits->standardSampleLocations = VK_TRUE;
+ limits->optimalBufferCopyOffsetAlignment = 1;
+ limits->optimalBufferCopyRowPitchAlignment = 1;
+ limits->nonCoherentAtomSize = 256;
+
+ return *limits;
+}
+
+void SetBoolArrayTrue(VkBool32* bool_array, uint32_t num_bools) {
+ for (uint32_t i = 0; i < num_bools; ++i) {
+ bool_array[i] = VK_TRUE;
+ }
+}
+
+VkDeviceSize GetImageSizeFromCreateInfo(const VkImageCreateInfo* pCreateInfo) {
+ VkDeviceSize size = pCreateInfo->extent.width;
+ size *= pCreateInfo->extent.height;
+ size *= pCreateInfo->extent.depth;
+ // TODO: A pixel size is 32 bytes. This accounts for the largest possible pixel size of any format. It could be changed to more
+ // accurate size if need be.
+ size *= 32;
+ size *= pCreateInfo->arrayLayers;
+ size *= (pCreateInfo->mipLevels > 1 ? 2 : 1);
+
+ switch (pCreateInfo->format) {
+ case VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM:
+ case VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM:
+ case VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM:
+ case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16:
+ case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16:
+ case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16:
+ case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16:
+ case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16:
+ case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16:
+ case VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM:
+ case VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM:
+ case VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM:
+ size *= 3;
+ break;
+ case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM:
+ case VK_FORMAT_G8_B8R8_2PLANE_422_UNORM:
+ case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_420_UNORM_3PACK16:
+ case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16:
+ case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16:
+ case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16:
+ case VK_FORMAT_G16_B16R16_2PLANE_420_UNORM:
+ case VK_FORMAT_G16_B16R16_2PLANE_422_UNORM:
+ size *= 2;
+ break;
+ default:
+ break;
+ }
+
+ return size;
+}
+
+} // namespace vkmock
diff --git a/icd/windows/VkICD_mock_icd.json b/icd/windows/VkICD_mock_icd.json
deleted file mode 100644
index d192f5c..0000000
--- a/icd/windows/VkICD_mock_icd.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "file_format_version" : "1.0.1",
- "ICD": {
- "library_path": ".\\VkICD_mock_icd.dll",
- "api_version": "1.1.97"
- }
-}
-
-
-
-
-
diff --git a/mac_common.cmake b/mac_common.cmake
index bad3c41..b06dce9 100644
--- a/mac_common.cmake
+++ b/mac_common.cmake
@@ -45,7 +45,7 @@
find_library(COCOA NAMES Cocoa)
# Locate Interface Builder Tool, needed to build things like Storyboards outside of Xcode.
-if(NOT ${CMAKE_GENERATOR} MATCHES "^Xcode.*")
+if(NOT XCODE)
# Make sure we can find the 'ibtool' program. If we can NOT find it we skip generation of this project.
find_program(IBTOOL ibtool HINTS "/usr/bin" "${OSX_DEVELOPER_ROOT}/usr/bin")
if(${IBTOOL} STREQUAL "IBTOOL-NOTFOUND")
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
new file mode 100644
index 0000000..3038d6e
--- /dev/null
+++ b/scripts/CMakeLists.txt
@@ -0,0 +1,123 @@
+# ~~~
+# Copyright (c) 2023 LunarG, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ~~~
+
+option(UPDATE_DEPS "Run update_deps.py for user")
+if (UPDATE_DEPS)
+ find_package(Python3 REQUIRED QUIET)
+
+ set(update_dep_py "${CMAKE_CURRENT_LIST_DIR}/update_deps.py")
+ set(known_good_json "${CMAKE_CURRENT_LIST_DIR}/known_good.json")
+
+ set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${update_dep_py} ${known_good_json})
+
+ list(APPEND update_dep_command "${update_dep_py}")
+ list(APPEND update_dep_command "--generator")
+ list(APPEND update_dep_command "${CMAKE_GENERATOR}")
+
+ if (CMAKE_GENERATOR_PLATFORM)
+ list(APPEND update_dep_command "--arch")
+ list(APPEND update_dep_command "${CMAKE_GENERATOR_PLATFORM}")
+ endif()
+
+ if (NOT CMAKE_BUILD_TYPE)
+ message(WARNING "CMAKE_BUILD_TYPE not set. Using Debug for dependency build type")
+ set(_build_type Debug)
+ else()
+ set(_build_type ${CMAKE_BUILD_TYPE})
+ endif()
+ list(APPEND update_dep_command "--config")
+ list(APPEND update_dep_command "${_build_type}")
+ list(APPEND update_dep_command "--api")
+ list(APPEND update_dep_command "${API_TYPE}")
+
+ set(UPDATE_DEPS_DIR_SUFFIX "${_build_type}")
+ if (ANDROID)
+ set(UPDATE_DEPS_DIR_SUFFIX "android/${UPDATE_DEPS_DIR_SUFFIX}")
+ endif()
+ set(UPDATE_DEPS_DIR "${PROJECT_SOURCE_DIR}/external/${UPDATE_DEPS_DIR_SUFFIX}" CACHE PATH "Location where update_deps.py installs packages")
+ list(APPEND update_dep_command "--dir" )
+ list(APPEND update_dep_command "${UPDATE_DEPS_DIR}")
+
+ if (NOT BUILD_TESTS)
+ list(APPEND update_dep_command "--optional=tests")
+ endif()
+
+ if (UPDATE_DEPS_SKIP_EXISTING_INSTALL)
+ list(APPEND update_dep_command "--skip-existing-install")
+ endif()
+
+ list(APPEND cmake_vars "CMAKE_TOOLCHAIN_FILE")
+ if (ANDROID)
+ list(APPEND cmake_vars "ANDROID_PLATFORM" "CMAKE_ANDROID_ARCH_ABI" "CMAKE_ANDROID_STL_TYPE" "CMAKE_ANDROID_RTTI" "CMAKE_ANDROID_EXCEPTIONS" "ANDROID_USE_LEGACY_TOOLCHAIN_FILE")
+ endif()
+
+ set(cmake_var)
+ foreach(var IN LISTS cmake_vars)
+ if (DEFINED ${var})
+ list(APPEND update_dep_command "--cmake_var")
+ list(APPEND update_dep_command "${var}=${${var}}")
+ endif()
+ endforeach()
+
+ if (cmake_var)
+ list(APPEND update_dep_command "${cmake_var}")
+ endif()
+
+ file(TIMESTAMP ${update_dep_py} timestamp_1)
+ file(TIMESTAMP ${known_good_json} timestamp_2)
+
+ string("MD5" md5_hash "${timestamp_1}-${timestamp_2}-${update_dep_command}")
+
+ set(UPDATE_DEPS_HASH "0" CACHE STRING "Default value until we run update_deps.py")
+ mark_as_advanced(UPDATE_DEPS_HASH)
+
+ if ("${UPDATE_DEPS_HASH}" STREQUAL "0")
+ list(APPEND update_dep_command "--clean-build")
+ list(APPEND update_dep_command "--clean-install")
+ endif()
+
+ if ("${md5_hash}" STREQUAL $CACHE{UPDATE_DEPS_HASH})
+ message(DEBUG "update_deps.py: no work to do.")
+ else()
+ execute_process(
+ COMMAND ${Python3_EXECUTABLE} ${update_dep_command}
+ RESULT_VARIABLE _update_deps_result
+ )
+ if (NOT (${_update_deps_result} EQUAL 0))
+ message(FATAL_ERROR "Could not run update_deps.py which is necessary to download dependencies.")
+ endif()
+ set(UPDATE_DEPS_HASH ${md5_hash} CACHE STRING "Ensure we only run update_deps.py when we need to." FORCE)
+ include("${UPDATE_DEPS_DIR}/helper.cmake")
+ endif()
+endif()
+if (VULKAN_HEADERS_INSTALL_DIR)
+ list(APPEND CMAKE_PREFIX_PATH ${VULKAN_HEADERS_INSTALL_DIR})
+endif()
+if (VULKAN_LOADER_INSTALL_DIR)
+ list(APPEND CMAKE_PREFIX_PATH ${VULKAN_LOADER_INSTALL_DIR})
+endif()
+if (MOLTENVK_REPO_ROOT)
+ list(APPEND CMAKE_PREFIX_PATH ${MOLTENVK_REPO_ROOT})
+endif()
+if (GOOGLETEST_INSTALL_DIR)
+ list(APPEND CMAKE_PREFIX_PATH ${GOOGLETEST_INSTALL_DIR})
+endif()
+
+if (CMAKE_CROSSCOMPILING)
+ set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+else()
+ set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+endif()
diff --git a/scripts/android.py b/scripts/android.py
new file mode 100755
index 0000000..f976a2f
--- /dev/null
+++ b/scripts/android.py
@@ -0,0 +1,202 @@
+#!/usr/bin/env python3
+# Copyright (c) 2023 Valve Corporation
+# Copyright (c) 2023 LunarG, Inc.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# NOTE: Android this documentation is crucial for understanding the layout of the NDK.
+# https://android.googlesource.com/platform/ndk/+/master/docs/BuildSystemMaintainers.md
+
+# NOTE: Environment variables we can rely on users/environments setting.
+# https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md#environment-variables-2
+
+import argparse
+import os
+import sys
+import shutil
+import subprocess
+
+# helper to define paths relative to the repo root
+def RepoRelative(path):
+ return os.path.abspath(os.path.join(os.path.dirname(__file__), '..', path))
+
+# Points to the directory containing the top level CMakeLists.txt
+PROJECT_SRC_DIR = os.path.abspath(os.path.join(os.path.split(os.path.abspath(__file__))[0], '..'))
+if not os.path.isfile(f'{PROJECT_SRC_DIR}/CMakeLists.txt'):
+ print(f'PROJECT_SRC_DIR invalid! {PROJECT_SRC_DIR}')
+ sys.exit(1)
+
+# Runs a command in a directory and returns its return code.
+# Directory is project root by default, or a relative path from project root
+def RunShellCmd(command, start_dir = PROJECT_SRC_DIR, env=None, verbose=False):
+ # Flush stdout here. Helps when debugging on CI.
+ sys.stdout.flush()
+
+ if start_dir != PROJECT_SRC_DIR:
+ start_dir = RepoRelative(start_dir)
+ cmd_list = command.split(" ")
+
+ if verbose:
+ print(f'CICMD({cmd_list}, env={env})')
+ subprocess.check_call(cmd_list, cwd=start_dir, env=env)
+
+# Manifest file describing out test application
+def get_android_manifest() -> str:
+ manifest = RepoRelative('cube/android/AndroidManifest.xml')
+ if not os.path.isfile(manifest):
+ print(f"Unable to find manifest for APK! {manifest}")
+ sys.exit(-1)
+ return manifest
+
+# Generate the APK from the CMake binaries
+def generate_apk(SDK_ROOT : str, CMAKE_INSTALL_DIR : str) -> str:
+ apk_dir = RepoRelative('build-android/bin')
+
+ # Delete APK directory since it could contain files from old runs
+ if os.path.isdir(apk_dir):
+ shutil.rmtree(apk_dir)
+
+ shutil.copytree(CMAKE_INSTALL_DIR, apk_dir)
+
+ android_manifest = get_android_manifest()
+
+ android_jar = f"{SDK_ROOT}/platforms/android-26/android.jar"
+ if not os.path.isfile(android_jar):
+ print(f"Unable to find {android_jar}!")
+ sys.exit(-1)
+
+ apk_name = 'VkCube'
+
+ unaligned_apk = f'{apk_dir}/{apk_name}-unaligned.apk'
+ test_apk = f'{apk_dir}/{apk_name}.apk'
+
+ # Create APK
+ RunShellCmd(f'aapt package -f -M {android_manifest} -I {android_jar} -F {unaligned_apk} {CMAKE_INSTALL_DIR}')
+
+ # Align APK
+ RunShellCmd(f'zipalign -f 4 {unaligned_apk} {test_apk}')
+
+ # Create Key (If it doesn't already exist)
+ debug_key = RepoRelative(f'{apk_dir}/debug.keystore')
+ ks_pass = 'android'
+ if not os.path.isfile(debug_key):
+ dname = 'CN=Android-Debug,O=Android,C=US'
+ RunShellCmd(f'keytool -genkey -v -keystore {debug_key} -alias androiddebugkey -storepass {ks_pass} -keypass {ks_pass} -keyalg RSA -keysize 2048 -validity 10000 -dname {dname}')
+
+ # Sign APK
+ RunShellCmd(f'apksigner sign --verbose --ks {debug_key} --ks-pass pass:{ks_pass} {test_apk}')
+
+# Android APKs can contain binaries for multiple ABIs (armeabi-v7a, arm64-v8a, x86, x86_64).
+# https://en.wikipedia.org/wiki/Apk_(file_format)#Package_contents
+#
+# As a result CMake will need to be run multiple times to create a complete test APK that can be run on any Android device.
+def main():
+ configs = ['Release', 'Debug']
+
+ parser = argparse.ArgumentParser()
+ parser.add_argument('--config', type=str, choices=configs, default=configs[0])
+ parser.add_argument('--app-abi', dest='android_abi', type=str, default="arm64-v8a")
+ parser.add_argument('--app-stl', dest='android_stl', type=str, choices=["c++_static", "c++_shared"], default="c++_static")
+ parser.add_argument('--apk', action='store_true', help='Generate an APK as a post build step.')
+ parser.add_argument('--tests', action='store_true', help='Build tests.')
+ parser.add_argument('--clean', action='store_true', help='Cleans CMake build artifacts')
+ args = parser.parse_args()
+
+ cmake_config = args.config
+ android_abis = args.android_abi.split(" ")
+ android_stl = args.android_stl
+ create_apk = args.apk
+ build_tests = args.tests
+ clean = args.clean
+
+ if "ANDROID_NDK_HOME" not in os.environ:
+ print("Cannot find ANDROID_NDK_HOME!")
+ sys.exit(1)
+
+ android_ndk_home = os.environ.get('ANDROID_NDK_HOME')
+ android_toolchain = f'{android_ndk_home}/build/cmake/android.toolchain.cmake'
+
+ # The only tool we require for building is CMake/Ninja
+ required_cli_tools = ['cmake', 'ninja']
+
+ # If we are building an APK we need a few more tools.
+ if create_apk:
+ if "ANDROID_SDK_ROOT" not in os.environ:
+ print("Cannot find ANDROID_SDK_ROOT!")
+ sys.exit(1)
+
+ android_sdk_root = os.environ.get('ANDROID_SDK_ROOT')
+ print(f"ANDROID_SDK_ROOT = {android_sdk_root}")
+ required_cli_tools += ['aapt', 'zipalign', 'keytool', 'apksigner']
+
+ print(f"ANDROID_NDK_HOME = {android_ndk_home}")
+ print(f"Build configured for {cmake_config} | {android_stl} | {android_abis} | APK {create_apk}")
+
+ if not os.path.isfile(android_toolchain):
+ print(f'Unable to find android.toolchain.cmake at {android_toolchain}')
+ exit(-1)
+
+ for tool in required_cli_tools:
+ path = shutil.which(tool)
+ if path is None:
+ print(f"Unable to find {tool}!")
+ exit(-1)
+
+ print(f"Using {tool} : {path}")
+
+ cmake_install_dir = RepoRelative('build-android/libs')
+
+ # Delete install directory since it could contain files from old runs
+ if os.path.isdir(cmake_install_dir):
+ print("Cleaning CMake install")
+ shutil.rmtree(cmake_install_dir)
+
+ for abi in android_abis:
+ build_dir = RepoRelative(f'build-android/cmake/{abi}')
+ lib_dir = f'lib/{abi}'
+
+ if clean:
+ print("Deleting CMakeCache.txt")
+
+ # Delete CMakeCache.txt to ensure clean builds
+ # NOTE: CMake 3.24 has --fresh which would be better to use in the future.
+ cmake_cache = f'{build_dir}/CMakeCache.txt'
+ if os.path.isfile(cmake_cache):
+ os.remove(cmake_cache)
+
+ cmake_cmd = f'cmake -S . -B {build_dir} -G Ninja'
+
+ cmake_cmd += f' -D CMAKE_BUILD_TYPE={cmake_config}'
+ cmake_cmd += f' -D UPDATE_DEPS=ON -D UPDATE_DEPS_DIR={build_dir}'
+ cmake_cmd += f' -D CMAKE_TOOLCHAIN_FILE={android_toolchain}'
+ cmake_cmd += f' -D CMAKE_ANDROID_ARCH_ABI={abi}'
+ cmake_cmd += f' -D CMAKE_INSTALL_LIBDIR={lib_dir}'
+ cmake_cmd += f' -D BUILD_TESTS={build_tests}'
+ cmake_cmd += f' -D CMAKE_ANDROID_STL_TYPE={android_stl}'
+
+ cmake_cmd += ' -D ANDROID_PLATFORM=26'
+ cmake_cmd += ' -D ANDROID_USE_LEGACY_TOOLCHAIN_FILE=NO'
+
+ RunShellCmd(cmake_cmd)
+
+ build_cmd = f'cmake --build {build_dir}'
+ RunShellCmd(build_cmd)
+
+ install_cmd = f'cmake --install {build_dir} --prefix {cmake_install_dir}'
+ RunShellCmd(install_cmd)
+
+ if create_apk:
+ generate_apk(SDK_ROOT = android_sdk_root, CMAKE_INSTALL_DIR = cmake_install_dir)
+
+if __name__ == '__main__':
+ main()
diff --git a/scripts/check_code_format.sh b/scripts/check_code_format.sh
deleted file mode 100755
index 216da47..0000000
--- a/scripts/check_code_format.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2017 Google Inc.
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Script to determine if source code in Pull Request is properly formatted.
-# Exits with non 0 exit code if formatting is needed.
-#
-# This script assumes to be invoked at the project root directory.
-
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-NC='\033[0m' # No Color
-
-clang-format --version
-
-FILES_TO_CHECK=$(git diff --name-only master | grep -v -E "^include/vulkan" | grep -E ".*\.(cpp|cc|c\+\+|cxx|c|h|hpp)$")
-
-if [ -z "${FILES_TO_CHECK}" ]; then
- echo -e "${GREEN}No source code to check for formatting.${NC}"
- exit 0
-fi
-
-FORMAT_DIFF=$(git diff -U0 master -- ${FILES_TO_CHECK} | python ./scripts/clang-format-diff.py -p1 -style=file)
-
-if [ -z "${FORMAT_DIFF}" ]; then
- echo -e "${GREEN}All source code in PR properly formatted.${NC}"
- exit 0
-else
- echo -e "${RED}Found formatting errors!${NC}"
- echo "${FORMAT_DIFF}"
- echo "Be sure you are using the following version of clang-format:"
- clang-format --version
- exit 1
-fi
diff --git a/scripts/check_commit_message_format.sh b/scripts/check_commit_message_format.sh
deleted file mode 100755
index 2966635..0000000
--- a/scripts/check_commit_message_format.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2018 Valve Corporation
-# Copyright (c) 2018 LunarG, Inc.
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Checks commit messages against project standards in CONTRIBUTING.md document
-# Script to determine if commit messages in Pull Request are properly formatted.
-# Exits with non 0 exit code if reformatting is needed.
-
-# Disable subshells
-shopt -s lastpipe
-
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-NC='\033[0m' # No Color
-
-# TRAVIS_COMMIT_RANGE contains range of commits for this PR
-
-# Get user-supplied commit message text for applicable commits and insert
-# a unique separator string identifier. The git command returns ONLY the
-# subject line and body for each of the commits.
-COMMIT_TEXT=$(git log ${TRAVIS_COMMIT_RANGE} --pretty=format:"XXXNEWLINEXXX"%n%B)
-
-# Bail if there are none
-if [ -z "${COMMIT_TEXT}" ]; then
- echo -e "${GREEN}No commit messgages to check for formatting.${NC}"
- exit 0
-elif ! echo $TRAVIS_COMMIT_RANGE | grep -q "\.\.\."; then
- echo -e "${GREEN}No commit messgages to check for formatting.${NC}"
- exit 0
-fi
-
-# Process commit messages
-success=1
-current_line=0
-prevline=""
-
-# Process each line of the commit message output, resetting counter on separator
-printf %s "$COMMIT_TEXT" | while IFS='' read -r line; do
- # echo "Count = $current_line <Line> = $line"
- current_line=$((current_line+1))
- if [ "$line" = "XXXNEWLINEXXX" ]; then
- current_line=0
- fi
- chars=${#line}
- if [ $current_line -eq 1 ]; then
- # Subject line should be 50 chars or less (but give some slack here)
- if [ $chars -gt 54 ]; then
- echo "The following subject line exceeds 50 characters in length."
- echo " '$line'"
- success=0
- fi
- i=$(($chars-1))
- last_char=${line:$i:1}
- # Output error if last char of subject line is not alpha-numeric
- if [[ ! $last_char =~ [0-9a-zA-Z] ]]; then
- echo "For the following commit, the last character of the subject line must not be non-alphanumeric."
- echo " '$line'"
- success=0
- fi
- # Checking if subject line doesn't start with 'module: '
- prefix=$(echo $line | cut -f1 -d " ")
- if [ "${prefix: -1}" != ":" ]; then
- echo "The following subject line must start with a single word specifying the functional area of the change, followed by a colon and space. I.e., 'layers: Subject line here'"
- echo " '$line'"
- success=0
- fi
- elif [ $current_line -eq 2 ]; then
- # Commit message must have a blank line between subject and body
- if [ $chars -ne 0 ]; then
- echo "The following subject line must be followed by a blank line."
- echo " '$prevline'"
- success=0
- fi
- else
- # Lines in a commit message body must be less than 72 characters in length (but give some slack)
- if [ $chars -gt 76 ]; then
- echo "The following commit message body line exceeds the 72 character limit."
- echo "'$line\'"
- success=0
- fi
- fi
- prevline=$line
-done
-
-if [ $success -eq 1 ]; then
- echo -e "${GREEN}All commit messages in pull request are properly formatted.${NC}"
- exit 0
-else
- exit 1
-fi
diff --git a/scripts/common_codegen.py b/scripts/common_codegen.py
index 5ba9a57..9539db2 100644
--- a/scripts/common_codegen.py
+++ b/scripts/common_codegen.py
@@ -60,6 +60,7 @@
'provisional' : 'VK_ENABLE_BETA_EXTENSIONS',
'directfb' : 'VK_USE_PLATFORM_DIRECTFB_EXT',
'screen' : 'VK_USE_PLATFORM_SCREEN_QNX',
+ 'sci' : 'VK_USE_PLATFORM_SCI',
}
#
diff --git a/scripts/determine_vs_version.py b/scripts/determine_vs_version.py
deleted file mode 100755
index 7982bf7..0000000
--- a/scripts/determine_vs_version.py
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (c) 2016 The Khronos Group Inc.
-# Copyright (c) 2016 Valve Corporation
-# Copyright (c) 2016 LunarG, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Author: Mark Young <marky@lunarg.com>
-
-import sys
-import os
-import subprocess
-
-# Following function code snippet was found on StackOverflow (with a change to lower
-# camel-case on the variable names):
-# http://stackoverflow.com/questions/377017/test-if-executable-exists-in-python
-def find_executable(program):
- def is_exe(fPath):
- return os.path.isfile(fPath) and os.access(fPath, os.X_OK)
-
- fPath, fName = os.path.split(program)
- if fPath:
- if is_exe(program):
- return program
- else:
- for path in os.environ["PATH"].split(os.pathsep):
- path = path.strip('"')
- exe_file = os.path.join(path, program)
- if is_exe(exe_file):
- return exe_file
-
- return None
-
-def determine_year(version):
- if version == 8:
- return 2005
- elif version == 9:
- return 2008
- elif version == 10:
- return 2010
- elif version == 11:
- return 2012
- elif version == 12:
- return 2013
- elif version == 14:
- return 2015
- elif version == 15:
- return 2017
- else:
- return 0000
-
-# Determine if msbuild is in the path, then call it to determine the version and parse
-# it into a format we can use, which is "<version_num> <version_year>".
-if __name__ == '__main__':
- exeName = 'msbuild.exe'
- arguments = '/ver'
-
- # Determine if the executable exists in the path, this is critical.
- #
- foundExeName = find_executable(exeName)
-
- # If not found, return an invalid number but in the appropriate format so it will
- # fail if the program above tries to use it.
- if foundExeName == None:
- print('00 0000')
- print('Executable ' + exeName + ' not found in PATH!')
- else:
- proc = subprocess.Popen([exeName, arguments], stdout=subprocess.PIPE)
- sysCallOut = proc.stdout.readline().decode('iso-8859-1').rstrip()
-
- version = None
-
- # Split around any spaces first
- spaceList = sysCallOut.split(' ')
- for spaceString in spaceList:
-
- # If we've already found it, bail.
- if version != None:
- break
-
- # Now split around line feeds
- lineList = spaceString.split('\n')
- for curLine in lineList:
-
- # If we've already found it, bail.
- if version != None:
- break
-
- # We only want to continue if there's a period in the list
- if '.' not in curLine:
- continue
-
- # Get the first element and determine if it is a number, if so, we've
- # got our number.
- splitAroundPeriod = curLine.split('.')
- if splitAroundPeriod[0].isdigit():
- version = int (splitAroundPeriod[0])
- break
-
- # Failsafe to return a number in the proper format, but one that will fail.
- if version == None:
- version = 00
-
- # Determine the year associated with that version
- year = determine_year(version)
-
- # Output the string we need for Cmake to properly build for this version
- print(str(version) + ' ' + str(year))
diff --git a/scripts/fetch_glslangvalidator.py b/scripts/fetch_glslangvalidator.py
deleted file mode 100755
index 936def8..0000000
--- a/scripts/fetch_glslangvalidator.py
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (c) 2018 The Khronos Group Inc.
-# Copyright (c) 2018 Valve Corporation
-# Copyright (c) 2018 LunarG, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Author: Mark Lobodzinski <mark@lunarg.com>
-
-
-# This script will download the latest glslang release binary and extract the
-# glslangValidator binary needed by the vkcube and vkcubepp applications.
-#
-# It takes as its lone argument the filname (no path) describing the release
-# binary name from the glslang github releases page.
-
-import sys
-import os
-import shutil
-import ssl
-import subprocess
-import urllib.request
-import zipfile
-import platform
-
-SCRIPTS_DIR = os.path.dirname(os.path.abspath(__file__))
-REPO_DIR = os.path.join(SCRIPTS_DIR, '..')
-GLSLANG_URL = "https://github.com/KhronosGroup/glslang/releases/download/7.9.2888"
-
-def platformDir(): return platform.system().lower()
-
-if __name__ == '__main__':
- if len(sys.argv) != 2:
- print("ERROR -- must include a single glslang release zipfile name argument")
- sys.exit();
-
- GLSLANG_FILENAME = sys.argv[1]
- GLSLANG_COMPLETE_URL = GLSLANG_URL + "/" + GLSLANG_FILENAME
- GLSLANG_OUTFILENAME = os.path.join(REPO_DIR, "glslang", GLSLANG_FILENAME)
- GLSLANG_DIR = os.path.join(REPO_DIR, "glslang", platformDir())
- GLSLANG_VALIDATOR_PATH = os.path.join(GLSLANG_DIR, "bin")
- GLSLANG_VALIDATOR_FULL_PATH = os.path.join(GLSLANG_VALIDATOR_PATH, "glslangValidator")
- if platform.system() == 'Windows':
- GLSLANG_VALIDATOR_FULL_PATH = GLSLANG_VALIDATOR_FULL_PATH + '.exe'
-
- if os.path.isdir(GLSLANG_DIR):
- if os.path.exists(GLSLANG_VALIDATOR_FULL_PATH):
- print(" Using glslangValidator at %s" % GLSLANG_VALIDATOR_PATH)
- sys.exit()
- else:
- os.makedirs(GLSLANG_DIR)
- print(" Downloading glslangValidator binary from glslang releases dir")
- sys.stdout.flush()
-
- # Download release zip file from glslang github releases site
- with urllib.request.urlopen(GLSLANG_COMPLETE_URL, context=ssl._create_unverified_context()) as response, open(GLSLANG_OUTFILENAME, 'wb') as out_file:
- shutil.copyfileobj(response, out_file)
- # Unzip the glslang binary archive
- zipped_file = zipfile.ZipFile(GLSLANG_OUTFILENAME, 'r')
- namelist = zipped_file.namelist()
- for afile in namelist:
- if "glslangValidator" in afile:
- EXE_FILE_PATH = os.path.join(GLSLANG_DIR, afile)
- zipped_file.extract(afile, GLSLANG_DIR)
- os.chmod(EXE_FILE_PATH, 0o775)
- break
- zipped_file.close()
- sys.exit();
diff --git a/scripts/generate_source.py b/scripts/generate_source.py
index a2002aa..6c63f0c 100755
--- a/scripts/generate_source.py
+++ b/scripts/generate_source.py
@@ -1,8 +1,9 @@
#!/usr/bin/env python3
-# Copyright (c) 2019 The Khronos Group Inc.
-# Copyright (c) 2019 Valve Corporation
-# Copyright (c) 2019 LunarG, Inc.
-# Copyright (c) 2019 Google Inc.
+# Copyright (c) 2019-2023 The Khronos Group Inc.
+# Copyright (c) 2019-2023 Valve Corporation
+# Copyright (c) 2019-2023 LunarG, Inc.
+# Copyright (c) 2019-2023 Google Inc.
+# Copyright (c) 2023-2023 RasterGrid Kft.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -21,6 +22,7 @@
import argparse
import filecmp
import os
+import json
import shutil
import subprocess
import sys
@@ -33,6 +35,11 @@
def main(argv):
parser = argparse.ArgumentParser(description='Generate source code for this repository')
+ parser.add_argument('--api',
+ default='vulkan',
+ choices=['vulkan', 'vulkansc'],
+ help='Specify API name to generate')
+ parser.add_argument('--generated-version', help='sets the header version used to generate the repo')
parser.add_argument('registry', metavar='REGISTRY_PATH', help='path to the Vulkan-Headers registry directory')
group = parser.add_mutually_exclusive_group()
group.add_argument('-i', '--incremental', action='store_true', help='only update repo files that change')
@@ -41,13 +48,26 @@
# output paths and the list of files in the path
files_to_gen = {str(os.path.join('icd','generated')) : ['vk_typemap_helper.h',
- 'mock_icd.h',
- 'mock_icd.cpp'],
+ 'function_definitions.h',
+ 'function_declarations.h'],
str(os.path.join('vulkaninfo','generated')): ['vulkaninfo.hpp']}
#base directory for the source repository
repo_dir = common_codegen.repo_relative('')
+ # Update the api_version in the respective json files
+ if args.generated_version:
+ json_files = []
+ json_files.append(common_codegen.repo_relative('icd/VkICD_mock_icd.json.in'))
+ for json_file in json_files:
+ with open(json_file) as f:
+ data = json.load(f)
+
+ data["ICD"]["api_version"] = args.generated_version
+
+ with open(json_file, mode='w', encoding='utf-8', newline='\n') as f:
+ f.write(json.dumps(data, indent=4))
+
# get directory where generators will run if needed
if args.verify or args.incremental:
# generate in temp directory so we can compare or copy later
@@ -65,6 +85,7 @@
output_path = common_codegen.repo_relative(path)
cmd = [common_codegen.repo_relative(os.path.join('scripts','kvt_genvk.py')),
+ '-api', args.api,
'-registry', os.path.abspath(os.path.join(args.registry, 'vk.xml')),
'-quiet', '-directory', output_path, filename]
print(' '.join(cmd))
diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py
index eb6ab14..35e3e5c 100755
--- a/scripts/generate_vulkan_wrapper.py
+++ b/scripts/generate_vulkan_wrapper.py
@@ -360,6 +360,28 @@
VK_KHR_sampler_mirror_clamp_to_edge = Extension(name='VK_KHR_sampler_mirror_clamp_to_edge', version=3, guard=None, commands=[
])
+VK_KHR_video_queue = Extension(name='VK_KHR_video_queue', version=8, guard=None, commands=[
+ Command(name='vkGetPhysicalDeviceVideoCapabilitiesKHR', dispatch='VkPhysicalDevice'),
+ Command(name='vkGetPhysicalDeviceVideoFormatPropertiesKHR', dispatch='VkPhysicalDevice'),
+ Command(name='vkCreateVideoSessionKHR', dispatch='VkDevice'),
+ Command(name='vkDestroyVideoSessionKHR', dispatch='VkDevice'),
+ Command(name='vkGetVideoSessionMemoryRequirementsKHR', dispatch='VkDevice'),
+ Command(name='vkBindVideoSessionMemoryKHR', dispatch='VkDevice'),
+ Command(name='vkCreateVideoSessionParametersKHR', dispatch='VkDevice'),
+ Command(name='vkUpdateVideoSessionParametersKHR', dispatch='VkDevice'),
+ Command(name='vkDestroyVideoSessionParametersKHR', dispatch='VkDevice'),
+ Command(name='vkCmdBeginVideoCodingKHR', dispatch='VkCommandBuffer'),
+ Command(name='vkCmdEndVideoCodingKHR', dispatch='VkCommandBuffer'),
+ Command(name='vkCmdControlVideoCodingKHR', dispatch='VkCommandBuffer'),
+])
+
+VK_KHR_video_decode_queue = Extension(name='VK_KHR_video_decode_queue', version=7, guard=None, commands=[
+ Command(name='vkCmdDecodeVideoKHR', dispatch='VkCommandBuffer'),
+])
+
+VK_KHR_video_decode_h264 = Extension(name='VK_KHR_video_decode_h264', version=8, guard=None, commands=[
+])
+
VK_KHR_dynamic_rendering = Extension(name='VK_KHR_dynamic_rendering', version=1, guard=None, commands=[
Command(name='vkCmdBeginRenderingKHR', dispatch='VkCommandBuffer'),
Command(name='vkCmdEndRenderingKHR', dispatch='VkCommandBuffer'),
@@ -539,6 +561,9 @@
VK_KHR_shader_clock = Extension(name='VK_KHR_shader_clock', version=1, guard=None, commands=[
])
+VK_KHR_video_decode_h265 = Extension(name='VK_KHR_video_decode_h265', version=7, guard=None, commands=[
+])
+
VK_KHR_global_priority = Extension(name='VK_KHR_global_priority', version=1, guard=None, commands=[
])
@@ -607,6 +632,11 @@
Command(name='vkGetPipelineExecutableInternalRepresentationsKHR', dispatch='VkDevice'),
])
+VK_KHR_map_memory2 = Extension(name='VK_KHR_map_memory2', version=1, guard=None, commands=[
+ Command(name='vkMapMemory2KHR', dispatch='VkDevice'),
+ Command(name='vkUnmapMemory2KHR', dispatch='VkDevice'),
+])
+
VK_KHR_shader_integer_dot_product = Extension(name='VK_KHR_shader_integer_dot_product', version=1, guard=None, commands=[
])
@@ -667,6 +697,20 @@
Command(name='vkGetDeviceImageSparseMemoryRequirementsKHR', dispatch='VkDevice'),
])
+VK_KHR_maintenance5 = Extension(name='VK_KHR_maintenance5', version=1, guard=None, commands=[
+ Command(name='vkCmdBindIndexBuffer2KHR', dispatch='VkCommandBuffer'),
+ Command(name='vkGetRenderingAreaGranularityKHR', dispatch='VkDevice'),
+ Command(name='vkGetDeviceImageSubresourceLayoutKHR', dispatch='VkDevice'),
+ Command(name='vkGetImageSubresourceLayout2KHR', dispatch='VkDevice'),
+])
+
+VK_KHR_ray_tracing_position_fetch = Extension(name='VK_KHR_ray_tracing_position_fetch', version=1, guard=None, commands=[
+])
+
+VK_KHR_cooperative_matrix = Extension(name='VK_KHR_cooperative_matrix', version=2, guard=None, commands=[
+ Command(name='vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR', dispatch='VkPhysicalDevice'),
+])
+
VK_EXT_debug_report = Extension(name='VK_EXT_debug_report', version=10, guard=None, commands=[
Command(name='vkCreateDebugReportCallbackEXT', dispatch='VkInstance'),
Command(name='vkDestroyDebugReportCallbackEXT', dispatch='VkInstance'),
@@ -826,8 +870,10 @@
VK_NV_viewport_swizzle = Extension(name='VK_NV_viewport_swizzle', version=1, guard=None, commands=[
])
-VK_EXT_discard_rectangles = Extension(name='VK_EXT_discard_rectangles', version=1, guard=None, commands=[
+VK_EXT_discard_rectangles = Extension(name='VK_EXT_discard_rectangles', version=2, guard=None, commands=[
Command(name='vkCmdSetDiscardRectangleEXT', dispatch='VkCommandBuffer'),
+ Command(name='vkCmdSetDiscardRectangleEnableEXT', dispatch='VkCommandBuffer'),
+ Command(name='vkCmdSetDiscardRectangleModeEXT', dispatch='VkCommandBuffer'),
])
VK_EXT_conservative_rasterization = Extension(name='VK_EXT_conservative_rasterization', version=1, guard=None, commands=[
@@ -1001,7 +1047,8 @@
VK_NV_shader_image_footprint = Extension(name='VK_NV_shader_image_footprint', version=2, guard=None, commands=[
])
-VK_NV_scissor_exclusive = Extension(name='VK_NV_scissor_exclusive', version=1, guard=None, commands=[
+VK_NV_scissor_exclusive = Extension(name='VK_NV_scissor_exclusive', version=2, guard=None, commands=[
+ Command(name='vkCmdSetExclusiveScissorEnableNV', dispatch='VkCommandBuffer'),
Command(name='vkCmdSetExclusiveScissorNV', dispatch='VkCommandBuffer'),
])
@@ -1129,9 +1176,24 @@
Command(name='vkCmdSetStencilOpEXT', dispatch='VkCommandBuffer'),
])
+VK_EXT_host_image_copy = Extension(name='VK_EXT_host_image_copy', version=1, guard=None, commands=[
+ Command(name='vkCopyMemoryToImageEXT', dispatch='VkDevice'),
+ Command(name='vkCopyImageToMemoryEXT', dispatch='VkDevice'),
+ Command(name='vkCopyImageToImageEXT', dispatch='VkDevice'),
+ Command(name='vkTransitionImageLayoutEXT', dispatch='VkDevice'),
+ Command(name='vkGetImageSubresourceLayout2EXT', dispatch='VkDevice'),
+])
+
VK_EXT_shader_atomic_float2 = Extension(name='VK_EXT_shader_atomic_float2', version=1, guard=None, commands=[
])
+VK_EXT_surface_maintenance1 = Extension(name='VK_EXT_surface_maintenance1', version=1, guard=None, commands=[
+])
+
+VK_EXT_swapchain_maintenance1 = Extension(name='VK_EXT_swapchain_maintenance1', version=1, guard=None, commands=[
+ Command(name='vkReleaseSwapchainImagesEXT', dispatch='VkDevice'),
+])
+
VK_EXT_shader_demote_to_helper_invocation = Extension(name='VK_EXT_shader_demote_to_helper_invocation', version=1, guard=None, commands=[
])
@@ -1153,6 +1215,10 @@
VK_QCOM_render_pass_transform = Extension(name='VK_QCOM_render_pass_transform', version=3, guard=None, commands=[
])
+VK_EXT_depth_bias_control = Extension(name='VK_EXT_depth_bias_control', version=1, guard=None, commands=[
+ Command(name='vkCmdSetDepthBias2EXT', dispatch='VkCommandBuffer'),
+])
+
VK_EXT_device_memory_report = Extension(name='VK_EXT_device_memory_report', version=2, guard=None, commands=[
])
@@ -1189,6 +1255,23 @@
VK_QCOM_render_pass_store_ops = Extension(name='VK_QCOM_render_pass_store_ops', version=2, guard=None, commands=[
])
+VK_NV_low_latency = Extension(name='VK_NV_low_latency', version=1, guard=None, commands=[
+])
+
+VK_EXT_descriptor_buffer = Extension(name='VK_EXT_descriptor_buffer', version=1, guard=None, commands=[
+ Command(name='vkGetDescriptorSetLayoutSizeEXT', dispatch='VkDevice'),
+ Command(name='vkGetDescriptorSetLayoutBindingOffsetEXT', dispatch='VkDevice'),
+ Command(name='vkGetDescriptorEXT', dispatch='VkDevice'),
+ Command(name='vkCmdBindDescriptorBuffersEXT', dispatch='VkCommandBuffer'),
+ Command(name='vkCmdSetDescriptorBufferOffsetsEXT', dispatch='VkCommandBuffer'),
+ Command(name='vkCmdBindDescriptorBufferEmbeddedSamplersEXT', dispatch='VkCommandBuffer'),
+ Command(name='vkGetBufferOpaqueCaptureDescriptorDataEXT', dispatch='VkDevice'),
+ Command(name='vkGetImageOpaqueCaptureDescriptorDataEXT', dispatch='VkDevice'),
+ Command(name='vkGetImageViewOpaqueCaptureDescriptorDataEXT', dispatch='VkDevice'),
+ Command(name='vkGetSamplerOpaqueCaptureDescriptorDataEXT', dispatch='VkDevice'),
+ Command(name='vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT', dispatch='VkDevice'),
+])
+
VK_EXT_graphics_pipeline_library = Extension(name='VK_EXT_graphics_pipeline_library', version=1, guard=None, commands=[
])
@@ -1215,7 +1298,6 @@
])
VK_EXT_image_compression_control = Extension(name='VK_EXT_image_compression_control', version=1, guard=None, commands=[
- Command(name='vkGetImageSubresourceLayout2EXT', dispatch='VkDevice'),
])
VK_EXT_attachment_feedback_loop_layout = Extension(name='VK_EXT_attachment_feedback_loop_layout', version=2, guard=None, commands=[
@@ -1224,7 +1306,7 @@
VK_EXT_4444_formats = Extension(name='VK_EXT_4444_formats', version=1, guard=None, commands=[
])
-VK_EXT_device_fault = Extension(name='VK_EXT_device_fault', version=1, guard=None, commands=[
+VK_EXT_device_fault = Extension(name='VK_EXT_device_fault', version=2, guard=None, commands=[
Command(name='vkGetDeviceFaultInfoEXT', dispatch='VkDevice'),
])
@@ -1234,11 +1316,6 @@
VK_EXT_rgba10x6_formats = Extension(name='VK_EXT_rgba10x6_formats', version=1, guard=None, commands=[
])
-VK_NV_acquire_winrt_display = Extension(name='VK_NV_acquire_winrt_display', version=1, guard=None, commands=[
- Command(name='vkAcquireWinrtDisplayNV', dispatch='VkPhysicalDevice'),
- Command(name='vkGetWinrtDisplayNV', dispatch='VkPhysicalDevice'),
-])
-
VK_VALVE_mutable_descriptor_type = Extension(name='VK_VALVE_mutable_descriptor_type', version=1, guard=None, commands=[
])
@@ -1258,7 +1335,7 @@
VK_EXT_primitive_topology_list_restart = Extension(name='VK_EXT_primitive_topology_list_restart', version=1, guard=None, commands=[
])
-VK_HUAWEI_subpass_shading = Extension(name='VK_HUAWEI_subpass_shading', version=2, guard=None, commands=[
+VK_HUAWEI_subpass_shading = Extension(name='VK_HUAWEI_subpass_shading', version=3, guard=None, commands=[
Command(name='vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI', dispatch='VkDevice'),
Command(name='vkCmdSubpassShadingHUAWEI', dispatch='VkCommandBuffer'),
])
@@ -1275,6 +1352,9 @@
Command(name='vkGetPipelinePropertiesEXT', dispatch='VkDevice'),
])
+VK_EXT_frame_boundary = Extension(name='VK_EXT_frame_boundary', version=1, guard=None, commands=[
+])
+
VK_EXT_multisampled_render_to_single_sampled = Extension(name='VK_EXT_multisampled_render_to_single_sampled', version=1, guard=None, commands=[
])
@@ -1307,6 +1387,9 @@
VK_EXT_image_2d_view_of_3d = Extension(name='VK_EXT_image_2d_view_of_3d', version=1, guard=None, commands=[
])
+VK_EXT_shader_tile_image = Extension(name='VK_EXT_shader_tile_image', version=1, guard=None, commands=[
+])
+
VK_EXT_opacity_micromap = Extension(name='VK_EXT_opacity_micromap', version=2, guard=None, commands=[
Command(name='vkCreateMicromapEXT', dispatch='VkDevice'),
Command(name='vkDestroyMicromapEXT', dispatch='VkDevice'),
@@ -1327,6 +1410,11 @@
VK_EXT_load_store_op_none = Extension(name='VK_EXT_load_store_op_none', version=1, guard=None, commands=[
])
+VK_HUAWEI_cluster_culling_shader = Extension(name='VK_HUAWEI_cluster_culling_shader', version=2, guard=None, commands=[
+ Command(name='vkCmdDrawClusterHUAWEI', dispatch='VkCommandBuffer'),
+ Command(name='vkCmdDrawClusterIndirectHUAWEI', dispatch='VkCommandBuffer'),
+])
+
VK_EXT_border_color_swizzle = Extension(name='VK_EXT_border_color_swizzle', version=1, guard=None, commands=[
])
@@ -1334,6 +1422,12 @@
Command(name='vkSetDeviceMemoryPriorityEXT', dispatch='VkDevice'),
])
+VK_ARM_shader_core_properties = Extension(name='VK_ARM_shader_core_properties', version=1, guard=None, commands=[
+])
+
+VK_EXT_image_sliced_view_of_3d = Extension(name='VK_EXT_image_sliced_view_of_3d', version=1, guard=None, commands=[
+])
+
VK_VALVE_descriptor_set_host_mapping = Extension(name='VK_VALVE_descriptor_set_host_mapping', version=1, guard=None, commands=[
Command(name='vkGetDescriptorSetLayoutHostMappingInfoVALVE', dispatch='VkDevice'),
Command(name='vkGetDescriptorSetHostMappingVALVE', dispatch='VkDevice'),
@@ -1348,6 +1442,22 @@
VK_QCOM_fragment_density_map_offset = Extension(name='VK_QCOM_fragment_density_map_offset', version=1, guard=None, commands=[
])
+VK_NV_copy_memory_indirect = Extension(name='VK_NV_copy_memory_indirect', version=1, guard=None, commands=[
+ Command(name='vkCmdCopyMemoryIndirectNV', dispatch='VkCommandBuffer'),
+ Command(name='vkCmdCopyMemoryToImageIndirectNV', dispatch='VkCommandBuffer'),
+])
+
+VK_NV_memory_decompression = Extension(name='VK_NV_memory_decompression', version=1, guard=None, commands=[
+ Command(name='vkCmdDecompressMemoryNV', dispatch='VkCommandBuffer'),
+ Command(name='vkCmdDecompressMemoryIndirectCountNV', dispatch='VkCommandBuffer'),
+])
+
+VK_NV_device_generated_commands_compute = Extension(name='VK_NV_device_generated_commands_compute', version=2, guard=None, commands=[
+ Command(name='vkGetPipelineIndirectMemoryRequirementsNV', dispatch='VkDevice'),
+ Command(name='vkCmdUpdatePipelineIndirectBufferNV', dispatch='VkCommandBuffer'),
+ Command(name='vkGetPipelineIndirectDeviceAddressNV', dispatch='VkDevice'),
+])
+
VK_NV_linear_color_attachment = Extension(name='VK_NV_linear_color_attachment', version=1, guard=None, commands=[
])
@@ -1360,6 +1470,12 @@
VK_QCOM_image_processing = Extension(name='VK_QCOM_image_processing', version=1, guard=None, commands=[
])
+VK_EXT_nested_command_buffer = Extension(name='VK_EXT_nested_command_buffer', version=1, guard=None, commands=[
+])
+
+VK_EXT_external_memory_acquire_unmodified = Extension(name='VK_EXT_external_memory_acquire_unmodified', version=1, guard=None, commands=[
+])
+
VK_EXT_extended_dynamic_state3 = Extension(name='VK_EXT_extended_dynamic_state3', version=2, guard=None, commands=[
Command(name='vkCmdSetTessellationDomainOriginEXT', dispatch='VkCommandBuffer'),
Command(name='vkCmdSetDepthClampEnableEXT', dispatch='VkCommandBuffer'),
@@ -1397,6 +1513,9 @@
VK_EXT_subpass_merge_feedback = Extension(name='VK_EXT_subpass_merge_feedback', version=2, guard=None, commands=[
])
+VK_LUNARG_direct_driver_loading = Extension(name='VK_LUNARG_direct_driver_loading', version=1, guard=None, commands=[
+])
+
VK_EXT_shader_module_identifier = Extension(name='VK_EXT_shader_module_identifier', version=1, guard=None, commands=[
Command(name='vkGetShaderModuleIdentifierEXT', dispatch='VkDevice'),
Command(name='vkGetShaderModuleCreateInfoIdentifierEXT', dispatch='VkDevice'),
@@ -1419,6 +1538,13 @@
VK_EXT_pipeline_protected_access = Extension(name='VK_EXT_pipeline_protected_access', version=1, guard=None, commands=[
])
+VK_EXT_shader_object = Extension(name='VK_EXT_shader_object', version=1, guard=None, commands=[
+ Command(name='vkCreateShadersEXT', dispatch='VkDevice'),
+ Command(name='vkDestroyShaderEXT', dispatch='VkDevice'),
+ Command(name='vkGetShaderBinaryDataEXT', dispatch='VkDevice'),
+ Command(name='vkCmdBindShadersEXT', dispatch='VkCommandBuffer'),
+])
+
VK_QCOM_tile_properties = Extension(name='VK_QCOM_tile_properties', version=1, guard=None, commands=[
Command(name='vkGetFramebufferTilePropertiesQCOM', dispatch='VkDevice'),
Command(name='vkGetDynamicRenderingTilePropertiesQCOM', dispatch='VkDevice'),
@@ -1427,10 +1553,58 @@
VK_SEC_amigo_profiling = Extension(name='VK_SEC_amigo_profiling', version=1, guard=None, commands=[
])
+VK_QCOM_multiview_per_view_viewports = Extension(name='VK_QCOM_multiview_per_view_viewports', version=1, guard=None, commands=[
+])
+
+VK_NV_ray_tracing_invocation_reorder = Extension(name='VK_NV_ray_tracing_invocation_reorder', version=1, guard=None, commands=[
+])
+
+VK_NV_extended_sparse_address_space = Extension(name='VK_NV_extended_sparse_address_space', version=1, guard=None, commands=[
+])
+
VK_EXT_mutable_descriptor_type = Extension(name='VK_EXT_mutable_descriptor_type', version=1, guard=None, commands=[
])
-VK_ARM_shader_core_builtins = Extension(name='VK_ARM_shader_core_builtins', version=1, guard=None, commands=[
+VK_ARM_shader_core_builtins = Extension(name='VK_ARM_shader_core_builtins', version=2, guard=None, commands=[
+])
+
+VK_EXT_pipeline_library_group_handles = Extension(name='VK_EXT_pipeline_library_group_handles', version=1, guard=None, commands=[
+])
+
+VK_EXT_dynamic_rendering_unused_attachments = Extension(name='VK_EXT_dynamic_rendering_unused_attachments', version=1, guard=None, commands=[
+])
+
+VK_NV_low_latency2 = Extension(name='VK_NV_low_latency2', version=1, guard=None, commands=[
+ Command(name='vkSetLatencySleepModeNV', dispatch='VkDevice'),
+ Command(name='vkLatencySleepNV', dispatch='VkDevice'),
+ Command(name='vkSetLatencyMarkerNV', dispatch='VkDevice'),
+ Command(name='vkGetLatencyTimingsNV', dispatch='VkDevice'),
+ Command(name='vkQueueNotifyOutOfBandNV', dispatch='VkQueue'),
+])
+
+VK_QCOM_multiview_per_view_render_areas = Extension(name='VK_QCOM_multiview_per_view_render_areas', version=1, guard=None, commands=[
+])
+
+VK_QCOM_image_processing2 = Extension(name='VK_QCOM_image_processing2', version=1, guard=None, commands=[
+])
+
+VK_QCOM_filter_cubic_weights = Extension(name='VK_QCOM_filter_cubic_weights', version=1, guard=None, commands=[
+])
+
+VK_QCOM_ycbcr_degamma = Extension(name='VK_QCOM_ycbcr_degamma', version=1, guard=None, commands=[
+])
+
+VK_QCOM_filter_cubic_clamp = Extension(name='VK_QCOM_filter_cubic_clamp', version=1, guard=None, commands=[
+])
+
+VK_EXT_attachment_feedback_loop_dynamic_state = Extension(name='VK_EXT_attachment_feedback_loop_dynamic_state', version=1, guard=None, commands=[
+ Command(name='vkCmdSetAttachmentFeedbackLoopEnableEXT', dispatch='VkCommandBuffer'),
+])
+
+VK_MSFT_layered_driver = Extension(name='VK_MSFT_layered_driver', version=1, guard=None, commands=[
+])
+
+VK_NV_descriptor_pool_overallocation = Extension(name='VK_NV_descriptor_pool_overallocation', version=1, guard=None, commands=[
])
VK_KHR_acceleration_structure = Extension(name='VK_KHR_acceleration_structure', version=13, guard=None, commands=[
@@ -1479,6 +1653,9 @@
Command(name='vkGetMemoryAndroidHardwareBufferANDROID', dispatch='VkDevice'),
])
+VK_ANDROID_external_format_resolve = Extension(name='VK_ANDROID_external_format_resolve', version=1, guard='VK_USE_PLATFORM_ANDROID_KHR', commands=[
+])
+
VK_FUCHSIA_imagepipe_surface = Extension(name='VK_FUCHSIA_imagepipe_surface', version=1, guard='VK_USE_PLATFORM_FUCHSIA', commands=[
Command(name='vkCreateImagePipeSurfaceFUCHSIA', dispatch='VkInstance'),
])
@@ -1563,6 +1740,11 @@
Command(name='vkGetDeviceGroupSurfacePresentModes2EXT', dispatch='VkDevice'),
])
+VK_NV_acquire_winrt_display = Extension(name='VK_NV_acquire_winrt_display', version=1, guard='VK_USE_PLATFORM_WIN32_KHR', commands=[
+ Command(name='vkAcquireWinrtDisplayNV', dispatch='VkPhysicalDevice'),
+ Command(name='vkGetWinrtDisplayNV', dispatch='VkPhysicalDevice'),
+])
+
VK_KHR_xcb_surface = Extension(name='VK_KHR_xcb_surface', version=6, guard='VK_USE_PLATFORM_XCB_KHR', commands=[
Command(name='vkCreateXcbSurfaceKHR', dispatch='VkInstance'),
Command(name='vkGetPhysicalDeviceXcbPresentationSupportKHR', dispatch='VkPhysicalDevice'),
@@ -1595,42 +1777,36 @@
Command(name='vkGetPhysicalDeviceScreenPresentationSupportQNX', dispatch='VkPhysicalDevice'),
])
-VK_KHR_video_queue = Extension(name='VK_KHR_video_queue', version=7, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
- Command(name='vkGetPhysicalDeviceVideoCapabilitiesKHR', dispatch='VkPhysicalDevice'),
- Command(name='vkGetPhysicalDeviceVideoFormatPropertiesKHR', dispatch='VkPhysicalDevice'),
- Command(name='vkCreateVideoSessionKHR', dispatch='VkDevice'),
- Command(name='vkDestroyVideoSessionKHR', dispatch='VkDevice'),
- Command(name='vkGetVideoSessionMemoryRequirementsKHR', dispatch='VkDevice'),
- Command(name='vkBindVideoSessionMemoryKHR', dispatch='VkDevice'),
- Command(name='vkCreateVideoSessionParametersKHR', dispatch='VkDevice'),
- Command(name='vkUpdateVideoSessionParametersKHR', dispatch='VkDevice'),
- Command(name='vkDestroyVideoSessionParametersKHR', dispatch='VkDevice'),
- Command(name='vkCmdBeginVideoCodingKHR', dispatch='VkCommandBuffer'),
- Command(name='vkCmdEndVideoCodingKHR', dispatch='VkCommandBuffer'),
- Command(name='vkCmdControlVideoCodingKHR', dispatch='VkCommandBuffer'),
-])
-
-VK_KHR_video_decode_queue = Extension(name='VK_KHR_video_decode_queue', version=6, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
- Command(name='vkCmdDecodeVideoKHR', dispatch='VkCommandBuffer'),
+VK_QNX_external_memory_screen_buffer = Extension(name='VK_QNX_external_memory_screen_buffer', version=1, guard='VK_USE_PLATFORM_SCREEN_QNX', commands=[
+ Command(name='vkGetScreenBufferPropertiesQNX', dispatch='VkDevice'),
])
VK_KHR_portability_subset = Extension(name='VK_KHR_portability_subset', version=1, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
])
-VK_KHR_video_encode_queue = Extension(name='VK_KHR_video_encode_queue', version=7, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
+VK_KHR_video_encode_queue = Extension(name='VK_KHR_video_encode_queue', version=10, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
+ Command(name='vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR', dispatch='VkPhysicalDevice'),
+ Command(name='vkGetEncodedVideoSessionParametersKHR', dispatch='VkDevice'),
Command(name='vkCmdEncodeVideoKHR', dispatch='VkCommandBuffer'),
])
-VK_EXT_video_encode_h264 = Extension(name='VK_EXT_video_encode_h264', version=9, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
+VK_EXT_video_encode_h264 = Extension(name='VK_EXT_video_encode_h264', version=12, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
])
-VK_EXT_video_encode_h265 = Extension(name='VK_EXT_video_encode_h265', version=9, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
+VK_EXT_video_encode_h265 = Extension(name='VK_EXT_video_encode_h265', version=12, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
])
-VK_EXT_video_decode_h264 = Extension(name='VK_EXT_video_decode_h264', version=7, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
+VK_AMDX_shader_enqueue = Extension(name='VK_AMDX_shader_enqueue', version=1, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
+ Command(name='vkCreateExecutionGraphPipelinesAMDX', dispatch='VkDevice'),
+ Command(name='vkGetExecutionGraphPipelineScratchSizeAMDX', dispatch='VkDevice'),
+ Command(name='vkGetExecutionGraphPipelineNodeIndexAMDX', dispatch='VkDevice'),
+ Command(name='vkCmdInitializeGraphScratchMemoryAMDX', dispatch='VkCommandBuffer'),
+ Command(name='vkCmdDispatchGraphAMDX', dispatch='VkCommandBuffer'),
+ Command(name='vkCmdDispatchGraphIndirectAMDX', dispatch='VkCommandBuffer'),
+ Command(name='vkCmdDispatchGraphIndirectCountAMDX', dispatch='VkCommandBuffer'),
])
-VK_EXT_video_decode_h265 = Extension(name='VK_EXT_video_decode_h265', version=5, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
+VK_NV_displacement_micromap = Extension(name='VK_NV_displacement_micromap', version=2, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
])
extensions = [
@@ -1643,6 +1819,9 @@
VK_KHR_display,
VK_KHR_display_swapchain,
VK_KHR_sampler_mirror_clamp_to_edge,
+ VK_KHR_video_queue,
+ VK_KHR_video_decode_queue,
+ VK_KHR_video_decode_h264,
VK_KHR_dynamic_rendering,
VK_KHR_multiview,
VK_KHR_get_physical_device_properties2,
@@ -1685,6 +1864,7 @@
VK_KHR_8bit_storage,
VK_KHR_shader_atomic_int64,
VK_KHR_shader_clock,
+ VK_KHR_video_decode_h265,
VK_KHR_global_priority,
VK_KHR_driver_properties,
VK_KHR_shader_float_controls,
@@ -1702,6 +1882,7 @@
VK_KHR_buffer_device_address,
VK_KHR_deferred_host_operations,
VK_KHR_pipeline_executable_properties,
+ VK_KHR_map_memory2,
VK_KHR_shader_integer_dot_product,
VK_KHR_pipeline_library,
VK_KHR_shader_non_semantic_info,
@@ -1716,6 +1897,9 @@
VK_KHR_ray_tracing_maintenance1,
VK_KHR_portability_enumeration,
VK_KHR_maintenance4,
+ VK_KHR_maintenance5,
+ VK_KHR_ray_tracing_position_fetch,
+ VK_KHR_cooperative_matrix,
VK_EXT_debug_report,
VK_NV_glsl_shader,
VK_EXT_depth_range_unrestricted,
@@ -1833,12 +2017,16 @@
VK_EXT_host_query_reset,
VK_EXT_index_type_uint8,
VK_EXT_extended_dynamic_state,
+ VK_EXT_host_image_copy,
VK_EXT_shader_atomic_float2,
+ VK_EXT_surface_maintenance1,
+ VK_EXT_swapchain_maintenance1,
VK_EXT_shader_demote_to_helper_invocation,
VK_NV_device_generated_commands,
VK_NV_inherited_viewport_scissor,
VK_EXT_texel_buffer_alignment,
VK_QCOM_render_pass_transform,
+ VK_EXT_depth_bias_control,
VK_EXT_device_memory_report,
VK_EXT_acquire_drm_display,
VK_EXT_robustness2,
@@ -1849,6 +2037,8 @@
VK_EXT_pipeline_creation_cache_control,
VK_NV_device_diagnostics_config,
VK_QCOM_render_pass_store_ops,
+ VK_NV_low_latency,
+ VK_EXT_descriptor_buffer,
VK_EXT_graphics_pipeline_library,
VK_AMD_shader_early_and_late_fragment_tests,
VK_NV_fragment_shading_rate_enums,
@@ -1863,7 +2053,6 @@
VK_EXT_device_fault,
VK_ARM_rasterization_order_attachment_access,
VK_EXT_rgba10x6_formats,
- VK_NV_acquire_winrt_display,
VK_VALVE_mutable_descriptor_type,
VK_EXT_vertex_input_dynamic_state,
VK_EXT_physical_device_drm,
@@ -1874,6 +2063,7 @@
VK_HUAWEI_invocation_mask,
VK_NV_external_memory_rdma,
VK_EXT_pipeline_properties,
+ VK_EXT_frame_boundary,
VK_EXT_multisampled_render_to_single_sampled,
VK_EXT_extended_dynamic_state2,
VK_EXT_color_write_enable,
@@ -1882,35 +2072,61 @@
VK_EXT_image_view_min_lod,
VK_EXT_multi_draw,
VK_EXT_image_2d_view_of_3d,
+ VK_EXT_shader_tile_image,
VK_EXT_opacity_micromap,
VK_EXT_load_store_op_none,
+ VK_HUAWEI_cluster_culling_shader,
VK_EXT_border_color_swizzle,
VK_EXT_pageable_device_local_memory,
+ VK_ARM_shader_core_properties,
+ VK_EXT_image_sliced_view_of_3d,
VK_VALVE_descriptor_set_host_mapping,
VK_EXT_depth_clamp_zero_one,
VK_EXT_non_seamless_cube_map,
VK_QCOM_fragment_density_map_offset,
+ VK_NV_copy_memory_indirect,
+ VK_NV_memory_decompression,
+ VK_NV_device_generated_commands_compute,
VK_NV_linear_color_attachment,
VK_GOOGLE_surfaceless_query,
VK_EXT_image_compression_control_swapchain,
VK_QCOM_image_processing,
+ VK_EXT_nested_command_buffer,
+ VK_EXT_external_memory_acquire_unmodified,
VK_EXT_extended_dynamic_state3,
VK_EXT_subpass_merge_feedback,
+ VK_LUNARG_direct_driver_loading,
VK_EXT_shader_module_identifier,
VK_EXT_rasterization_order_attachment_access,
VK_NV_optical_flow,
VK_EXT_legacy_dithering,
VK_EXT_pipeline_protected_access,
+ VK_EXT_shader_object,
VK_QCOM_tile_properties,
VK_SEC_amigo_profiling,
+ VK_QCOM_multiview_per_view_viewports,
+ VK_NV_ray_tracing_invocation_reorder,
+ VK_NV_extended_sparse_address_space,
VK_EXT_mutable_descriptor_type,
VK_ARM_shader_core_builtins,
+ VK_EXT_pipeline_library_group_handles,
+ VK_EXT_dynamic_rendering_unused_attachments,
+ VK_NV_low_latency2,
+ VK_QCOM_multiview_per_view_render_areas,
+ VK_QCOM_image_processing2,
+ VK_QCOM_filter_cubic_weights,
+ VK_QCOM_ycbcr_degamma,
+ VK_QCOM_filter_cubic_clamp,
+ VK_EXT_attachment_feedback_loop_dynamic_state,
+ VK_MSFT_layered_driver,
+ VK_NV_descriptor_pool_overallocation,
VK_KHR_acceleration_structure,
VK_KHR_ray_tracing_pipeline,
VK_KHR_ray_query,
VK_EXT_mesh_shader,
VK_KHR_android_surface,
VK_ANDROID_external_memory_android_hardware_buffer,
+ VK_ANDROID_external_format_resolve,
VK_FUCHSIA_imagepipe_surface,
VK_FUCHSIA_external_memory,
VK_FUCHSIA_external_semaphore,
@@ -1929,6 +2145,7 @@
VK_NV_external_memory_win32,
VK_NV_win32_keyed_mutex,
VK_EXT_full_screen_exclusive,
+ VK_NV_acquire_winrt_display,
VK_KHR_xcb_surface,
VK_KHR_xlib_surface,
VK_EXT_directfb_surface,
@@ -1936,14 +2153,13 @@
VK_GGP_stream_descriptor_surface,
VK_GGP_frame_token,
VK_QNX_screen_surface,
- VK_KHR_video_queue,
- VK_KHR_video_decode_queue,
+ VK_QNX_external_memory_screen_buffer,
VK_KHR_portability_subset,
VK_KHR_video_encode_queue,
VK_EXT_video_encode_h264,
VK_EXT_video_encode_h265,
- VK_EXT_video_decode_h264,
- VK_EXT_video_decode_h265,
+ VK_AMDX_shader_enqueue,
+ VK_NV_displacement_micromap,
]
# end of generated code
@@ -2134,7 +2350,9 @@
if line.startswith("#include \"vulkan_"):
# Extract the filename and parse it. Must be local to script file (no path).
- extensions.extend(parse_subheader(line[10:].replace('"', ''), ext_guard))
+ filename = line[10:].replace('"', '')
+ if filename != "vulkan_sci.h":
+ extensions.extend(parse_subheader(filename, ext_guard))
elif line.startswith("#ifdef VK_USE_PLATFORM") or line.startswith('#ifdef VK_ENABLE_BETA_EXTENSIONS'):
guard_begin = line.find(" ") + 1
ext_guard = line[guard_begin:]
diff --git a/scripts/gn/DEPS b/scripts/gn/DEPS
new file mode 100644
index 0000000..8cf931a
--- /dev/null
+++ b/scripts/gn/DEPS
@@ -0,0 +1,68 @@
+gclient_gn_args_file = 'build/config/gclient_args.gni'
+
+vars = {
+ 'chromium_git': 'https://chromium.googlesource.com',
+ 'ninja_version': 'version:2@1.11.1.chromium.6',
+}
+
+deps = {
+
+ 'build': {
+ 'url': '{chromium_git}/chromium/src/build.git@1015724d82945f9ef7e51c6f804034ccf5f79951',
+ },
+
+ 'buildtools': {
+ 'url': '{chromium_git}/chromium/src/buildtools.git@3c7e3f1b8b1e4c0b6ec693430379cea682de78d6',
+ },
+
+ 'buildtools/linux64': {
+ 'packages': [
+ {
+ 'package': 'gn/gn/linux-${{arch}}',
+ 'version': 'git_revision:5e19d2fb166fbd4f6f32147fbb2f497091a54ad8',
+ }
+ ],
+ 'dep_type': 'cipd',
+ 'condition': 'host_os == "linux"',
+ },
+
+ 'testing': {
+ 'url': '{chromium_git}/chromium/src/testing@949b2864b6bd27656753b917c9aa7731dc7a06f6',
+ },
+
+ 'tools/clang': {
+ 'url': '{chromium_git}/chromium/src/tools/clang.git@566877f1ff1a5fa6beaca3ab4b47bd0b92eb614f',
+ },
+
+ 'third_party/ninja': {
+ 'packages': [
+ {
+ 'package': 'infra/3pp/tools/ninja/${{platform}}',
+ 'version': Var('ninja_version'),
+ }
+ ],
+ 'dep_type': 'cipd',
+ },
+
+}
+
+hooks = [
+ {
+ 'name': 'sysroot_x64',
+ 'pattern': '.',
+ 'condition': 'checkout_linux and checkout_x64',
+ 'action': ['python3', 'build/linux/sysroot_scripts/install-sysroot.py',
+ '--arch=x64'],
+ },
+ {
+ # Note: On Win, this should run after win_toolchain, as it may use it.
+ 'name': 'clang',
+ 'pattern': '.',
+ 'action': ['python3', 'tools/clang/scripts/update.py'],
+ },
+]
+
+recursedeps = [
+ # buildtools provides clang_format.
+ 'buildtools',
+]
diff --git a/build-gn/generate_vulkan_layers_json.py b/scripts/gn/generate_vulkan_icd_json.py
similarity index 81%
rename from build-gn/generate_vulkan_layers_json.py
rename to scripts/gn/generate_vulkan_icd_json.py
index 93d105b..498bc07 100755
--- a/build-gn/generate_vulkan_layers_json.py
+++ b/scripts/gn/generate_vulkan_icd_json.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
+# Copyright (c) 2022-2023 LunarG, Inc.
# Copyright (C) 2016 The ANGLE Project Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,18 +27,19 @@
import platform
import sys
-
def glob_slash(dirname):
"""Like regular glob but replaces \ with / in returned paths."""
return [s.replace('\\', '/') for s in glob.glob(dirname)]
-
def main():
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('--icd', action='store_true')
+ parser.add_argument('--no-path-prefix', action='store_true')
+ parser.add_argument('--platform', type=str, default=platform.system(),
+ help='Target platform to build validation layers for: '
+ 'Linux|Darwin|Windows|Fuchsia|...')
parser.add_argument('source_dir')
parser.add_argument('target_dir')
- parser.add_argument('version_header', help='path to vulkan_core.h')
parser.add_argument('json_files', nargs='*')
args = parser.parse_args()
@@ -82,25 +84,17 @@
with open(target_fname, 'w') as outfile:
json.dump(data, outfile)
- # Get the Vulkan version from the vulkan_core.h file
- vk_header_filename = args.version_header
- vk_version = None
- with open(vk_header_filename) as vk_header_file:
- for line in vk_header_file:
- if line.startswith('#define VK_HEADER_VERSION'):
- vk_version = line.split()[-1]
- break
- if not vk_version:
- print('failed to extract vk_version', file=sys.stderr)
- return 1
-
# Set json file prefix and suffix for generating files, default to Linux.
- relative_path_prefix = '../lib'
- file_type_suffix = '.so'
- if platform.system() == 'Windows':
+ if args.no_path_prefix:
+ relative_path_prefix = ''
+ elif args.platform == 'Windows':
relative_path_prefix = r'..\\' # json-escaped, hence two backslashes.
+ else:
+ relative_path_prefix = '../lib'
+ file_type_suffix = '.so'
+ if args.platform == 'Windows':
file_type_suffix = '.dll'
- elif platform.system() == 'Darwin':
+ elif args.platform == 'Darwin':
file_type_suffix = '.dylib'
# For each *.json.in template files in source dir generate actual json file
@@ -119,9 +113,7 @@
with open(json_out_fname,'w') as json_out_file, \
open(json_in_name) as infile:
for line in infile:
- line = line.replace('@RELATIVE_LAYER_BINARY@',
- relative_path_prefix + layer_lib_name)
- line = line.replace('@VK_VERSION@', '1.1.' + vk_version)
+ line = line.replace('@JSON_LIBRARY_PATH@', relative_path_prefix + layer_lib_name)
json_out_file.write(line)
if __name__ == '__main__':
diff --git a/scripts/gn/gn.py b/scripts/gn/gn.py
new file mode 100755
index 0000000..52b20c5
--- /dev/null
+++ b/scripts/gn/gn.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python3
+# Copyright 2023 The Khronos Group Inc.
+# Copyright 2023 Valve Corporation
+# Copyright 2023 LunarG, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import os
+import subprocess
+import sys
+
+# helper to define paths relative to the repo root
+def RepoRelative(path):
+ return os.path.abspath(os.path.join(os.path.dirname(__file__), '../../', path))
+
+def BuildGn():
+ if not os.path.exists(RepoRelative("depot_tools")):
+ print("Cloning Chromium depot_tools\n", flush=True)
+ clone_cmd = 'git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git depot_tools'.split(" ")
+ subprocess.call(clone_cmd)
+
+ os.environ['PATH'] = os.environ.get('PATH') + ":" + RepoRelative("depot_tools")
+
+ print("Updating Repo Dependencies and GN Toolchain\n", flush=True)
+ update_cmd = './scripts/gn/update_deps.sh'
+ subprocess.call(update_cmd)
+
+ print("Checking Header Dependencies\n", flush=True)
+ gn_check_cmd = 'gn gen --check out/Debug'.split(" ")
+ subprocess.call(gn_check_cmd)
+
+ print("Generating Ninja Files\n", flush=True)
+ gn_gen_cmd = 'gn gen out/Debug'.split(" ")
+ subprocess.call(gn_gen_cmd)
+
+ print("Running Ninja Build\n", flush=True)
+ ninja_build_cmd = 'ninja -C out/Debug'.split(" ")
+ subprocess.call(ninja_build_cmd)
+
+#
+# Module Entrypoint
+def main():
+ try:
+ BuildGn()
+
+ except subprocess.CalledProcessError as proc_error:
+ print('Command "%s" failed with return code %s' % (' '.join(proc_error.cmd), proc_error.returncode))
+ sys.exit(proc_error.returncode)
+ except Exception as unknown_error:
+ print('An unkown error occured: %s', unknown_error)
+ sys.exit(1)
+
+ sys.exit(0)
+
+if __name__ == '__main__':
+ main()
diff --git a/build-gn/secondary/build_overrides/build.gni b/scripts/gn/secondary/build_overrides/build.gni
similarity index 94%
rename from build-gn/secondary/build_overrides/build.gni
rename to scripts/gn/secondary/build_overrides/build.gni
index c6c11fa..dbf4703 100644
--- a/build-gn/secondary/build_overrides/build.gni
+++ b/scripts/gn/secondary/build_overrides/build.gni
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 LunarG, Inc.
+# Copyright (c) 2019-2023 LunarG, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/build-gn/secondary/build_overrides/vulkan_headers.gni b/scripts/gn/secondary/build_overrides/vulkan_headers.gni
similarity index 93%
rename from build-gn/secondary/build_overrides/vulkan_headers.gni
rename to scripts/gn/secondary/build_overrides/vulkan_headers.gni
index 0cd8307..5f24b39 100644
--- a/build-gn/secondary/build_overrides/vulkan_headers.gni
+++ b/scripts/gn/secondary/build_overrides/vulkan_headers.gni
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 LunarG, Inc.
+# Copyright (c) 2020-2023 LunarG, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/build-gn/secondary/build_overrides/vulkan_tools.gni b/scripts/gn/secondary/build_overrides/vulkan_tools.gni
similarity index 94%
rename from build-gn/secondary/build_overrides/vulkan_tools.gni
rename to scripts/gn/secondary/build_overrides/vulkan_tools.gni
index 9f80846..c62fb64 100644
--- a/build-gn/secondary/build_overrides/vulkan_tools.gni
+++ b/scripts/gn/secondary/build_overrides/vulkan_tools.gni
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 LunarG, Inc.
+# Copyright (c) 2019-2023 LunarG, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/build-gn/update_deps.sh b/scripts/gn/update_deps.sh
similarity index 69%
rename from build-gn/update_deps.sh
rename to scripts/gn/update_deps.sh
index 41da2ab..763c305 100755
--- a/build-gn/update_deps.sh
+++ b/scripts/gn/update_deps.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (c) 2019 LunarG, Inc.
+# Copyright (c) 2019-2023 LunarG, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,17 +15,29 @@
# limitations under the License.
# Execute at repo root
-cd "$(dirname $0)/.."
+cd "$(dirname $0)/../../"
# Use update_deps.py to update source dependencies from /scripts/known_good.json
scripts/update_deps.py --dir="external" --no-build
-# Use gclient to update toolchain dependencies from /build-gn/DEPS (from chromium)
+cat << EOF > .gn
+buildconfig = "//build/config/BUILDCONFIG.gn"
+secondary_source = "//scripts/gn/secondary/"
+
+script_executable = "python3"
+
+default_args = {
+ clang_use_chrome_plugins = false
+ use_custom_libcxx = false
+}
+EOF
+
+# Use gclient to update toolchain dependencies from /scripts/gn/DEPS (from chromium)
cat << EOF >> .gclient
solutions = [
{ "name" : ".",
"url" : "https://github.com/KhronosGroup/Vulkan-Tools",
- "deps_file" : "build-gn/DEPS",
+ "deps_file" : "scripts/gn/DEPS",
"managed" : False,
"custom_deps" : {
},
diff --git a/scripts/known_good.json b/scripts/known_good.json
index 8af846a..2b865f8 100644
--- a/scripts/known_good.json
+++ b/scripts/known_good.json
@@ -1,54 +1,74 @@
{
- "repos" : [
- {
- "name" : "Vulkan-Headers",
- "url" : "https://github.com/KhronosGroup/Vulkan-Headers.git",
- "sub_dir" : "Vulkan-Headers",
- "build_dir" : "Vulkan-Headers/build",
- "install_dir" : "Vulkan-Headers/build/install",
- "commit" : "v1.3.231"
- },
- {
- "name" : "MoltenVK",
- "url" : "https://github.com/KhronosGroup/MoltenVK.git",
- "sub_dir" : "MoltenVK",
- "build_dir" : "MoltenVK",
- "install_dir" : "MoltenVK",
- "commit" : "v1.1.11",
- "custom_build" : [
- "./fetchDependencies --macos --no-parallel-build",
- "xcodebuild -project MoltenVKPackaging.xcodeproj GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS MVK_CONFIG_LOG_LEVEL=1' -scheme \"MoltenVK Package (macOS only)\" build"
- ],
- "build_step" : "custom",
- "build_platforms" : [
- "darwin"
- ]
- },
- {
- "name" : "Vulkan-Loader",
- "url" : "https://github.com/KhronosGroup/Vulkan-Loader.git",
- "sub_dir" : "Vulkan-Loader",
- "build_dir" : "Vulkan-Loader/build",
- "install_dir" : "Vulkan-Loader/build/install",
- "commit" : "v1.3.231",
- "deps" : [
+ "repos": [
{
- "var_name" : "VULKAN_HEADERS_INSTALL_DIR",
- "repo_name" : "Vulkan-Headers"
+ "name": "Vulkan-Headers",
+ "api": "vulkan",
+ "url": "https://github.com/KhronosGroup/Vulkan-Headers.git",
+ "sub_dir": "Vulkan-Headers",
+ "build_dir": "Vulkan-Headers/build",
+ "install_dir": "Vulkan-Headers/build/install",
+ "commit": "v1.3.268"
+ },
+ {
+ "name": "MoltenVK",
+ "url": "https://github.com/KhronosGroup/MoltenVK.git",
+ "sub_dir": "MoltenVK",
+ "build_dir": "MoltenVK",
+ "install_dir": "MoltenVK",
+ "commit": "v1.2.5",
+ "custom_build": [
+ "./fetchDependencies --macos --no-parallel-build",
+ "xcodebuild -project MoltenVKPackaging.xcodeproj GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS MVK_CONFIG_LOG_LEVEL=1' -scheme \"MoltenVK Package (macOS only)\" build"
+ ],
+ "build_step": "custom",
+ "build_platforms": [
+ "darwin"
+ ]
+ },
+ {
+ "name": "Vulkan-Loader",
+ "api": "vulkan",
+ "url": "https://github.com/KhronosGroup/Vulkan-Loader.git",
+ "sub_dir": "Vulkan-Loader",
+ "build_dir": "Vulkan-Loader/build",
+ "install_dir": "Vulkan-Loader/build/install",
+ "cmake_options": [
+ "-DLOADER_USE_UNSAFE_FILE_SEARCH=ON"
+ ],
+ "commit": "v1.3.268",
+ "build_platforms": [
+ "windows",
+ "linux",
+ "darwin"
+ ],
+ "deps": [
+ {
+ "var_name": "VULKAN_HEADERS_INSTALL_DIR",
+ "repo_name": "Vulkan-Headers"
+ }
+ ]
+ },
+ {
+ "name": "googletest",
+ "url": "https://github.com/google/googletest.git",
+ "sub_dir": "googletest",
+ "build_dir": "googletest/build",
+ "install_dir": "googletest/build/install",
+ "cmake_options": [
+ "-DBUILD_GMOCK=OFF",
+ "-Dgtest_force_shared_crt=ON",
+ "-DBUILD_SHARED_LIBS=OFF"
+ ],
+ "commit": "v1.14.0",
+ "optional": [
+ "tests"
+ ]
}
- ],
- "cmake_options" : [
- "-DBUILD_TESTS=NO"
- ],
- "build_platforms" : [
- "linux",
- "darwin"
- ]
+ ],
+ "install_names": {
+ "Vulkan-Headers": "VULKAN_HEADERS_INSTALL_DIR",
+ "Vulkan-Loader": "VULKAN_LOADER_INSTALL_DIR",
+ "MoltenVK": "MOLTENVK_REPO_ROOT",
+ "googletest": "GOOGLETEST_INSTALL_DIR"
}
- ],
- "install_names" : {
- "Vulkan-Headers" : "VULKAN_HEADERS_INSTALL_DIR",
- "Vulkan-Loader" : "VULKAN_LOADER_INSTALL_DIR",
- "MoltenVK" : "MOLTENVK_REPO_ROOT"
- }
-}
+}
\ No newline at end of file
diff --git a/scripts/kvt_genvk.py b/scripts/kvt_genvk.py
index 8cd3e1b..804b407 100644
--- a/scripts/kvt_genvk.py
+++ b/scripts/kvt_genvk.py
@@ -1,6 +1,7 @@
#!/usr/bin/python3
#
-# Copyright (c) 2013-2019 The Khronos Group Inc.
+# Copyright (c) 2013-2023 The Khronos Group Inc.
+# Copyright (c) 2023-2023 RasterGrid Kft.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -59,8 +60,14 @@
global genOpts
genOpts = {}
+ # API to generate sources for
+ apiname = args.api
+
# Default class of extensions to include, or None
- defaultExtensions = args.defaultExtensions
+ if args.defaultExtensions is not None:
+ defaultExtensions = args.defaultExtensions
+ else:
+ defaultExtensions = apiname
# Additional extensions to include (list of extensions)
extensions = args.extension
@@ -97,7 +104,7 @@
# Copyright text prefixing all headers (list of strings).
prefixStrings = [
'/*',
- '** Copyright (c) 2015-2018 The Khronos Group Inc.',
+ '** Copyright (c) 2015-2018, 2023 The Khronos Group Inc.',
'**',
'** Licensed under the Apache License, Version 2.0 (the "License");',
'** you may not use this file except in compliance with the License.',
@@ -137,11 +144,11 @@
filename='vk_typemap_helper.h',
directory=directory,
genpath=None,
- apiname='vulkan',
+ apiname=apiname,
profile=None,
versions=featuresPat,
emitversions=featuresPat,
- defaultExtensions='vulkan',
+ defaultExtensions=defaultExtensions,
addExtensions=addExtensionsPat,
removeExtensions=removeExtensionsPat,
emitExtensions=emitExtensionsPat,
@@ -156,18 +163,18 @@
]
# Options for mock ICD header
- genOpts['mock_icd.h'] = [
+ genOpts['function_declarations.h'] = [
MockICDOutputGenerator,
MockICDGeneratorOptions(
conventions=conventions,
- filename='mock_icd.h',
+ filename='function_declarations.h',
directory=directory,
genpath=None,
- apiname='vulkan',
+ apiname=apiname,
profile=None,
versions=featuresPat,
emitversions=featuresPat,
- defaultExtensions='vulkan',
+ defaultExtensions=defaultExtensions,
addExtensions=addExtensionsPat,
removeExtensions=removeExtensionsPat,
emitExtensions=emitExtensionsPat,
@@ -178,22 +185,22 @@
apientryp='VKAPI_PTR *',
alignFuncParam=48,
expandEnumerants=False,
- helper_file_type='mock_icd_header')
+ helper_file_type='mock_icd_function_declaration_implementation')
]
# Options for mock ICD cpp
- genOpts['mock_icd.cpp'] = [
+ genOpts['function_definitions.h'] = [
MockICDOutputGenerator,
MockICDGeneratorOptions(
conventions=conventions,
- filename='mock_icd.cpp',
+ filename='function_definitions.h',
directory=directory,
genpath=None,
- apiname='vulkan',
+ apiname=apiname,
profile=None,
versions=featuresPat,
emitversions=featuresPat,
- defaultExtensions='vulkan',
+ defaultExtensions=defaultExtensions,
addExtensions=addExtensionsPat,
removeExtensions=removeExtensionsPat,
emitExtensions=emitExtensionsPat,
@@ -204,7 +211,7 @@
apientryp='VKAPI_PTR *',
alignFuncParam=48,
expandEnumerants=False,
- helper_file_type='mock_icd_source')
+ helper_file_type='mock_icd_function_definition_implementation')
]
# Options for vulkaninfo.hpp
@@ -215,11 +222,11 @@
filename='vulkaninfo.hpp',
directory=directory,
genpath=None,
- apiname='vulkan',
+ apiname=apiname,
profile=None,
versions=featuresPat,
emitversions=featuresPat,
- defaultExtensions='vulkan',
+ defaultExtensions=defaultExtensions,
addExtensions=addExtensionsPat,
removeExtensions=removeExtensionsPat,
emitExtensions=emitExtensionsPat,
@@ -254,6 +261,7 @@
if not args.quiet:
write('* Building', options.filename, file=sys.stderr)
+ write('* options.apiname =', options.apiname, file=sys.stderr)
write('* options.versions =', options.versions, file=sys.stderr)
write('* options.emitversions =', options.emitversions, file=sys.stderr)
write('* options.defaultExtensions =', options.defaultExtensions, file=sys.stderr)
@@ -279,8 +287,12 @@
if __name__ == '__main__':
parser = argparse.ArgumentParser()
- parser.add_argument('-defaultExtensions', action='store',
+ parser.add_argument('-api', action='store',
default='vulkan',
+ choices=['vulkan', 'vulkansc'],
+ help='Specify API name to generate')
+ parser.add_argument('-defaultExtensions', action='store',
+ default=None,
help='Specify a single class of extensions to add to targets')
parser.add_argument('-directory', action='store', default='.',
help='Specify where the built file is place')
@@ -402,4 +414,4 @@
startTimer(args.time)
reg.apiGen()
endTimer(args.time, '* Time to generate ' + options.filename + ' =')
- genTarget(args)
\ No newline at end of file
+ genTarget(args)
diff --git a/scripts/mock_icd_generator.py b/scripts/mock_icd_generator.py
index bf366fe..bb87af3 100644
--- a/scripts/mock_icd_generator.py
+++ b/scripts/mock_icd_generator.py
@@ -1,9 +1,10 @@
#!/usr/bin/python3 -i
#
-# Copyright (c) 2015-2022 The Khronos Group Inc.
-# Copyright (c) 2015-2022 Valve Corporation
-# Copyright (c) 2015-2022 LunarG, Inc.
-# Copyright (c) 2015-2022 Google Inc.
+# Copyright (c) 2015-2023 The Khronos Group Inc.
+# Copyright (c) 2015-2023 Valve Corporation
+# Copyright (c) 2015-2023 LunarG, Inc.
+# Copyright (c) 2015-2023 Google Inc.
+# Copyright (c) 2023-2023 RasterGrid Kft.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -28,401 +29,6 @@
from generator import *
from common_codegen import *
-
-# Mock header code
-HEADER_C_CODE = '''
-using mutex_t = std::mutex;
-using lock_guard_t = std::lock_guard<mutex_t>;
-using unique_lock_t = std::unique_lock<mutex_t>;
-
-static mutex_t global_lock;
-static uint64_t global_unique_handle = 1;
-static const uint32_t SUPPORTED_LOADER_ICD_INTERFACE_VERSION = 5;
-static uint32_t loader_interface_version = 0;
-static bool negotiate_loader_icd_interface_called = false;
-static void* CreateDispObjHandle() {
- auto handle = new VK_LOADER_DATA;
- set_loader_magic_value(handle);
- return handle;
-}
-static void DestroyDispObjHandle(void* handle) {
- delete reinterpret_cast<VK_LOADER_DATA*>(handle);
-}
-'''
-
-# Manual code at the top of the cpp source file
-SOURCE_CPP_PREFIX = '''
-using std::unordered_map;
-
-static constexpr uint32_t icd_physical_device_count = 1;
-static constexpr uint32_t kSupportedVulkanAPIVersion = VK_API_VERSION_1_1;
-static unordered_map<VkInstance, std::array<VkPhysicalDevice, icd_physical_device_count>> physical_device_map;
-
-// Map device memory handle to any mapped allocations that we'll need to free on unmap
-static unordered_map<VkDeviceMemory, std::vector<void*>> mapped_memory_map;
-
-// Map device memory allocation handle to the size
-static unordered_map<VkDeviceMemory, VkDeviceSize> allocated_memory_size_map;
-
-static unordered_map<VkDevice, unordered_map<uint32_t, unordered_map<uint32_t, VkQueue>>> queue_map;
-static unordered_map<VkDevice, unordered_map<VkBuffer, VkBufferCreateInfo>> buffer_map;
-static unordered_map<VkDevice, unordered_map<VkImage, VkDeviceSize>> image_memory_size_map;
-static unordered_map<VkCommandPool, std::vector<VkCommandBuffer>> command_pool_buffer_map;
-
-static constexpr uint32_t icd_swapchain_image_count = 1;
-static unordered_map<VkSwapchainKHR, VkImage[icd_swapchain_image_count]> swapchain_image_map;
-
-// TODO: Would like to codegen this but limits aren't in XML
-static VkPhysicalDeviceLimits SetLimits(VkPhysicalDeviceLimits *limits) {
- limits->maxImageDimension1D = 4096;
- limits->maxImageDimension2D = 4096;
- limits->maxImageDimension3D = 256;
- limits->maxImageDimensionCube = 4096;
- limits->maxImageArrayLayers = 256;
- limits->maxTexelBufferElements = 65536;
- limits->maxUniformBufferRange = 16384;
- limits->maxStorageBufferRange = 134217728;
- limits->maxPushConstantsSize = 128;
- limits->maxMemoryAllocationCount = 4096;
- limits->maxSamplerAllocationCount = 4000;
- limits->bufferImageGranularity = 1;
- limits->sparseAddressSpaceSize = 2147483648;
- limits->maxBoundDescriptorSets = 4;
- limits->maxPerStageDescriptorSamplers = 16;
- limits->maxPerStageDescriptorUniformBuffers = 12;
- limits->maxPerStageDescriptorStorageBuffers = 4;
- limits->maxPerStageDescriptorSampledImages = 16;
- limits->maxPerStageDescriptorStorageImages = 4;
- limits->maxPerStageDescriptorInputAttachments = 4;
- limits->maxPerStageResources = 128;
- limits->maxDescriptorSetSamplers = 96;
- limits->maxDescriptorSetUniformBuffers = 72;
- limits->maxDescriptorSetUniformBuffersDynamic = 8;
- limits->maxDescriptorSetStorageBuffers = 24;
- limits->maxDescriptorSetStorageBuffersDynamic = 4;
- limits->maxDescriptorSetSampledImages = 96;
- limits->maxDescriptorSetStorageImages = 24;
- limits->maxDescriptorSetInputAttachments = 4;
- limits->maxVertexInputAttributes = 16;
- limits->maxVertexInputBindings = 16;
- limits->maxVertexInputAttributeOffset = 2047;
- limits->maxVertexInputBindingStride = 2048;
- limits->maxVertexOutputComponents = 64;
- limits->maxTessellationGenerationLevel = 64;
- limits->maxTessellationPatchSize = 32;
- limits->maxTessellationControlPerVertexInputComponents = 64;
- limits->maxTessellationControlPerVertexOutputComponents = 64;
- limits->maxTessellationControlPerPatchOutputComponents = 120;
- limits->maxTessellationControlTotalOutputComponents = 2048;
- limits->maxTessellationEvaluationInputComponents = 64;
- limits->maxTessellationEvaluationOutputComponents = 64;
- limits->maxGeometryShaderInvocations = 32;
- limits->maxGeometryInputComponents = 64;
- limits->maxGeometryOutputComponents = 64;
- limits->maxGeometryOutputVertices = 256;
- limits->maxGeometryTotalOutputComponents = 1024;
- limits->maxFragmentInputComponents = 64;
- limits->maxFragmentOutputAttachments = 4;
- limits->maxFragmentDualSrcAttachments = 1;
- limits->maxFragmentCombinedOutputResources = 4;
- limits->maxComputeSharedMemorySize = 16384;
- limits->maxComputeWorkGroupCount[0] = 65535;
- limits->maxComputeWorkGroupCount[1] = 65535;
- limits->maxComputeWorkGroupCount[2] = 65535;
- limits->maxComputeWorkGroupInvocations = 128;
- limits->maxComputeWorkGroupSize[0] = 128;
- limits->maxComputeWorkGroupSize[1] = 128;
- limits->maxComputeWorkGroupSize[2] = 64;
- limits->subPixelPrecisionBits = 4;
- limits->subTexelPrecisionBits = 4;
- limits->mipmapPrecisionBits = 4;
- limits->maxDrawIndexedIndexValue = UINT32_MAX;
- limits->maxDrawIndirectCount = UINT16_MAX;
- limits->maxSamplerLodBias = 2.0f;
- limits->maxSamplerAnisotropy = 16;
- limits->maxViewports = 16;
- limits->maxViewportDimensions[0] = 4096;
- limits->maxViewportDimensions[1] = 4096;
- limits->viewportBoundsRange[0] = -8192;
- limits->viewportBoundsRange[1] = 8191;
- limits->viewportSubPixelBits = 0;
- limits->minMemoryMapAlignment = 64;
- limits->minTexelBufferOffsetAlignment = 16;
- limits->minUniformBufferOffsetAlignment = 16;
- limits->minStorageBufferOffsetAlignment = 16;
- limits->minTexelOffset = -8;
- limits->maxTexelOffset = 7;
- limits->minTexelGatherOffset = -8;
- limits->maxTexelGatherOffset = 7;
- limits->minInterpolationOffset = 0.0f;
- limits->maxInterpolationOffset = 0.5f;
- limits->subPixelInterpolationOffsetBits = 4;
- limits->maxFramebufferWidth = 4096;
- limits->maxFramebufferHeight = 4096;
- limits->maxFramebufferLayers = 256;
- limits->framebufferColorSampleCounts = 0x7F;
- limits->framebufferDepthSampleCounts = 0x7F;
- limits->framebufferStencilSampleCounts = 0x7F;
- limits->framebufferNoAttachmentsSampleCounts = 0x7F;
- limits->maxColorAttachments = 4;
- limits->sampledImageColorSampleCounts = 0x7F;
- limits->sampledImageIntegerSampleCounts = 0x7F;
- limits->sampledImageDepthSampleCounts = 0x7F;
- limits->sampledImageStencilSampleCounts = 0x7F;
- limits->storageImageSampleCounts = 0x7F;
- limits->maxSampleMaskWords = 1;
- limits->timestampComputeAndGraphics = VK_TRUE;
- limits->timestampPeriod = 1;
- limits->maxClipDistances = 8;
- limits->maxCullDistances = 8;
- limits->maxCombinedClipAndCullDistances = 8;
- limits->discreteQueuePriorities = 2;
- limits->pointSizeRange[0] = 1.0f;
- limits->pointSizeRange[1] = 64.0f;
- limits->lineWidthRange[0] = 1.0f;
- limits->lineWidthRange[1] = 8.0f;
- limits->pointSizeGranularity = 1.0f;
- limits->lineWidthGranularity = 1.0f;
- limits->strictLines = VK_TRUE;
- limits->standardSampleLocations = VK_TRUE;
- limits->optimalBufferCopyOffsetAlignment = 1;
- limits->optimalBufferCopyRowPitchAlignment = 1;
- limits->nonCoherentAtomSize = 256;
-
- return *limits;
-}
-
-void SetBoolArrayTrue(VkBool32* bool_array, uint32_t num_bools)
-{
- for (uint32_t i = 0; i < num_bools; ++i) {
- bool_array[i] = VK_TRUE;
- }
-}
-'''
-
-# Manual code at the end of the cpp source file
-SOURCE_CPP_POSTFIX = '''
-
-static VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL GetPhysicalDeviceProcAddr(VkInstance instance, const char *funcName) {
- // TODO: This function should only care about physical device functions and return nullptr for other functions
- const auto &item = name_to_funcptr_map.find(funcName);
- if (item != name_to_funcptr_map.end()) {
- return reinterpret_cast<PFN_vkVoidFunction>(item->second);
- }
- // Mock should intercept all functions so if we get here just return null
- return nullptr;
-}
-
-} // namespace vkmock
-
-#if defined(__GNUC__) && __GNUC__ >= 4
-#define EXPORT __attribute__((visibility("default")))
-#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
-#define EXPORT __attribute__((visibility("default")))
-#else
-#define EXPORT
-#endif
-
-extern "C" {
-
-EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr(VkInstance instance, const char* pName) {
- if (!vkmock::negotiate_loader_icd_interface_called) {
- vkmock::loader_interface_version = 1;
- }
- return vkmock::GetInstanceProcAddr(instance, pName);
-}
-
-EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetPhysicalDeviceProcAddr(VkInstance instance, const char* pName) {
- return vkmock::GetPhysicalDeviceProcAddr(instance, pName);
-}
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion) {
- vkmock::negotiate_loader_icd_interface_called = true;
- vkmock::loader_interface_version = *pSupportedVersion;
- if (*pSupportedVersion > vkmock::SUPPORTED_LOADER_ICD_INTERFACE_VERSION) {
- *pSupportedVersion = vkmock::SUPPORTED_LOADER_ICD_INTERFACE_VERSION;
- }
- return VK_SUCCESS;
-}
-
-
-EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroySurfaceKHR(
- VkInstance instance,
- VkSurfaceKHR surface,
- const VkAllocationCallbacks* pAllocator)
-{
- vkmock::DestroySurfaceKHR(instance, surface, pAllocator);
-}
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceSupportKHR(
- VkPhysicalDevice physicalDevice,
- uint32_t queueFamilyIndex,
- VkSurfaceKHR surface,
- VkBool32* pSupported)
-{
- return vkmock::GetPhysicalDeviceSurfaceSupportKHR(physicalDevice, queueFamilyIndex, surface, pSupported);
-}
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceCapabilitiesKHR(
- VkPhysicalDevice physicalDevice,
- VkSurfaceKHR surface,
- VkSurfaceCapabilitiesKHR* pSurfaceCapabilities)
-{
- return vkmock::GetPhysicalDeviceSurfaceCapabilitiesKHR(physicalDevice, surface, pSurfaceCapabilities);
-}
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceFormatsKHR(
- VkPhysicalDevice physicalDevice,
- VkSurfaceKHR surface,
- uint32_t* pSurfaceFormatCount,
- VkSurfaceFormatKHR* pSurfaceFormats)
-{
- return vkmock::GetPhysicalDeviceSurfaceFormatsKHR(physicalDevice, surface, pSurfaceFormatCount, pSurfaceFormats);
-}
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfacePresentModesKHR(
- VkPhysicalDevice physicalDevice,
- VkSurfaceKHR surface,
- uint32_t* pPresentModeCount,
- VkPresentModeKHR* pPresentModes)
-{
- return vkmock::GetPhysicalDeviceSurfacePresentModesKHR(physicalDevice, surface, pPresentModeCount, pPresentModes);
-}
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateDisplayPlaneSurfaceKHR(
- VkInstance instance,
- const VkDisplaySurfaceCreateInfoKHR* pCreateInfo,
- const VkAllocationCallbacks* pAllocator,
- VkSurfaceKHR* pSurface)
-{
- return vkmock::CreateDisplayPlaneSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
-}
-
-#ifdef VK_USE_PLATFORM_XLIB_KHR
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateXlibSurfaceKHR(
- VkInstance instance,
- const VkXlibSurfaceCreateInfoKHR* pCreateInfo,
- const VkAllocationCallbacks* pAllocator,
- VkSurfaceKHR* pSurface)
-{
- return vkmock::CreateXlibSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
-}
-#endif /* VK_USE_PLATFORM_XLIB_KHR */
-
-#ifdef VK_USE_PLATFORM_XCB_KHR
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateXcbSurfaceKHR(
- VkInstance instance,
- const VkXcbSurfaceCreateInfoKHR* pCreateInfo,
- const VkAllocationCallbacks* pAllocator,
- VkSurfaceKHR* pSurface)
-{
- return vkmock::CreateXcbSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
-}
-#endif /* VK_USE_PLATFORM_XCB_KHR */
-
-#ifdef VK_USE_PLATFORM_WAYLAND_KHR
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateWaylandSurfaceKHR(
- VkInstance instance,
- const VkWaylandSurfaceCreateInfoKHR* pCreateInfo,
- const VkAllocationCallbacks* pAllocator,
- VkSurfaceKHR* pSurface)
-{
- return vkmock::CreateWaylandSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
-}
-#endif /* VK_USE_PLATFORM_WAYLAND_KHR */
-
-#ifdef VK_USE_PLATFORM_ANDROID_KHR
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateAndroidSurfaceKHR(
- VkInstance instance,
- const VkAndroidSurfaceCreateInfoKHR* pCreateInfo,
- const VkAllocationCallbacks* pAllocator,
- VkSurfaceKHR* pSurface)
-{
- return vkmock::CreateAndroidSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
-}
-#endif /* VK_USE_PLATFORM_ANDROID_KHR */
-
-#ifdef VK_USE_PLATFORM_WIN32_KHR
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateWin32SurfaceKHR(
- VkInstance instance,
- const VkWin32SurfaceCreateInfoKHR* pCreateInfo,
- const VkAllocationCallbacks* pAllocator,
- VkSurfaceKHR* pSurface)
-{
- return vkmock::CreateWin32SurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
-}
-#endif /* VK_USE_PLATFORM_WIN32_KHR */
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetDeviceGroupSurfacePresentModesKHR(
- VkDevice device,
- VkSurfaceKHR surface,
- VkDeviceGroupPresentModeFlagsKHR* pModes)
-{
- return vkmock::GetDeviceGroupSurfacePresentModesKHR(device, surface, pModes);
-}
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDevicePresentRectanglesKHR(
- VkPhysicalDevice physicalDevice,
- VkSurfaceKHR surface,
- uint32_t* pRectCount,
- VkRect2D* pRects)
-{
- return vkmock::GetPhysicalDevicePresentRectanglesKHR(physicalDevice, surface, pRectCount, pRects);
-}
-
-#ifdef VK_USE_PLATFORM_VI_NN
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateViSurfaceNN(
- VkInstance instance,
- const VkViSurfaceCreateInfoNN* pCreateInfo,
- const VkAllocationCallbacks* pAllocator,
- VkSurfaceKHR* pSurface)
-{
- return vkmock::CreateViSurfaceNN(instance, pCreateInfo, pAllocator, pSurface);
-}
-#endif /* VK_USE_PLATFORM_VI_NN */
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceCapabilities2EXT(
- VkPhysicalDevice physicalDevice,
- VkSurfaceKHR surface,
- VkSurfaceCapabilities2EXT* pSurfaceCapabilities)
-{
- return vkmock::GetPhysicalDeviceSurfaceCapabilities2EXT(physicalDevice, surface, pSurfaceCapabilities);
-}
-
-#ifdef VK_USE_PLATFORM_IOS_MVK
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateIOSSurfaceMVK(
- VkInstance instance,
- const VkIOSSurfaceCreateInfoMVK* pCreateInfo,
- const VkAllocationCallbacks* pAllocator,
- VkSurfaceKHR* pSurface)
-{
- return vkmock::CreateIOSSurfaceMVK(instance, pCreateInfo, pAllocator, pSurface);
-}
-#endif /* VK_USE_PLATFORM_IOS_MVK */
-
-#ifdef VK_USE_PLATFORM_MACOS_MVK
-
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateMacOSSurfaceMVK(
- VkInstance instance,
- const VkMacOSSurfaceCreateInfoMVK* pCreateInfo,
- const VkAllocationCallbacks* pAllocator,
- VkSurfaceKHR* pSurface)
-{
- return vkmock::CreateMacOSSurfaceMVK(instance, pCreateInfo, pAllocator, pSurface);
-}
-#endif /* VK_USE_PLATFORM_MACOS_MVK */
-
-} // end extern "C"
-
-'''
-
CUSTOM_C_INTERCEPTS = {
'vkCreateInstance': '''
// TODO: If loader ver <=4 ICD must fail with VK_ERROR_INCOMPATIBLE_DRIVER for all vkCreateInstance calls with
@@ -471,6 +77,12 @@
DestroyDispObjHandle((void*) pCommandBuffers[i]);
}
''',
+'vkCreateCommandPool': '''
+ unique_lock_t lock(global_lock);
+ *pCommandPool = (VkCommandPool)global_unique_handle++;
+ command_pool_map[device].insert(*pCommandPool);
+ return VK_SUCCESS;
+''',
'vkDestroyCommandPool': '''
// destroy command buffers for this pool
unique_lock_t lock(global_lock);
@@ -481,6 +93,7 @@
}
command_pool_buffer_map.erase(it);
}
+ command_pool_map[device].erase(commandPool);
''',
'vkEnumeratePhysicalDevices': '''
VkResult result_code = VK_SUCCESS;
@@ -509,6 +122,14 @@
}
}
+ for (auto& cp : command_pool_map[device]) {
+ for (auto& cb : command_pool_buffer_map[cp]) {
+ DestroyDispObjHandle((void*) cb);
+ }
+ command_pool_buffer_map.erase(cp);
+ }
+ command_pool_map[device].clear();
+
queue_map.erase(device);
buffer_map.erase(device);
image_memory_size_map.erase(device);
@@ -535,7 +156,7 @@
return VK_SUCCESS;
''',
'vkEnumerateInstanceVersion': '''
- *pApiVersion = kSupportedVulkanAPIVersion;
+ *pApiVersion = VK_HEADER_VERSION_COMPLETE;
return VK_SUCCESS;
''',
'vkEnumerateDeviceLayerProperties': '''
@@ -679,6 +300,18 @@
''',
'vkGetPhysicalDeviceSurfaceCapabilities2KHR': '''
GetPhysicalDeviceSurfaceCapabilitiesKHR(physicalDevice, pSurfaceInfo->surface, &pSurfaceCapabilities->surfaceCapabilities);
+
+ auto *present_mode_compatibility = lvl_find_mod_in_chain<VkSurfacePresentModeCompatibilityEXT>(pSurfaceCapabilities->pNext);
+ if (present_mode_compatibility) {
+ if (!present_mode_compatibility->pPresentModes) {
+ present_mode_compatibility->presentModeCount = 3;
+ } else {
+ // arbitrary
+ present_mode_compatibility->pPresentModes[0] = VK_PRESENT_MODE_IMMEDIATE_KHR;
+ present_mode_compatibility->pPresentModes[1] = VK_PRESENT_MODE_FIFO_KHR;
+ present_mode_compatibility->pPresentModes[2] = VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR;
+ }
+ }
return VK_SUCCESS;
''',
'vkGetInstanceProcAddr': '''
@@ -696,13 +329,27 @@
return GetInstanceProcAddr(nullptr, pName);
''',
'vkGetPhysicalDeviceMemoryProperties': '''
- pMemoryProperties->memoryTypeCount = 2;
+ pMemoryProperties->memoryTypeCount = 6;
+ // Host visible Coherent
pMemoryProperties->memoryTypes[0].propertyFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
pMemoryProperties->memoryTypes[0].heapIndex = 0;
- pMemoryProperties->memoryTypes[1].propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
- pMemoryProperties->memoryTypes[1].heapIndex = 1;
+ // Host visible Cached
+ pMemoryProperties->memoryTypes[1].propertyFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
+ pMemoryProperties->memoryTypes[1].heapIndex = 0;
+ // Device local and Host visible
+ pMemoryProperties->memoryTypes[2].propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
+ pMemoryProperties->memoryTypes[2].heapIndex = 1;
+ // Device local lazily
+ pMemoryProperties->memoryTypes[3].propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT;
+ pMemoryProperties->memoryTypes[3].heapIndex = 1;
+ // Device local protected
+ pMemoryProperties->memoryTypes[4].propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_PROTECTED_BIT;
+ pMemoryProperties->memoryTypes[4].heapIndex = 1;
+ // Device local only
+ pMemoryProperties->memoryTypes[5].propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
+ pMemoryProperties->memoryTypes[5].heapIndex = 1;
pMemoryProperties->memoryHeapCount = 2;
- pMemoryProperties->memoryHeaps[0].flags = 0;
+ pMemoryProperties->memoryHeaps[0].flags = VK_MEMORY_HEAP_MULTI_INSTANCE_BIT;
pMemoryProperties->memoryHeaps[0].size = 8000000000;
pMemoryProperties->memoryHeaps[1].flags = VK_MEMORY_HEAP_DEVICE_LOCAL_BIT;
pMemoryProperties->memoryHeaps[1].size = 8000000000;
@@ -715,9 +362,9 @@
*pQueueFamilyPropertyCount = 1;
} else {
if (*pQueueFamilyPropertyCount) {
- pQueueFamilyProperties[0].queueFlags = VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT | VK_QUEUE_SPARSE_BINDING_BIT;
+ pQueueFamilyProperties[0].queueFlags = VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT | VK_QUEUE_SPARSE_BINDING_BIT | VK_QUEUE_PROTECTED_BIT;
pQueueFamilyProperties[0].queueCount = 1;
- pQueueFamilyProperties[0].timestampValidBits = 0;
+ pQueueFamilyProperties[0].timestampValidBits = 16;
pQueueFamilyProperties[0].minImageTransferGranularity = {1,1,1};
}
}
@@ -752,6 +399,11 @@
feat_bools = (VkBool32*)&blendop_features->advancedBlendCoherentOperations;
SetBoolArrayTrue(feat_bools, num_bools);
}
+ const auto *host_image_copy_features = lvl_find_in_chain<VkPhysicalDeviceHostImageCopyFeaturesEXT>(pFeatures->pNext);
+ if (host_image_copy_features) {
+ feat_bools = (VkBool32*)&host_image_copy_features->hostImageCopy;
+ SetBoolArrayTrue(feat_bools, 1);
+ }
''',
'vkGetPhysicalDeviceFormatProperties': '''
if (VK_FORMAT_UNDEFINED == format) {
@@ -782,6 +434,7 @@
props_3->linearTilingFeatures = pFormatProperties->formatProperties.linearTilingFeatures;
props_3->optimalTilingFeatures = pFormatProperties->formatProperties.optimalTilingFeatures;
props_3->bufferFeatures = pFormatProperties->formatProperties.bufferFeatures;
+ props_3->optimalTilingFeatures |= VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT_EXT;
}
''',
'vkGetPhysicalDeviceImageFormatProperties': '''
@@ -801,12 +454,53 @@
return VK_SUCCESS;
''',
'vkGetPhysicalDeviceImageFormatProperties2KHR': '''
+ auto *external_image_prop = lvl_find_mod_in_chain<VkExternalImageFormatProperties>(pImageFormatProperties->pNext);
+ auto *external_image_format = lvl_find_in_chain<VkPhysicalDeviceExternalImageFormatInfo>(pImageFormatInfo->pNext);
+ if (external_image_prop && external_image_format && external_image_format->handleType == VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID) {
+ external_image_prop->externalMemoryProperties.externalMemoryFeatures = VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT | VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT;
+ external_image_prop->externalMemoryProperties.compatibleHandleTypes = external_image_format->handleType;
+ external_image_prop->externalMemoryProperties.compatibleHandleTypes = external_image_format->handleType;
+ }
+
GetPhysicalDeviceImageFormatProperties(physicalDevice, pImageFormatInfo->format, pImageFormatInfo->type, pImageFormatInfo->tiling, pImageFormatInfo->usage, pImageFormatInfo->flags, &pImageFormatProperties->imageFormatProperties);
return VK_SUCCESS;
''',
+'vkGetPhysicalDeviceSparseImageFormatProperties': '''
+ if (!pProperties) {
+ *pPropertyCount = 1;
+ } else {
+ // arbitrary
+ pProperties->imageGranularity = {4, 4, 4};
+ pProperties->flags = VK_SPARSE_IMAGE_FORMAT_SINGLE_MIPTAIL_BIT;
+ switch (format) {
+ case VK_FORMAT_D16_UNORM:
+ case VK_FORMAT_D32_SFLOAT:
+ pProperties->aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT;
+ break;
+ case VK_FORMAT_S8_UINT:
+ pProperties->aspectMask = VK_IMAGE_ASPECT_STENCIL_BIT;
+ break;
+ case VK_FORMAT_X8_D24_UNORM_PACK32:
+ case VK_FORMAT_D16_UNORM_S8_UINT:
+ case VK_FORMAT_D24_UNORM_S8_UINT:
+ case VK_FORMAT_D32_SFLOAT_S8_UINT:
+ pProperties->aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT;
+ break;
+ default:
+ pProperties->aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+ break;
+ }
+ }
+''',
+'vkGetPhysicalDeviceSparseImageFormatProperties2KHR': '''
+ if (pPropertyCount && pProperties) {
+ GetPhysicalDeviceSparseImageFormatProperties(physicalDevice, pFormatInfo->format, pFormatInfo->type, pFormatInfo->samples, pFormatInfo->usage, pFormatInfo->tiling, pPropertyCount, &pProperties->properties);
+ } else {
+ GetPhysicalDeviceSparseImageFormatProperties(physicalDevice, pFormatInfo->format, pFormatInfo->type, pFormatInfo->samples, pFormatInfo->usage, pFormatInfo->tiling, pPropertyCount, nullptr);
+ }
+''',
'vkGetPhysicalDeviceProperties': '''
- // TODO: Just hard-coding some values for now
- pProperties->apiVersion = kSupportedVulkanAPIVersion;
+ pProperties->apiVersion = VK_HEADER_VERSION_COMPLETE;
pProperties->driverVersion = 1;
pProperties->vendorID = 0xba5eba11;
pProperties->deviceID = 0xf005ba11;
@@ -818,55 +512,131 @@
pProperties->sparseProperties = { VK_TRUE, VK_TRUE, VK_TRUE, VK_TRUE, VK_TRUE };
''',
'vkGetPhysicalDeviceProperties2KHR': '''
+ // The only value that need to be set are those the Profile layer can't set
+ // see https://github.com/KhronosGroup/Vulkan-Profiles/issues/352
+ // All values set are arbitrary
GetPhysicalDeviceProperties(physicalDevice, &pProperties->properties);
- const auto *desc_idx_props = lvl_find_in_chain<VkPhysicalDeviceDescriptorIndexingPropertiesEXT>(pProperties->pNext);
- if (desc_idx_props) {
- VkPhysicalDeviceDescriptorIndexingPropertiesEXT* write_props = (VkPhysicalDeviceDescriptorIndexingPropertiesEXT*)desc_idx_props;
- write_props->maxUpdateAfterBindDescriptorsInAllPools = 500000;
- write_props->shaderUniformBufferArrayNonUniformIndexingNative = false;
- write_props->shaderSampledImageArrayNonUniformIndexingNative = false;
- write_props->shaderStorageBufferArrayNonUniformIndexingNative = false;
- write_props->shaderStorageImageArrayNonUniformIndexingNative = false;
- write_props->shaderInputAttachmentArrayNonUniformIndexingNative = false;
- write_props->robustBufferAccessUpdateAfterBind = true;
- write_props->quadDivergentImplicitLod = true;
- write_props->maxPerStageDescriptorUpdateAfterBindSamplers = 500000;
- write_props->maxPerStageDescriptorUpdateAfterBindUniformBuffers = 500000;
- write_props->maxPerStageDescriptorUpdateAfterBindStorageBuffers = 500000;
- write_props->maxPerStageDescriptorUpdateAfterBindSampledImages = 500000;
- write_props->maxPerStageDescriptorUpdateAfterBindStorageImages = 500000;
- write_props->maxPerStageDescriptorUpdateAfterBindInputAttachments = 500000;
- write_props->maxPerStageUpdateAfterBindResources = 500000;
- write_props->maxDescriptorSetUpdateAfterBindSamplers = 500000;
- write_props->maxDescriptorSetUpdateAfterBindUniformBuffers = 96;
- write_props->maxDescriptorSetUpdateAfterBindUniformBuffersDynamic = 8;
- write_props->maxDescriptorSetUpdateAfterBindStorageBuffers = 500000;
- write_props->maxDescriptorSetUpdateAfterBindStorageBuffersDynamic = 4;
- write_props->maxDescriptorSetUpdateAfterBindSampledImages = 500000;
- write_props->maxDescriptorSetUpdateAfterBindStorageImages = 500000;
- write_props->maxDescriptorSetUpdateAfterBindInputAttachments = 500000;
+
+ auto *props_11 = lvl_find_mod_in_chain<VkPhysicalDeviceVulkan11Properties>(pProperties->pNext);
+ if (props_11) {
+ props_11->protectedNoFault = VK_FALSE;
}
- const auto *push_descriptor_props = lvl_find_in_chain<VkPhysicalDevicePushDescriptorPropertiesKHR>(pProperties->pNext);
- if (push_descriptor_props) {
- VkPhysicalDevicePushDescriptorPropertiesKHR* write_props = (VkPhysicalDevicePushDescriptorPropertiesKHR*)push_descriptor_props;
- write_props->maxPushDescriptors = 256;
+ auto *props_12 = lvl_find_mod_in_chain<VkPhysicalDeviceVulkan12Properties>(pProperties->pNext);
+ if (props_12) {
+ props_12->denormBehaviorIndependence = VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL;
+ props_12->roundingModeIndependence = VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL;
}
- const auto *depth_stencil_resolve_props = lvl_find_in_chain<VkPhysicalDeviceDepthStencilResolvePropertiesKHR>(pProperties->pNext);
- if (depth_stencil_resolve_props) {
- VkPhysicalDeviceDepthStencilResolvePropertiesKHR* write_props = (VkPhysicalDeviceDepthStencilResolvePropertiesKHR*)depth_stencil_resolve_props;
- write_props->supportedDepthResolveModes = VK_RESOLVE_MODE_SAMPLE_ZERO_BIT_KHR;
- write_props->supportedStencilResolveModes = VK_RESOLVE_MODE_SAMPLE_ZERO_BIT_KHR;
+ auto *props_13 = lvl_find_mod_in_chain<VkPhysicalDeviceVulkan13Properties>(pProperties->pNext);
+ if (props_13) {
+ props_13->storageTexelBufferOffsetSingleTexelAlignment = VK_TRUE;
+ props_13->uniformTexelBufferOffsetSingleTexelAlignment = VK_TRUE;
+ props_13->storageTexelBufferOffsetAlignmentBytes = 16;
+ props_13->uniformTexelBufferOffsetAlignmentBytes = 16;
}
- const auto *fragment_density_map2_props = lvl_find_in_chain<VkPhysicalDeviceFragmentDensityMap2PropertiesEXT>(pProperties->pNext);
+ auto *protected_memory_props = lvl_find_mod_in_chain<VkPhysicalDeviceProtectedMemoryProperties>(pProperties->pNext);
+ if (protected_memory_props) {
+ protected_memory_props->protectedNoFault = VK_FALSE;
+ }
+
+ auto *float_controls_props = lvl_find_mod_in_chain<VkPhysicalDeviceFloatControlsProperties>(pProperties->pNext);
+ if (float_controls_props) {
+ float_controls_props->denormBehaviorIndependence = VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL;
+ float_controls_props->roundingModeIndependence = VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL;
+ }
+
+ auto *conservative_raster_props = lvl_find_mod_in_chain<VkPhysicalDeviceConservativeRasterizationPropertiesEXT>(pProperties->pNext);
+ if (conservative_raster_props) {
+ conservative_raster_props->primitiveOverestimationSize = 0.00195313f;
+ conservative_raster_props->conservativePointAndLineRasterization = VK_TRUE;
+ conservative_raster_props->degenerateTrianglesRasterized = VK_TRUE;
+ conservative_raster_props->degenerateLinesRasterized = VK_TRUE;
+ }
+
+ auto *rt_pipeline_props = lvl_find_mod_in_chain<VkPhysicalDeviceRayTracingPipelinePropertiesKHR>(pProperties->pNext);
+ if (rt_pipeline_props) {
+ rt_pipeline_props->shaderGroupHandleSize = 32;
+ rt_pipeline_props->shaderGroupBaseAlignment = 64;
+ rt_pipeline_props->shaderGroupHandleCaptureReplaySize = 32;
+ }
+
+ auto *rt_pipeline_nv_props = lvl_find_mod_in_chain<VkPhysicalDeviceRayTracingPropertiesNV>(pProperties->pNext);
+ if (rt_pipeline_nv_props) {
+ rt_pipeline_nv_props->shaderGroupHandleSize = 32;
+ rt_pipeline_nv_props->shaderGroupBaseAlignment = 64;
+ }
+
+ auto *texel_buffer_props = lvl_find_mod_in_chain<VkPhysicalDeviceTexelBufferAlignmentProperties>(pProperties->pNext);
+ if (texel_buffer_props) {
+ texel_buffer_props->storageTexelBufferOffsetSingleTexelAlignment = VK_TRUE;
+ texel_buffer_props->uniformTexelBufferOffsetSingleTexelAlignment = VK_TRUE;
+ texel_buffer_props->storageTexelBufferOffsetAlignmentBytes = 16;
+ texel_buffer_props->uniformTexelBufferOffsetAlignmentBytes = 16;
+ }
+
+ auto *descriptor_buffer_props = lvl_find_mod_in_chain<VkPhysicalDeviceDescriptorBufferPropertiesEXT>(pProperties->pNext);
+ if (descriptor_buffer_props) {
+ descriptor_buffer_props->combinedImageSamplerDescriptorSingleArray = VK_TRUE;
+ descriptor_buffer_props->bufferlessPushDescriptors = VK_TRUE;
+ descriptor_buffer_props->allowSamplerImageViewPostSubmitCreation = VK_TRUE;
+ descriptor_buffer_props->descriptorBufferOffsetAlignment = 4;
+ }
+
+ auto *mesh_shader_props = lvl_find_mod_in_chain<VkPhysicalDeviceMeshShaderPropertiesEXT>(pProperties->pNext);
+ if (mesh_shader_props) {
+ mesh_shader_props->meshOutputPerVertexGranularity = 32;
+ mesh_shader_props->meshOutputPerPrimitiveGranularity = 32;
+ mesh_shader_props->prefersLocalInvocationVertexOutput = VK_TRUE;
+ mesh_shader_props->prefersLocalInvocationPrimitiveOutput = VK_TRUE;
+ mesh_shader_props->prefersCompactVertexOutput = VK_TRUE;
+ mesh_shader_props->prefersCompactPrimitiveOutput = VK_TRUE;
+ }
+
+ auto *fragment_density_map2_props = lvl_find_mod_in_chain<VkPhysicalDeviceFragmentDensityMap2PropertiesEXT>(pProperties->pNext);
if (fragment_density_map2_props) {
- VkPhysicalDeviceFragmentDensityMap2PropertiesEXT* write_props = (VkPhysicalDeviceFragmentDensityMap2PropertiesEXT*)fragment_density_map2_props;
- write_props->subsampledLoads = VK_FALSE;
- write_props->subsampledCoarseReconstructionEarlyAccess = VK_FALSE;
- write_props->maxSubsampledArrayLayers = 2;
- write_props->maxDescriptorSetSubsampledSamplers = 1;
+ fragment_density_map2_props->subsampledLoads = VK_FALSE;
+ fragment_density_map2_props->subsampledCoarseReconstructionEarlyAccess = VK_FALSE;
+ fragment_density_map2_props->maxSubsampledArrayLayers = 2;
+ fragment_density_map2_props->maxDescriptorSetSubsampledSamplers = 1;
+ }
+
+ const uint32_t num_copy_layouts = 5;
+ const VkImageLayout HostCopyLayouts[]{
+ VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
+ VK_IMAGE_LAYOUT_GENERAL,
+ VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL,
+ VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL,
+ VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL,
+ };
+
+ auto *host_image_copy_props = lvl_find_mod_in_chain<VkPhysicalDeviceHostImageCopyPropertiesEXT>(pProperties->pNext);
+ if (host_image_copy_props){
+ if (host_image_copy_props->pCopyDstLayouts == nullptr) host_image_copy_props->copyDstLayoutCount = num_copy_layouts;
+ else {
+ uint32_t num_layouts = (std::min)(host_image_copy_props->copyDstLayoutCount, num_copy_layouts);
+ for (uint32_t i = 0; i < num_layouts; i++) {
+ host_image_copy_props->pCopyDstLayouts[i] = HostCopyLayouts[i];
+ }
+ }
+ if (host_image_copy_props->pCopySrcLayouts == nullptr) host_image_copy_props->copySrcLayoutCount = num_copy_layouts;
+ else {
+ uint32_t num_layouts = (std::min)(host_image_copy_props->copySrcLayoutCount, num_copy_layouts);
+ for (uint32_t i = 0; i < num_layouts; i++) {
+ host_image_copy_props->pCopySrcLayouts[i] = HostCopyLayouts[i];
+ }
+ }
+ }
+
+ auto *driver_properties = lvl_find_mod_in_chain<VkPhysicalDeviceDriverProperties>(pProperties->pNext);
+ if (driver_properties) {
+ std::strncpy(driver_properties->driverName, "Vulkan Mock Device", VK_MAX_DRIVER_NAME_SIZE);
+#if defined(GIT_BRANCH_NAME) && defined(GIT_TAG_INFO)
+ std::strncpy(driver_properties->driverInfo, "Branch: " GIT_BRANCH_NAME " Tag Info: " GIT_TAG_INFO, VK_MAX_DRIVER_INFO_SIZE);
+#else
+ std::strncpy(driver_properties->driverInfo, "Branch: --unknown-- Tag Info: --unknown--", VK_MAX_DRIVER_INFO_SIZE);
+#endif
}
''',
'vkGetPhysicalDeviceExternalSemaphoreProperties':'''
@@ -888,10 +658,24 @@
GetPhysicalDeviceExternalFenceProperties(physicalDevice, pExternalFenceInfo, pExternalFenceProperties);
''',
'vkGetPhysicalDeviceExternalBufferProperties':'''
- // Hard-code support for all handle types and features
- pExternalBufferProperties->externalMemoryProperties.externalMemoryFeatures = 0x7;
- pExternalBufferProperties->externalMemoryProperties.exportFromImportedHandleTypes = 0x1FF;
- pExternalBufferProperties->externalMemoryProperties.compatibleHandleTypes = 0x1FF;
+ constexpr VkExternalMemoryHandleTypeFlags supported_flags = 0x1FF;
+ if (pExternalBufferInfo->handleType & VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID) {
+ // Can't have dedicated memory with AHB
+ pExternalBufferProperties->externalMemoryProperties.externalMemoryFeatures = VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT | VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT;
+ pExternalBufferProperties->externalMemoryProperties.exportFromImportedHandleTypes = pExternalBufferInfo->handleType;
+ pExternalBufferProperties->externalMemoryProperties.compatibleHandleTypes = pExternalBufferInfo->handleType;
+ } else if (pExternalBufferInfo->handleType & supported_flags) {
+ pExternalBufferProperties->externalMemoryProperties.externalMemoryFeatures = 0x7;
+ pExternalBufferProperties->externalMemoryProperties.exportFromImportedHandleTypes = supported_flags;
+ pExternalBufferProperties->externalMemoryProperties.compatibleHandleTypes = supported_flags;
+ } else {
+ pExternalBufferProperties->externalMemoryProperties.externalMemoryFeatures = 0;
+ pExternalBufferProperties->externalMemoryProperties.exportFromImportedHandleTypes = 0;
+ // According to spec, handle type is always compatible with itself. Even if export/import
+ // not supported, it's important to properly implement self-compatibility property since
+ // application's control flow can rely on this.
+ pExternalBufferProperties->externalMemoryProperties.compatibleHandleTypes = pExternalBufferInfo->handleType;
+ }
''',
'vkGetPhysicalDeviceExternalBufferPropertiesKHR':'''
GetPhysicalDeviceExternalBufferProperties(physicalDevice, pExternalBufferInfo, pExternalBufferProperties);
@@ -902,6 +686,7 @@
pMemoryRequirements->alignment = 1;
pMemoryRequirements->memoryTypeBits = 0xFFFF;
// Return a better size based on the buffer size from the create info.
+ unique_lock_t lock(global_lock);
auto d_iter = buffer_map.find(device);
if (d_iter != buffer_map.end()) {
auto iter = d_iter->second.find(buffer);
@@ -913,10 +698,22 @@
'vkGetBufferMemoryRequirements2KHR': '''
GetBufferMemoryRequirements(device, pInfo->buffer, &pMemoryRequirements->memoryRequirements);
''',
+'vkGetDeviceBufferMemoryRequirements': '''
+ // TODO: Just hard-coding reqs for now
+ pMemoryRequirements->memoryRequirements.alignment = 1;
+ pMemoryRequirements->memoryRequirements.memoryTypeBits = 0xFFFF;
+
+ // Return a size based on the buffer size from the create info.
+ pMemoryRequirements->memoryRequirements.size = ((pInfo->pCreateInfo->size + 4095) / 4096) * 4096;
+''',
+'vkGetDeviceBufferMemoryRequirementsKHR': '''
+ GetDeviceBufferMemoryRequirements(device, pInfo, pMemoryRequirements);
+''',
'vkGetImageMemoryRequirements': '''
pMemoryRequirements->size = 0;
pMemoryRequirements->alignment = 1;
+ unique_lock_t lock(global_lock);
auto d_iter = image_memory_size_map.find(device);
if(d_iter != image_memory_size_map.end()){
auto iter = d_iter->second.find(image);
@@ -930,6 +727,15 @@
'vkGetImageMemoryRequirements2KHR': '''
GetImageMemoryRequirements(device, pInfo->image, &pMemoryRequirements->memoryRequirements);
''',
+'vkGetDeviceImageMemoryRequirements': '''
+ pMemoryRequirements->memoryRequirements.size = GetImageSizeFromCreateInfo(pInfo->pCreateInfo);
+ pMemoryRequirements->memoryRequirements.alignment = 1;
+ // Here we hard-code that the memory type at index 3 doesn't support this image.
+ pMemoryRequirements->memoryRequirements.memoryTypeBits = 0xFFFF & ~(0x1 << 3);
+''',
+'vkGetDeviceImageMemoryRequirementsKHR': '''
+ GetDeviceImageMemoryRequirements(device, pInfo, pMemoryRequirements);
+''',
'vkMapMemory': '''
unique_lock_t lock(global_lock);
if (VK_WHOLE_SIZE == size) {
@@ -943,6 +749,9 @@
*ppData = map_addr;
return VK_SUCCESS;
''',
+'vkMapMemory2KHR': '''
+ return MapMemory(device, pMemoryMapInfo->memory, pMemoryMapInfo->offset, pMemoryMapInfo->size, pMemoryMapInfo->flags, ppData);
+''',
'vkUnmapMemory': '''
unique_lock_t lock(global_lock);
for (auto map_addr : mapped_memory_map[memory]) {
@@ -950,6 +759,10 @@
}
mapped_memory_map.erase(memory);
''',
+'vkUnmapMemory2KHR': '''
+ UnmapMemory(device, pMemoryUnmapInfo->memory);
+ return VK_SUCCESS;
+''',
'vkGetImageSubresourceLayout': '''
// Need safe values. Callers are computing memory offsets from pLayout, with no return code to flag failure.
*pLayout = VkSubresourceLayout(); // Default constructor zero values.
@@ -991,7 +804,16 @@
'vkCreateBuffer': '''
unique_lock_t lock(global_lock);
*pBuffer = (VkBuffer)global_unique_handle++;
- buffer_map[device][*pBuffer] = *pCreateInfo;
+ buffer_map[device][*pBuffer] = {
+ pCreateInfo->size,
+ current_available_address
+ };
+ current_available_address += pCreateInfo->size;
+ // Always align to next 64-bit pointer
+ const uint64_t alignment = current_available_address % 64;
+ if (alignment != 0) {
+ current_available_address += (64 - alignment);
+ }
return VK_SUCCESS;
''',
'vkDestroyBuffer': '''
@@ -1001,44 +823,256 @@
'vkCreateImage': '''
unique_lock_t lock(global_lock);
*pImage = (VkImage)global_unique_handle++;
- // TODO: A pixel size is 32 bytes. This accounts for the largest possible pixel size of any format. It could be changed to more accurate size if need be.
- image_memory_size_map[device][*pImage] = pCreateInfo->extent.width * pCreateInfo->extent.height * pCreateInfo->extent.depth *
- 32 * pCreateInfo->arrayLayers * (pCreateInfo->mipLevels > 1 ? 2 : 1);
- // plane count
- switch (pCreateInfo->format) {
- case VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM:
- case VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM:
- case VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM:
- case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16:
- case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16:
- case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16:
- case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16:
- case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16:
- case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16:
- case VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM:
- case VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM:
- case VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM:
- image_memory_size_map[device][*pImage] *= 3;
- break;
- case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM:
- case VK_FORMAT_G8_B8R8_2PLANE_422_UNORM:
- case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_420_UNORM_3PACK16:
- case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16:
- case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16:
- case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16:
- case VK_FORMAT_G16_B16R16_2PLANE_420_UNORM:
- case VK_FORMAT_G16_B16R16_2PLANE_422_UNORM:
- image_memory_size_map[device][*pImage] *= 2;
- break;
- default:
- break;
- }
+ image_memory_size_map[device][*pImage] = GetImageSizeFromCreateInfo(pCreateInfo);
return VK_SUCCESS;
''',
'vkDestroyImage': '''
unique_lock_t lock(global_lock);
image_memory_size_map[device].erase(image);
''',
+'vkEnumeratePhysicalDeviceGroupsKHR': '''
+ if (!pPhysicalDeviceGroupProperties) {
+ *pPhysicalDeviceGroupCount = 1;
+ } else {
+ // arbitrary
+ pPhysicalDeviceGroupProperties->physicalDeviceCount = 1;
+ pPhysicalDeviceGroupProperties->physicalDevices[0] = physical_device_map.at(instance)[0];
+ pPhysicalDeviceGroupProperties->subsetAllocation = VK_FALSE;
+ }
+ return VK_SUCCESS;
+''',
+'vkGetPhysicalDeviceMultisamplePropertiesEXT': '''
+ if (pMultisampleProperties) {
+ // arbitrary
+ pMultisampleProperties->maxSampleLocationGridSize = {32, 32};
+ }
+''',
+'vkGetPhysicalDeviceFragmentShadingRatesKHR': '''
+ if (!pFragmentShadingRates) {
+ *pFragmentShadingRateCount = 1;
+ } else {
+ // arbitrary
+ pFragmentShadingRates->sampleCounts = VK_SAMPLE_COUNT_1_BIT | VK_SAMPLE_COUNT_4_BIT;
+ pFragmentShadingRates->fragmentSize = {8, 8};
+ }
+ return VK_SUCCESS;
+''',
+'vkGetPhysicalDeviceCalibrateableTimeDomainsEXT': '''
+ if (!pTimeDomains) {
+ *pTimeDomainCount = 1;
+ } else {
+ // arbitrary
+ *pTimeDomains = VK_TIME_DOMAIN_DEVICE_EXT;
+ }
+ return VK_SUCCESS;
+''',
+'vkGetFenceWin32HandleKHR': '''
+ *pHandle = (HANDLE)0x12345678;
+ return VK_SUCCESS;
+''',
+'vkGetFenceFdKHR': '''
+ *pFd = 0x42;
+ return VK_SUCCESS;
+''',
+'vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR': '''
+ if (!pCounters) {
+ *pCounterCount = 3;
+ } else {
+ if (*pCounterCount == 0){
+ return VK_INCOMPLETE;
+ }
+ // arbitrary
+ pCounters[0].unit = VK_PERFORMANCE_COUNTER_UNIT_GENERIC_KHR;
+ pCounters[0].scope = VK_QUERY_SCOPE_COMMAND_BUFFER_KHR;
+ pCounters[0].storage = VK_PERFORMANCE_COUNTER_STORAGE_INT32_KHR;
+ pCounters[0].uuid[0] = 0x01;
+ if (*pCounterCount == 1){
+ return VK_INCOMPLETE;
+ }
+ pCounters[1].unit = VK_PERFORMANCE_COUNTER_UNIT_GENERIC_KHR;
+ pCounters[1].scope = VK_QUERY_SCOPE_RENDER_PASS_KHR;
+ pCounters[1].storage = VK_PERFORMANCE_COUNTER_STORAGE_INT32_KHR;
+ pCounters[1].uuid[0] = 0x02;
+ if (*pCounterCount == 2){
+ return VK_INCOMPLETE;
+ }
+ pCounters[2].unit = VK_PERFORMANCE_COUNTER_UNIT_GENERIC_KHR;
+ pCounters[2].scope = VK_QUERY_SCOPE_COMMAND_KHR;
+ pCounters[2].storage = VK_PERFORMANCE_COUNTER_STORAGE_INT32_KHR;
+ pCounters[2].uuid[0] = 0x03;
+ *pCounterCount = 3;
+ }
+ return VK_SUCCESS;
+''',
+'vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR': '''
+ if (pNumPasses) {
+ // arbitrary
+ *pNumPasses = 1;
+ }
+''',
+'vkGetShaderModuleIdentifierEXT': '''
+ if (pIdentifier) {
+ // arbitrary
+ pIdentifier->identifierSize = 1;
+ pIdentifier->identifier[0] = 0x01;
+ }
+''',
+'vkGetImageSparseMemoryRequirements': '''
+ if (!pSparseMemoryRequirements) {
+ *pSparseMemoryRequirementCount = 1;
+ } else {
+ // arbitrary
+ pSparseMemoryRequirements->imageMipTailFirstLod = 0;
+ pSparseMemoryRequirements->imageMipTailSize = 8;
+ pSparseMemoryRequirements->imageMipTailOffset = 0;
+ pSparseMemoryRequirements->imageMipTailStride = 4;
+ pSparseMemoryRequirements->formatProperties.imageGranularity = {4, 4, 4};
+ pSparseMemoryRequirements->formatProperties.flags = VK_SPARSE_IMAGE_FORMAT_SINGLE_MIPTAIL_BIT;
+ // Would need to track the VkImage to know format for better value here
+ pSparseMemoryRequirements->formatProperties.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_METADATA_BIT;
+ }
+
+''',
+'vkGetImageSparseMemoryRequirements2KHR': '''
+ if (pSparseMemoryRequirementCount && pSparseMemoryRequirements) {
+ GetImageSparseMemoryRequirements(device, pInfo->image, pSparseMemoryRequirementCount, &pSparseMemoryRequirements->memoryRequirements);
+ } else {
+ GetImageSparseMemoryRequirements(device, pInfo->image, pSparseMemoryRequirementCount, nullptr);
+ }
+''',
+'vkGetBufferDeviceAddress': '''
+ VkDeviceAddress address = 0;
+ auto d_iter = buffer_map.find(device);
+ if (d_iter != buffer_map.end()) {
+ auto iter = d_iter->second.find(pInfo->buffer);
+ if (iter != d_iter->second.end()) {
+ address = iter->second.address;
+ }
+ }
+ return address;
+''',
+'vkGetBufferDeviceAddressKHR': '''
+ return GetBufferDeviceAddress(device, pInfo);
+''',
+'vkGetBufferDeviceAddressEXT': '''
+ return GetBufferDeviceAddress(device, pInfo);
+''',
+'vkGetDescriptorSetLayoutSizeEXT': '''
+ // Need to give something non-zero
+ *pLayoutSizeInBytes = 4;
+''',
+'vkGetAccelerationStructureBuildSizesKHR': '''
+ // arbitrary
+ pSizeInfo->accelerationStructureSize = 4;
+ pSizeInfo->updateScratchSize = 4;
+ pSizeInfo->buildScratchSize = 4;
+''',
+'vkGetAccelerationStructureMemoryRequirementsNV': '''
+ // arbitrary
+ pMemoryRequirements->memoryRequirements.size = 4096;
+ pMemoryRequirements->memoryRequirements.alignment = 1;
+ pMemoryRequirements->memoryRequirements.memoryTypeBits = 0xFFFF;
+''',
+'vkGetAccelerationStructureDeviceAddressKHR': '''
+ // arbitrary - need to be aligned to 256 bytes
+ return 0x262144;
+''',
+'vkGetVideoSessionMemoryRequirementsKHR': '''
+ if (!pMemoryRequirements) {
+ *pMemoryRequirementsCount = 1;
+ } else {
+ // arbitrary
+ pMemoryRequirements[0].memoryBindIndex = 0;
+ pMemoryRequirements[0].memoryRequirements.size = 4096;
+ pMemoryRequirements[0].memoryRequirements.alignment = 1;
+ pMemoryRequirements[0].memoryRequirements.memoryTypeBits = 0xFFFF;
+ }
+ return VK_SUCCESS;
+''',
+'vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR': '''
+ if (!pProperties) {
+ *pPropertyCount = 2;
+ } else {
+ // arbitrary
+ pProperties[0].MSize = 16;
+ pProperties[0].NSize = 16;
+ pProperties[0].KSize = 16;
+ pProperties[0].AType = VK_COMPONENT_TYPE_UINT32_KHR;
+ pProperties[0].BType = VK_COMPONENT_TYPE_UINT32_KHR;
+ pProperties[0].CType = VK_COMPONENT_TYPE_UINT32_KHR;
+ pProperties[0].ResultType = VK_COMPONENT_TYPE_UINT32_KHR;
+ pProperties[0].saturatingAccumulation = VK_FALSE;
+ pProperties[0].scope = VK_SCOPE_SUBGROUP_KHR;
+
+ pProperties[1] = pProperties[0];
+ pProperties[1].scope = VK_SCOPE_DEVICE_KHR;
+ }
+ return VK_SUCCESS;
+''',
+'vkGetPhysicalDeviceVideoFormatPropertiesKHR': '''
+ if (!pVideoFormatProperties) {
+ *pVideoFormatPropertyCount = 2;
+ } else {
+ // arbitrary
+ pVideoFormatProperties[0].format = VK_FORMAT_R8G8B8A8_UNORM;
+ pVideoFormatProperties[0].imageCreateFlags = VK_IMAGE_TYPE_2D;
+ pVideoFormatProperties[0].imageType = VK_IMAGE_TYPE_2D;
+ pVideoFormatProperties[0].imageTiling = VK_IMAGE_TILING_OPTIMAL;
+ pVideoFormatProperties[0].imageUsageFlags = VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR | VK_IMAGE_USAGE_VIDEO_DECODE_SRC_BIT_KHR | VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR;
+ pVideoFormatProperties[1].format = VK_FORMAT_R8G8B8A8_SNORM;
+ pVideoFormatProperties[1].imageCreateFlags = VK_IMAGE_TYPE_2D;
+ pVideoFormatProperties[1].imageType = VK_IMAGE_TYPE_2D;
+ pVideoFormatProperties[1].imageTiling = VK_IMAGE_TILING_OPTIMAL;
+ pVideoFormatProperties[1].imageUsageFlags = VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR | VK_IMAGE_USAGE_VIDEO_DECODE_SRC_BIT_KHR | VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR;
+
+ }
+ return VK_SUCCESS;
+''',
+'vkGetPhysicalDeviceVideoCapabilitiesKHR': '''
+ // arbitrary
+ auto *decode_caps = lvl_find_mod_in_chain<VkVideoDecodeCapabilitiesKHR>(pCapabilities->pNext);
+ if (decode_caps) {
+ decode_caps->flags = VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_COINCIDE_BIT_KHR | VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_DISTINCT_BIT_KHR;
+ }
+ pCapabilities->flags = 0;
+ pCapabilities->minBitstreamBufferOffsetAlignment = 4;
+ pCapabilities->minBitstreamBufferSizeAlignment = 4;
+ pCapabilities->pictureAccessGranularity = {1, 1};
+ pCapabilities->minCodedExtent = {4, 4};
+ pCapabilities->maxCodedExtent = {16, 16};
+ pCapabilities->maxDpbSlots = 4;
+ pCapabilities->maxActiveReferencePictures = 4;
+ return VK_SUCCESS;
+''',
+'vkGetDescriptorSetLayoutSupport':'''
+ if (pSupport) {
+ pSupport->supported = VK_TRUE;
+ }
+''',
+'vkGetDescriptorSetLayoutSupportKHR':'''
+ GetDescriptorSetLayoutSupport(device, pCreateInfo, pSupport);
+''',
+'vkGetRenderAreaGranularity': '''
+ pGranularity->width = 1;
+ pGranularity->height = 1;
+''',
+'vkGetAndroidHardwareBufferPropertiesANDROID': '''
+ pProperties->allocationSize = 65536;
+ pProperties->memoryTypeBits = 1 << 5; // DEVICE_LOCAL only type
+
+ auto *format_prop = lvl_find_mod_in_chain<VkAndroidHardwareBufferFormatPropertiesANDROID>(pProperties->pNext);
+ if (format_prop) {
+ // Likley using this format
+ format_prop->format = VK_FORMAT_R8G8B8A8_UNORM;
+ format_prop->externalFormat = 37;
+ }
+
+ auto *format_resolve_prop = lvl_find_mod_in_chain<VkAndroidHardwareBufferFormatResolvePropertiesANDROID>(pProperties->pNext);
+ if (format_resolve_prop) {
+ format_resolve_prop->colorAttachmentFormat = VK_FORMAT_R8G8B8A8_UNORM;
+ }
+ return VK_SUCCESS;
+''',
}
# MockICDGeneratorOptions - subclass of GeneratorOptions.
@@ -1162,6 +1196,7 @@
# Internal state - accumulators for different inner block text
self.sections = dict([(section, []) for section in self.ALL_SECTIONS])
self.intercepts = []
+ self.function_declarations = False
# Check if the parameter passed in is a pointer to an array
def paramIsArray(self, param):
@@ -1191,48 +1226,32 @@
else:
return False
+ # Check that the target API is in the supported list for the extension
+ def checkExtensionAPISupport(self, supported):
+ return self.genOpts.apiname in supported.split(',')
+
def beginFile(self, genOpts):
OutputGenerator.beginFile(self, genOpts)
# C-specific
#
# Multiple inclusion protection & C++ namespace.
- self.header = False
- if (genOpts.protectFile and self.genOpts.filename and 'h' == self.genOpts.filename[-1]):
- self.header = True
- headerSym = '__' + re.sub(r'\.h', '_h_', os.path.basename(self.genOpts.filename))
- write('#ifndef', headerSym, file=self.outFile)
- write('#define', headerSym, '1', file=self.outFile)
- self.newline()
- #
+ if (genOpts.protectFile and self.genOpts.filename == "function_declarations.h"):
+ self.function_declarations = True
+
# User-supplied prefix text, if any (list of strings)
if (genOpts.prefixText):
for s in genOpts.prefixText:
write(s, file=self.outFile)
- if self.header:
- write('#include <unordered_map>', file=self.outFile)
- write('#include <mutex>', file=self.outFile)
- write('#include <string>', file=self.outFile)
- write('#include <cstring>', file=self.outFile)
- write('#include "vulkan/vk_icd.h"', file=self.outFile)
- else:
- write('#include "mock_icd.h"', file=self.outFile)
- write('#include <stdlib.h>', file=self.outFile)
- write('#include <algorithm>', file=self.outFile)
- write('#include <array>', file=self.outFile)
- write('#include <vector>', file=self.outFile)
- write('#include "vk_typemap_helper.h"', file=self.outFile)
- write('namespace vkmock {', file=self.outFile)
- if self.header:
+ if self.function_declarations:
self.newline()
- write(HEADER_C_CODE, file=self.outFile)
# Include all of the extensions in ICD except specific ignored ones
device_exts = []
instance_exts = []
# Ignore extensions that ICDs should not implement or are not safe to report
ignore_exts = ['VK_EXT_validation_cache', 'VK_KHR_portability_subset']
for ext in self.registry.tree.findall("extensions/extension"):
- if ext.attrib['supported'] != 'disabled': # Only include enabled extensions
+ if self.checkExtensionAPISupport(ext.attrib['supported']): # Only include API-relevant extensions
if (ext.attrib['name'] not in ignore_exts):
# Search for extension version enum
for enum in ext.findall('require/enum'):
@@ -1243,7 +1262,14 @@
else:
device_exts.append(' {"%s", %s},' % (ext.attrib['name'], ext_version))
break
-
+ write('#pragma once\n',file=self.outFile)
+ write('#include <stdint.h>',file=self.outFile)
+ write('#include <cstring>',file=self.outFile)
+ write('#include <string>',file=self.outFile)
+ write('#include <unordered_map>',file=self.outFile)
+ write('#include <vulkan/vulkan.h>',file=self.outFile)
+ self.newline()
+ write('namespace vkmock {\n', file=self.outFile)
write('// Map of instance extension name to version', file=self.outFile)
write('static const std::unordered_map<std::string, uint32_t> instance_extension_map = {', file=self.outFile)
write('\n'.join(instance_exts), file=self.outFile)
@@ -1252,27 +1278,26 @@
write('static const std::unordered_map<std::string, uint32_t> device_extension_map = {', file=self.outFile)
write('\n'.join(device_exts), file=self.outFile)
write('};', file=self.outFile)
-
else:
- self.newline()
- write(SOURCE_CPP_PREFIX, file=self.outFile)
+ write('#pragma once\n',file=self.outFile)
+ write('#include "mock_icd.h"',file=self.outFile)
+ write('#include "function_declarations.h"\n',file=self.outFile)
+ write('namespace vkmock {', file=self.outFile)
+
def endFile(self):
# C-specific
- # Finish C++ namespace and multiple inclusion protection
+ # Finish C++ namespace
self.newline()
- if self.header:
+ if self.function_declarations:
# record intercepted procedures
write('// Map of all APIs to be intercepted by this layer', file=self.outFile)
write('static const std::unordered_map<std::string, void*> name_to_funcptr_map = {', file=self.outFile)
write('\n'.join(self.intercepts), file=self.outFile)
write('};\n', file=self.outFile)
- self.newline()
- write('} // namespace vkmock', file=self.outFile)
- self.newline()
- write('#endif', file=self.outFile)
- else: # Loader-layer-interface, need to implement global interface functions
- write(SOURCE_CPP_POSTFIX, file=self.outFile)
+ write('} // namespace vkmock', file=self.outFile)
+ self.newline()
+
# Finish processing in superclass
OutputGenerator.endFile(self)
def beginFeature(self, interface, emit):
@@ -1358,7 +1383,7 @@
# Command generation
def genCmd(self, cmdinfo, name, alias):
decls = self.makeCDecls(cmdinfo.elem)
- if self.header: # In the header declare all intercepts
+ if self.function_declarations: # In the header declare all intercepts
self.appendSection('command', '')
self.appendSection('command', 'static %s' % (decls[0]))
if (self.featureExtraProtect != None):
@@ -1465,6 +1490,7 @@
self.appendSection('command', '//Destroy object')
if 'FreeMemory' in api_function_name:
# Remove from allocation map
+ self.appendSection('command', ' unique_lock_t lock(global_lock);')
self.appendSection('command', ' allocated_memory_size_map.erase(memory);')
else:
self.appendSection('command', '//Not a CREATE or DESTROY function')
diff --git a/scripts/update_deps.py b/scripts/update_deps.py
index 105ef22..6a39426 100755
--- a/scripts/update_deps.py
+++ b/scripts/update_deps.py
@@ -1,8 +1,9 @@
#!/usr/bin/env python
# Copyright 2017 The Glslang Authors. All rights reserved.
-# Copyright (c) 2018 Valve Corporation
-# Copyright (c) 2018-2021 LunarG, Inc.
+# Copyright (c) 2018-2023 Valve Corporation
+# Copyright (c) 2018-2023 LunarG, Inc.
+# Copyright (c) 2023-2023 RasterGrid Kft.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -31,11 +32,6 @@
repository at a "known-good" commit in order to provide stability in
the dependent repositories.
-Python Compatibility
---------------------
-
-This program can be used with Python 2.7 and Python 3.
-
Known-Good JSON Database
------------------------
@@ -117,6 +113,10 @@
The name of the dependent repository. This field can be referenced
by the "deps.repo_name" structure to record a dependency.
+- api
+
+The name of the API the dependency is specific to (e.g. "vulkan").
+
- url
Specifies the URL of the repository.
@@ -206,11 +206,6 @@
A list of environment variables where one must be set to "true"
(case-insensitive) in order for this repo to be fetched and built.
This list can be used to specify repos that should be built only in CI.
-Typically, this list might contain "TRAVIS" and/or "APPVEYOR" because
-each of these CI systems sets an environment variable with its own
-name to "true". Note that this could also be (ab)used to control
-the processing of the repo with any environment variable. The default
-is an empty list, which means that the repo is always processed.
- build_step (optional)
@@ -225,6 +220,7 @@
"windows"
"linux"
"darwin"
+"android"
Builds on all platforms by default.
@@ -238,8 +234,6 @@
"""
-from __future__ import print_function
-
import argparse
import json
import os.path
@@ -269,7 +263,7 @@
def on_rm_error( func, path, exc_info):
"""Error handler for recursively removing a directory. The
shutil.rmtree function can fail on Windows due to read-only files.
- This handler will change the permissions for tha file and continue.
+ This handler will change the permissions for the file and continue.
"""
os.chmod( path, stat.S_IWRITE )
os.unlink( path )
@@ -340,6 +334,7 @@
self.build_step = json['build_step'] if ('build_step' in json) else 'build'
self.build_platforms = json['build_platforms'] if ('build_platforms' in json) else []
self.optional = set(json.get('optional', []))
+ self.api = json['api'] if ('api' in json) else None
# Absolute paths for a repo's directories
dir_top = os.path.abspath(args.dir)
self.repo_dir = os.path.join(dir_top, self.sub_dir)
@@ -347,9 +342,16 @@
self.build_dir = os.path.join(dir_top, self.build_dir)
if self.install_dir:
self.install_dir = os.path.join(dir_top, self.install_dir)
- # Check if platform is one to build on
+
+ # By default the target platform is the host platform.
+ target_platform = platform.system().lower()
+ # However, we need to account for cross-compiling.
+ for cmake_var in self._args.cmake_var:
+ if "android.toolchain.cmake" in cmake_var:
+ target_platform = 'android'
+
self.on_build_platform = False
- if self.build_platforms == [] or platform.system().lower() in self.build_platforms:
+ if self.build_platforms == [] or target_platform in self.build_platforms:
self.on_build_platform = True
def Clone(self, retries=10, retry_seconds=60):
@@ -430,9 +432,11 @@
def CMakeConfig(self, repos):
"""Build CMake command for the configuration phase and execute it"""
if self._args.do_clean_build:
- shutil.rmtree(self.build_dir)
+ if os.path.isdir(self.build_dir):
+ shutil.rmtree(self.build_dir, onerror=on_rm_error)
if self._args.do_clean_install:
- shutil.rmtree(self.install_dir)
+ if os.path.isdir(self.install_dir):
+ shutil.rmtree(self.install_dir, onerror=on_rm_error)
# Create and change to build directory
make_or_exist_dirs(self.build_dir)
@@ -443,6 +447,11 @@
'-DCMAKE_INSTALL_PREFIX=' + self.install_dir
]
+ # Allow users to pass in arbitrary cache variables
+ for cmake_var in self._args.cmake_var:
+ pieces = cmake_var.split('=', 1)
+ cmake_cmd.append('-D{}={}'.format(pieces[0], pieces[1]))
+
# For each repo this repo depends on, generate a CMake variable
# definitions for "...INSTALL_DIR" that points to that dependent
# repo's install dir.
@@ -457,10 +466,8 @@
for option in self.cmake_options:
cmake_cmd.append(escape(option.format(**self.__dict__)))
- # Set build config for single-configuration generators
- if platform.system() == 'Linux' or platform.system() == 'Darwin':
- cmake_cmd.append('-DCMAKE_BUILD_TYPE={config}'.format(
- config=CONFIG_MAP[self._args.config]))
+ # Set build config for single-configuration generators (this is a no-op on multi-config generators)
+ cmake_cmd.append(f'-D CMAKE_BUILD_TYPE={CONFIG_MAP[self._args.config]}')
# Use the CMake -A option to select the platform architecture
# without needing a Visual Studio generator.
@@ -487,29 +494,14 @@
def CMakeBuild(self):
"""Build CMake command for the build phase and execute it"""
- cmake_cmd = ['cmake', '--build', self.build_dir, '--target', 'install']
+ cmake_cmd = ['cmake', '--build', self.build_dir, '--target', 'install', '--config', CONFIG_MAP[self._args.config]]
if self._args.do_clean:
cmake_cmd.append('--clean-first')
- if platform.system() == 'Windows':
- cmake_cmd.append('--config')
- cmake_cmd.append(CONFIG_MAP[self._args.config])
-
- # Speed up the build.
- if platform.system() == 'Linux' or platform.system() == 'Darwin':
- cmake_cmd.append('--')
- num_make_jobs = multiprocessing.cpu_count()
- env_make_jobs = os.environ.get('MAKE_JOBS', None)
- if env_make_jobs is not None:
- try:
- num_make_jobs = min(num_make_jobs, int(env_make_jobs))
- except ValueError:
- print('warning: environment variable MAKE_JOBS has non-numeric value "{}". '
- 'Using {} (CPU count) instead.'.format(env_make_jobs, num_make_jobs))
- cmake_cmd.append('-j{}'.format(num_make_jobs))
- if platform.system() == 'Windows' and self._args.generator != "Ninja":
- cmake_cmd.append('--')
- cmake_cmd.append('/maxcpucount')
+ # Ninja is parallel by default
+ if self._args.generator != "Ninja":
+ cmake_cmd.append('--parallel')
+ cmake_cmd.append(format(multiprocessing.cpu_count()))
if VERBOSE:
print("CMake command: " + " ".join(cmake_cmd))
@@ -596,6 +588,10 @@
install_names = GetInstallNames(args)
with open(filename, 'w') as helper_file:
for repo in repos:
+ # If the repo has an API tag and that does not match
+ # the target API then skip it
+ if repo.api is not None and repo.api != args.api:
+ continue
if install_names and repo.name in install_names and repo.on_build_platform:
helper_file.write('set({var} "{dir}" CACHE STRING "" FORCE)\n'
.format(
@@ -619,7 +615,7 @@
'--ref',
dest='ref',
default='',
- help="Override 'commit' with git reference. E.g., 'origin/master'")
+ help="Override 'commit' with git reference. E.g., 'origin/main'")
parser.add_argument(
'--no-build',
dest='do_build',
@@ -652,11 +648,17 @@
help="Delete install directory before building",
default=False)
parser.add_argument(
+ '--skip-existing-install',
+ dest='skip_existing_install',
+ action='store_true',
+ help="Skip build if install directory exists",
+ default=False)
+ parser.add_argument(
'--arch',
dest='arch',
choices=['32', '64', 'x86', 'x64', 'win32', 'win64'],
type=str.lower,
- help="Set build files architecture (Windows)",
+ help="Set build files architecture (Visual Studio Generator Only)",
default='64')
parser.add_argument(
'--config',
@@ -666,6 +668,12 @@
help="Set build files configuration",
default='debug')
parser.add_argument(
+ '--api',
+ dest='api',
+ default='vulkan',
+ choices=['vulkan'],
+ help="Target API")
+ parser.add_argument(
'--generator',
dest='generator',
help="Set the CMake generator",
@@ -676,6 +684,13 @@
type=lambda a: set(a.lower().split(',')),
help="Comma-separated list of 'optional' resources that may be skipped. Only 'tests' is currently supported as 'optional'",
default=set())
+ parser.add_argument(
+ '--cmake_var',
+ dest='cmake_var',
+ action='append',
+ metavar='VAR[=VALUE]',
+ help="Add CMake command line option -D'VAR'='VALUE' to the CMake generation command line; may be used multiple times",
+ default=[])
args = parser.parse_args()
save_cwd = os.getcwd()
@@ -689,11 +704,24 @@
print('Starting builds in {d}'.format(d=abs_top_dir))
for repo in repos:
+ # If the repo has an API tag and that does not match
+ # the target API then skip it
+ if repo.api is not None and repo.api != args.api:
+ continue
+
# If the repo has a platform whitelist, skip the repo
# unless we are building on a whitelisted platform.
if not repo.on_build_platform:
continue
+ # Skip building the repo if its install directory already exists
+ # and requested via an option. This is useful for cases where the
+ # install directory is restored from a cache that is known to be up
+ # to date.
+ if args.skip_existing_install and os.path.isdir(repo.install_dir):
+ print('Skipping build for repo {n} due to existing install directory'.format(n=repo.name))
+ continue
+
# Skip test-only repos if the --tests option was not passed in
if repo.IsOptional(args.optional):
continue
diff --git a/scripts/vulkaninfo_generator.py b/scripts/vulkaninfo_generator.py
index 1eba3e1..2062115 100644
--- a/scripts/vulkaninfo_generator.py
+++ b/scripts/vulkaninfo_generator.py
@@ -81,7 +81,8 @@
# used in the .cpp code
structures_to_gen = ['VkExtent3D', 'VkExtent2D', 'VkPhysicalDeviceLimits', 'VkPhysicalDeviceFeatures', 'VkPhysicalDeviceSparseProperties',
- 'VkSurfaceCapabilitiesKHR', 'VkSurfaceFormatKHR', 'VkLayerProperties', 'VkPhysicalDeviceToolProperties']
+ 'VkSurfaceCapabilitiesKHR', 'VkSurfaceFormatKHR', 'VkLayerProperties', 'VkPhysicalDeviceToolProperties', 'VkFormatProperties',
+ 'VkSurfacePresentScalingCapabilitiesEXT', 'VkSurfacePresentModeCompatibilityEXT', 'VkPhysicalDeviceHostImageCopyPropertiesEXT']
enums_to_gen = ['VkResult', 'VkFormat', 'VkPresentModeKHR',
'VkPhysicalDeviceType', 'VkImageTiling']
flags_to_gen = ['VkSurfaceTransformFlagsKHR', 'VkCompositeAlphaFlagsKHR', 'VkSurfaceCounterFlagsEXT', 'VkQueueFlags',
@@ -110,12 +111,38 @@
# Types that need pNext Chains built. 'extends' is the xml tag used in the structextends member. 'type' can be device, instance, or both
EXTENSION_CATEGORIES = OrderedDict((
- ('phys_device_props2', {'extends': 'VkPhysicalDeviceProperties2', 'type': EXTENSION_TYPE_BOTH, 'holder_type': 'VkPhysicalDeviceProperties2', 'print_iterator': True}),
- ('phys_device_mem_props2', {'extends': 'VkPhysicalDeviceMemoryProperties2', 'type': EXTENSION_TYPE_DEVICE, 'holder_type':'VkPhysicalDeviceMemoryProperties2', 'print_iterator': False}),
- ('phys_device_features2', {'extends': 'VkPhysicalDeviceFeatures2,VkDeviceCreateInfo', 'type': EXTENSION_TYPE_DEVICE, 'holder_type': 'VkPhysicalDeviceFeatures2', 'print_iterator': True}),
- ('surface_capabilities2', {'extends': 'VkSurfaceCapabilities2KHR', 'type': EXTENSION_TYPE_BOTH, 'holder_type': 'VkSurfaceCapabilities2KHR', 'print_iterator': True}),
- ('format_properties2', {'extends': 'VkFormatProperties2', 'type': EXTENSION_TYPE_DEVICE, 'holder_type':'VkFormatProperties2', 'print_iterator': True}),
- ('queue_properties2', {'extends': 'VkQueueFamilyProperties2', 'type': EXTENSION_TYPE_DEVICE, 'holder_type': 'VkQueueFamilyProperties2', 'print_iterator': True})
+ ('phys_device_props2',
+ {'extends': 'VkPhysicalDeviceProperties2',
+ 'type': EXTENSION_TYPE_BOTH,
+ 'holder_type': 'VkPhysicalDeviceProperties2',
+ 'print_iterator': True,
+ 'exclude': ['VkPhysicalDeviceHostImageCopyPropertiesEXT']}),
+ ('phys_device_mem_props2',
+ {'extends': 'VkPhysicalDeviceMemoryProperties2',
+ 'type': EXTENSION_TYPE_DEVICE,
+ 'holder_type':'VkPhysicalDeviceMemoryProperties2',
+ 'print_iterator': False}),
+ ('phys_device_features2',
+ {'extends': 'VkPhysicalDeviceFeatures2,VkDeviceCreateInfo',
+ 'type': EXTENSION_TYPE_DEVICE,
+ 'holder_type': 'VkPhysicalDeviceFeatures2',
+ 'print_iterator': True}),
+ ('surface_capabilities2',
+ {'extends': 'VkSurfaceCapabilities2KHR',
+ 'type': EXTENSION_TYPE_BOTH,
+ 'holder_type': 'VkSurfaceCapabilities2KHR',
+ 'print_iterator': True,
+ 'exclude': ['VkSurfacePresentScalingCapabilitiesEXT', 'VkSurfacePresentModeCompatibilityEXT']}),
+ ('format_properties2',
+ {'extends': 'VkFormatProperties2',
+ 'type': EXTENSION_TYPE_DEVICE,
+ 'holder_type':'VkFormatProperties2',
+ 'print_iterator': True}),
+ ('queue_properties2',
+ {'extends': 'VkQueueFamilyProperties2',
+ 'type': EXTENSION_TYPE_DEVICE,
+ 'holder_type': 'VkQueueFamilyProperties2',
+ 'print_iterator': True})
))
class VulkanInfoGeneratorOptions(GeneratorOptions):
def __init__(self,
@@ -243,9 +270,9 @@
types_to_gen.update(
GatherTypesToGen(self.all_structures, structures_to_gen))
- for key in EXTENSION_CATEGORIES.keys():
+ for key, info in EXTENSION_CATEGORIES.items():
types_to_gen.update(
- GatherTypesToGen(self.all_structures, self.extension_sets[key]))
+ GatherTypesToGen(self.all_structures, self.extension_sets[key], info.get('exclude')))
types_to_gen = sorted(types_to_gen)
names_of_structures_to_gen = set()
@@ -365,10 +392,13 @@
for key, value in EXTENSION_CATEGORIES.items():
if str(typeinfo.elem.get('structextends')).find(value.get('extends')) != -1:
- self.extension_sets[key].add(name)
+ if value.get('exclude') is None or name not in value.get('exclude'):
+ self.extension_sets[key].add(name)
-def GatherTypesToGen(structure_list, structures):
+def GatherTypesToGen(structure_list, structures, exclude = []):
+ if exclude == None:
+ exclude = []
types = set()
for s in structures:
types.add(s)
@@ -380,8 +410,9 @@
for m in s.members:
if m.typeID not in predefined_types and m.name not in names_to_ignore:
if m.typeID not in types:
- types.add(m.typeID)
- added_stuff = True
+ if s.name not in exclude:
+ types.add(m.typeID)
+ added_stuff = True
return types
@@ -441,10 +472,12 @@
out += f" std::vector<const char *> strings;\n"
# If a bitmask contains a field whose value is zero, we want to support printing the correct bitflag
# Otherwise, use "None" for when there are not bits set in the bitmask
- if bitmask.options[0].value != "0":
+ if bitmask.options[0].value != 0:
out += f' if (value == 0) {{ strings.push_back("None"); return strings; }}\n'
for v in bitmask.options:
- out += f' if ({v.name} & value) strings.push_back("{v.name[3:]}");\n'
+ # only check single-bit flags
+ if (v.value & (v.value - 1)) == 0:
+ out += f' if ({v.name} & value) strings.push_back("{v.name[3:]}");\n'
out += f" return strings;\n}}\n"
return out
@@ -473,8 +506,12 @@
def PrintFlagBits(bitmask):
return f"""void Dump{bitmask.name}(Printer &p, std::string name, {bitmask.name} value) {{
auto strings = {bitmask.name}GetStrings(value);
- if (strings.size() > 0)
- p.PrintKeyString(name, strings.at(0));
+ if (strings.size() > 0) {{
+ if (p.Type() == OutputType::json)
+ p.PrintKeyString(name, std::string("VK_") + strings.at(0));
+ else
+ p.PrintKeyString(name, strings.at(0));
+ }}
}}
"""
@@ -498,7 +535,7 @@
for v in bitmask.options:
out += f" if ({v.name} & value) {{\n"
out += f' if (is_first) {{ is_first = false; }} else {{ out += " | "; }}\n'
- out += f' out += "{str(v.name).strip("VK_").strip("_BIT")}";\n'
+ out += f' out += "{str(v.name)[3:]}";\n'
out += f" }}\n"
out += f" return out;\n"
out += f"}}\n"
@@ -545,11 +582,7 @@
elif v.typeID == "uint8_t" and (v.arrayLength == '8' or v.arrayLength == '16'): # VK_UUID_SIZE
if v.arrayLength == '8':
out += ' if (obj.deviceLUIDValid) { // special case\n'
- out += f''' if (p.Type() == OutputType::json) {{
- ArrayWrapper arr(p, "{v.name}");
- for (uint32_t i = 0; i < {v.arrayLength}; i++) p.PrintElement(static_cast<uint32_t>(obj.{v.name}[i]));
- }} else
- p.PrintKeyString("{v.name}", to_string_{v.arrayLength}(obj.{v.name}));\n'''
+ out += f' p.PrintKeyValue("{v.name}", obj.{v.name});\n'
if v.arrayLength == '8':
out += ' }\n'
elif struct.name == "VkQueueFamilyGlobalPriorityPropertiesKHR" and v.name == "priorities":
@@ -561,20 +594,24 @@
out += f' p.PrintString(VkQueueGlobalPriorityKHRString(obj.priorities[i]));\n'
out += f" }}\n"
elif v.arrayLength.isdigit():
- out += f' {{ ArrayWrapper arr(p,"{v.name}", ' + v.arrayLength + ');\n'
- for i in range(0, int(v.arrayLength)):
- out += f" p.PrintElement(obj.{v.name}[{str(i)}]);\n"
+ out += f' {{\n ArrayWrapper arr(p,"{v.name}", ' + v.arrayLength + ');\n'
+ out += f' for (uint32_t i = 0; i < {v.arrayLength}; i++) {{ p.PrintElement(obj.{v.name}[i]); }}\n'
out += f" }}\n"
else: # dynamic array length based on other member
- out += f' ArrayWrapper arr(p,"{v.name}", obj.' + v.arrayLength + ');\n'
- out += f" for (uint32_t i = 0; i < obj.{v.arrayLength}; i++) {{\n"
+ out += f" {{\n"
+ out += f' ArrayWrapper arr(p,"{v.name}", obj.' + v.arrayLength + ');\n'
+ out += f" for (uint32_t i = 0; i < obj.{v.arrayLength}; i++) {{\n"
if v.typeID in types_to_gen:
- out += f" if (obj.{v.name} != nullptr) {{\n"
- out += f" p.SetElementIndex(i);\n"
- out += f' Dump{v.typeID}(p, "{v.name}", obj.{v.name}[i]);\n'
- out += f" }}\n"
+ out += f' if (obj.{v.name} != nullptr) {{\n'
+ out += f' p.SetElementIndex(i);\n'
+ out += ' if (p.Type() == OutputType::json)\n'
+ out += f' p.PrintString(std::string("VK_") + {v.typeID}String(obj.{v.name}[i]));\n'
+ out += ' else\n'
+ out += f' p.PrintString({v.typeID}String(obj.{v.name}[i]));\n'
+ out += f' }}\n'
else:
- out += f" p.PrintElement(obj.{v.name}[i]);\n"
+ out += f" p.PrintElement(obj.{v.name}[i]);\n"
+ out += f" }}\n"
out += f" }}\n"
elif v.typeID == "VkBool32":
out += f' p.PrintKeyBool("{v.name}", static_cast<bool>(obj.{v.name}));\n'
@@ -586,6 +623,8 @@
out += f' p.PrintKeyValue("{v.name}", obj.{v.name});\n'
elif v.name not in names_to_ignore:
# if it is an enum/flag/bitmask
+ if v.typeID in ['VkFormatFeatureFlags', 'VkFormatFeatureFlags2']:
+ out += ' p.SetOpenDetails();\n' # special case so that feature flags are open in html output
out += f' Dump{v.typeID}(p, "{v.name}", obj.{v.name});\n'
if struct.name in ["VkPhysicalDeviceLimits", "VkPhysicalDeviceSparseProperties"]:
@@ -639,13 +678,13 @@
out += AddGuardHeader(s)
if s.sTypeName is not None:
out += f" {s.name} {s.name[2:]}{{}};\n"
- # Specific versions of drivers have an incorrect definition of the size of this struct.
+ # Specific versions of drivers have an incorrect definition of the size of these structs.
# We need to artificially pad the structure it just so the driver doesn't write out of bounds and
# into other structures that are adjacent. This bug comes from the in-development version of
# the extension having a larger size than the final version, so older drivers try to write to
# members which don't exist.
- if s.sTypeName == "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES":
- out += " char padding[64];\n"
+ if s.name in ['VkPhysicalDeviceShaderIntegerDotProductFeatures', 'VkPhysicalDeviceHostImageCopyFeaturesEXT']:
+ out += f" char {s.name}_padding[64];\n"
out += AddGuardFooter(s)
out += f" void initialize_chain() noexcept {{\n"
for s in structs_to_print:
@@ -792,8 +831,13 @@
self.name = name
self.comment = comment
- if value == 0 or value is None:
+ if bitpos is not None:
value = 1 << int(bitpos)
+ elif type(value) is str:
+ if value.lower().startswith('0x'):
+ value = int(value, 16)
+ else:
+ value = int(value)
self.value = value
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 0000000..8d299ee
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,82 @@
+# ~~~
+# Copyright (c) 2023 Valve Corporation
+# Copyright (c) 2023 LunarG, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ~~~
+
+if (ANDROID)
+
+ # Ensure ANativeActivity_onCreate is being exported from vkcube
+ find_program(GNU_NM NAMES nm)
+ if (GNU_NM)
+ add_test(NAME ANativeActivity_onCreate COMMAND ${GNU_NM} --dynamic $<TARGET_FILE:vkcube>)
+ set_tests_properties(ANativeActivity_onCreate
+ PROPERTIES PASS_REGULAR_EXPRESSION "T ANativeActivity_onCreate"
+ )
+ endif()
+
+ return()
+endif()
+
+# setup binary_locations_$<CONFIG>.h.in using binary_locations.h.in as a source
+file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/binary_locations_$<CONFIG>.h" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/binary_locations.h.in")
+
+# copy binary_locations_$<CONFIG> to the build directory
+add_custom_command(
+ PRE_BUILD
+ COMMAND ${CMAKE_COMMAND} "-E" "copy_if_different" "${CMAKE_CURRENT_BINARY_DIR}/binary_locations_$<CONFIG>.h" "${CMAKE_CURRENT_BINARY_DIR}/binary_locations.h"
+ VERBATIM
+ DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/binary_locations_$<CONFIG>.h"
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/binary_locations.h"
+ COMMENT "creating binary_locations.h file ({event: PRE_BUILD}, {filename: binary_locations.h })"
+ )
+add_custom_target (generate_binary_locations DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/binary_locations.h")
+add_dependencies (generate_binary_locations vkcube vkcubepp VkICD_mock_icd vulkaninfo)
+
+find_package(GTest REQUIRED CONFIG QUIET)
+
+add_executable(vulkan_tools_tests)
+target_sources(vulkan_tools_tests PRIVATE
+ main.cpp
+ test_common.h
+ icd/mock_icd_tests.cpp
+)
+get_target_property(TEST_SOURCES vulkan_tools_tests SOURCES)
+source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${TEST_SOURCES})
+
+target_include_directories(vulkan_tools_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries(vulkan_tools_tests GTest::gtest Vulkan::Headers Vulkan::Loader)
+add_dependencies(vulkan_tools_tests generate_binary_locations)
+if (WIN32)
+ target_compile_definitions(vulkan_tools_tests PUBLIC -DVK_USE_PLATFORM_WIN32_KHR -DWIN32_LEAN_AND_MEAN -DNOMINMAX)
+endif()
+set_target_properties(vulkan_tools_tests PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+
+if (DEFINED GIT_BRANCH_NAME AND DEFINED GIT_TAG_INFO)
+ target_compile_definitions(vulkan_tools_tests PRIVATE GIT_BRANCH_NAME="${GIT_BRANCH_NAME}" GIT_TAG_INFO="${GIT_TAG_INFO}")
+endif()
+
+if (ENABLE_ADDRESS_SANITIZER)
+ target_compile_options(vulkan_tools_tests PUBLIC -fsanitize=address)
+ target_link_options(vulkan_tools_tests PUBLIC -fsanitize=address)
+endif ()
+
+if (WIN32)
+ # Copy the loader shared lib (if built) to the test application directory so the test app finds it.
+ add_custom_command(TARGET vulkan_tools_tests POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:Vulkan::Loader> $<TARGET_FILE_DIR:vulkan_tools_tests>)
+endif()
+
+include(GoogleTest)
+gtest_discover_tests(vulkan_tools_tests DISCOVERY_TIMEOUT 100)
diff --git a/tests/README.md b/tests/README.md
new file mode 100644
index 0000000..0e0798e
--- /dev/null
+++ b/tests/README.md
@@ -0,0 +1,34 @@
+## Android
+
+### Running vkcube on Android
+
+```sh
+cd Vulkan-Tools
+
+cd build-android
+
+# Optional
+adb uninstall com.example.VkCube
+
+adb install -r -g --no-incremental bin/VkCube.apk
+
+adb shell am start com.example.VkCube/android.app.NativeActivity
+```
+
+### vulkaninfo on Android
+
+Unlike `vkcube`, `vulkaninfo` doesn't require the extra step of creating an `APK`.
+
+So the following should be enough.
+
+```sh
+cd Vulkan-Tools
+
+scripts/android.py --config Release --app-abi arm64-v8a --app-stl c++_static --clean
+
+adb push build-android/cmake/arm64-v8a/vulkaninfo/vulkaninfo /data/local/tmp
+
+adb shell /data/local/tmp/vulkaninfo --json --output /data/local/tmp/foobar.json
+
+adb pull /data/local/tmp/foobar.json
+```
diff --git a/tests/binary_locations.h.in b/tests/binary_locations.h.in
new file mode 100644
index 0000000..acdd9b8
--- /dev/null
+++ b/tests/binary_locations.h.in
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2023 The Khronos Group Inc.
+ * Copyright (c) 2023 Valve Corporation
+ * Copyright (c) 2023 LunarG, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#define MOCK_ICD_JSON_MANIFEST_PATH "$<TARGET_FILE_DIR:VkICD_mock_icd>"
diff --git a/tests/icd/mock_icd_tests.cpp b/tests/icd/mock_icd_tests.cpp
new file mode 100644
index 0000000..cad067a
--- /dev/null
+++ b/tests/icd/mock_icd_tests.cpp
@@ -0,0 +1,1184 @@
+/*
+ * Copyright (c) 2023 The Khronos Group Inc.
+ * Copyright (c) 2023 Valve Corporation
+ * Copyright (c) 2023 LunarG, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include "test_common.h"
+
+void setup_mock_icd_env_vars() {
+ // Necessary to point the loader at the mock driver
+ set_environment_var("VK_DRIVER_FILES", MOCK_ICD_JSON_MANIFEST_PATH);
+ // Prevents layers from being loaded at all
+ set_environment_var("VK_LOADER_LAYERS_DISABLE", "~all~");
+}
+
+// Defines a simple context for tests to use.
+// Creates an instance, physical_device, device, and queue
+
+class MockICD : public ::testing::Test {
+ protected:
+ void SetUp() override {
+ setup_mock_icd_env_vars();
+
+ // Create an instance with the latest version & necessary surface extensions
+ VkResult res = VK_SUCCESS;
+ VkApplicationInfo app_info{};
+ app_info.apiVersion = VK_HEADER_VERSION_COMPLETE;
+ VkInstanceCreateInfo instance_create_info{};
+ instance_create_info.pApplicationInfo = &app_info;
+ std::array<const char*, 2> extension_to_enable = {"VK_KHR_surface", "VK_KHR_display"};
+ instance_create_info.enabledExtensionCount = static_cast<uint32_t>(extension_to_enable.size());
+ instance_create_info.ppEnabledExtensionNames = extension_to_enable.data();
+ res = vkCreateInstance(&instance_create_info, nullptr, &instance);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_NE(instance, nullptr);
+
+ uint32_t count = 1;
+ res = vkEnumeratePhysicalDevices(instance, &count, &physical_device);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(count, 1);
+ ASSERT_NE(physical_device, nullptr);
+
+ VkDeviceCreateInfo device_create_info{};
+ std::array<const char*, 1> device_extension_to_enable = {"VK_KHR_swapchain"};
+ device_create_info.enabledExtensionCount = static_cast<uint32_t>(device_extension_to_enable.size());
+ device_create_info.ppEnabledExtensionNames = device_extension_to_enable.data();
+ res = vkCreateDevice(physical_device, &device_create_info, nullptr, &device);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_NE(device, nullptr);
+
+ vkGetDeviceQueue(device, 0, 0, &queue);
+ ASSERT_NE(queue, nullptr);
+ }
+
+ void TearDown() override {
+ vkDestroyDevice(device, nullptr);
+ vkDestroyInstance(instance, nullptr);
+ }
+
+ VkInstance instance{};
+ VkPhysicalDevice physical_device{};
+ VkDevice device{};
+ VkQueue queue{};
+};
+
+/*
+ * Exercises the following commands:
+ * vkEnumerateInstanceExtensionProperties
+ * vkEnumerateInstanceLayerProperties
+ * vkEnumerateInstanceVersion
+ * vkCreateInstance
+ * vkEnumeratePhysicalDevices
+ * vkEnumeratePhysicalDeviceGroups
+ * vkEnumerateDeviceExtensionProperties
+ * vkGetPhysicalDeviceQueueFamilyProperties
+ * vkGetPhysicalDeviceQueueFamilyProperties2
+ * vkCreateDevice
+ * vkDestroyDevice
+ * vkDestroyInstance
+ * vkGetDeviceQueue
+ * vkGetDeviceQueue2
+ */
+TEST_F(MockICD, InitializationFunctions) {
+ setup_mock_icd_env_vars();
+ VkResult res = VK_SUCCESS;
+ uint32_t count = 0;
+ res = vkEnumerateInstanceExtensionProperties(nullptr, &count, nullptr);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_GT(count, 0);
+ std::vector<VkExtensionProperties> inst_ext_props{count, VkExtensionProperties{}};
+ res = vkEnumerateInstanceExtensionProperties(nullptr, &count, inst_ext_props.data());
+ ASSERT_EQ(res, VK_SUCCESS);
+
+ // Since we disabled layers, count should stay zero
+ count = 0;
+ res = vkEnumerateInstanceLayerProperties(&count, nullptr);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(count, 0);
+
+ uint32_t api_version;
+ res = vkEnumerateInstanceVersion(&api_version);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(api_version, VK_HEADER_VERSION_COMPLETE);
+
+ VkInstanceCreateInfo inst_create_info{};
+ VkInstance instance{};
+ res = vkCreateInstance(&inst_create_info, nullptr, &instance);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_NE(instance, nullptr);
+
+ count = 0;
+ VkPhysicalDevice physical_device;
+ res = vkEnumeratePhysicalDevices(instance, &count, nullptr);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(count, 1);
+
+ res = vkEnumeratePhysicalDevices(instance, &count, &physical_device);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(count, 1);
+ ASSERT_NE(physical_device, nullptr);
+
+ count = 0;
+ res = vkEnumeratePhysicalDeviceGroups(instance, &count, nullptr);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_GT(count, 0);
+
+ VkPhysicalDeviceGroupProperties physical_device_groups;
+ count = 1;
+ res = vkEnumeratePhysicalDeviceGroups(instance, &count, &physical_device_groups);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(count, 1);
+
+ count = 0;
+ res = vkEnumerateDeviceExtensionProperties(physical_device, nullptr, &count, nullptr);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_GT(count, 0);
+ std::vector<VkExtensionProperties> device_ext_props{count, VkExtensionProperties{}};
+ res = vkEnumerateDeviceExtensionProperties(physical_device, nullptr, &count, device_ext_props.data());
+ ASSERT_EQ(res, VK_SUCCESS);
+
+ // Device layers are deprecated, should return number of active layers, which is zero
+ count = 0;
+ res = vkEnumerateDeviceLayerProperties(physical_device, &count, nullptr);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(count, 0);
+ count = 0;
+
+ vkGetPhysicalDeviceQueueFamilyProperties(physical_device, &count, nullptr);
+ ASSERT_EQ(count, 1);
+ VkQueueFamilyProperties queue_family_properties{};
+ vkGetPhysicalDeviceQueueFamilyProperties(physical_device, &count, &queue_family_properties);
+ ASSERT_EQ(count, 1);
+ ASSERT_EQ(queue_family_properties.queueFlags, 1 | 2 | 4 | 8 | 16);
+ ASSERT_EQ(queue_family_properties.queueCount, 1);
+ ASSERT_EQ(queue_family_properties.timestampValidBits, 16);
+ ASSERT_EQ(queue_family_properties.minImageTransferGranularity.width, 1);
+ ASSERT_EQ(queue_family_properties.minImageTransferGranularity.height, 1);
+ ASSERT_EQ(queue_family_properties.minImageTransferGranularity.depth, 1);
+
+ vkGetPhysicalDeviceQueueFamilyProperties2(physical_device, &count, nullptr);
+ ASSERT_EQ(count, 1);
+ VkQueueFamilyProperties2 queue_family_properties2{};
+ vkGetPhysicalDeviceQueueFamilyProperties2(physical_device, &count, &queue_family_properties2);
+ ASSERT_EQ(count, 1);
+ ASSERT_EQ(queue_family_properties2.queueFamilyProperties.queueFlags, 1 | 2 | 4 | 8 | 16);
+ ASSERT_EQ(queue_family_properties2.queueFamilyProperties.queueCount, 1);
+ ASSERT_EQ(queue_family_properties2.queueFamilyProperties.timestampValidBits, 16);
+ ASSERT_EQ(queue_family_properties2.queueFamilyProperties.minImageTransferGranularity.width, 1);
+ ASSERT_EQ(queue_family_properties2.queueFamilyProperties.minImageTransferGranularity.height, 1);
+ ASSERT_EQ(queue_family_properties2.queueFamilyProperties.minImageTransferGranularity.depth, 1);
+
+ VkDeviceCreateInfo dev_create_info{};
+ VkDevice device{};
+ res = vkCreateDevice(physical_device, &dev_create_info, nullptr, &device);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_NE(device, nullptr);
+
+ VkQueue queue{};
+ vkGetDeviceQueue(device, 0, 0, &queue);
+ ASSERT_NE(queue, nullptr);
+
+ VkDeviceQueueInfo2 queue_info{};
+ vkGetDeviceQueue2(device, &queue_info, &queue);
+ ASSERT_NE(queue, nullptr);
+
+ vkDestroyDevice(device, nullptr);
+ vkDestroyInstance(instance, nullptr);
+}
+
+/*
+ * Exercises the following commands:
+ * vkCreateCommandPool
+ * vkAllocateCommandBuffers
+ * vkFreeCommandBuffers
+ * vkDestroyCommandPool
+ */
+TEST_F(MockICD, CommandBufferOperations) {
+ VkResult res = VK_SUCCESS;
+ VkCommandPoolCreateInfo command_pool_create_info{};
+ VkCommandPool command_pool;
+ res = vkCreateCommandPool(device, &command_pool_create_info, nullptr, &command_pool);
+ ASSERT_EQ(VK_SUCCESS, res);
+
+ VkCommandBufferAllocateInfo command_buffer_allocate_info{};
+ command_buffer_allocate_info.commandBufferCount = 5;
+ std::array<VkCommandBuffer, 5> command_buffers;
+ res = vkAllocateCommandBuffers(device, &command_buffer_allocate_info, command_buffers.data());
+ ASSERT_EQ(VK_SUCCESS, res);
+ for (const auto& command_buffer : command_buffers) {
+ ASSERT_NE(nullptr, command_buffer);
+ }
+
+ vkFreeCommandBuffers(device, command_pool, 5, command_buffers.data());
+
+ vkDestroyCommandPool(device, command_pool, nullptr);
+}
+
+VkResult create_surface(VkInstance instance, VkSurfaceKHR& surface) {
+ VkDisplaySurfaceCreateInfoKHR surf_create_info{};
+ return vkCreateDisplayPlaneSurfaceKHR(instance, &surf_create_info, nullptr, &surface);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceSurfacePresentModesKHR) {
+ VkResult res = VK_SUCCESS;
+ VkSurfaceKHR surface{};
+ res = create_surface(instance, surface);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_NE(surface, VK_NULL_HANDLE);
+ uint32_t count = 0;
+ std::array<VkPresentModeKHR, 6> present_modes{};
+ res = vkGetPhysicalDeviceSurfacePresentModesKHR(physical_device, surface, &count, nullptr);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(count, present_modes.size());
+ vkGetPhysicalDeviceSurfacePresentModesKHR(physical_device, surface, &count, present_modes.data());
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(present_modes[0], VK_PRESENT_MODE_IMMEDIATE_KHR);
+ ASSERT_EQ(present_modes[1], VK_PRESENT_MODE_MAILBOX_KHR);
+ ASSERT_EQ(present_modes[2], VK_PRESENT_MODE_FIFO_KHR);
+ ASSERT_EQ(present_modes[3], VK_PRESENT_MODE_FIFO_RELAXED_KHR);
+ ASSERT_EQ(present_modes[4], VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR);
+ ASSERT_EQ(present_modes[5], VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR);
+ vkDestroySurfaceKHR(instance, surface, nullptr);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceSurfaceFormatsKHR) {
+ VkResult res = VK_SUCCESS;
+ VkSurfaceKHR surface{};
+ res = create_surface(instance, surface);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_NE(surface, VK_NULL_HANDLE);
+ uint32_t count = 0;
+ std::array<VkSurfaceFormatKHR, 2> surface_formats{};
+ res = vkGetPhysicalDeviceSurfaceFormatsKHR(physical_device, surface, &count, nullptr);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(count, surface_formats.size());
+ vkGetPhysicalDeviceSurfaceFormatsKHR(physical_device, surface, &count, surface_formats.data());
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(surface_formats[0].format, VK_FORMAT_B8G8R8A8_UNORM);
+ ASSERT_EQ(surface_formats[0].colorSpace, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR);
+ ASSERT_EQ(surface_formats[1].format, VK_FORMAT_R8G8B8A8_UNORM);
+ ASSERT_EQ(surface_formats[1].colorSpace, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR);
+ vkDestroySurfaceKHR(instance, surface, nullptr);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceSurfaceFormats2KHR) {
+ VkResult res = VK_SUCCESS;
+ VkSurfaceKHR surface{};
+ res = create_surface(instance, surface);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_NE(surface, VK_NULL_HANDLE);
+ uint32_t count = 0;
+ std::array<VkSurfaceFormat2KHR, 2> surface_formats2{};
+ VkPhysicalDeviceSurfaceInfo2KHR surface_info{};
+ surface_info.surface = surface;
+ res = vkGetPhysicalDeviceSurfaceFormats2KHR(physical_device, &surface_info, &count, nullptr);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(count, surface_formats2.size());
+ vkGetPhysicalDeviceSurfaceFormats2KHR(physical_device, &surface_info, &count, surface_formats2.data());
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(surface_formats2[0].pNext, nullptr);
+ ASSERT_EQ(surface_formats2[0].surfaceFormat.format, VK_FORMAT_B8G8R8A8_UNORM);
+ ASSERT_EQ(surface_formats2[0].surfaceFormat.colorSpace, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR);
+ ASSERT_EQ(surface_formats2[1].pNext, nullptr);
+ ASSERT_EQ(surface_formats2[1].surfaceFormat.format, VK_FORMAT_R8G8B8A8_UNORM);
+ ASSERT_EQ(surface_formats2[1].surfaceFormat.colorSpace, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR);
+ vkDestroySurfaceKHR(instance, surface, nullptr);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceSurfaceSupportKHR) {
+ VkResult res = VK_SUCCESS;
+ VkSurfaceKHR surface{};
+ res = create_surface(instance, surface);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_NE(surface, VK_NULL_HANDLE);
+ VkBool32 supported = false;
+ res = vkGetPhysicalDeviceSurfaceSupportKHR(physical_device, 0, surface, &supported);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(supported, true);
+ vkDestroySurfaceKHR(instance, surface, nullptr);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceSurfaceCapabilitiesKHR) {
+ VkResult res = VK_SUCCESS;
+ VkSurfaceKHR surface{};
+ res = create_surface(instance, surface);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_NE(surface, VK_NULL_HANDLE);
+ VkSurfaceCapabilitiesKHR surface_capabilities{};
+ res = vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physical_device, surface, &surface_capabilities);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(surface_capabilities.minImageCount, 1);
+ ASSERT_EQ(surface_capabilities.currentExtent.width, std::numeric_limits<uint32_t>::max());
+ ASSERT_EQ(surface_capabilities.currentExtent.height, std::numeric_limits<uint32_t>::max());
+ ASSERT_EQ(surface_capabilities.minImageExtent.width, 1);
+ ASSERT_EQ(surface_capabilities.minImageExtent.height, 1);
+ ASSERT_EQ(surface_capabilities.maxImageArrayLayers, 128);
+ ASSERT_EQ(surface_capabilities.currentTransform, VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR);
+ vkDestroySurfaceKHR(instance, surface, nullptr);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceSurfaceCapabilities2KHR) {
+ VkResult res = VK_SUCCESS;
+ VkSurfaceKHR surface{};
+ res = create_surface(instance, surface);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_NE(surface, VK_NULL_HANDLE);
+ VkSurfaceCapabilities2KHR surface_capabilities2{};
+ VkPhysicalDeviceSurfaceInfo2KHR surface_info{};
+ surface_info.surface = surface;
+ res = vkGetPhysicalDeviceSurfaceCapabilities2KHR(physical_device, &surface_info, &surface_capabilities2);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(surface_capabilities2.surfaceCapabilities.minImageCount, 1);
+ ASSERT_EQ(surface_capabilities2.surfaceCapabilities.currentExtent.width, std::numeric_limits<uint32_t>::max());
+ ASSERT_EQ(surface_capabilities2.surfaceCapabilities.currentExtent.height, std::numeric_limits<uint32_t>::max());
+ ASSERT_EQ(surface_capabilities2.surfaceCapabilities.minImageExtent.width, 1);
+ ASSERT_EQ(surface_capabilities2.surfaceCapabilities.minImageExtent.height, 1);
+ ASSERT_EQ(surface_capabilities2.surfaceCapabilities.maxImageArrayLayers, 128);
+ ASSERT_EQ(surface_capabilities2.surfaceCapabilities.currentTransform, VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR);
+ vkDestroySurfaceKHR(instance, surface, nullptr);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceMemoryProperties) {
+ VkPhysicalDeviceMemoryProperties memory_properties{};
+ vkGetPhysicalDeviceMemoryProperties(physical_device, &memory_properties);
+ ASSERT_EQ(memory_properties.memoryTypeCount, 6);
+ ASSERT_EQ(memory_properties.memoryTypes[0].propertyFlags,
+ VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
+ ASSERT_EQ(memory_properties.memoryTypes[0].heapIndex, 0);
+ ASSERT_EQ(memory_properties.memoryTypes[5].propertyFlags, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
+ ASSERT_EQ(memory_properties.memoryTypes[5].heapIndex, 1);
+ ASSERT_EQ(memory_properties.memoryHeapCount, 2);
+ ASSERT_EQ(memory_properties.memoryHeaps[0].flags, VK_MEMORY_HEAP_MULTI_INSTANCE_BIT);
+ ASSERT_EQ(memory_properties.memoryHeaps[0].size, 8000000000);
+ ASSERT_EQ(memory_properties.memoryHeaps[1].flags, VK_MEMORY_HEAP_DEVICE_LOCAL_BIT);
+ ASSERT_EQ(memory_properties.memoryHeaps[1].size, 8000000000);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceMemoryProperties2) {
+ VkPhysicalDeviceMemoryProperties2 memory_properties2{};
+ vkGetPhysicalDeviceMemoryProperties2(physical_device, &memory_properties2);
+ ASSERT_EQ(memory_properties2.memoryProperties.memoryTypeCount, 6);
+ ASSERT_EQ(memory_properties2.memoryProperties.memoryTypes[0].propertyFlags,
+ VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
+ ASSERT_EQ(memory_properties2.memoryProperties.memoryTypes[0].heapIndex, 0);
+ ASSERT_EQ(memory_properties2.memoryProperties.memoryTypes[5].propertyFlags, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
+ ASSERT_EQ(memory_properties2.memoryProperties.memoryTypes[5].heapIndex, 1);
+ ASSERT_EQ(memory_properties2.memoryProperties.memoryHeapCount, 2);
+ ASSERT_EQ(memory_properties2.memoryProperties.memoryHeaps[0].flags, VK_MEMORY_HEAP_MULTI_INSTANCE_BIT);
+ ASSERT_EQ(memory_properties2.memoryProperties.memoryHeaps[0].size, 8000000000);
+ ASSERT_EQ(memory_properties2.memoryProperties.memoryHeaps[1].flags, VK_MEMORY_HEAP_DEVICE_LOCAL_BIT);
+ ASSERT_EQ(memory_properties2.memoryProperties.memoryHeaps[1].size, 8000000000);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceFeatures) {
+ VkPhysicalDeviceFeatures features{};
+ vkGetPhysicalDeviceFeatures(physical_device, &features);
+ // Make sure the first and last elements are set to true
+ ASSERT_EQ(features.robustBufferAccess, true);
+ ASSERT_EQ(features.inheritedQueries, true);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceFeatures2) {
+ VkPhysicalDeviceDescriptorIndexingFeaturesEXT descriptor_indexing_features{};
+ descriptor_indexing_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES;
+
+ VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT blending_operation_advanced_features{};
+ blending_operation_advanced_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_FEATURES_EXT;
+ blending_operation_advanced_features.pNext = static_cast<void*>(&descriptor_indexing_features);
+
+ VkPhysicalDeviceFeatures2 features2{};
+ features2.pNext = static_cast<void*>(&blending_operation_advanced_features);
+ vkGetPhysicalDeviceFeatures2(physical_device, &features2);
+ // Make sure the first and last elements are set to true
+ ASSERT_EQ(features2.features.robustBufferAccess, true);
+ ASSERT_EQ(features2.features.inheritedQueries, true);
+ ASSERT_EQ(descriptor_indexing_features.shaderInputAttachmentArrayDynamicIndexing, true);
+ ASSERT_EQ(descriptor_indexing_features.runtimeDescriptorArray, true);
+ ASSERT_EQ(blending_operation_advanced_features.advancedBlendCoherentOperations, true);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceFormatProperties) {
+ VkFormatProperties format_properties{};
+ vkGetPhysicalDeviceFormatProperties(physical_device, VK_FORMAT_R8G8B8A8_SRGB, &format_properties);
+ ASSERT_EQ(format_properties.bufferFeatures, 0x00FFFDFF);
+ ASSERT_EQ(format_properties.linearTilingFeatures, 0x00FFFDFF);
+ ASSERT_EQ(format_properties.optimalTilingFeatures, 0x00FFFDFF);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceFormatProperties2) {
+ VkFormatProperties3 format_properties3{};
+ format_properties3.sType = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3;
+ VkFormatProperties2 format_properties2{};
+ format_properties2.sType = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2;
+ format_properties2.pNext = static_cast<void*>(&format_properties3);
+ vkGetPhysicalDeviceFormatProperties2(physical_device, VK_FORMAT_R8G8B8A8_SRGB, &format_properties2);
+ ASSERT_EQ(format_properties2.formatProperties.bufferFeatures, 0x00FFFDFF);
+ ASSERT_EQ(format_properties2.formatProperties.linearTilingFeatures, 0x00FFFDFF);
+ ASSERT_EQ(format_properties2.formatProperties.optimalTilingFeatures, 0x00FFFDFF);
+ ASSERT_EQ(format_properties3.bufferFeatures, 0x00FFFDFF);
+ ASSERT_EQ(format_properties3.linearTilingFeatures, 0x00FFFDFF);
+ ASSERT_EQ(format_properties3.optimalTilingFeatures, 0x400000FFFDFF);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceImageFormatProperties) {
+ VkImageFormatProperties image_format_properties{};
+ vkGetPhysicalDeviceImageFormatProperties(physical_device, VK_FORMAT_R8G8B8A8_SRGB, VK_IMAGE_TYPE_2D, VK_IMAGE_TILING_LINEAR,
+ VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, 0, &image_format_properties);
+ ASSERT_EQ(image_format_properties.maxExtent.width, 4096);
+ ASSERT_EQ(image_format_properties.maxExtent.height, 4096);
+ ASSERT_EQ(image_format_properties.maxExtent.depth, 256);
+ ASSERT_EQ(image_format_properties.maxMipLevels, 1);
+ ASSERT_EQ(image_format_properties.maxArrayLayers, 1);
+ ASSERT_EQ(image_format_properties.sampleCounts, VK_SAMPLE_COUNT_1_BIT);
+ ASSERT_EQ(image_format_properties.maxResourceSize, 4294967296 /* this is max of uint32_t + 1*/);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceImageFormatProperties2) {
+ VkImageFormatProperties2 image_format_properties2{};
+ VkPhysicalDeviceImageFormatInfo2 image_format_info2{};
+ image_format_info2.format = VK_FORMAT_R8G8B8A8_SRGB;
+ image_format_info2.type = VK_IMAGE_TYPE_2D;
+ image_format_info2.tiling = VK_IMAGE_TILING_OPTIMAL;
+ image_format_info2.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
+ image_format_info2.flags = 0;
+ vkGetPhysicalDeviceImageFormatProperties2(physical_device, &image_format_info2, &image_format_properties2);
+ ASSERT_EQ(image_format_properties2.imageFormatProperties.maxExtent.width, 4096);
+ ASSERT_EQ(image_format_properties2.imageFormatProperties.maxExtent.height, 4096);
+ ASSERT_EQ(image_format_properties2.imageFormatProperties.maxExtent.depth, 256);
+ ASSERT_EQ(image_format_properties2.imageFormatProperties.maxMipLevels, 12);
+ ASSERT_EQ(image_format_properties2.imageFormatProperties.maxArrayLayers, 256);
+ ASSERT_EQ(image_format_properties2.imageFormatProperties.sampleCounts, 0x7F & ~VK_SAMPLE_COUNT_64_BIT);
+ ASSERT_EQ(image_format_properties2.imageFormatProperties.maxResourceSize, 4294967296 /* this is max of uint32_t + 1*/);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceSparseImageFormatProperties) {
+ uint32_t count = 0;
+ VkSparseImageFormatProperties sparse_image_format_properties{};
+ vkGetPhysicalDeviceSparseImageFormatProperties(physical_device, VK_FORMAT_R8G8B8A8_SRGB, VK_IMAGE_TYPE_2D,
+ VK_SAMPLE_COUNT_64_BIT, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
+ VK_IMAGE_TILING_OPTIMAL, &count, nullptr);
+ ASSERT_EQ(count, 1);
+ vkGetPhysicalDeviceSparseImageFormatProperties(physical_device, VK_FORMAT_R8G8B8A8_SRGB, VK_IMAGE_TYPE_2D,
+ VK_SAMPLE_COUNT_64_BIT, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
+ VK_IMAGE_TILING_OPTIMAL, &count, &sparse_image_format_properties);
+ ASSERT_EQ(sparse_image_format_properties.aspectMask, VK_IMAGE_ASPECT_COLOR_BIT);
+ ASSERT_EQ(sparse_image_format_properties.imageGranularity.width, 4);
+ ASSERT_EQ(sparse_image_format_properties.imageGranularity.height, 4);
+ ASSERT_EQ(sparse_image_format_properties.imageGranularity.depth, 4);
+ ASSERT_EQ(sparse_image_format_properties.flags, VK_SPARSE_IMAGE_FORMAT_SINGLE_MIPTAIL_BIT);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceSparseImageFormatProperties2) {
+ uint32_t count = 0;
+ VkSparseImageFormatProperties2 sparse_image_format_properties2{};
+ VkPhysicalDeviceSparseImageFormatInfo2 sparse_image_format_info2{};
+ sparse_image_format_info2.format = VK_FORMAT_R8G8B8A8_SRGB;
+ sparse_image_format_info2.type = VK_IMAGE_TYPE_2D;
+ sparse_image_format_info2.samples = VK_SAMPLE_COUNT_64_BIT;
+ sparse_image_format_info2.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
+ sparse_image_format_info2.tiling = VK_IMAGE_TILING_OPTIMAL;
+ vkGetPhysicalDeviceSparseImageFormatProperties2(physical_device, &sparse_image_format_info2, &count, nullptr);
+ ASSERT_EQ(count, 1);
+ vkGetPhysicalDeviceSparseImageFormatProperties2(physical_device, &sparse_image_format_info2, &count,
+ &sparse_image_format_properties2);
+ ASSERT_EQ(sparse_image_format_properties2.properties.aspectMask, VK_IMAGE_ASPECT_COLOR_BIT);
+ ASSERT_EQ(sparse_image_format_properties2.properties.imageGranularity.width, 4);
+ ASSERT_EQ(sparse_image_format_properties2.properties.imageGranularity.height, 4);
+ ASSERT_EQ(sparse_image_format_properties2.properties.imageGranularity.depth, 4);
+ ASSERT_EQ(sparse_image_format_properties2.properties.flags, VK_SPARSE_IMAGE_FORMAT_SINGLE_MIPTAIL_BIT);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceProperties) {
+ VkPhysicalDeviceProperties physical_device_properties{};
+ vkGetPhysicalDeviceProperties(physical_device, &physical_device_properties);
+ ASSERT_EQ(physical_device_properties.apiVersion, VK_HEADER_VERSION_COMPLETE);
+ ASSERT_EQ(physical_device_properties.driverVersion, 1);
+ ASSERT_EQ(physical_device_properties.vendorID, 0xba5eba11);
+ ASSERT_EQ(physical_device_properties.deviceID, 0xf005ba11);
+ ASSERT_EQ(physical_device_properties.deviceType, VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU);
+ ASSERT_STREQ(&physical_device_properties.deviceName[0], "Vulkan Mock Device");
+ ASSERT_EQ(physical_device_properties.pipelineCacheUUID[0], 18);
+ ASSERT_EQ(physical_device_properties.limits.maxImageDimension1D, 4096);
+ ASSERT_EQ(physical_device_properties.limits.nonCoherentAtomSize, 256);
+ ASSERT_EQ(physical_device_properties.sparseProperties.residencyAlignedMipSize, VK_TRUE);
+ ASSERT_EQ(physical_device_properties.sparseProperties.residencyNonResidentStrict, VK_TRUE);
+ ASSERT_EQ(physical_device_properties.sparseProperties.residencyStandard2DBlockShape, VK_TRUE);
+ ASSERT_EQ(physical_device_properties.sparseProperties.residencyStandard2DMultisampleBlockShape, VK_TRUE);
+ ASSERT_EQ(physical_device_properties.sparseProperties.residencyStandard3DBlockShape, VK_TRUE);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceProperties2) {
+ VkPhysicalDeviceVulkan11Properties properties11{};
+ properties11.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_PROPERTIES;
+
+ VkPhysicalDeviceVulkan12Properties properties12{};
+ properties12.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES;
+ properties12.pNext = static_cast<void*>(&properties11);
+
+ VkPhysicalDeviceVulkan13Properties properties13{};
+ properties13.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES;
+ properties13.pNext = static_cast<void*>(&properties12);
+
+ VkPhysicalDeviceProtectedMemoryProperties protected_memory_properties{};
+ protected_memory_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_PROPERTIES;
+ protected_memory_properties.pNext = static_cast<void*>(&properties13);
+
+ VkPhysicalDeviceFloatControlsProperties float_controls_properties{};
+ float_controls_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES;
+ float_controls_properties.pNext = static_cast<void*>(&protected_memory_properties);
+
+ VkPhysicalDeviceConservativeRasterizationPropertiesEXT conservative_rasterization_properties{};
+ conservative_rasterization_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONSERVATIVE_RASTERIZATION_PROPERTIES_EXT;
+ conservative_rasterization_properties.pNext = static_cast<void*>(&float_controls_properties);
+
+ VkPhysicalDeviceRayTracingPipelinePropertiesKHR raytracing_pipeline_properties{};
+ raytracing_pipeline_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_PROPERTIES_KHR;
+ raytracing_pipeline_properties.pNext = static_cast<void*>(&conservative_rasterization_properties);
+
+ VkPhysicalDeviceRayTracingPropertiesNV ray_tracing_properties{};
+ ray_tracing_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_NV;
+ ray_tracing_properties.pNext = static_cast<void*>(&raytracing_pipeline_properties);
+
+ VkPhysicalDeviceTexelBufferAlignmentProperties texel_buffer_alignment_properties{};
+ texel_buffer_alignment_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES;
+ texel_buffer_alignment_properties.pNext = static_cast<void*>(&ray_tracing_properties);
+
+ VkPhysicalDeviceDescriptorBufferPropertiesEXT descriptor_buffer_properties{};
+ descriptor_buffer_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_PROPERTIES_EXT;
+ descriptor_buffer_properties.pNext = static_cast<void*>(&texel_buffer_alignment_properties);
+
+ VkPhysicalDeviceMeshShaderPropertiesEXT mesh_shader_properties{};
+ mesh_shader_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_PROPERTIES_EXT;
+ mesh_shader_properties.pNext = static_cast<void*>(&descriptor_buffer_properties);
+
+ VkPhysicalDeviceFragmentDensityMap2PropertiesEXT fragment_density_map2_properties{};
+ fragment_density_map2_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_PROPERTIES_EXT;
+ fragment_density_map2_properties.pNext = static_cast<void*>(&mesh_shader_properties);
+
+ VkPhysicalDeviceDriverProperties driver_properties{};
+ driver_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES;
+ driver_properties.pNext = static_cast<void*>(&fragment_density_map2_properties);
+
+ VkPhysicalDeviceProperties2 properties2{};
+ properties2.pNext = static_cast<void*>(&driver_properties);
+ vkGetPhysicalDeviceProperties2(physical_device, &properties2);
+ ASSERT_EQ(properties2.properties.apiVersion, VK_HEADER_VERSION_COMPLETE);
+ ASSERT_EQ(properties2.properties.driverVersion, 1);
+ ASSERT_EQ(properties2.properties.vendorID, 0xba5eba11);
+ ASSERT_EQ(properties2.properties.deviceID, 0xf005ba11);
+ ASSERT_EQ(properties2.properties.deviceType, VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU);
+ ASSERT_STREQ(&properties2.properties.deviceName[0], "Vulkan Mock Device");
+ ASSERT_EQ(properties2.properties.pipelineCacheUUID[0], 18);
+ ASSERT_EQ(properties2.properties.limits.maxImageDimension1D, 4096);
+ ASSERT_EQ(properties2.properties.limits.nonCoherentAtomSize, 256);
+ ASSERT_EQ(properties2.properties.sparseProperties.residencyAlignedMipSize, VK_TRUE);
+ ASSERT_EQ(properties2.properties.sparseProperties.residencyNonResidentStrict, VK_TRUE);
+ ASSERT_EQ(properties2.properties.sparseProperties.residencyStandard2DBlockShape, VK_TRUE);
+ ASSERT_EQ(properties2.properties.sparseProperties.residencyStandard2DMultisampleBlockShape, VK_TRUE);
+ ASSERT_EQ(properties2.properties.sparseProperties.residencyStandard3DBlockShape, VK_TRUE);
+
+ ASSERT_EQ(properties11.protectedNoFault, VK_FALSE);
+ ASSERT_EQ(properties12.denormBehaviorIndependence, VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL);
+ ASSERT_EQ(properties12.roundingModeIndependence, VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL);
+ ASSERT_EQ(properties13.storageTexelBufferOffsetSingleTexelAlignment, VK_TRUE);
+ ASSERT_EQ(properties13.uniformTexelBufferOffsetSingleTexelAlignment, VK_TRUE);
+ ASSERT_EQ(properties13.storageTexelBufferOffsetAlignmentBytes, 16);
+ ASSERT_EQ(properties13.uniformTexelBufferOffsetAlignmentBytes, 16);
+ ASSERT_EQ(protected_memory_properties.protectedNoFault, VK_FALSE);
+ ASSERT_EQ(float_controls_properties.denormBehaviorIndependence, VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL);
+ ASSERT_EQ(float_controls_properties.roundingModeIndependence, VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL);
+ ASSERT_EQ(conservative_rasterization_properties.primitiveOverestimationSize, 0.00195313f);
+ ASSERT_EQ(conservative_rasterization_properties.conservativePointAndLineRasterization, VK_TRUE);
+ ASSERT_EQ(conservative_rasterization_properties.degenerateTrianglesRasterized, VK_TRUE);
+ ASSERT_EQ(conservative_rasterization_properties.degenerateLinesRasterized, VK_TRUE);
+ ASSERT_EQ(raytracing_pipeline_properties.shaderGroupHandleSize, 32);
+ ASSERT_EQ(raytracing_pipeline_properties.shaderGroupBaseAlignment, 64);
+ ASSERT_EQ(raytracing_pipeline_properties.shaderGroupHandleCaptureReplaySize, 32);
+ ASSERT_EQ(ray_tracing_properties.shaderGroupHandleSize, 32);
+ ASSERT_EQ(ray_tracing_properties.shaderGroupBaseAlignment, 64);
+ ASSERT_EQ(texel_buffer_alignment_properties.storageTexelBufferOffsetSingleTexelAlignment, VK_TRUE);
+ ASSERT_EQ(texel_buffer_alignment_properties.uniformTexelBufferOffsetSingleTexelAlignment, VK_TRUE);
+ ASSERT_EQ(texel_buffer_alignment_properties.storageTexelBufferOffsetAlignmentBytes, 16);
+ ASSERT_EQ(texel_buffer_alignment_properties.uniformTexelBufferOffsetAlignmentBytes, 16);
+ ASSERT_EQ(descriptor_buffer_properties.combinedImageSamplerDescriptorSingleArray, VK_TRUE);
+ ASSERT_EQ(descriptor_buffer_properties.bufferlessPushDescriptors, VK_TRUE);
+ ASSERT_EQ(descriptor_buffer_properties.allowSamplerImageViewPostSubmitCreation, VK_TRUE);
+ ASSERT_EQ(descriptor_buffer_properties.descriptorBufferOffsetAlignment, 4);
+ ASSERT_EQ(mesh_shader_properties.meshOutputPerVertexGranularity, 32);
+ ASSERT_EQ(mesh_shader_properties.meshOutputPerPrimitiveGranularity, 32);
+ ASSERT_EQ(mesh_shader_properties.prefersLocalInvocationVertexOutput, VK_TRUE);
+ ASSERT_EQ(mesh_shader_properties.prefersLocalInvocationPrimitiveOutput, VK_TRUE);
+ ASSERT_EQ(mesh_shader_properties.prefersCompactVertexOutput, VK_TRUE);
+ ASSERT_EQ(mesh_shader_properties.prefersCompactPrimitiveOutput, VK_TRUE);
+ ASSERT_EQ(fragment_density_map2_properties.subsampledLoads, VK_FALSE);
+ ASSERT_EQ(fragment_density_map2_properties.subsampledCoarseReconstructionEarlyAccess, VK_FALSE);
+ ASSERT_EQ(fragment_density_map2_properties.maxSubsampledArrayLayers, 2);
+ ASSERT_EQ(fragment_density_map2_properties.maxDescriptorSetSubsampledSamplers, 1);
+ ASSERT_EQ(std::string(driver_properties.driverName), "Vulkan Mock Device");
+ ASSERT_EQ(std::string(driver_properties.driverInfo), "Branch: " GIT_BRANCH_NAME " Tag Info: " GIT_TAG_INFO);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceExternalSemaphoreProperties) {
+ VkPhysicalDeviceExternalSemaphoreInfo external_semaphore_info{};
+ VkExternalSemaphoreProperties external_semaphore_properties{};
+ vkGetPhysicalDeviceExternalSemaphoreProperties(physical_device, &external_semaphore_info, &external_semaphore_properties);
+ ASSERT_EQ(external_semaphore_properties.exportFromImportedHandleTypes, 0x1F);
+ ASSERT_EQ(external_semaphore_properties.compatibleHandleTypes, 0x1F);
+ ASSERT_EQ(external_semaphore_properties.externalSemaphoreFeatures, 0x3);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceExternalFenceProperties) {
+ VkPhysicalDeviceExternalFenceInfo external_fence_info{};
+ VkExternalFenceProperties external_fence_properties{};
+ vkGetPhysicalDeviceExternalFenceProperties(physical_device, &external_fence_info, &external_fence_properties);
+ ASSERT_EQ(external_fence_properties.exportFromImportedHandleTypes, 0xF);
+ ASSERT_EQ(external_fence_properties.compatibleHandleTypes, 0xF);
+ ASSERT_EQ(external_fence_properties.externalFenceFeatures, 0x3);
+}
+TEST_F(MockICD, vkGetPhysicalDeviceExternalBufferProperties) {
+ VkPhysicalDeviceExternalBufferInfo external_buffer_info{};
+ external_buffer_info.handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT;
+ VkExternalBufferProperties external_buffer_properties{};
+ vkGetPhysicalDeviceExternalBufferProperties(physical_device, &external_buffer_info, &external_buffer_properties);
+ ASSERT_EQ(external_buffer_properties.externalMemoryProperties.externalMemoryFeatures, 0x7);
+ ASSERT_EQ(external_buffer_properties.externalMemoryProperties.exportFromImportedHandleTypes, 0x1FF);
+ ASSERT_EQ(external_buffer_properties.externalMemoryProperties.compatibleHandleTypes, 0x1FF);
+
+ external_buffer_info.handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_SCREEN_BUFFER_BIT_QNX;
+ vkGetPhysicalDeviceExternalBufferProperties(physical_device, &external_buffer_info, &external_buffer_properties);
+ ASSERT_EQ(external_buffer_properties.externalMemoryProperties.externalMemoryFeatures, 0);
+ ASSERT_EQ(external_buffer_properties.externalMemoryProperties.exportFromImportedHandleTypes, 0);
+ ASSERT_EQ(external_buffer_properties.externalMemoryProperties.compatibleHandleTypes,
+ VK_EXTERNAL_MEMORY_HANDLE_TYPE_SCREEN_BUFFER_BIT_QNX);
+}
+
+/*
+ * Exercises the following commands:
+ * vkCreateBuffer
+ * vkGetBufferMemoryRequirements
+ * vkGetBufferMemoryRequirements2
+ * vkGetDeviceBufferMemoryRequirements
+ * vkAllocateMemory
+ * vkMapMemory
+ * vkUnmapMemory
+ * vkGetBufferDeviceAddress
+ * vkGetBufferDeviceAddressKHR
+ * vkGetBufferDeviceAddressEXT
+ * vkDestroyBuffer
+ * vkFreeMemory
+ */
+TEST_F(MockICD, BufferOperations) {
+ VkResult res = VK_SUCCESS;
+
+ VkBufferCreateInfo buffer_create_info{};
+ buffer_create_info.size = 128;
+ VkBuffer buffer{};
+ res = vkCreateBuffer(device, &buffer_create_info, nullptr, &buffer);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_NE(buffer, VK_NULL_HANDLE);
+
+ VkMemoryRequirements memory_requirements{};
+ vkGetBufferMemoryRequirements(device, buffer, &memory_requirements);
+ ASSERT_EQ(memory_requirements.size, 4096);
+ ASSERT_EQ(memory_requirements.alignment, 1);
+ ASSERT_EQ(memory_requirements.memoryTypeBits, 0xFFFF);
+
+ VkBufferMemoryRequirementsInfo2 memory_requirements_info2{};
+ VkMemoryRequirements2 memory_requirements2{};
+ vkGetBufferMemoryRequirements2(device, &memory_requirements_info2, &memory_requirements2);
+ ASSERT_EQ(memory_requirements2.memoryRequirements.size, 4096);
+ ASSERT_EQ(memory_requirements2.memoryRequirements.alignment, 1);
+ ASSERT_EQ(memory_requirements2.memoryRequirements.memoryTypeBits, 0xFFFF);
+
+ VkDeviceBufferMemoryRequirements buffer_memory_requirements{};
+ buffer_memory_requirements.pCreateInfo = &buffer_create_info;
+ vkGetDeviceBufferMemoryRequirements(device, &buffer_memory_requirements, &memory_requirements2);
+ ASSERT_EQ(memory_requirements2.memoryRequirements.size, 4096);
+ ASSERT_EQ(memory_requirements2.memoryRequirements.alignment, 1);
+ ASSERT_EQ(memory_requirements2.memoryRequirements.memoryTypeBits, 0xFFFF);
+
+ VkMemoryAllocateInfo allocate_info{};
+ allocate_info.allocationSize = memory_requirements.size;
+ VkDeviceMemory memory{};
+ res = vkAllocateMemory(device, &allocate_info, nullptr, &memory);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_NE(memory, VK_NULL_HANDLE);
+
+ std::array<uint32_t, 32> source_data;
+ void* data = nullptr;
+ res = vkMapMemory(device, memory, 0, memory_requirements.size, 0, &data);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_NE(data, nullptr);
+ memcpy(data, source_data.data(), source_data.size());
+ vkUnmapMemory(device, memory);
+
+ VkBufferDeviceAddressInfo buffer_device_address_info{};
+ buffer_device_address_info.buffer = buffer;
+ VkDeviceAddress device_address = vkGetBufferDeviceAddress(device, &buffer_device_address_info);
+ ASSERT_NE(device_address, 0);
+
+ auto vkGetBufferDeviceAddressEXT =
+ reinterpret_cast<PFN_vkGetBufferDeviceAddressEXT>(vkGetDeviceProcAddr(device, "vkGetBufferDeviceAddressEXT"));
+ ASSERT_NE(vkGetBufferDeviceAddressEXT, nullptr);
+ device_address = vkGetBufferDeviceAddressEXT(device, &buffer_device_address_info);
+ ASSERT_NE(device_address, 0);
+
+ auto vkGetBufferDeviceAddressKHR =
+ reinterpret_cast<PFN_vkGetBufferDeviceAddressKHR>(vkGetDeviceProcAddr(device, "vkGetBufferDeviceAddressKHR"));
+ ASSERT_NE(vkGetBufferDeviceAddressKHR, nullptr);
+ device_address = vkGetBufferDeviceAddressKHR(device, &buffer_device_address_info);
+ ASSERT_NE(device_address, 0);
+
+ vkDestroyBuffer(device, buffer, nullptr);
+ vkFreeMemory(device, memory, nullptr);
+}
+
+/*
+ * Exercises the following commands:
+ * vkCreateImage
+ * vkGetImageSubresourceLayout
+ * vkGetImageMemoryRequirements
+ * vkGetImageMemoryRequirements2
+ * vkGetDeviceImageMemoryRequirements
+ * vkGetImageSparseMemoryRequirements
+ * vkGetImageSparseMemoryRequirements2
+ * vkAllocateMemory
+ * vkMapMemory2KHR
+ * vkUnmapMemory2KHR
+ * vkDestroyImage
+ * vkFreeMemory
+ */
+TEST_F(MockICD, ImageOperations) {
+ VkResult res = VK_SUCCESS;
+
+ VkImageCreateInfo image_create_info{};
+ image_create_info.imageType = VK_IMAGE_TYPE_2D;
+ image_create_info.format = VK_FORMAT_R8G8B8A8_SRGB;
+ image_create_info.extent = {8, 8, 8};
+ image_create_info.mipLevels = 1;
+ image_create_info.arrayLayers = 1;
+ image_create_info.samples = VK_SAMPLE_COUNT_1_BIT;
+ image_create_info.tiling = VK_IMAGE_TILING_OPTIMAL;
+ image_create_info.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
+ image_create_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
+ image_create_info.queueFamilyIndexCount = 0;
+ image_create_info.pQueueFamilyIndices = nullptr;
+ image_create_info.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+ VkImage image{};
+ res = vkCreateImage(device, &image_create_info, nullptr, &image);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_NE(image, VK_NULL_HANDLE);
+
+ VkImageSubresource image_subresource{};
+ VkSubresourceLayout subresource_layout{};
+ vkGetImageSubresourceLayout(device, image, &image_subresource, &subresource_layout);
+ ASSERT_EQ(subresource_layout.arrayPitch, 0);
+ ASSERT_EQ(subresource_layout.depthPitch, 0);
+ ASSERT_EQ(subresource_layout.offset, 0);
+ ASSERT_EQ(subresource_layout.rowPitch, 0);
+ ASSERT_EQ(subresource_layout.size, 0);
+
+ VkMemoryRequirements memory_requirements{};
+ vkGetImageMemoryRequirements(device, image, &memory_requirements);
+ ASSERT_EQ(memory_requirements.size, 8 * 8 * 8 * 32 /*refer to GetImageSizeFromCreateInfo for size calc*/);
+ ASSERT_EQ(memory_requirements.alignment, 1);
+ ASSERT_EQ(memory_requirements.memoryTypeBits, 0xFFFF & ~(0x1 << 3));
+
+ VkImageMemoryRequirementsInfo2 memory_requirements_info2{};
+ VkMemoryRequirements2 memory_requirements2{};
+ vkGetImageMemoryRequirements2(device, &memory_requirements_info2, &memory_requirements2);
+ ASSERT_EQ(memory_requirements2.memoryRequirements.size, 0);
+ ASSERT_EQ(memory_requirements2.memoryRequirements.alignment, 1);
+ ASSERT_EQ(memory_requirements2.memoryRequirements.memoryTypeBits, 0xFFFF & ~(0x1 << 3));
+
+ VkDeviceImageMemoryRequirements image_memory_requirements{};
+ image_memory_requirements.pCreateInfo = &image_create_info;
+ vkGetDeviceImageMemoryRequirements(device, &image_memory_requirements, &memory_requirements2);
+ ASSERT_EQ(memory_requirements2.memoryRequirements.size, 8 * 8 * 8 * 32 /*refer to GetImageSizeFromCreateInfo for size calc*/);
+ ASSERT_EQ(memory_requirements2.memoryRequirements.alignment, 1);
+ ASSERT_EQ(memory_requirements2.memoryRequirements.memoryTypeBits, 0xFFFF & ~(0x1 << 3));
+
+ uint32_t count = 0;
+ vkGetImageSparseMemoryRequirements(device, image, &count, nullptr);
+ ASSERT_EQ(count, 1);
+ VkSparseImageMemoryRequirements sparse_image_memory_requirements{};
+ vkGetImageSparseMemoryRequirements(device, image, &count, &sparse_image_memory_requirements);
+ ASSERT_EQ(count, 1);
+ ASSERT_EQ(sparse_image_memory_requirements.imageMipTailFirstLod, 0);
+ ASSERT_EQ(sparse_image_memory_requirements.imageMipTailSize, 8);
+ ASSERT_EQ(sparse_image_memory_requirements.imageMipTailOffset, 0);
+ ASSERT_EQ(sparse_image_memory_requirements.imageMipTailStride, 4);
+ ASSERT_EQ(sparse_image_memory_requirements.formatProperties.imageGranularity.width, 4);
+ ASSERT_EQ(sparse_image_memory_requirements.formatProperties.imageGranularity.height, 4);
+ ASSERT_EQ(sparse_image_memory_requirements.formatProperties.imageGranularity.depth, 4);
+ ASSERT_EQ(sparse_image_memory_requirements.formatProperties.flags, VK_SPARSE_IMAGE_FORMAT_SINGLE_MIPTAIL_BIT);
+ ASSERT_EQ(sparse_image_memory_requirements.formatProperties.aspectMask, 1 | 2 | 4 | 8);
+
+ count = 0;
+ VkImageSparseMemoryRequirementsInfo2 sparse_memory_requirement_info2{};
+ sparse_memory_requirement_info2.image = image;
+ vkGetImageSparseMemoryRequirements2(device, &sparse_memory_requirement_info2, &count, nullptr);
+ ASSERT_EQ(count, 1);
+ VkSparseImageMemoryRequirements2 sparse_image_memory_reqs2{};
+ vkGetImageSparseMemoryRequirements2(device, &sparse_memory_requirement_info2, &count, &sparse_image_memory_reqs2);
+ ASSERT_EQ(sparse_image_memory_reqs2.memoryRequirements.imageMipTailFirstLod, 0);
+ ASSERT_EQ(sparse_image_memory_reqs2.memoryRequirements.imageMipTailSize, 8);
+ ASSERT_EQ(sparse_image_memory_reqs2.memoryRequirements.imageMipTailOffset, 0);
+ ASSERT_EQ(sparse_image_memory_reqs2.memoryRequirements.imageMipTailStride, 4);
+ ASSERT_EQ(sparse_image_memory_reqs2.memoryRequirements.formatProperties.imageGranularity.width, 4);
+ ASSERT_EQ(sparse_image_memory_reqs2.memoryRequirements.formatProperties.imageGranularity.height, 4);
+ ASSERT_EQ(sparse_image_memory_reqs2.memoryRequirements.formatProperties.imageGranularity.depth, 4);
+ ASSERT_EQ(sparse_image_memory_reqs2.memoryRequirements.formatProperties.flags, VK_SPARSE_IMAGE_FORMAT_SINGLE_MIPTAIL_BIT);
+ ASSERT_EQ(sparse_image_memory_reqs2.memoryRequirements.formatProperties.aspectMask, 1 | 2 | 4 | 8);
+
+ VkMemoryAllocateInfo allocate_info{};
+ allocate_info.allocationSize = memory_requirements.size;
+ VkDeviceMemory memory{};
+ res = vkAllocateMemory(device, &allocate_info, nullptr, &memory);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_NE(memory, VK_NULL_HANDLE);
+
+ auto vkMapMemory2KHR = reinterpret_cast<PFN_vkMapMemory2KHR>(vkGetDeviceProcAddr(device, "vkMapMemory2KHR"));
+ auto vkUnmapMemory2KHR = reinterpret_cast<PFN_vkUnmapMemory2KHR>(vkGetDeviceProcAddr(device, "vkUnmapMemory2KHR"));
+ ASSERT_NE(vkMapMemory2KHR, nullptr);
+ ASSERT_NE(vkUnmapMemory2KHR, nullptr);
+
+ std::array<uint32_t, 32> source_data;
+ void* data = nullptr;
+ VkMemoryMapInfoKHR memory_map_info{};
+ memory_map_info.memory = memory;
+ memory_map_info.size = memory_requirements.size;
+ res = vkMapMemory2KHR(device, &memory_map_info, &data);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_NE(data, nullptr);
+ memcpy(data, source_data.data(), source_data.size());
+ VkMemoryUnmapInfoKHR memory_unmap_info{};
+ memory_unmap_info.memory = memory;
+ vkUnmapMemory2KHR(device, &memory_unmap_info);
+
+ vkDestroyImage(device, image, nullptr);
+ vkFreeMemory(device, memory, nullptr);
+}
+
+/*
+ * Exercises the following commands:
+ * vkCreateSwapchainKHR
+ * vkGetSwapchainImagesKHR
+ * vkDestroySwapchainKHR
+ * vkAcquireNextImageKHR
+ * vkAcquireNextImage2KHR
+ */
+TEST_F(MockICD, SwapchainLifeCycle) {
+ VkResult res = VK_SUCCESS;
+ VkSurfaceKHR surface{};
+ res = create_surface(instance, surface);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_NE(surface, VK_NULL_HANDLE);
+
+ VkSwapchainCreateInfoKHR swapchain_create_info{};
+ swapchain_create_info.surface = surface;
+ swapchain_create_info.minImageCount = 1;
+ VkSwapchainKHR swapchain{};
+ res = vkCreateSwapchainKHR(device, &swapchain_create_info, nullptr, &swapchain);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_NE(swapchain, VK_NULL_HANDLE);
+
+ uint32_t count = 0;
+ res = vkGetSwapchainImagesKHR(device, swapchain, &count, nullptr);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(count, 1);
+ std::array<VkImage, 1> swapchain_images;
+ res = vkGetSwapchainImagesKHR(device, swapchain, &count, swapchain_images.data());
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_NE(swapchain_images[0], VK_NULL_HANDLE);
+
+ uint32_t image_index = 10; // arbitrary non zero value
+ res = vkAcquireNextImageKHR(device, swapchain, 0, VK_NULL_HANDLE, VK_NULL_HANDLE, &image_index);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(image_index, 0);
+
+ VkAcquireNextImageInfoKHR acquire_info{};
+ acquire_info.swapchain = swapchain;
+ res = vkAcquireNextImage2KHR(device, &acquire_info, &image_index);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(image_index, 0);
+
+ vkDestroySwapchainKHR(device, swapchain, nullptr);
+ vkDestroySurfaceKHR(instance, surface, nullptr);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceMultisamplePropertiesEXT) {
+ auto vkGetPhysicalDeviceMultisamplePropertiesEXT = reinterpret_cast<PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT>(
+ vkGetInstanceProcAddr(instance, "vkGetPhysicalDeviceMultisamplePropertiesEXT"));
+ ASSERT_NE(vkGetPhysicalDeviceMultisamplePropertiesEXT, nullptr);
+ VkMultisamplePropertiesEXT multisample_properties{};
+ vkGetPhysicalDeviceMultisamplePropertiesEXT(physical_device, VK_SAMPLE_COUNT_16_BIT, &multisample_properties);
+ ASSERT_EQ(multisample_properties.maxSampleLocationGridSize.width, 32);
+ ASSERT_EQ(multisample_properties.maxSampleLocationGridSize.height, 32);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceFragmentShadingRatesKHR) {
+ auto vkGetPhysicalDeviceFragmentShadingRatesKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceFragmentShadingRatesKHR>(
+ vkGetInstanceProcAddr(instance, "vkGetPhysicalDeviceFragmentShadingRatesKHR"));
+ ASSERT_NE(vkGetPhysicalDeviceFragmentShadingRatesKHR, nullptr);
+
+ VkResult res = VK_SUCCESS;
+ uint32_t count = 0;
+ res = vkGetPhysicalDeviceFragmentShadingRatesKHR(physical_device, &count, nullptr);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(count, 1);
+
+ VkPhysicalDeviceFragmentShadingRateKHR fragment_shading_rates{};
+ res = vkGetPhysicalDeviceFragmentShadingRatesKHR(physical_device, &count, &fragment_shading_rates);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(count, 1);
+ ASSERT_EQ(fragment_shading_rates.sampleCounts, VK_SAMPLE_COUNT_1_BIT | VK_SAMPLE_COUNT_4_BIT);
+ ASSERT_EQ(fragment_shading_rates.fragmentSize.width, 8);
+ ASSERT_EQ(fragment_shading_rates.fragmentSize.height, 8);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceCalibrateableTimeDomainsEXT) {
+ auto vkGetPhysicalDeviceCalibrateableTimeDomainsEXT = reinterpret_cast<PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT>(
+ vkGetInstanceProcAddr(instance, "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT"));
+ ASSERT_NE(vkGetPhysicalDeviceCalibrateableTimeDomainsEXT, nullptr);
+
+ VkResult res = VK_SUCCESS;
+ uint32_t count = 0;
+ res = vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(physical_device, &count, nullptr);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(count, 1);
+
+ VkTimeDomainEXT time_domain{};
+ res = vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(physical_device, &count, &time_domain);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(count, 1);
+ ASSERT_EQ(time_domain, VK_TIME_DOMAIN_DEVICE_EXT);
+}
+
+#if defined(WIN32)
+TEST_F(MockICD, vkGetFenceWin32HandleKHR) {
+ auto vkGetFenceWin32HandleKHR =
+ reinterpret_cast<PFN_vkGetFenceWin32HandleKHR>(vkGetDeviceProcAddr(device, "vkGetFenceWin32HandleKHR"));
+ ASSERT_NE(vkGetFenceWin32HandleKHR, nullptr);
+ VkFenceGetWin32HandleInfoKHR get_win32_handle_info{};
+ HANDLE handle{};
+ VkResult res = vkGetFenceWin32HandleKHR(device, &get_win32_handle_info, &handle);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(handle, (HANDLE)0x12345678);
+}
+#endif // defined(WIN32)
+
+TEST_F(MockICD, vkGetFenceFdKHR) {
+ auto vkGetFenceFdKHR = reinterpret_cast<PFN_vkGetFenceFdKHR>(vkGetDeviceProcAddr(device, "vkGetFenceFdKHR"));
+ ASSERT_NE(vkGetFenceFdKHR, nullptr);
+ VkFenceGetFdInfoKHR get_win32_handle_info{};
+ int handle{};
+ VkResult res = vkGetFenceFdKHR(device, &get_win32_handle_info, &handle);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(handle, 0x42);
+}
+
+TEST_F(MockICD, vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR) {
+ auto vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR =
+ reinterpret_cast<PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR>(
+ vkGetInstanceProcAddr(instance, "vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR"));
+ ASSERT_NE(vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR, nullptr);
+
+ VkResult res = VK_SUCCESS;
+ uint32_t count = 0;
+ res = vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(physical_device, 0, &count, nullptr, nullptr);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(count, 3);
+
+ std::array<VkPerformanceCounterKHR, 3> counters{};
+ std::array<VkPerformanceCounterDescriptionKHR, 3> counter_descriptions{};
+ res = vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(physical_device, 0, &count, counters.data(),
+ counter_descriptions.data());
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(count, 3);
+ ASSERT_EQ(counters[0].unit, VK_PERFORMANCE_COUNTER_UNIT_GENERIC_KHR);
+ ASSERT_EQ(counters[0].scope, VK_QUERY_SCOPE_COMMAND_BUFFER_KHR);
+ ASSERT_EQ(counters[0].storage, VK_PERFORMANCE_COUNTER_STORAGE_INT32_KHR);
+ ASSERT_EQ(counters[0].uuid[0], 0x01);
+ ASSERT_EQ(counters[1].unit, VK_PERFORMANCE_COUNTER_UNIT_GENERIC_KHR);
+ ASSERT_EQ(counters[1].scope, VK_QUERY_SCOPE_RENDER_PASS_KHR);
+ ASSERT_EQ(counters[1].storage, VK_PERFORMANCE_COUNTER_STORAGE_INT32_KHR);
+ ASSERT_EQ(counters[1].uuid[0], 0x02);
+ ASSERT_EQ(counters[2].unit, VK_PERFORMANCE_COUNTER_UNIT_GENERIC_KHR);
+ ASSERT_EQ(counters[2].scope, VK_QUERY_SCOPE_COMMAND_KHR);
+ ASSERT_EQ(counters[2].storage, VK_PERFORMANCE_COUNTER_STORAGE_INT32_KHR);
+ ASSERT_EQ(counters[2].uuid[0], 0x03);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR) {
+ auto vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR =
+ reinterpret_cast<PFN_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR>(
+ vkGetInstanceProcAddr(instance, "vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR"));
+ ASSERT_NE(vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR, nullptr);
+ VkQueryPoolPerformanceCreateInfoKHR performance_query_create_info{};
+ uint32_t num_passes = 0;
+ vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR(physical_device, &performance_query_create_info, &num_passes);
+ ASSERT_EQ(num_passes, 1);
+}
+
+TEST_F(MockICD, vkGetShaderModuleIdentifierEXT) {
+ auto vkGetShaderModuleIdentifierEXT =
+ reinterpret_cast<PFN_vkGetShaderModuleIdentifierEXT>(vkGetDeviceProcAddr(device, "vkGetShaderModuleIdentifierEXT"));
+ ASSERT_NE(vkGetShaderModuleIdentifierEXT, nullptr);
+ VkShaderModule shader_module{};
+ VkShaderModuleIdentifierEXT identifier{};
+ vkGetShaderModuleIdentifierEXT(device, shader_module, &identifier);
+ ASSERT_EQ(identifier.identifierSize, 1);
+ ASSERT_EQ(identifier.identifier[0], 0x01);
+}
+
+TEST_F(MockICD, vkGetDescriptorSetLayoutSizeEXT) {
+ auto vkGetDescriptorSetLayoutSizeEXT =
+ reinterpret_cast<PFN_vkGetDescriptorSetLayoutSizeEXT>(vkGetDeviceProcAddr(device, "vkGetDescriptorSetLayoutSizeEXT"));
+ ASSERT_NE(vkGetDescriptorSetLayoutSizeEXT, nullptr);
+
+ VkDescriptorSetLayout layout{};
+ VkDeviceSize layout_size_in_bytes = 0;
+ vkGetDescriptorSetLayoutSizeEXT(device, layout, &layout_size_in_bytes);
+ ASSERT_EQ(layout_size_in_bytes, 4);
+}
+
+TEST_F(MockICD, vkGetAccelerationStructureBuildSizesKHR) {
+ auto vkGetAccelerationStructureBuildSizesKHR = reinterpret_cast<PFN_vkGetAccelerationStructureBuildSizesKHR>(
+ vkGetDeviceProcAddr(device, "vkGetAccelerationStructureBuildSizesKHR"));
+ ASSERT_NE(vkGetAccelerationStructureBuildSizesKHR, nullptr);
+
+ VkAccelerationStructureBuildGeometryInfoKHR build_info{};
+ uint32_t max_primitive_count = 0;
+ VkAccelerationStructureBuildSizesInfoKHR size_info{};
+ vkGetAccelerationStructureBuildSizesKHR(device, VK_ACCELERATION_STRUCTURE_BUILD_TYPE_DEVICE_KHR, &build_info,
+ &max_primitive_count, &size_info);
+ ASSERT_EQ(size_info.accelerationStructureSize, 4);
+ ASSERT_EQ(size_info.updateScratchSize, 4);
+ ASSERT_EQ(size_info.buildScratchSize, 4);
+}
+
+TEST_F(MockICD, vkGetAccelerationStructureMemoryRequirementsNV) {
+ auto vkGetAccelerationStructureMemoryRequirementsNV = reinterpret_cast<PFN_vkGetAccelerationStructureMemoryRequirementsNV>(
+ vkGetDeviceProcAddr(device, "vkGetAccelerationStructureMemoryRequirementsNV"));
+ ASSERT_NE(vkGetAccelerationStructureMemoryRequirementsNV, nullptr);
+
+ VkAccelerationStructureMemoryRequirementsInfoNV acceleration_structure_memory_requirements_info{};
+ VkMemoryRequirements2KHR memory_requirements{};
+ vkGetAccelerationStructureMemoryRequirementsNV(device, &acceleration_structure_memory_requirements_info, &memory_requirements);
+ ASSERT_EQ(memory_requirements.memoryRequirements.size, 4096);
+ ASSERT_EQ(memory_requirements.memoryRequirements.alignment, 1);
+ ASSERT_EQ(memory_requirements.memoryRequirements.memoryTypeBits, 0xFFFF);
+}
+
+TEST_F(MockICD, vkGetVideoSessionMemoryRequirementsKHR) {
+ auto vkGetVideoSessionMemoryRequirementsKHR = reinterpret_cast<PFN_vkGetVideoSessionMemoryRequirementsKHR>(
+ vkGetDeviceProcAddr(device, "vkGetVideoSessionMemoryRequirementsKHR"));
+ ASSERT_NE(vkGetVideoSessionMemoryRequirementsKHR, nullptr);
+
+ VkVideoSessionKHR video_session{};
+ uint32_t count = 0;
+ VkResult res = vkGetVideoSessionMemoryRequirementsKHR(device, video_session, &count, nullptr);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(count, 1);
+ VkVideoSessionMemoryRequirementsKHR memory_requirements{};
+ res = vkGetVideoSessionMemoryRequirementsKHR(device, video_session, &count, &memory_requirements);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(count, 1);
+ ASSERT_EQ(memory_requirements.memoryBindIndex, 0);
+ ASSERT_EQ(memory_requirements.memoryRequirements.size, 4096);
+ ASSERT_EQ(memory_requirements.memoryRequirements.alignment, 1);
+ ASSERT_EQ(memory_requirements.memoryRequirements.memoryTypeBits, 0xFFFF);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceVideoFormatPropertiesKHR) {
+ auto vkGetPhysicalDeviceVideoFormatPropertiesKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR>(
+ vkGetInstanceProcAddr(instance, "vkGetPhysicalDeviceVideoFormatPropertiesKHR"));
+ ASSERT_NE(vkGetPhysicalDeviceVideoFormatPropertiesKHR, nullptr);
+
+ VkPhysicalDeviceVideoFormatInfoKHR video_format_info{};
+ uint32_t count = 0;
+ VkResult res = vkGetPhysicalDeviceVideoFormatPropertiesKHR(physical_device, &video_format_info, &count, nullptr);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(count, 2);
+ std::array<VkVideoFormatPropertiesKHR, 2> video_format_properties{};
+ res = vkGetPhysicalDeviceVideoFormatPropertiesKHR(physical_device, &video_format_info, &count, video_format_properties.data());
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(count, 2);
+ ASSERT_EQ(video_format_properties[0].format, VK_FORMAT_R8G8B8A8_UNORM);
+ ASSERT_EQ(video_format_properties[0].imageCreateFlags, VK_IMAGE_TYPE_2D);
+ ASSERT_EQ(video_format_properties[0].imageType, VK_IMAGE_TYPE_2D);
+ ASSERT_EQ(video_format_properties[0].imageTiling, VK_IMAGE_TILING_OPTIMAL);
+ ASSERT_EQ(video_format_properties[0].imageUsageFlags, VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR |
+ VK_IMAGE_USAGE_VIDEO_DECODE_SRC_BIT_KHR |
+ VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR);
+ ASSERT_EQ(video_format_properties[1].format, VK_FORMAT_R8G8B8A8_SNORM);
+ ASSERT_EQ(video_format_properties[1].imageCreateFlags, VK_IMAGE_TYPE_2D);
+ ASSERT_EQ(video_format_properties[1].imageType, VK_IMAGE_TYPE_2D);
+ ASSERT_EQ(video_format_properties[1].imageTiling, VK_IMAGE_TILING_OPTIMAL);
+ ASSERT_EQ(video_format_properties[1].imageUsageFlags, VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR |
+ VK_IMAGE_USAGE_VIDEO_DECODE_SRC_BIT_KHR |
+ VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR);
+}
+
+TEST_F(MockICD, vkGetPhysicalDeviceVideoCapabilitiesKHR) {
+ auto vkGetPhysicalDeviceVideoCapabilitiesKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR>(
+ vkGetInstanceProcAddr(instance, "vkGetPhysicalDeviceVideoCapabilitiesKHR"));
+ ASSERT_NE(vkGetPhysicalDeviceVideoCapabilitiesKHR, nullptr);
+
+ VkVideoProfileInfoKHR video_profile_info{};
+ VkVideoCapabilitiesKHR video_capabilities{};
+ VkResult res = vkGetPhysicalDeviceVideoCapabilitiesKHR(physical_device, &video_profile_info, &video_capabilities);
+ ASSERT_EQ(res, VK_SUCCESS);
+ ASSERT_EQ(video_capabilities.flags, 0);
+ ASSERT_EQ(video_capabilities.minBitstreamBufferOffsetAlignment, 4);
+ ASSERT_EQ(video_capabilities.minBitstreamBufferSizeAlignment, 4);
+ ASSERT_EQ(video_capabilities.pictureAccessGranularity.width, 1);
+ ASSERT_EQ(video_capabilities.pictureAccessGranularity.height, 1);
+ ASSERT_EQ(video_capabilities.minCodedExtent.width, 4);
+ ASSERT_EQ(video_capabilities.minCodedExtent.height, 4);
+ ASSERT_EQ(video_capabilities.maxCodedExtent.width, 16);
+ ASSERT_EQ(video_capabilities.maxCodedExtent.height, 16);
+ ASSERT_EQ(video_capabilities.maxDpbSlots, 4);
+ ASSERT_EQ(video_capabilities.maxActiveReferencePictures, 4);
+}
+
+TEST_F(MockICD, vkGetDescriptorSetLayoutSupport) {
+ VkDescriptorSetLayoutCreateInfo create_info{};
+ VkDescriptorSetLayoutSupport support{};
+ vkGetDescriptorSetLayoutSupport(device, &create_info, &support);
+ ASSERT_EQ(support.supported, VK_TRUE);
+}
+
+TEST_F(MockICD, vkGetDescriptorSetLayoutSupportKHR) {
+ auto vkGetDescriptorSetLayoutSupportKHR =
+ reinterpret_cast<PFN_vkGetDescriptorSetLayoutSupportKHR>(vkGetDeviceProcAddr(device, "vkGetDescriptorSetLayoutSupportKHR"));
+ ASSERT_NE(vkGetDescriptorSetLayoutSupportKHR, nullptr);
+
+ VkDescriptorSetLayoutCreateInfo create_info{};
+ VkDescriptorSetLayoutSupport support{};
+ vkGetDescriptorSetLayoutSupportKHR(device, &create_info, &support);
+ ASSERT_EQ(support.supported, VK_TRUE);
+}
+
+TEST_F(MockICD, vkGetRenderAreaGranularity) {
+ VkRenderPass render_pass{};
+ VkExtent2D granularity{};
+ vkGetRenderAreaGranularity(device, render_pass, &granularity);
+ ASSERT_EQ(granularity.width, 1);
+ ASSERT_EQ(granularity.height, 1);
+}
diff --git a/tests/main.cpp b/tests/main.cpp
new file mode 100644
index 0000000..3113142
--- /dev/null
+++ b/tests/main.cpp
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2023 The Khronos Group Inc.
+ * Copyright (c) 2023 Valve Corporation
+ * Copyright (c) 2023 LunarG, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#if defined(_WIN32) && !defined(NDEBUG)
+#include <crtdbg.h>
+#endif
+
+#include "gtest/gtest.h"
+
+int main(int argc, char **argv) {
+ int result;
+
+ ::testing::InitGoogleTest(&argc, argv);
+
+ result = RUN_ALL_TESTS();
+
+ return result;
+}
diff --git a/tests/test_common.h b/tests/test_common.h
new file mode 100644
index 0000000..de06a78
--- /dev/null
+++ b/tests/test_common.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2023 The Khronos Group Inc.
+ * Copyright (c) 2023 Valve Corporation
+ * Copyright (c) 2023 LunarG, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <stdlib.h>
+
+#include <array>
+#include <iostream>
+#include <vector>
+
+#include "gtest/gtest.h"
+#include "vulkan/vulkan.h"
+
+// Location of the built binaries in this repo
+#include "binary_locations.h"
+
+#if defined(WIN32)
+#include <windows.h>
+inline int set_environment_var(const char* name, const char* value) { return SetEnvironmentVariable(name, value); }
+#else
+inline int set_environment_var(const char* name, const char* value) { return setenv(name, value, 1); }
+#endif
diff --git a/vulkaninfo/CMakeLists.txt b/vulkaninfo/CMakeLists.txt
index 5c05866..4d65473 100644
--- a/vulkaninfo/CMakeLists.txt
+++ b/vulkaninfo/CMakeLists.txt
@@ -1,6 +1,6 @@
# ~~~
-# Copyright (c) 2018-2019 Valve Corporation
-# Copyright (c) 2018-2019 LunarG, Inc.
+# Copyright (c) 2018-2023 Valve Corporation
+# Copyright (c) 2018-2023 LunarG, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,23 +15,22 @@
# limitations under the License.
# ~~~
-# CMakeLists.txt file for building Vulkaninfo
-
if(WIN32)
# ~~~
# Setup the vulkaninfo.rc file to contain the correct info
# Optionally uses the VULKANINFO_BUILD_DLL_VERSIONINFO build option to allow setting the exact build version
- # When VULKANINFO_BUILD_DLL_VERSIONINFO is not provided, "Dev Build" is added to the version string
+ # When VULKANINFO_BUILD_DLL_VERSIONINFO is not provided, "Dev Build" is added to the version strings
# ~~~
+ string(TIMESTAMP CURRENT_YEAR "%Y")
+ set(VULKANINFO_CUR_COPYRIGHT_STR "${CURRENT_YEAR}")
if ("$CACHE{VULKANINFO_BUILD_DLL_VERSIONINFO}" STREQUAL "")
- # Default version - for when no version is provided
- set(VULKANINFO_RC_VERSION "1.0.1111.2222")
+ set(VULKANINFO_RC_VERSION "${VulkanHeaders_VERSION}")
set(VULKANINFO_VER_FILE_VERSION_STR "\"${VULKANINFO_RC_VERSION}.Dev Build\"")
- set(VULKANINFO_VER_FILE_DESCRIPTION_STR "\"Vulkan Loader - Dev Build\"")
+ set(VULKANINFO_VER_FILE_DESCRIPTION_STR "\"Vulkaninfo - Dev Build\"")
else()
set(VULKANINFO_RC_VERSION "$CACHE{VULKANINFO_BUILD_DLL_VERSIONINFO}")
set(VULKANINFO_VER_FILE_VERSION_STR "\"${VULKANINFO_RC_VERSION}\"")
- set(VULKANINFO_VER_FILE_DESCRIPTION_STR "\"Vulkan Loader\"")
+ set(VULKANINFO_VER_FILE_DESCRIPTION_STR "\"vulkaninfo\"")
endif()
# RC file wants the value of FILEVERSION to separated by commas
@@ -60,91 +59,78 @@
target_link_libraries(vulkaninfo ${CMAKE_DL_LIBS})
endif()
-if(UNIX AND NOT APPLE) # i.e. Linux
- include(FindPkgConfig)
+target_compile_definitions(vulkaninfo PRIVATE -DVK_ENABLE_BETA_EXTENSIONS)
+
+if (CMAKE_SYSTEM_NAME MATCHES "Linux|BSD")
option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
option(BUILD_WSI_WAYLAND_SUPPORT "Build Wayland WSI support" ON)
option(BUILD_WSI_DIRECTFB_SUPPORT "Build DirectFB WSI support" OFF)
+ find_package(PkgConfig REQUIRED QUIET) # Use PkgConfig to find Linux system libraries
+
if(BUILD_WSI_XCB_SUPPORT)
- find_package(XCB REQUIRED)
- target_include_directories(vulkaninfo PRIVATE ${XCB_INCLUDE_DIRS})
- target_link_libraries(vulkaninfo ${XCB_LIBRARIES})
+ pkg_check_modules(XCB REQUIRED QUIET IMPORTED_TARGET xcb)
+ target_link_libraries(vulkaninfo PkgConfig::XCB)
target_compile_definitions(vulkaninfo PRIVATE -DVK_USE_PLATFORM_XCB_KHR -DVK_NO_PROTOTYPES)
endif()
if(BUILD_WSI_XLIB_SUPPORT)
- find_package(X11 REQUIRED)
- target_include_directories(vulkaninfo PRIVATE ${X11_INCLUDE_DIR})
- target_link_libraries(vulkaninfo ${X11_LIBRARIES})
+ pkg_check_modules(X11 REQUIRED QUIET IMPORTED_TARGET x11)
+ target_link_libraries(vulkaninfo PkgConfig::X11)
target_compile_definitions(vulkaninfo PRIVATE -DVK_USE_PLATFORM_XLIB_KHR -DVK_NO_PROTOTYPES)
endif()
if(BUILD_WSI_WAYLAND_SUPPORT)
- find_package(Wayland REQUIRED)
- target_include_directories(vulkaninfo PRIVATE ${WAYLAND_CLIENT_INCLUDE_DIR})
- target_link_libraries(vulkaninfo ${WAYLAND_CLIENT_LIBRARIES})
+ pkg_check_modules(WAYLAND_CLIENT REQUIRED IMPORTED_TARGET wayland-client)
+ add_compile_definitions(VK_USE_PLATFORM_WAYLAND_KHR)
+
+ target_link_libraries(vulkaninfo PkgConfig::WAYLAND_CLIENT)
target_compile_definitions(vulkaninfo PRIVATE -DVK_USE_PLATFORM_WAYLAND_KHR -DVK_NO_PROTOTYPES)
endif()
if(BUILD_WSI_DIRECTFB_SUPPORT)
- find_package(DirectFB REQUIRED)
- target_include_directories(vulkaninfo PRIVATE ${DIRECTFB_INCLUDE_DIR})
- target_link_libraries(vulkaninfo ${DIRECTFB_LIBRARIES})
+ pkg_check_modules(DirectFB REQUIRED QUIET IMPORTED_TARGET directfb)
+ target_link_libraries(vulkaninfo PkgConfig::DirectFB)
target_compile_definitions(vulkaninfo PRIVATE -DVK_USE_PLATFORM_DIRECTFB_EXT -DVK_NO_PROTOTYPES)
endif()
+
+ if (ENABLE_ADDRESS_SANITIZER)
+ target_compile_options(vulkaninfo PRIVATE -fsanitize=address)
+ target_link_options(vulkaninfo PRIVATE -fsanitize=address)
+ endif ()
endif()
if(APPLE)
# We do this so vulkaninfo is linked to an individual library and NOT a framework.
- target_link_libraries(vulkaninfo ${Vulkan_LIBRARY} "-framework AppKit -framework QuartzCore")
- target_include_directories(vulkaninfo PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/macOS/vulkaninfo ${VulkanHeaders_INCLUDE_DIR})
-else()
- target_include_directories(vulkaninfo PRIVATE ${VulkanHeaders_INCLUDE_DIR})
+ target_link_libraries(vulkaninfo Vulkan::Loader "-framework AppKit -framework QuartzCore")
+ target_include_directories(vulkaninfo PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/macOS/vulkaninfo)
endif()
-# Create vulkaninfo application bundle for MacOS
-if(APPLE)
- include(${CMAKE_CURRENT_SOURCE_DIR}/macOS/vulkaninfo.cmake)
-endif()
+target_link_libraries(vulkaninfo Vulkan::Headers)
if(WIN32)
- target_compile_definitions(vulkaninfo PUBLIC -DVK_USE_PLATFORM_WIN32_KHR -DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_WARNINGS -DVK_NO_PROTOTYPES)
- if(MSVC AND NOT MSVC_VERSION LESS 1900)
- # If MSVC, Enable control flow guard
- message(STATUS "Building vulkaninfo with control flow guard")
- add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/guard:cf>")
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf")
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf")
- endif()
+ target_compile_definitions(vulkaninfo PRIVATE
+ VK_USE_PLATFORM_WIN32_KHR
+ WIN32_LEAN_AND_MEAN
+ _CRT_SECURE_NO_WARNINGS
+ VK_NO_PROTOTYPES
+ )
- # Use static MSVCRT libraries
- foreach(configuration
- in
- CMAKE_C_FLAGS_DEBUG
- CMAKE_C_FLAGS_MINSIZEREL
- CMAKE_C_FLAGS_RELEASE
- CMAKE_C_FLAGS_RELWITHDEBINFO
- CMAKE_CXX_FLAGS_DEBUG
- CMAKE_CXX_FLAGS_MINSIZEREL
- CMAKE_CXX_FLAGS_RELEASE
- CMAKE_CXX_FLAGS_RELWITHDEBINFO)
- if(${configuration} MATCHES "/MD")
- string(REGEX
- REPLACE "/MD"
- "/MT"
- ${configuration}
- "${${configuration}}")
- endif()
- endforeach()
+ message(STATUS "Building vulkaninfo with control flow guard")
+ target_compile_options(vulkaninfo PRIVATE /guard:cf)
+ target_link_options(vulkaninfo PRIVATE /guard:cf)
+
elseif(APPLE)
- add_definitions(-DVK_USE_PLATFORM_MACOS_MVK -DVK_USE_PLATFORM_METAL_EXT)
+ target_compile_definitions(vulkaninfo PRIVATE
+ VK_USE_PLATFORM_MACOS_MVK
+ VK_USE_PLATFORM_METAL_EXT
+ )
endif()
if(APPLE)
install(TARGETS vulkaninfo RUNTIME DESTINATION "vulkaninfo")
else()
- install(TARGETS vulkaninfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ install(TARGETS vulkaninfo)
endif()
diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp
index 475f762..e32a57c 100644
--- a/vulkaninfo/generated/vulkaninfo.hpp
+++ b/vulkaninfo/generated/vulkaninfo.hpp
@@ -96,6 +96,9 @@
case (VK_DRIVER_ID_SAMSUNG_PROPRIETARY): return "DRIVER_ID_SAMSUNG_PROPRIETARY";
case (VK_DRIVER_ID_MESA_VENUS): return "DRIVER_ID_MESA_VENUS";
case (VK_DRIVER_ID_MESA_DOZEN): return "DRIVER_ID_MESA_DOZEN";
+ case (VK_DRIVER_ID_MESA_NVK): return "DRIVER_ID_MESA_NVK";
+ case (VK_DRIVER_ID_IMAGINATION_OPEN_SOURCE_MESA): return "DRIVER_ID_IMAGINATION_OPEN_SOURCE_MESA";
+ case (VK_DRIVER_ID_MESA_AGXV): return "DRIVER_ID_MESA_AGXV";
default: return std::string("UNKNOWN_VkDriverId_value") + std::to_string(value);
}
}
@@ -355,6 +358,8 @@
case (VK_FORMAT_PVRTC2_2BPP_SRGB_BLOCK_IMG): return "FORMAT_PVRTC2_2BPP_SRGB_BLOCK_IMG";
case (VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG): return "FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG";
case (VK_FORMAT_R16G16_S10_5_NV): return "FORMAT_R16G16_S10_5_NV";
+ case (VK_FORMAT_A1B5G5R5_UNORM_PACK16_KHR): return "FORMAT_A1B5G5R5_UNORM_PACK16_KHR";
+ case (VK_FORMAT_A8_UNORM_KHR): return "FORMAT_A8_UNORM_KHR";
default: return std::string("UNKNOWN_VkFormat_value") + std::to_string(value);
}
}
@@ -364,6 +369,45 @@
else
p.PrintKeyString(name, VkFormatString(value));
}
+std::string VkImageLayoutString(VkImageLayout value) {
+ switch (value) {
+ case (VK_IMAGE_LAYOUT_UNDEFINED): return "IMAGE_LAYOUT_UNDEFINED";
+ case (VK_IMAGE_LAYOUT_GENERAL): return "IMAGE_LAYOUT_GENERAL";
+ case (VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL): return "IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL";
+ case (VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL): return "IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL";
+ case (VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL): return "IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL";
+ case (VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL): return "IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL";
+ case (VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL): return "IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL";
+ case (VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL): return "IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL";
+ case (VK_IMAGE_LAYOUT_PREINITIALIZED): return "IMAGE_LAYOUT_PREINITIALIZED";
+ case (VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL): return "IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL";
+ case (VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL): return "IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL";
+ case (VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL): return "IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL";
+ case (VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL): return "IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL";
+ case (VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL): return "IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL";
+ case (VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL): return "IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL";
+ case (VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL): return "IMAGE_LAYOUT_READ_ONLY_OPTIMAL";
+ case (VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL): return "IMAGE_LAYOUT_ATTACHMENT_OPTIMAL";
+ case (VK_IMAGE_LAYOUT_PRESENT_SRC_KHR): return "IMAGE_LAYOUT_PRESENT_SRC_KHR";
+ case (VK_IMAGE_LAYOUT_VIDEO_DECODE_DST_KHR): return "IMAGE_LAYOUT_VIDEO_DECODE_DST_KHR";
+ case (VK_IMAGE_LAYOUT_VIDEO_DECODE_SRC_KHR): return "IMAGE_LAYOUT_VIDEO_DECODE_SRC_KHR";
+ case (VK_IMAGE_LAYOUT_VIDEO_DECODE_DPB_KHR): return "IMAGE_LAYOUT_VIDEO_DECODE_DPB_KHR";
+ case (VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR): return "IMAGE_LAYOUT_SHARED_PRESENT_KHR";
+ case (VK_IMAGE_LAYOUT_FRAGMENT_DENSITY_MAP_OPTIMAL_EXT): return "IMAGE_LAYOUT_FRAGMENT_DENSITY_MAP_OPTIMAL_EXT";
+ case (VK_IMAGE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL_KHR): return "IMAGE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL_KHR";
+ case (VK_IMAGE_LAYOUT_VIDEO_ENCODE_DST_KHR): return "IMAGE_LAYOUT_VIDEO_ENCODE_DST_KHR";
+ case (VK_IMAGE_LAYOUT_VIDEO_ENCODE_SRC_KHR): return "IMAGE_LAYOUT_VIDEO_ENCODE_SRC_KHR";
+ case (VK_IMAGE_LAYOUT_VIDEO_ENCODE_DPB_KHR): return "IMAGE_LAYOUT_VIDEO_ENCODE_DPB_KHR";
+ case (VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT): return "IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT";
+ default: return std::string("UNKNOWN_VkImageLayout_value") + std::to_string(value);
+ }
+}
+void DumpVkImageLayout(Printer &p, std::string name, VkImageLayout value) {
+ if (p.Type() == OutputType::json)
+ p.PrintKeyString(name, std::string("VK_") + VkImageLayoutString(value));
+ else
+ p.PrintKeyString(name, VkImageLayoutString(value));
+}
std::string VkImageTilingString(VkImageTiling value) {
switch (value) {
case (VK_IMAGE_TILING_OPTIMAL): return "IMAGE_TILING_OPTIMAL";
@@ -515,7 +559,9 @@
case (VK_THREAD_DONE_KHR): return "THREAD_DONE_KHR";
case (VK_OPERATION_DEFERRED_KHR): return "OPERATION_DEFERRED_KHR";
case (VK_OPERATION_NOT_DEFERRED_KHR): return "OPERATION_NOT_DEFERRED_KHR";
+ case (VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR): return "ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR";
case (VK_ERROR_COMPRESSION_EXHAUSTED_EXT): return "ERROR_COMPRESSION_EXHAUSTED_EXT";
+ case (VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT): return "ERROR_INCOMPATIBLE_SHADER_BINARY_EXT";
default: return std::string("UNKNOWN_VkResult_value") + std::to_string(value);
}
}
@@ -566,8 +612,12 @@
}
void DumpVkCompositeAlphaFlagBitsKHR(Printer &p, std::string name, VkCompositeAlphaFlagBitsKHR value) {
auto strings = VkCompositeAlphaFlagBitsKHRGetStrings(value);
- if (strings.size() > 0)
- p.PrintKeyString(name, strings.at(0));
+ if (strings.size() > 0) {
+ if (p.Type() == OutputType::json)
+ p.PrintKeyString(name, std::string("VK_") + strings.at(0));
+ else
+ p.PrintKeyString(name, strings.at(0));
+ }
}
std::vector<const char *> VkDeviceGroupPresentModeFlagBitsKHRGetStrings(VkDeviceGroupPresentModeFlagBitsKHR value) {
@@ -597,8 +647,12 @@
}
void DumpVkDeviceGroupPresentModeFlagBitsKHR(Printer &p, std::string name, VkDeviceGroupPresentModeFlagBitsKHR value) {
auto strings = VkDeviceGroupPresentModeFlagBitsKHRGetStrings(value);
- if (strings.size() > 0)
- p.PrintKeyString(name, strings.at(0));
+ if (strings.size() > 0) {
+ if (p.Type() == OutputType::json)
+ p.PrintKeyString(name, std::string("VK_") + strings.at(0));
+ else
+ p.PrintKeyString(name, strings.at(0));
+ }
}
std::vector<const char *> VkFormatFeatureFlagBitsGetStrings(VkFormatFeatureFlagBits value) {
@@ -655,8 +709,12 @@
}
void DumpVkFormatFeatureFlagBits(Printer &p, std::string name, VkFormatFeatureFlagBits value) {
auto strings = VkFormatFeatureFlagBitsGetStrings(value);
- if (strings.size() > 0)
- p.PrintKeyString(name, strings.at(0));
+ if (strings.size() > 0) {
+ if (p.Type() == OutputType::json)
+ p.PrintKeyString(name, std::string("VK_") + strings.at(0));
+ else
+ p.PrintKeyString(name, strings.at(0));
+ }
}
std::vector<const char *> VkFormatFeatureFlagBits2GetStrings(VkFormatFeatureFlagBits2 value) {
@@ -694,6 +752,7 @@
if (VK_FORMAT_FEATURE_2_ACCELERATION_STRUCTURE_VERTEX_BUFFER_BIT_KHR & value) strings.push_back("FORMAT_FEATURE_2_ACCELERATION_STRUCTURE_VERTEX_BUFFER_BIT_KHR");
if (VK_FORMAT_FEATURE_2_FRAGMENT_DENSITY_MAP_BIT_EXT & value) strings.push_back("FORMAT_FEATURE_2_FRAGMENT_DENSITY_MAP_BIT_EXT");
if (VK_FORMAT_FEATURE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR & value) strings.push_back("FORMAT_FEATURE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR");
+ if (VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT_EXT & value) strings.push_back("FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT_EXT");
if (VK_FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR & value) strings.push_back("FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR");
if (VK_FORMAT_FEATURE_2_VIDEO_ENCODE_DPB_BIT_KHR & value) strings.push_back("FORMAT_FEATURE_2_VIDEO_ENCODE_DPB_BIT_KHR");
if (VK_FORMAT_FEATURE_2_LINEAR_COLOR_ATTACHMENT_BIT_NV & value) strings.push_back("FORMAT_FEATURE_2_LINEAR_COLOR_ATTACHMENT_BIT_NV");
@@ -724,8 +783,12 @@
}
void DumpVkFormatFeatureFlagBits2(Printer &p, std::string name, VkFormatFeatureFlagBits2 value) {
auto strings = VkFormatFeatureFlagBits2GetStrings(value);
- if (strings.size() > 0)
- p.PrintKeyString(name, strings.at(0));
+ if (strings.size() > 0) {
+ if (p.Type() == OutputType::json)
+ p.PrintKeyString(name, std::string("VK_") + strings.at(0));
+ else
+ p.PrintKeyString(name, strings.at(0));
+ }
}
std::vector<const char *> VkImageUsageFlagBitsGetStrings(VkImageUsageFlagBits value) {
@@ -744,6 +807,7 @@
if (VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR & value) strings.push_back("IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR");
if (VK_IMAGE_USAGE_FRAGMENT_DENSITY_MAP_BIT_EXT & value) strings.push_back("IMAGE_USAGE_FRAGMENT_DENSITY_MAP_BIT_EXT");
if (VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR & value) strings.push_back("IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR");
+ if (VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT & value) strings.push_back("IMAGE_USAGE_HOST_TRANSFER_BIT_EXT");
if (VK_IMAGE_USAGE_VIDEO_ENCODE_DST_BIT_KHR & value) strings.push_back("IMAGE_USAGE_VIDEO_ENCODE_DST_BIT_KHR");
if (VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR & value) strings.push_back("IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR");
if (VK_IMAGE_USAGE_VIDEO_ENCODE_DPB_BIT_KHR & value) strings.push_back("IMAGE_USAGE_VIDEO_ENCODE_DPB_BIT_KHR");
@@ -771,8 +835,12 @@
}
void DumpVkImageUsageFlagBits(Printer &p, std::string name, VkImageUsageFlagBits value) {
auto strings = VkImageUsageFlagBitsGetStrings(value);
- if (strings.size() > 0)
- p.PrintKeyString(name, strings.at(0));
+ if (strings.size() > 0) {
+ if (p.Type() == OutputType::json)
+ p.PrintKeyString(name, std::string("VK_") + strings.at(0));
+ else
+ p.PrintKeyString(name, strings.at(0));
+ }
}
std::vector<const char *> VkMemoryHeapFlagBitsGetStrings(VkMemoryHeapFlagBits value) {
@@ -800,8 +868,12 @@
}
void DumpVkMemoryHeapFlagBits(Printer &p, std::string name, VkMemoryHeapFlagBits value) {
auto strings = VkMemoryHeapFlagBitsGetStrings(value);
- if (strings.size() > 0)
- p.PrintKeyString(name, strings.at(0));
+ if (strings.size() > 0) {
+ if (p.Type() == OutputType::json)
+ p.PrintKeyString(name, std::string("VK_") + strings.at(0));
+ else
+ p.PrintKeyString(name, strings.at(0));
+ }
}
std::vector<const char *> VkMemoryPropertyFlagBitsGetStrings(VkMemoryPropertyFlagBits value) {
@@ -836,8 +908,80 @@
}
void DumpVkMemoryPropertyFlagBits(Printer &p, std::string name, VkMemoryPropertyFlagBits value) {
auto strings = VkMemoryPropertyFlagBitsGetStrings(value);
- if (strings.size() > 0)
- p.PrintKeyString(name, strings.at(0));
+ if (strings.size() > 0) {
+ if (p.Type() == OutputType::json)
+ p.PrintKeyString(name, std::string("VK_") + strings.at(0));
+ else
+ p.PrintKeyString(name, strings.at(0));
+ }
+}
+
+std::vector<const char *> VkPresentGravityFlagBitsEXTGetStrings(VkPresentGravityFlagBitsEXT value) {
+ std::vector<const char *> strings;
+ if (value == 0) { strings.push_back("None"); return strings; }
+ if (VK_PRESENT_GRAVITY_MIN_BIT_EXT & value) strings.push_back("PRESENT_GRAVITY_MIN_BIT_EXT");
+ if (VK_PRESENT_GRAVITY_MAX_BIT_EXT & value) strings.push_back("PRESENT_GRAVITY_MAX_BIT_EXT");
+ if (VK_PRESENT_GRAVITY_CENTERED_BIT_EXT & value) strings.push_back("PRESENT_GRAVITY_CENTERED_BIT_EXT");
+ return strings;
+}
+void DumpVkPresentGravityFlagsEXT(Printer &p, std::string name, VkPresentGravityFlagsEXT value) {
+ if (static_cast<VkPresentGravityFlagBitsEXT>(value) == 0) {
+ ArrayWrapper arr(p, name, 0);
+ if (p.Type() != OutputType::json && p.Type() != OutputType::vkconfig_output)
+ p.SetAsType().PrintString("None");
+ return;
+ }
+ auto strings = VkPresentGravityFlagBitsEXTGetStrings(static_cast<VkPresentGravityFlagBitsEXT>(value));
+ ArrayWrapper arr(p, name, strings.size());
+ for(auto& str : strings){
+ if (p.Type() == OutputType::json)
+ p.SetAsType().PrintString(std::string("VK_") + str);
+ else
+ p.SetAsType().PrintString(str);
+ }
+}
+void DumpVkPresentGravityFlagBitsEXT(Printer &p, std::string name, VkPresentGravityFlagBitsEXT value) {
+ auto strings = VkPresentGravityFlagBitsEXTGetStrings(value);
+ if (strings.size() > 0) {
+ if (p.Type() == OutputType::json)
+ p.PrintKeyString(name, std::string("VK_") + strings.at(0));
+ else
+ p.PrintKeyString(name, strings.at(0));
+ }
+}
+
+std::vector<const char *> VkPresentScalingFlagBitsEXTGetStrings(VkPresentScalingFlagBitsEXT value) {
+ std::vector<const char *> strings;
+ if (value == 0) { strings.push_back("None"); return strings; }
+ if (VK_PRESENT_SCALING_ONE_TO_ONE_BIT_EXT & value) strings.push_back("PRESENT_SCALING_ONE_TO_ONE_BIT_EXT");
+ if (VK_PRESENT_SCALING_ASPECT_RATIO_STRETCH_BIT_EXT & value) strings.push_back("PRESENT_SCALING_ASPECT_RATIO_STRETCH_BIT_EXT");
+ if (VK_PRESENT_SCALING_STRETCH_BIT_EXT & value) strings.push_back("PRESENT_SCALING_STRETCH_BIT_EXT");
+ return strings;
+}
+void DumpVkPresentScalingFlagsEXT(Printer &p, std::string name, VkPresentScalingFlagsEXT value) {
+ if (static_cast<VkPresentScalingFlagBitsEXT>(value) == 0) {
+ ArrayWrapper arr(p, name, 0);
+ if (p.Type() != OutputType::json && p.Type() != OutputType::vkconfig_output)
+ p.SetAsType().PrintString("None");
+ return;
+ }
+ auto strings = VkPresentScalingFlagBitsEXTGetStrings(static_cast<VkPresentScalingFlagBitsEXT>(value));
+ ArrayWrapper arr(p, name, strings.size());
+ for(auto& str : strings){
+ if (p.Type() == OutputType::json)
+ p.SetAsType().PrintString(std::string("VK_") + str);
+ else
+ p.SetAsType().PrintString(str);
+ }
+}
+void DumpVkPresentScalingFlagBitsEXT(Printer &p, std::string name, VkPresentScalingFlagBitsEXT value) {
+ auto strings = VkPresentScalingFlagBitsEXTGetStrings(value);
+ if (strings.size() > 0) {
+ if (p.Type() == OutputType::json)
+ p.PrintKeyString(name, std::string("VK_") + strings.at(0));
+ else
+ p.PrintKeyString(name, strings.at(0));
+ }
}
std::vector<const char *> VkQueueFlagBitsGetStrings(VkQueueFlagBits value) {
@@ -871,8 +1015,12 @@
}
void DumpVkQueueFlagBits(Printer &p, std::string name, VkQueueFlagBits value) {
auto strings = VkQueueFlagBitsGetStrings(value);
- if (strings.size() > 0)
- p.PrintKeyString(name, strings.at(0));
+ if (strings.size() > 0) {
+ if (p.Type() == OutputType::json)
+ p.PrintKeyString(name, std::string("VK_") + strings.at(0));
+ else
+ p.PrintKeyString(name, strings.at(0));
+ }
}
std::string VkQueueFlagsString(VkQueueFlags value) {
@@ -880,23 +1028,23 @@
bool is_first = true;
if (VK_QUEUE_GRAPHICS_BIT & value) {
if (is_first) { is_first = false; } else { out += " | "; }
- out += "QUEUE_GRAPHICS";
+ out += "QUEUE_GRAPHICS_BIT";
}
if (VK_QUEUE_COMPUTE_BIT & value) {
if (is_first) { is_first = false; } else { out += " | "; }
- out += "QUEUE_COMPUTE";
+ out += "QUEUE_COMPUTE_BIT";
}
if (VK_QUEUE_TRANSFER_BIT & value) {
if (is_first) { is_first = false; } else { out += " | "; }
- out += "QUEUE_TRANSFER";
+ out += "QUEUE_TRANSFER_BIT";
}
if (VK_QUEUE_SPARSE_BINDING_BIT & value) {
if (is_first) { is_first = false; } else { out += " | "; }
- out += "QUEUE_SPARSE_BINDING";
+ out += "QUEUE_SPARSE_BINDING_BIT";
}
if (VK_QUEUE_PROTECTED_BIT & value) {
if (is_first) { is_first = false; } else { out += " | "; }
- out += "QUEUE_PROTECTED";
+ out += "QUEUE_PROTECTED_BIT";
}
if (VK_QUEUE_VIDEO_DECODE_BIT_KHR & value) {
if (is_first) { is_first = false; } else { out += " | "; }
@@ -908,7 +1056,7 @@
}
if (VK_QUEUE_OPTICAL_FLOW_BIT_NV & value) {
if (is_first) { is_first = false; } else { out += " | "; }
- out += "QUEUE_OPTICAL_FLOW_BIT_N";
+ out += "QUEUE_OPTICAL_FLOW_BIT_NV";
}
return out;
}
@@ -919,6 +1067,7 @@
if (VK_RESOLVE_MODE_AVERAGE_BIT & value) strings.push_back("RESOLVE_MODE_AVERAGE_BIT");
if (VK_RESOLVE_MODE_MIN_BIT & value) strings.push_back("RESOLVE_MODE_MIN_BIT");
if (VK_RESOLVE_MODE_MAX_BIT & value) strings.push_back("RESOLVE_MODE_MAX_BIT");
+ if (VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_ANDROID & value) strings.push_back("RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_ANDROID");
return strings;
}
void DumpVkResolveModeFlags(Printer &p, std::string name, VkResolveModeFlags value) {
@@ -939,8 +1088,12 @@
}
void DumpVkResolveModeFlagBits(Printer &p, std::string name, VkResolveModeFlagBits value) {
auto strings = VkResolveModeFlagBitsGetStrings(value);
- if (strings.size() > 0)
- p.PrintKeyString(name, strings.at(0));
+ if (strings.size() > 0) {
+ if (p.Type() == OutputType::json)
+ p.PrintKeyString(name, std::string("VK_") + strings.at(0));
+ else
+ p.PrintKeyString(name, strings.at(0));
+ }
}
std::vector<const char *> VkSampleCountFlagBitsGetStrings(VkSampleCountFlagBits value) {
@@ -973,8 +1126,12 @@
}
void DumpVkSampleCountFlagBits(Printer &p, std::string name, VkSampleCountFlagBits value) {
auto strings = VkSampleCountFlagBitsGetStrings(value);
- if (strings.size() > 0)
- p.PrintKeyString(name, strings.at(0));
+ if (strings.size() > 0) {
+ if (p.Type() == OutputType::json)
+ p.PrintKeyString(name, std::string("VK_") + strings.at(0));
+ else
+ p.PrintKeyString(name, strings.at(0));
+ }
}
std::vector<const char *> VkShaderStageFlagBitsGetStrings(VkShaderStageFlagBits value) {
@@ -986,8 +1143,6 @@
if (VK_SHADER_STAGE_GEOMETRY_BIT & value) strings.push_back("SHADER_STAGE_GEOMETRY_BIT");
if (VK_SHADER_STAGE_FRAGMENT_BIT & value) strings.push_back("SHADER_STAGE_FRAGMENT_BIT");
if (VK_SHADER_STAGE_COMPUTE_BIT & value) strings.push_back("SHADER_STAGE_COMPUTE_BIT");
- if (VK_SHADER_STAGE_ALL_GRAPHICS & value) strings.push_back("SHADER_STAGE_ALL_GRAPHICS");
- if (VK_SHADER_STAGE_ALL & value) strings.push_back("SHADER_STAGE_ALL");
if (VK_SHADER_STAGE_RAYGEN_BIT_KHR & value) strings.push_back("SHADER_STAGE_RAYGEN_BIT_KHR");
if (VK_SHADER_STAGE_ANY_HIT_BIT_KHR & value) strings.push_back("SHADER_STAGE_ANY_HIT_BIT_KHR");
if (VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR & value) strings.push_back("SHADER_STAGE_CLOSEST_HIT_BIT_KHR");
@@ -997,6 +1152,7 @@
if (VK_SHADER_STAGE_TASK_BIT_EXT & value) strings.push_back("SHADER_STAGE_TASK_BIT_EXT");
if (VK_SHADER_STAGE_MESH_BIT_EXT & value) strings.push_back("SHADER_STAGE_MESH_BIT_EXT");
if (VK_SHADER_STAGE_SUBPASS_SHADING_BIT_HUAWEI & value) strings.push_back("SHADER_STAGE_SUBPASS_SHADING_BIT_HUAWEI");
+ if (VK_SHADER_STAGE_CLUSTER_CULLING_BIT_HUAWEI & value) strings.push_back("SHADER_STAGE_CLUSTER_CULLING_BIT_HUAWEI");
return strings;
}
void DumpVkShaderStageFlags(Printer &p, std::string name, VkShaderStageFlags value) {
@@ -1017,8 +1173,12 @@
}
void DumpVkShaderStageFlagBits(Printer &p, std::string name, VkShaderStageFlagBits value) {
auto strings = VkShaderStageFlagBitsGetStrings(value);
- if (strings.size() > 0)
- p.PrintKeyString(name, strings.at(0));
+ if (strings.size() > 0) {
+ if (p.Type() == OutputType::json)
+ p.PrintKeyString(name, std::string("VK_") + strings.at(0));
+ else
+ p.PrintKeyString(name, strings.at(0));
+ }
}
std::vector<const char *> VkSubgroupFeatureFlagBitsGetStrings(VkSubgroupFeatureFlagBits value) {
@@ -1053,8 +1213,12 @@
}
void DumpVkSubgroupFeatureFlagBits(Printer &p, std::string name, VkSubgroupFeatureFlagBits value) {
auto strings = VkSubgroupFeatureFlagBitsGetStrings(value);
- if (strings.size() > 0)
- p.PrintKeyString(name, strings.at(0));
+ if (strings.size() > 0) {
+ if (p.Type() == OutputType::json)
+ p.PrintKeyString(name, std::string("VK_") + strings.at(0));
+ else
+ p.PrintKeyString(name, strings.at(0));
+ }
}
std::vector<const char *> VkSurfaceCounterFlagBitsEXTGetStrings(VkSurfaceCounterFlagBitsEXT value) {
@@ -1081,8 +1245,12 @@
}
void DumpVkSurfaceCounterFlagBitsEXT(Printer &p, std::string name, VkSurfaceCounterFlagBitsEXT value) {
auto strings = VkSurfaceCounterFlagBitsEXTGetStrings(value);
- if (strings.size() > 0)
- p.PrintKeyString(name, strings.at(0));
+ if (strings.size() > 0) {
+ if (p.Type() == OutputType::json)
+ p.PrintKeyString(name, std::string("VK_") + strings.at(0));
+ else
+ p.PrintKeyString(name, strings.at(0));
+ }
}
std::vector<const char *> VkSurfaceTransformFlagBitsKHRGetStrings(VkSurfaceTransformFlagBitsKHR value) {
@@ -1117,8 +1285,12 @@
}
void DumpVkSurfaceTransformFlagBitsKHR(Printer &p, std::string name, VkSurfaceTransformFlagBitsKHR value) {
auto strings = VkSurfaceTransformFlagBitsKHRGetStrings(value);
- if (strings.size() > 0)
- p.PrintKeyString(name, strings.at(0));
+ if (strings.size() > 0) {
+ if (p.Type() == OutputType::json)
+ p.PrintKeyString(name, std::string("VK_") + strings.at(0));
+ else
+ p.PrintKeyString(name, strings.at(0));
+ }
}
std::vector<const char *> VkToolPurposeFlagBitsGetStrings(VkToolPurposeFlagBits value) {
@@ -1151,8 +1323,12 @@
}
void DumpVkToolPurposeFlagBits(Printer &p, std::string name, VkToolPurposeFlagBits value) {
auto strings = VkToolPurposeFlagBitsGetStrings(value);
- if (strings.size() > 0)
- p.PrintKeyString(name, strings.at(0));
+ if (strings.size() > 0) {
+ if (p.Type() == OutputType::json)
+ p.PrintKeyString(name, std::string("VK_") + strings.at(0));
+ else
+ p.PrintKeyString(name, strings.at(0));
+ }
}
std::vector<const char *> VkVideoCodecOperationFlagBitsKHRGetStrings(VkVideoCodecOperationFlagBitsKHR value) {
@@ -1160,11 +1336,10 @@
if (VK_VIDEO_CODEC_OPERATION_NONE_KHR & value) strings.push_back("VIDEO_CODEC_OPERATION_NONE_KHR");
if (VK_VIDEO_CODEC_OPERATION_ENCODE_H264_BIT_EXT & value) strings.push_back("VIDEO_CODEC_OPERATION_ENCODE_H264_BIT_EXT");
if (VK_VIDEO_CODEC_OPERATION_ENCODE_H265_BIT_EXT & value) strings.push_back("VIDEO_CODEC_OPERATION_ENCODE_H265_BIT_EXT");
- if (VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_EXT & value) strings.push_back("VIDEO_CODEC_OPERATION_DECODE_H264_BIT_EXT");
- if (VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_EXT & value) strings.push_back("VIDEO_CODEC_OPERATION_DECODE_H265_BIT_EXT");
+ if (VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR & value) strings.push_back("VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR");
+ if (VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR & value) strings.push_back("VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR");
return strings;
}
-#ifdef VK_ENABLE_BETA_EXTENSIONS
void DumpVkVideoCodecOperationFlagsKHR(Printer &p, std::string name, VkVideoCodecOperationFlagsKHR value) {
if (static_cast<VkVideoCodecOperationFlagBitsKHR>(value) == 0) {
ArrayWrapper arr(p, name, 0);
@@ -1183,10 +1358,13 @@
}
void DumpVkVideoCodecOperationFlagBitsKHR(Printer &p, std::string name, VkVideoCodecOperationFlagBitsKHR value) {
auto strings = VkVideoCodecOperationFlagBitsKHRGetStrings(value);
- if (strings.size() > 0)
- p.PrintKeyString(name, strings.at(0));
+ if (strings.size() > 0) {
+ if (p.Type() == OutputType::json)
+ p.PrintKeyString(name, std::string("VK_") + strings.at(0));
+ else
+ p.PrintKeyString(name, strings.at(0));
+ }
}
-#endif // VK_ENABLE_BETA_EXTENSIONS
void DumpVkConformanceVersion(Printer &p, std::string name, const VkConformanceVersion &obj) {
ObjectWrapper object{p, name};
@@ -1201,6 +1379,7 @@
p.SetMinKeyWidth(27);
p.PrintKeyValue("drmFormatModifier", obj.drmFormatModifier);
p.PrintKeyValue("drmFormatModifierPlaneCount", obj.drmFormatModifierPlaneCount);
+ p.SetOpenDetails();
DumpVkFormatFeatureFlags2(p, "drmFormatModifierTilingFeatures", obj.drmFormatModifierTilingFeatures);
}
void DumpVkExtent2D(Printer &p, std::string name, const VkExtent2D &obj) {
@@ -1216,10 +1395,22 @@
p.PrintKeyValue("height", obj.height);
p.PrintKeyValue("depth", obj.depth);
}
+void DumpVkFormatProperties(Printer &p, std::string name, const VkFormatProperties &obj) {
+ ObjectWrapper object{p, name};
+ p.SetOpenDetails();
+ DumpVkFormatFeatureFlags(p, "linearTilingFeatures", obj.linearTilingFeatures);
+ p.SetOpenDetails();
+ DumpVkFormatFeatureFlags(p, "optimalTilingFeatures", obj.optimalTilingFeatures);
+ p.SetOpenDetails();
+ DumpVkFormatFeatureFlags(p, "bufferFeatures", obj.bufferFeatures);
+}
void DumpVkFormatProperties3(Printer &p, std::string name, const VkFormatProperties3 &obj) {
ObjectWrapper object{p, name};
+ p.SetOpenDetails();
DumpVkFormatFeatureFlags2(p, "linearTilingFeatures", obj.linearTilingFeatures);
+ p.SetOpenDetails();
DumpVkFormatFeatureFlags2(p, "optimalTilingFeatures", obj.optimalTilingFeatures);
+ p.SetOpenDetails();
DumpVkFormatFeatureFlags2(p, "bufferFeatures", obj.bufferFeatures);
}
void DumpVkLayerProperties(Printer &p, std::string name, const VkLayerProperties &obj) {
@@ -1282,6 +1473,11 @@
p.SetMinKeyWidth(20);
p.PrintKeyBool("reportAddressBinding", static_cast<bool>(obj.reportAddressBinding));
}
+void DumpVkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(34);
+ p.PrintKeyBool("attachmentFeedbackLoopDynamicState", static_cast<bool>(obj.attachmentFeedbackLoopDynamicState));
+}
void DumpVkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT &obj) {
ObjectWrapper object{p, name};
p.SetMinKeyWidth(28);
@@ -1346,6 +1542,16 @@
p.PrintKeyBool("fullyCoveredFragmentShaderInputVariable", static_cast<bool>(obj.fullyCoveredFragmentShaderInputVariable));
p.PrintKeyBool("conservativeRasterizationPostDepthCoverage", static_cast<bool>(obj.conservativeRasterizationPostDepthCoverage));
}
+void DumpVkPhysicalDeviceCooperativeMatrixFeaturesKHR(Printer &p, std::string name, const VkPhysicalDeviceCooperativeMatrixFeaturesKHR &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(35);
+ p.PrintKeyBool("cooperativeMatrix", static_cast<bool>(obj.cooperativeMatrix));
+ p.PrintKeyBool("cooperativeMatrixRobustBufferAccess", static_cast<bool>(obj.cooperativeMatrixRobustBufferAccess));
+}
+void DumpVkPhysicalDeviceCooperativeMatrixPropertiesKHR(Printer &p, std::string name, const VkPhysicalDeviceCooperativeMatrixPropertiesKHR &obj) {
+ ObjectWrapper object{p, name};
+ DumpVkShaderStageFlags(p, "cooperativeMatrixSupportedStages", obj.cooperativeMatrixSupportedStages);
+}
void DumpVkPhysicalDeviceCustomBorderColorFeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceCustomBorderColorFeaturesEXT &obj) {
ObjectWrapper object{p, name};
p.SetMinKeyWidth(30);
@@ -1357,6 +1563,14 @@
p.SetMinKeyWidth(28);
p.PrintKeyValue("maxCustomBorderColorSamplers", obj.maxCustomBorderColorSamplers);
}
+void DumpVkPhysicalDeviceDepthBiasControlFeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceDepthBiasControlFeaturesEXT &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(47);
+ p.PrintKeyBool("depthBiasControl", static_cast<bool>(obj.depthBiasControl));
+ p.PrintKeyBool("leastRepresentableValueForceUnormRepresentation", static_cast<bool>(obj.leastRepresentableValueForceUnormRepresentation));
+ p.PrintKeyBool("floatRepresentation", static_cast<bool>(obj.floatRepresentation));
+ p.PrintKeyBool("depthBiasExact", static_cast<bool>(obj.depthBiasExact));
+}
void DumpVkPhysicalDeviceDepthClampZeroOneFeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceDepthClampZeroOneFeaturesEXT &obj) {
ObjectWrapper object{p, name};
p.SetMinKeyWidth(17);
@@ -1380,6 +1594,56 @@
p.PrintKeyBool("independentResolveNone", static_cast<bool>(obj.independentResolveNone));
p.PrintKeyBool("independentResolve", static_cast<bool>(obj.independentResolve));
}
+void DumpVkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT(Printer &p, std::string name, const VkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(44);
+ p.PrintKeyValue("combinedImageSamplerDensityMapDescriptorSize", obj.combinedImageSamplerDensityMapDescriptorSize);
+}
+void DumpVkPhysicalDeviceDescriptorBufferFeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceDescriptorBufferFeaturesEXT &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(34);
+ p.PrintKeyBool("descriptorBuffer", static_cast<bool>(obj.descriptorBuffer));
+ p.PrintKeyBool("descriptorBufferCaptureReplay", static_cast<bool>(obj.descriptorBufferCaptureReplay));
+ p.PrintKeyBool("descriptorBufferImageLayoutIgnored", static_cast<bool>(obj.descriptorBufferImageLayoutIgnored));
+ p.PrintKeyBool("descriptorBufferPushDescriptors", static_cast<bool>(obj.descriptorBufferPushDescriptors));
+}
+void DumpVkPhysicalDeviceDescriptorBufferPropertiesEXT(Printer &p, std::string name, const VkPhysicalDeviceDescriptorBufferPropertiesEXT &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(52);
+ p.PrintKeyBool("combinedImageSamplerDescriptorSingleArray", static_cast<bool>(obj.combinedImageSamplerDescriptorSingleArray));
+ p.PrintKeyBool("bufferlessPushDescriptors", static_cast<bool>(obj.bufferlessPushDescriptors));
+ p.PrintKeyBool("allowSamplerImageViewPostSubmitCreation", static_cast<bool>(obj.allowSamplerImageViewPostSubmitCreation));
+ p.PrintKeyValue("descriptorBufferOffsetAlignment", to_hex_str(p, obj.descriptorBufferOffsetAlignment));
+ p.PrintKeyValue("maxDescriptorBufferBindings", obj.maxDescriptorBufferBindings);
+ p.PrintKeyValue("maxResourceDescriptorBufferBindings", obj.maxResourceDescriptorBufferBindings);
+ p.PrintKeyValue("maxSamplerDescriptorBufferBindings", obj.maxSamplerDescriptorBufferBindings);
+ p.PrintKeyValue("maxEmbeddedImmutableSamplerBindings", obj.maxEmbeddedImmutableSamplerBindings);
+ p.PrintKeyValue("maxEmbeddedImmutableSamplers", obj.maxEmbeddedImmutableSamplers);
+ p.PrintKeyValue("bufferCaptureReplayDescriptorDataSize", obj.bufferCaptureReplayDescriptorDataSize);
+ p.PrintKeyValue("imageCaptureReplayDescriptorDataSize", obj.imageCaptureReplayDescriptorDataSize);
+ p.PrintKeyValue("imageViewCaptureReplayDescriptorDataSize", obj.imageViewCaptureReplayDescriptorDataSize);
+ p.PrintKeyValue("samplerCaptureReplayDescriptorDataSize", obj.samplerCaptureReplayDescriptorDataSize);
+ p.PrintKeyValue("accelerationStructureCaptureReplayDescriptorDataSize", obj.accelerationStructureCaptureReplayDescriptorDataSize);
+ p.PrintKeyValue("samplerDescriptorSize", obj.samplerDescriptorSize);
+ p.PrintKeyValue("combinedImageSamplerDescriptorSize", obj.combinedImageSamplerDescriptorSize);
+ p.PrintKeyValue("sampledImageDescriptorSize", obj.sampledImageDescriptorSize);
+ p.PrintKeyValue("storageImageDescriptorSize", obj.storageImageDescriptorSize);
+ p.PrintKeyValue("uniformTexelBufferDescriptorSize", obj.uniformTexelBufferDescriptorSize);
+ p.PrintKeyValue("robustUniformTexelBufferDescriptorSize", obj.robustUniformTexelBufferDescriptorSize);
+ p.PrintKeyValue("storageTexelBufferDescriptorSize", obj.storageTexelBufferDescriptorSize);
+ p.PrintKeyValue("robustStorageTexelBufferDescriptorSize", obj.robustStorageTexelBufferDescriptorSize);
+ p.PrintKeyValue("uniformBufferDescriptorSize", obj.uniformBufferDescriptorSize);
+ p.PrintKeyValue("robustUniformBufferDescriptorSize", obj.robustUniformBufferDescriptorSize);
+ p.PrintKeyValue("storageBufferDescriptorSize", obj.storageBufferDescriptorSize);
+ p.PrintKeyValue("robustStorageBufferDescriptorSize", obj.robustStorageBufferDescriptorSize);
+ p.PrintKeyValue("inputAttachmentDescriptorSize", obj.inputAttachmentDescriptorSize);
+ p.PrintKeyValue("accelerationStructureDescriptorSize", obj.accelerationStructureDescriptorSize);
+ p.PrintKeyValue("maxSamplerDescriptorBufferRange", to_hex_str(p, obj.maxSamplerDescriptorBufferRange));
+ p.PrintKeyValue("maxResourceDescriptorBufferRange", to_hex_str(p, obj.maxResourceDescriptorBufferRange));
+ p.PrintKeyValue("samplerDescriptorBufferAddressSpaceSize", to_hex_str(p, obj.samplerDescriptorBufferAddressSpaceSize));
+ p.PrintKeyValue("resourceDescriptorBufferAddressSpaceSize", to_hex_str(p, obj.resourceDescriptorBufferAddressSpaceSize));
+ p.PrintKeyValue("descriptorBufferAddressSpaceSize", to_hex_str(p, obj.descriptorBufferAddressSpaceSize));
+}
void DumpVkPhysicalDeviceDescriptorIndexingFeatures(Printer &p, std::string name, const VkPhysicalDeviceDescriptorIndexingFeatures &obj) {
ObjectWrapper object{p, name};
p.SetMinKeyWidth(50);
@@ -1464,6 +1728,11 @@
p.SetMinKeyWidth(16);
p.PrintKeyBool("dynamicRendering", static_cast<bool>(obj.dynamicRendering));
}
+void DumpVkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(33);
+ p.PrintKeyBool("dynamicRenderingUnusedAttachments", static_cast<bool>(obj.dynamicRenderingUnusedAttachments));
+}
void DumpVkPhysicalDeviceExtendedDynamicState2FeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceExtendedDynamicState2FeaturesEXT &obj) {
ObjectWrapper object{p, name};
p.SetMinKeyWidth(39);
@@ -1679,6 +1948,11 @@
p.PrintKeyBool("fragmentShadingRateWithCustomSampleLocations", static_cast<bool>(obj.fragmentShadingRateWithCustomSampleLocations));
p.PrintKeyBool("fragmentShadingRateStrictMultiplyCombiner", static_cast<bool>(obj.fragmentShadingRateStrictMultiplyCombiner));
}
+void DumpVkPhysicalDeviceFrameBoundaryFeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceFrameBoundaryFeaturesEXT &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(13);
+ p.PrintKeyBool("frameBoundary", static_cast<bool>(obj.frameBoundary));
+}
void DumpVkPhysicalDeviceGlobalPriorityQueryFeaturesKHR(Printer &p, std::string name, const VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR &obj) {
ObjectWrapper object{p, name};
p.SetMinKeyWidth(19);
@@ -1695,6 +1969,43 @@
p.PrintKeyBool("graphicsPipelineLibraryFastLinking", static_cast<bool>(obj.graphicsPipelineLibraryFastLinking));
p.PrintKeyBool("graphicsPipelineLibraryIndependentInterpolationDecoration", static_cast<bool>(obj.graphicsPipelineLibraryIndependentInterpolationDecoration));
}
+void DumpVkPhysicalDeviceHostImageCopyFeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceHostImageCopyFeaturesEXT &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(13);
+ p.PrintKeyBool("hostImageCopy", static_cast<bool>(obj.hostImageCopy));
+}
+void DumpVkPhysicalDeviceHostImageCopyPropertiesEXT(Printer &p, std::string name, const VkPhysicalDeviceHostImageCopyPropertiesEXT &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(35);
+ p.PrintKeyValue("copySrcLayoutCount", obj.copySrcLayoutCount);
+ {
+ ArrayWrapper arr(p,"pCopySrcLayouts", obj.copySrcLayoutCount);
+ for (uint32_t i = 0; i < obj.copySrcLayoutCount; i++) {
+ if (obj.pCopySrcLayouts != nullptr) {
+ p.SetElementIndex(i);
+ if (p.Type() == OutputType::json)
+ p.PrintString(std::string("VK_") + VkImageLayoutString(obj.pCopySrcLayouts[i]));
+ else
+ p.PrintString(VkImageLayoutString(obj.pCopySrcLayouts[i]));
+ }
+ }
+ }
+ p.PrintKeyValue("copyDstLayoutCount", obj.copyDstLayoutCount);
+ {
+ ArrayWrapper arr(p,"pCopyDstLayouts", obj.copyDstLayoutCount);
+ for (uint32_t i = 0; i < obj.copyDstLayoutCount; i++) {
+ if (obj.pCopyDstLayouts != nullptr) {
+ p.SetElementIndex(i);
+ if (p.Type() == OutputType::json)
+ p.PrintString(std::string("VK_") + VkImageLayoutString(obj.pCopyDstLayouts[i]));
+ else
+ p.PrintString(VkImageLayoutString(obj.pCopyDstLayouts[i]));
+ }
+ }
+ }
+ p.PrintKeyValue("optimalTilingLayoutUUID", obj.optimalTilingLayoutUUID);
+ p.PrintKeyBool("identicalMemoryTypeRequirements", static_cast<bool>(obj.identicalMemoryTypeRequirements));
+}
void DumpVkPhysicalDeviceHostQueryResetFeatures(Printer &p, std::string name, const VkPhysicalDeviceHostQueryResetFeatures &obj) {
ObjectWrapper object{p, name};
p.SetMinKeyWidth(14);
@@ -1703,22 +2014,10 @@
void DumpVkPhysicalDeviceIDProperties(Printer &p, std::string name, const VkPhysicalDeviceIDProperties &obj) {
ObjectWrapper object{p, name};
p.SetMinKeyWidth(15);
- if (p.Type() == OutputType::json) {
- ArrayWrapper arr(p, "deviceUUID");
- for (uint32_t i = 0; i < 16; i++) p.PrintElement(static_cast<uint32_t>(obj.deviceUUID[i]));
- } else
- p.PrintKeyString("deviceUUID", to_string_16(obj.deviceUUID));
- if (p.Type() == OutputType::json) {
- ArrayWrapper arr(p, "driverUUID");
- for (uint32_t i = 0; i < 16; i++) p.PrintElement(static_cast<uint32_t>(obj.driverUUID[i]));
- } else
- p.PrintKeyString("driverUUID", to_string_16(obj.driverUUID));
+ p.PrintKeyValue("deviceUUID", obj.deviceUUID);
+ p.PrintKeyValue("driverUUID", obj.driverUUID);
if (obj.deviceLUIDValid) { // special case
- if (p.Type() == OutputType::json) {
- ArrayWrapper arr(p, "deviceLUID");
- for (uint32_t i = 0; i < 8; i++) p.PrintElement(static_cast<uint32_t>(obj.deviceLUID[i]));
- } else
- p.PrintKeyString("deviceLUID", to_string_8(obj.deviceLUID));
+ p.PrintKeyValue("deviceLUID", obj.deviceLUID);
}
p.PrintKeyValue("deviceNodeMask", obj.deviceNodeMask);
p.PrintKeyBool("deviceLUIDValid", static_cast<bool>(obj.deviceLUIDValid));
@@ -1744,6 +2043,11 @@
p.SetMinKeyWidth(17);
p.PrintKeyBool("robustImageAccess", static_cast<bool>(obj.robustImageAccess));
}
+void DumpVkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(19);
+ p.PrintKeyBool("imageSlicedViewOf3D", static_cast<bool>(obj.imageSlicedViewOf3D));
+}
void DumpVkPhysicalDeviceImageViewMinLodFeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceImageViewMinLodFeaturesEXT &obj) {
ObjectWrapper object{p, name};
p.SetMinKeyWidth(6);
@@ -1837,16 +2141,14 @@
p.PrintKeyValue("maxFragmentDualSrcAttachments", obj.maxFragmentDualSrcAttachments);
p.PrintKeyValue("maxFragmentCombinedOutputResources", obj.maxFragmentCombinedOutputResources);
p.PrintKeyValue("maxComputeSharedMemorySize", obj.maxComputeSharedMemorySize);
- { ArrayWrapper arr(p,"maxComputeWorkGroupCount", 3);
- p.PrintElement(obj.maxComputeWorkGroupCount[0]);
- p.PrintElement(obj.maxComputeWorkGroupCount[1]);
- p.PrintElement(obj.maxComputeWorkGroupCount[2]);
+ {
+ ArrayWrapper arr(p,"maxComputeWorkGroupCount", 3);
+ for (uint32_t i = 0; i < 3; i++) { p.PrintElement(obj.maxComputeWorkGroupCount[i]); }
}
p.PrintKeyValue("maxComputeWorkGroupInvocations", obj.maxComputeWorkGroupInvocations);
- { ArrayWrapper arr(p,"maxComputeWorkGroupSize", 3);
- p.PrintElement(obj.maxComputeWorkGroupSize[0]);
- p.PrintElement(obj.maxComputeWorkGroupSize[1]);
- p.PrintElement(obj.maxComputeWorkGroupSize[2]);
+ {
+ ArrayWrapper arr(p,"maxComputeWorkGroupSize", 3);
+ for (uint32_t i = 0; i < 3; i++) { p.PrintElement(obj.maxComputeWorkGroupSize[i]); }
}
p.PrintKeyValue("subPixelPrecisionBits", obj.subPixelPrecisionBits);
p.PrintKeyValue("subTexelPrecisionBits", obj.subTexelPrecisionBits);
@@ -1856,13 +2158,13 @@
p.PrintKeyValue("maxSamplerLodBias", obj.maxSamplerLodBias);
p.PrintKeyValue("maxSamplerAnisotropy", obj.maxSamplerAnisotropy);
p.PrintKeyValue("maxViewports", obj.maxViewports);
- { ArrayWrapper arr(p,"maxViewportDimensions", 2);
- p.PrintElement(obj.maxViewportDimensions[0]);
- p.PrintElement(obj.maxViewportDimensions[1]);
+ {
+ ArrayWrapper arr(p,"maxViewportDimensions", 2);
+ for (uint32_t i = 0; i < 2; i++) { p.PrintElement(obj.maxViewportDimensions[i]); }
}
- { ArrayWrapper arr(p,"viewportBoundsRange", 2);
- p.PrintElement(obj.viewportBoundsRange[0]);
- p.PrintElement(obj.viewportBoundsRange[1]);
+ {
+ ArrayWrapper arr(p,"viewportBoundsRange", 2);
+ for (uint32_t i = 0; i < 2; i++) { p.PrintElement(obj.viewportBoundsRange[i]); }
}
p.PrintKeyValue("viewportSubPixelBits", obj.viewportSubPixelBits);
p.PrintKeyValue("minMemoryMapAlignment", obj.minMemoryMapAlignment);
@@ -1896,13 +2198,13 @@
p.PrintKeyValue("maxCullDistances", obj.maxCullDistances);
p.PrintKeyValue("maxCombinedClipAndCullDistances", obj.maxCombinedClipAndCullDistances);
p.PrintKeyValue("discreteQueuePriorities", obj.discreteQueuePriorities);
- { ArrayWrapper arr(p,"pointSizeRange", 2);
- p.PrintElement(obj.pointSizeRange[0]);
- p.PrintElement(obj.pointSizeRange[1]);
+ {
+ ArrayWrapper arr(p,"pointSizeRange", 2);
+ for (uint32_t i = 0; i < 2; i++) { p.PrintElement(obj.pointSizeRange[i]); }
}
- { ArrayWrapper arr(p,"lineWidthRange", 2);
- p.PrintElement(obj.lineWidthRange[0]);
- p.PrintElement(obj.lineWidthRange[1]);
+ {
+ ArrayWrapper arr(p,"lineWidthRange", 2);
+ for (uint32_t i = 0; i < 2; i++) { p.PrintElement(obj.lineWidthRange[i]); }
}
p.PrintKeyValue("pointSizeGranularity", obj.pointSizeGranularity);
p.PrintKeyValue("lineWidthGranularity", obj.lineWidthGranularity);
@@ -1944,44 +2246,31 @@
p.SetMinKeyWidth(13);
p.PrintKeyValue("maxBufferSize", to_hex_str(p, obj.maxBufferSize));
}
+void DumpVkPhysicalDeviceMaintenance5FeaturesKHR(Printer &p, std::string name, const VkPhysicalDeviceMaintenance5FeaturesKHR &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(12);
+ p.PrintKeyBool("maintenance5", static_cast<bool>(obj.maintenance5));
+}
+void DumpVkPhysicalDeviceMaintenance5PropertiesKHR(Printer &p, std::string name, const VkPhysicalDeviceMaintenance5PropertiesKHR &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(51);
+ p.PrintKeyBool("earlyFragmentMultisampleCoverageAfterSampleCounting", static_cast<bool>(obj.earlyFragmentMultisampleCoverageAfterSampleCounting));
+ p.PrintKeyBool("earlyFragmentSampleMaskTestBeforeSampleCounting", static_cast<bool>(obj.earlyFragmentSampleMaskTestBeforeSampleCounting));
+ p.PrintKeyBool("depthStencilSwizzleOneSupport", static_cast<bool>(obj.depthStencilSwizzleOneSupport));
+ p.PrintKeyBool("polygonModePointSize", static_cast<bool>(obj.polygonModePointSize));
+ p.PrintKeyBool("nonStrictSinglePixelWideLinesUseParallelogram", static_cast<bool>(obj.nonStrictSinglePixelWideLinesUseParallelogram));
+ p.PrintKeyBool("nonStrictWideLinesUseParallelogram", static_cast<bool>(obj.nonStrictWideLinesUseParallelogram));
+}
void DumpVkPhysicalDeviceMemoryBudgetPropertiesEXT(Printer &p, std::string name, const VkPhysicalDeviceMemoryBudgetPropertiesEXT &obj) {
ObjectWrapper object{p, name};
p.SetMinKeyWidth(14);
- { ArrayWrapper arr(p,"heapBudget", 16);
- p.PrintElement(obj.heapBudget[0]);
- p.PrintElement(obj.heapBudget[1]);
- p.PrintElement(obj.heapBudget[2]);
- p.PrintElement(obj.heapBudget[3]);
- p.PrintElement(obj.heapBudget[4]);
- p.PrintElement(obj.heapBudget[5]);
- p.PrintElement(obj.heapBudget[6]);
- p.PrintElement(obj.heapBudget[7]);
- p.PrintElement(obj.heapBudget[8]);
- p.PrintElement(obj.heapBudget[9]);
- p.PrintElement(obj.heapBudget[10]);
- p.PrintElement(obj.heapBudget[11]);
- p.PrintElement(obj.heapBudget[12]);
- p.PrintElement(obj.heapBudget[13]);
- p.PrintElement(obj.heapBudget[14]);
- p.PrintElement(obj.heapBudget[15]);
+ {
+ ArrayWrapper arr(p,"heapBudget", 16);
+ for (uint32_t i = 0; i < 16; i++) { p.PrintElement(obj.heapBudget[i]); }
}
- { ArrayWrapper arr(p,"heapUsage", 16);
- p.PrintElement(obj.heapUsage[0]);
- p.PrintElement(obj.heapUsage[1]);
- p.PrintElement(obj.heapUsage[2]);
- p.PrintElement(obj.heapUsage[3]);
- p.PrintElement(obj.heapUsage[4]);
- p.PrintElement(obj.heapUsage[5]);
- p.PrintElement(obj.heapUsage[6]);
- p.PrintElement(obj.heapUsage[7]);
- p.PrintElement(obj.heapUsage[8]);
- p.PrintElement(obj.heapUsage[9]);
- p.PrintElement(obj.heapUsage[10]);
- p.PrintElement(obj.heapUsage[11]);
- p.PrintElement(obj.heapUsage[12]);
- p.PrintElement(obj.heapUsage[13]);
- p.PrintElement(obj.heapUsage[14]);
- p.PrintElement(obj.heapUsage[15]);
+ {
+ ArrayWrapper arr(p,"heapUsage", 16);
+ for (uint32_t i = 0; i < 16; i++) { p.PrintElement(obj.heapUsage[i]); }
}
}
void DumpVkPhysicalDeviceMemoryPriorityFeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceMemoryPriorityFeaturesEXT &obj) {
@@ -2002,31 +2291,27 @@
ObjectWrapper object{p, name};
p.SetMinKeyWidth(37);
p.PrintKeyValue("maxTaskWorkGroupTotalCount", obj.maxTaskWorkGroupTotalCount);
- { ArrayWrapper arr(p,"maxTaskWorkGroupCount", 3);
- p.PrintElement(obj.maxTaskWorkGroupCount[0]);
- p.PrintElement(obj.maxTaskWorkGroupCount[1]);
- p.PrintElement(obj.maxTaskWorkGroupCount[2]);
+ {
+ ArrayWrapper arr(p,"maxTaskWorkGroupCount", 3);
+ for (uint32_t i = 0; i < 3; i++) { p.PrintElement(obj.maxTaskWorkGroupCount[i]); }
}
p.PrintKeyValue("maxTaskWorkGroupInvocations", obj.maxTaskWorkGroupInvocations);
- { ArrayWrapper arr(p,"maxTaskWorkGroupSize", 3);
- p.PrintElement(obj.maxTaskWorkGroupSize[0]);
- p.PrintElement(obj.maxTaskWorkGroupSize[1]);
- p.PrintElement(obj.maxTaskWorkGroupSize[2]);
+ {
+ ArrayWrapper arr(p,"maxTaskWorkGroupSize", 3);
+ for (uint32_t i = 0; i < 3; i++) { p.PrintElement(obj.maxTaskWorkGroupSize[i]); }
}
p.PrintKeyValue("maxTaskPayloadSize", obj.maxTaskPayloadSize);
p.PrintKeyValue("maxTaskSharedMemorySize", obj.maxTaskSharedMemorySize);
p.PrintKeyValue("maxTaskPayloadAndSharedMemorySize", obj.maxTaskPayloadAndSharedMemorySize);
p.PrintKeyValue("maxMeshWorkGroupTotalCount", obj.maxMeshWorkGroupTotalCount);
- { ArrayWrapper arr(p,"maxMeshWorkGroupCount", 3);
- p.PrintElement(obj.maxMeshWorkGroupCount[0]);
- p.PrintElement(obj.maxMeshWorkGroupCount[1]);
- p.PrintElement(obj.maxMeshWorkGroupCount[2]);
+ {
+ ArrayWrapper arr(p,"maxMeshWorkGroupCount", 3);
+ for (uint32_t i = 0; i < 3; i++) { p.PrintElement(obj.maxMeshWorkGroupCount[i]); }
}
p.PrintKeyValue("maxMeshWorkGroupInvocations", obj.maxMeshWorkGroupInvocations);
- { ArrayWrapper arr(p,"maxMeshWorkGroupSize", 3);
- p.PrintElement(obj.maxMeshWorkGroupSize[0]);
- p.PrintElement(obj.maxMeshWorkGroupSize[1]);
- p.PrintElement(obj.maxMeshWorkGroupSize[2]);
+ {
+ ArrayWrapper arr(p,"maxMeshWorkGroupSize", 3);
+ for (uint32_t i = 0; i < 3; i++) { p.PrintElement(obj.maxMeshWorkGroupSize[i]); }
}
p.PrintKeyValue("maxMeshSharedMemorySize", obj.maxMeshSharedMemorySize);
p.PrintKeyValue("maxMeshPayloadAndSharedMemorySize", obj.maxMeshPayloadAndSharedMemorySize);
@@ -2079,6 +2364,18 @@
p.SetMinKeyWidth(21);
p.PrintKeyBool("mutableDescriptorType", static_cast<bool>(obj.mutableDescriptorType));
}
+void DumpVkPhysicalDeviceNestedCommandBufferFeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceNestedCommandBufferFeaturesEXT &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(34);
+ p.PrintKeyBool("nestedCommandBuffer", static_cast<bool>(obj.nestedCommandBuffer));
+ p.PrintKeyBool("nestedCommandBufferRendering", static_cast<bool>(obj.nestedCommandBufferRendering));
+ p.PrintKeyBool("nestedCommandBufferSimultaneousUse", static_cast<bool>(obj.nestedCommandBufferSimultaneousUse));
+}
+void DumpVkPhysicalDeviceNestedCommandBufferPropertiesEXT(Printer &p, std::string name, const VkPhysicalDeviceNestedCommandBufferPropertiesEXT &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(28);
+ p.PrintKeyValue("maxCommandBufferNestingLevel", obj.maxCommandBufferNestingLevel);
+}
void DumpVkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT &obj) {
ObjectWrapper object{p, name};
p.SetMinKeyWidth(18);
@@ -2131,6 +2428,11 @@
p.SetMinKeyWidth(22);
p.PrintKeyBool("pipelineExecutableInfo", static_cast<bool>(obj.pipelineExecutableInfo));
}
+void DumpVkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT(Printer &p, std::string name, const VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(27);
+ p.PrintKeyBool("pipelineLibraryGroupHandles", static_cast<bool>(obj.pipelineLibraryGroupHandles));
+}
void DumpVkPhysicalDevicePipelinePropertiesFeaturesEXT(Printer &p, std::string name, const VkPhysicalDevicePipelinePropertiesFeaturesEXT &obj) {
ObjectWrapper object{p, name};
p.SetMinKeyWidth(28);
@@ -2284,6 +2586,11 @@
p.PrintKeyValue("shaderGroupHandleAlignment", obj.shaderGroupHandleAlignment);
p.PrintKeyValue("maxRayHitAttributeSize", obj.maxRayHitAttributeSize);
}
+void DumpVkPhysicalDeviceRayTracingPositionFetchFeaturesKHR(Printer &p, std::string name, const VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(23);
+ p.PrintKeyBool("rayTracingPositionFetch", static_cast<bool>(obj.rayTracingPositionFetch));
+}
void DumpVkPhysicalDeviceRobustness2FeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceRobustness2FeaturesEXT &obj) {
ObjectWrapper object{p, name};
p.SetMinKeyWidth(19);
@@ -2302,9 +2609,9 @@
p.SetMinKeyWidth(32);
DumpVkSampleCountFlags(p, "sampleLocationSampleCounts", obj.sampleLocationSampleCounts);
DumpVkExtent2D(p, "maxSampleLocationGridSize", obj.maxSampleLocationGridSize);
- { ArrayWrapper arr(p,"sampleLocationCoordinateRange", 2);
- p.PrintElement(obj.sampleLocationCoordinateRange[0]);
- p.PrintElement(obj.sampleLocationCoordinateRange[1]);
+ {
+ ArrayWrapper arr(p,"sampleLocationCoordinateRange", 2);
+ for (uint32_t i = 0; i < 2; i++) { p.PrintElement(obj.sampleLocationCoordinateRange[i]); }
}
p.PrintKeyValue("sampleLocationSubPixelBits", obj.sampleLocationSubPixelBits);
p.PrintKeyBool("variableSampleLocations", static_cast<bool>(obj.variableSampleLocations));
@@ -2443,11 +2750,18 @@
void DumpVkPhysicalDeviceShaderModuleIdentifierPropertiesEXT(Printer &p, std::string name, const VkPhysicalDeviceShaderModuleIdentifierPropertiesEXT &obj) {
ObjectWrapper object{p, name};
p.SetMinKeyWidth(39);
- if (p.Type() == OutputType::json) {
- ArrayWrapper arr(p, "shaderModuleIdentifierAlgorithmUUID");
- for (uint32_t i = 0; i < 16; i++) p.PrintElement(static_cast<uint32_t>(obj.shaderModuleIdentifierAlgorithmUUID[i]));
- } else
- p.PrintKeyString("shaderModuleIdentifierAlgorithmUUID", to_string_16(obj.shaderModuleIdentifierAlgorithmUUID));
+ p.PrintKeyValue("shaderModuleIdentifierAlgorithmUUID", obj.shaderModuleIdentifierAlgorithmUUID);
+}
+void DumpVkPhysicalDeviceShaderObjectFeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceShaderObjectFeaturesEXT &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(12);
+ p.PrintKeyBool("shaderObject", static_cast<bool>(obj.shaderObject));
+}
+void DumpVkPhysicalDeviceShaderObjectPropertiesEXT(Printer &p, std::string name, const VkPhysicalDeviceShaderObjectPropertiesEXT &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(20);
+ p.PrintKeyValue("shaderBinaryUUID", obj.shaderBinaryUUID);
+ p.PrintKeyValue("shaderBinaryVersion", obj.shaderBinaryVersion);
}
void DumpVkPhysicalDeviceShaderSubgroupExtendedTypesFeatures(Printer &p, std::string name, const VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures &obj) {
ObjectWrapper object{p, name};
@@ -2464,6 +2778,20 @@
p.SetMinKeyWidth(25);
p.PrintKeyBool("shaderTerminateInvocation", static_cast<bool>(obj.shaderTerminateInvocation));
}
+void DumpVkPhysicalDeviceShaderTileImageFeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceShaderTileImageFeaturesEXT &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(32);
+ p.PrintKeyBool("shaderTileImageColorReadAccess", static_cast<bool>(obj.shaderTileImageColorReadAccess));
+ p.PrintKeyBool("shaderTileImageDepthReadAccess", static_cast<bool>(obj.shaderTileImageDepthReadAccess));
+ p.PrintKeyBool("shaderTileImageStencilReadAccess", static_cast<bool>(obj.shaderTileImageStencilReadAccess));
+}
+void DumpVkPhysicalDeviceShaderTileImagePropertiesEXT(Printer &p, std::string name, const VkPhysicalDeviceShaderTileImagePropertiesEXT &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(48);
+ p.PrintKeyBool("shaderTileImageCoherentReadAccelerated", static_cast<bool>(obj.shaderTileImageCoherentReadAccelerated));
+ p.PrintKeyBool("shaderTileImageReadSampleFromPixelRateInvocation", static_cast<bool>(obj.shaderTileImageReadSampleFromPixelRateInvocation));
+ p.PrintKeyBool("shaderTileImageReadFromHelperInvocation", static_cast<bool>(obj.shaderTileImageReadFromHelperInvocation));
+}
void DumpVkPhysicalDeviceSparseProperties(Printer &p, std::string name, const VkPhysicalDeviceSparseProperties &obj) {
if (p.Type() == OutputType::json)
p.ObjectStart("sparseProperties");
@@ -2504,6 +2832,11 @@
p.SetMinKeyWidth(20);
p.PrintKeyBool("subpassMergeFeedback", static_cast<bool>(obj.subpassMergeFeedback));
}
+void DumpVkPhysicalDeviceSwapchainMaintenance1FeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(21);
+ p.PrintKeyBool("swapchainMaintenance1", static_cast<bool>(obj.swapchainMaintenance1));
+}
void DumpVkPhysicalDeviceSynchronization2Features(Printer &p, std::string name, const VkPhysicalDeviceSynchronization2Features &obj) {
ObjectWrapper object{p, name};
p.SetMinKeyWidth(16);
@@ -2612,22 +2945,10 @@
void DumpVkPhysicalDeviceVulkan11Properties(Printer &p, std::string name, const VkPhysicalDeviceVulkan11Properties &obj) {
ObjectWrapper object{p, name};
p.SetMinKeyWidth(33);
- if (p.Type() == OutputType::json) {
- ArrayWrapper arr(p, "deviceUUID");
- for (uint32_t i = 0; i < 16; i++) p.PrintElement(static_cast<uint32_t>(obj.deviceUUID[i]));
- } else
- p.PrintKeyString("deviceUUID", to_string_16(obj.deviceUUID));
- if (p.Type() == OutputType::json) {
- ArrayWrapper arr(p, "driverUUID");
- for (uint32_t i = 0; i < 16; i++) p.PrintElement(static_cast<uint32_t>(obj.driverUUID[i]));
- } else
- p.PrintKeyString("driverUUID", to_string_16(obj.driverUUID));
+ p.PrintKeyValue("deviceUUID", obj.deviceUUID);
+ p.PrintKeyValue("driverUUID", obj.driverUUID);
if (obj.deviceLUIDValid) { // special case
- if (p.Type() == OutputType::json) {
- ArrayWrapper arr(p, "deviceLUID");
- for (uint32_t i = 0; i < 8; i++) p.PrintElement(static_cast<uint32_t>(obj.deviceLUID[i]));
- } else
- p.PrintKeyString("deviceLUID", to_string_8(obj.deviceLUID));
+ p.PrintKeyValue("deviceLUID", obj.deviceLUID);
}
p.PrintKeyValue("deviceNodeMask", obj.deviceNodeMask);
p.PrintKeyBool("deviceLUIDValid", static_cast<bool>(obj.deviceLUIDValid));
@@ -2859,19 +3180,15 @@
p.PrintString(VkQueueGlobalPriorityKHRString(obj.priorities[i]));
}
}
-#ifdef VK_ENABLE_BETA_EXTENSIONS
void DumpVkQueueFamilyQueryResultStatusPropertiesKHR(Printer &p, std::string name, const VkQueueFamilyQueryResultStatusPropertiesKHR &obj) {
ObjectWrapper object{p, name};
p.SetMinKeyWidth(24);
p.PrintKeyBool("queryResultStatusSupport", static_cast<bool>(obj.queryResultStatusSupport));
}
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
void DumpVkQueueFamilyVideoPropertiesKHR(Printer &p, std::string name, const VkQueueFamilyVideoPropertiesKHR &obj) {
ObjectWrapper object{p, name};
DumpVkVideoCodecOperationFlagsKHR(p, "videoCodecOperations", obj.videoCodecOperations);
}
-#endif // VK_ENABLE_BETA_EXTENSIONS
void DumpVkSharedPresentSurfaceCapabilitiesKHR(Printer &p, std::string name, const VkSharedPresentSurfaceCapabilitiesKHR &obj) {
ObjectWrapper object{p, name};
DumpVkImageUsageFlags(p, "sharedPresentSupportedUsageFlags", obj.sharedPresentSupportedUsageFlags);
@@ -2907,6 +3224,31 @@
DumpVkFormat(p, "format", obj.format);
DumpVkColorSpaceKHR(p, "colorSpace", obj.colorSpace);
}
+void DumpVkSurfacePresentModeCompatibilityEXT(Printer &p, std::string name, const VkSurfacePresentModeCompatibilityEXT &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(31);
+ p.PrintKeyValue("presentModeCount", obj.presentModeCount);
+ {
+ ArrayWrapper arr(p,"pPresentModes", obj.presentModeCount);
+ for (uint32_t i = 0; i < obj.presentModeCount; i++) {
+ if (obj.pPresentModes != nullptr) {
+ p.SetElementIndex(i);
+ if (p.Type() == OutputType::json)
+ p.PrintString(std::string("VK_") + VkPresentModeKHRString(obj.pPresentModes[i]));
+ else
+ p.PrintString(VkPresentModeKHRString(obj.pPresentModes[i]));
+ }
+ }
+ }
+}
+void DumpVkSurfacePresentScalingCapabilitiesEXT(Printer &p, std::string name, const VkSurfacePresentScalingCapabilitiesEXT &obj) {
+ ObjectWrapper object{p, name};
+ DumpVkPresentScalingFlagsEXT(p, "supportedPresentScaling", obj.supportedPresentScaling);
+ DumpVkPresentGravityFlagsEXT(p, "supportedPresentGravityX", obj.supportedPresentGravityX);
+ DumpVkPresentGravityFlagsEXT(p, "supportedPresentGravityY", obj.supportedPresentGravityY);
+ DumpVkExtent2D(p, "minScaledImageExtent", obj.minScaledImageExtent);
+ DumpVkExtent2D(p, "maxScaledImageExtent", obj.maxScaledImageExtent);
+}
void DumpVkSurfaceProtectedCapabilitiesKHR(Printer &p, std::string name, const VkSurfaceProtectedCapabilitiesKHR &obj) {
ObjectWrapper object{p, name};
p.SetMinKeyWidth(17);
@@ -2922,8 +3264,11 @@
VkPhysicalDeviceAccelerationStructurePropertiesKHR PhysicalDeviceAccelerationStructurePropertiesKHR{};
VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT PhysicalDeviceBlendOperationAdvancedPropertiesEXT{};
VkPhysicalDeviceConservativeRasterizationPropertiesEXT PhysicalDeviceConservativeRasterizationPropertiesEXT{};
+ VkPhysicalDeviceCooperativeMatrixPropertiesKHR PhysicalDeviceCooperativeMatrixPropertiesKHR{};
VkPhysicalDeviceCustomBorderColorPropertiesEXT PhysicalDeviceCustomBorderColorPropertiesEXT{};
VkPhysicalDeviceDepthStencilResolveProperties PhysicalDeviceDepthStencilResolveProperties{};
+ VkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT PhysicalDeviceDescriptorBufferDensityMapPropertiesEXT{};
+ VkPhysicalDeviceDescriptorBufferPropertiesEXT PhysicalDeviceDescriptorBufferPropertiesEXT{};
VkPhysicalDeviceDescriptorIndexingProperties PhysicalDeviceDescriptorIndexingProperties{};
VkPhysicalDeviceDiscardRectanglePropertiesEXT PhysicalDeviceDiscardRectanglePropertiesEXT{};
VkPhysicalDeviceDriverProperties PhysicalDeviceDriverProperties{};
@@ -2941,9 +3286,11 @@
VkPhysicalDeviceLineRasterizationPropertiesEXT PhysicalDeviceLineRasterizationPropertiesEXT{};
VkPhysicalDeviceMaintenance3Properties PhysicalDeviceMaintenance3Properties{};
VkPhysicalDeviceMaintenance4Properties PhysicalDeviceMaintenance4Properties{};
+ VkPhysicalDeviceMaintenance5PropertiesKHR PhysicalDeviceMaintenance5PropertiesKHR{};
VkPhysicalDeviceMeshShaderPropertiesEXT PhysicalDeviceMeshShaderPropertiesEXT{};
VkPhysicalDeviceMultiDrawPropertiesEXT PhysicalDeviceMultiDrawPropertiesEXT{};
VkPhysicalDeviceMultiviewProperties PhysicalDeviceMultiviewProperties{};
+ VkPhysicalDeviceNestedCommandBufferPropertiesEXT PhysicalDeviceNestedCommandBufferPropertiesEXT{};
VkPhysicalDeviceOpacityMicromapPropertiesEXT PhysicalDeviceOpacityMicromapPropertiesEXT{};
VkPhysicalDevicePCIBusInfoPropertiesEXT PhysicalDevicePCIBusInfoPropertiesEXT{};
VkPhysicalDevicePerformanceQueryPropertiesKHR PhysicalDevicePerformanceQueryPropertiesKHR{};
@@ -2961,6 +3308,8 @@
VkPhysicalDeviceSamplerFilterMinmaxProperties PhysicalDeviceSamplerFilterMinmaxProperties{};
VkPhysicalDeviceShaderIntegerDotProductProperties PhysicalDeviceShaderIntegerDotProductProperties{};
VkPhysicalDeviceShaderModuleIdentifierPropertiesEXT PhysicalDeviceShaderModuleIdentifierPropertiesEXT{};
+ VkPhysicalDeviceShaderObjectPropertiesEXT PhysicalDeviceShaderObjectPropertiesEXT{};
+ VkPhysicalDeviceShaderTileImagePropertiesEXT PhysicalDeviceShaderTileImagePropertiesEXT{};
VkPhysicalDeviceSubgroupProperties PhysicalDeviceSubgroupProperties{};
VkPhysicalDeviceSubgroupSizeControlProperties PhysicalDeviceSubgroupSizeControlProperties{};
VkPhysicalDeviceTexelBufferAlignmentProperties PhysicalDeviceTexelBufferAlignmentProperties{};
@@ -2974,8 +3323,11 @@
PhysicalDeviceAccelerationStructurePropertiesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_PROPERTIES_KHR;
PhysicalDeviceBlendOperationAdvancedPropertiesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_PROPERTIES_EXT;
PhysicalDeviceConservativeRasterizationPropertiesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONSERVATIVE_RASTERIZATION_PROPERTIES_EXT;
+ PhysicalDeviceCooperativeMatrixPropertiesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_PROPERTIES_KHR;
PhysicalDeviceCustomBorderColorPropertiesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_PROPERTIES_EXT;
PhysicalDeviceDepthStencilResolveProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES;
+ PhysicalDeviceDescriptorBufferDensityMapPropertiesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_DENSITY_MAP_PROPERTIES_EXT;
+ PhysicalDeviceDescriptorBufferPropertiesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_PROPERTIES_EXT;
PhysicalDeviceDescriptorIndexingProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES;
PhysicalDeviceDiscardRectanglePropertiesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT;
PhysicalDeviceDriverProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES;
@@ -2993,9 +3345,11 @@
PhysicalDeviceLineRasterizationPropertiesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_EXT;
PhysicalDeviceMaintenance3Properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES;
PhysicalDeviceMaintenance4Properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES;
+ PhysicalDeviceMaintenance5PropertiesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES_KHR;
PhysicalDeviceMeshShaderPropertiesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_PROPERTIES_EXT;
PhysicalDeviceMultiDrawPropertiesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_PROPERTIES_EXT;
PhysicalDeviceMultiviewProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES;
+ PhysicalDeviceNestedCommandBufferPropertiesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_PROPERTIES_EXT;
PhysicalDeviceOpacityMicromapPropertiesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_OPACITY_MICROMAP_PROPERTIES_EXT;
PhysicalDevicePCIBusInfoPropertiesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT;
PhysicalDevicePerformanceQueryPropertiesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_QUERY_PROPERTIES_KHR;
@@ -3013,6 +3367,8 @@
PhysicalDeviceSamplerFilterMinmaxProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES;
PhysicalDeviceShaderIntegerDotProductProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES;
PhysicalDeviceShaderModuleIdentifierPropertiesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MODULE_IDENTIFIER_PROPERTIES_EXT;
+ PhysicalDeviceShaderObjectPropertiesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_PROPERTIES_EXT;
+ PhysicalDeviceShaderTileImagePropertiesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TILE_IMAGE_PROPERTIES_EXT;
PhysicalDeviceSubgroupProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES;
PhysicalDeviceSubgroupSizeControlProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES;
PhysicalDeviceTexelBufferAlignmentProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES;
@@ -3026,8 +3382,11 @@
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceAccelerationStructurePropertiesKHR));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceBlendOperationAdvancedPropertiesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceConservativeRasterizationPropertiesEXT));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceCooperativeMatrixPropertiesKHR));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceCustomBorderColorPropertiesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceDepthStencilResolveProperties));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceDescriptorBufferDensityMapPropertiesEXT));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceDescriptorBufferPropertiesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceDescriptorIndexingProperties));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceDiscardRectanglePropertiesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceDriverProperties));
@@ -3045,9 +3404,11 @@
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceLineRasterizationPropertiesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceMaintenance3Properties));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceMaintenance4Properties));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceMaintenance5PropertiesKHR));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceMeshShaderPropertiesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceMultiDrawPropertiesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceMultiviewProperties));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceNestedCommandBufferPropertiesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceOpacityMicromapPropertiesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDevicePCIBusInfoPropertiesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDevicePerformanceQueryPropertiesKHR));
@@ -3065,6 +3426,8 @@
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceSamplerFilterMinmaxProperties));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceShaderIntegerDotProductProperties));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceShaderModuleIdentifierPropertiesEXT));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceShaderObjectPropertiesEXT));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceShaderTileImagePropertiesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceSubgroupProperties));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceSubgroupSizeControlProperties));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceTexelBufferAlignmentProperties));
@@ -3123,6 +3486,7 @@
VkPhysicalDeviceASTCDecodeFeaturesEXT PhysicalDeviceASTCDecodeFeaturesEXT{};
VkPhysicalDeviceAccelerationStructureFeaturesKHR PhysicalDeviceAccelerationStructureFeaturesKHR{};
VkPhysicalDeviceAddressBindingReportFeaturesEXT PhysicalDeviceAddressBindingReportFeaturesEXT{};
+ VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT{};
VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT{};
VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT PhysicalDeviceBlendOperationAdvancedFeaturesEXT{};
VkPhysicalDeviceBorderColorSwizzleFeaturesEXT PhysicalDeviceBorderColorSwizzleFeaturesEXT{};
@@ -3130,13 +3494,17 @@
VkPhysicalDeviceBufferDeviceAddressFeaturesEXT PhysicalDeviceBufferDeviceAddressFeaturesEXT{};
VkPhysicalDeviceColorWriteEnableFeaturesEXT PhysicalDeviceColorWriteEnableFeaturesEXT{};
VkPhysicalDeviceConditionalRenderingFeaturesEXT PhysicalDeviceConditionalRenderingFeaturesEXT{};
+ VkPhysicalDeviceCooperativeMatrixFeaturesKHR PhysicalDeviceCooperativeMatrixFeaturesKHR{};
VkPhysicalDeviceCustomBorderColorFeaturesEXT PhysicalDeviceCustomBorderColorFeaturesEXT{};
+ VkPhysicalDeviceDepthBiasControlFeaturesEXT PhysicalDeviceDepthBiasControlFeaturesEXT{};
VkPhysicalDeviceDepthClampZeroOneFeaturesEXT PhysicalDeviceDepthClampZeroOneFeaturesEXT{};
VkPhysicalDeviceDepthClipControlFeaturesEXT PhysicalDeviceDepthClipControlFeaturesEXT{};
VkPhysicalDeviceDepthClipEnableFeaturesEXT PhysicalDeviceDepthClipEnableFeaturesEXT{};
+ VkPhysicalDeviceDescriptorBufferFeaturesEXT PhysicalDeviceDescriptorBufferFeaturesEXT{};
VkPhysicalDeviceDescriptorIndexingFeatures PhysicalDeviceDescriptorIndexingFeatures{};
VkPhysicalDeviceDeviceMemoryReportFeaturesEXT PhysicalDeviceDeviceMemoryReportFeaturesEXT{};
VkPhysicalDeviceDynamicRenderingFeatures PhysicalDeviceDynamicRenderingFeatures{};
+ VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT PhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT{};
VkPhysicalDeviceExtendedDynamicState2FeaturesEXT PhysicalDeviceExtendedDynamicState2FeaturesEXT{};
VkPhysicalDeviceExtendedDynamicState3FeaturesEXT PhysicalDeviceExtendedDynamicState3FeaturesEXT{};
VkPhysicalDeviceExtendedDynamicStateFeaturesEXT PhysicalDeviceExtendedDynamicStateFeaturesEXT{};
@@ -3146,13 +3514,17 @@
VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR PhysicalDeviceFragmentShaderBarycentricFeaturesKHR{};
VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT PhysicalDeviceFragmentShaderInterlockFeaturesEXT{};
VkPhysicalDeviceFragmentShadingRateFeaturesKHR PhysicalDeviceFragmentShadingRateFeaturesKHR{};
+ VkPhysicalDeviceFrameBoundaryFeaturesEXT PhysicalDeviceFrameBoundaryFeaturesEXT{};
VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR PhysicalDeviceGlobalPriorityQueryFeaturesKHR{};
VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT{};
+ VkPhysicalDeviceHostImageCopyFeaturesEXT PhysicalDeviceHostImageCopyFeaturesEXT{};
+ char VkPhysicalDeviceHostImageCopyFeaturesEXT_padding[64];
VkPhysicalDeviceHostQueryResetFeatures PhysicalDeviceHostQueryResetFeatures{};
VkPhysicalDeviceImage2DViewOf3DFeaturesEXT PhysicalDeviceImage2DViewOf3DFeaturesEXT{};
VkPhysicalDeviceImageCompressionControlFeaturesEXT PhysicalDeviceImageCompressionControlFeaturesEXT{};
VkPhysicalDeviceImageCompressionControlSwapchainFeaturesEXT PhysicalDeviceImageCompressionControlSwapchainFeaturesEXT{};
VkPhysicalDeviceImageRobustnessFeatures PhysicalDeviceImageRobustnessFeatures{};
+ VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT PhysicalDeviceImageSlicedViewOf3DFeaturesEXT{};
VkPhysicalDeviceImageViewMinLodFeaturesEXT PhysicalDeviceImageViewMinLodFeaturesEXT{};
VkPhysicalDeviceImagelessFramebufferFeatures PhysicalDeviceImagelessFramebufferFeatures{};
VkPhysicalDeviceIndexTypeUint8FeaturesEXT PhysicalDeviceIndexTypeUint8FeaturesEXT{};
@@ -3160,18 +3532,21 @@
VkPhysicalDeviceLegacyDitheringFeaturesEXT PhysicalDeviceLegacyDitheringFeaturesEXT{};
VkPhysicalDeviceLineRasterizationFeaturesEXT PhysicalDeviceLineRasterizationFeaturesEXT{};
VkPhysicalDeviceMaintenance4Features PhysicalDeviceMaintenance4Features{};
+ VkPhysicalDeviceMaintenance5FeaturesKHR PhysicalDeviceMaintenance5FeaturesKHR{};
VkPhysicalDeviceMemoryPriorityFeaturesEXT PhysicalDeviceMemoryPriorityFeaturesEXT{};
VkPhysicalDeviceMeshShaderFeaturesEXT PhysicalDeviceMeshShaderFeaturesEXT{};
VkPhysicalDeviceMultiDrawFeaturesEXT PhysicalDeviceMultiDrawFeaturesEXT{};
VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT{};
VkPhysicalDeviceMultiviewFeatures PhysicalDeviceMultiviewFeatures{};
VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT PhysicalDeviceMutableDescriptorTypeFeaturesEXT{};
+ VkPhysicalDeviceNestedCommandBufferFeaturesEXT PhysicalDeviceNestedCommandBufferFeaturesEXT{};
VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT PhysicalDeviceNonSeamlessCubeMapFeaturesEXT{};
VkPhysicalDeviceOpacityMicromapFeaturesEXT PhysicalDeviceOpacityMicromapFeaturesEXT{};
VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT{};
VkPhysicalDevicePerformanceQueryFeaturesKHR PhysicalDevicePerformanceQueryFeaturesKHR{};
VkPhysicalDevicePipelineCreationCacheControlFeatures PhysicalDevicePipelineCreationCacheControlFeatures{};
VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR PhysicalDevicePipelineExecutablePropertiesFeaturesKHR{};
+ VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT PhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT{};
VkPhysicalDevicePipelinePropertiesFeaturesEXT PhysicalDevicePipelinePropertiesFeaturesEXT{};
VkPhysicalDevicePipelineProtectedAccessFeaturesEXT PhysicalDevicePipelineProtectedAccessFeaturesEXT{};
VkPhysicalDevicePipelineRobustnessFeaturesEXT PhysicalDevicePipelineRobustnessFeaturesEXT{};
@@ -3190,6 +3565,7 @@
VkPhysicalDeviceRayQueryFeaturesKHR PhysicalDeviceRayQueryFeaturesKHR{};
VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR PhysicalDeviceRayTracingMaintenance1FeaturesKHR{};
VkPhysicalDeviceRayTracingPipelineFeaturesKHR PhysicalDeviceRayTracingPipelineFeaturesKHR{};
+ VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR PhysicalDeviceRayTracingPositionFetchFeaturesKHR{};
VkPhysicalDeviceRobustness2FeaturesEXT PhysicalDeviceRobustness2FeaturesEXT{};
VkPhysicalDeviceSamplerYcbcrConversionFeatures PhysicalDeviceSamplerYcbcrConversionFeatures{};
VkPhysicalDeviceScalarBlockLayoutFeatures PhysicalDeviceScalarBlockLayoutFeatures{};
@@ -3203,13 +3579,16 @@
VkPhysicalDeviceShaderFloat16Int8Features PhysicalDeviceShaderFloat16Int8Features{};
VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT PhysicalDeviceShaderImageAtomicInt64FeaturesEXT{};
VkPhysicalDeviceShaderIntegerDotProductFeatures PhysicalDeviceShaderIntegerDotProductFeatures{};
- char padding[64];
+ char VkPhysicalDeviceShaderIntegerDotProductFeatures_padding[64];
VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT PhysicalDeviceShaderModuleIdentifierFeaturesEXT{};
+ VkPhysicalDeviceShaderObjectFeaturesEXT PhysicalDeviceShaderObjectFeaturesEXT{};
VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures PhysicalDeviceShaderSubgroupExtendedTypesFeatures{};
VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR PhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR{};
VkPhysicalDeviceShaderTerminateInvocationFeatures PhysicalDeviceShaderTerminateInvocationFeatures{};
+ VkPhysicalDeviceShaderTileImageFeaturesEXT PhysicalDeviceShaderTileImageFeaturesEXT{};
VkPhysicalDeviceSubgroupSizeControlFeatures PhysicalDeviceSubgroupSizeControlFeatures{};
VkPhysicalDeviceSubpassMergeFeedbackFeaturesEXT PhysicalDeviceSubpassMergeFeedbackFeaturesEXT{};
+ VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT PhysicalDeviceSwapchainMaintenance1FeaturesEXT{};
VkPhysicalDeviceSynchronization2Features PhysicalDeviceSynchronization2Features{};
VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT PhysicalDeviceTexelBufferAlignmentFeaturesEXT{};
VkPhysicalDeviceTextureCompressionASTCHDRFeatures PhysicalDeviceTextureCompressionASTCHDRFeatures{};
@@ -3234,6 +3613,7 @@
PhysicalDeviceASTCDecodeFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ASTC_DECODE_FEATURES_EXT;
PhysicalDeviceAccelerationStructureFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_FEATURES_KHR;
PhysicalDeviceAddressBindingReportFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ADDRESS_BINDING_REPORT_FEATURES_EXT;
+ PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ATTACHMENT_FEEDBACK_LOOP_DYNAMIC_STATE_FEATURES_EXT;
PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ATTACHMENT_FEEDBACK_LOOP_LAYOUT_FEATURES_EXT;
PhysicalDeviceBlendOperationAdvancedFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_FEATURES_EXT;
PhysicalDeviceBorderColorSwizzleFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT;
@@ -3241,13 +3621,17 @@
PhysicalDeviceBufferDeviceAddressFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_EXT;
PhysicalDeviceColorWriteEnableFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COLOR_WRITE_ENABLE_FEATURES_EXT;
PhysicalDeviceConditionalRenderingFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT;
+ PhysicalDeviceCooperativeMatrixFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_FEATURES_KHR;
PhysicalDeviceCustomBorderColorFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_FEATURES_EXT;
+ PhysicalDeviceDepthBiasControlFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_BIAS_CONTROL_FEATURES_EXT;
PhysicalDeviceDepthClampZeroOneFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_ZERO_ONE_FEATURES_EXT;
PhysicalDeviceDepthClipControlFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_CONTROL_FEATURES_EXT;
PhysicalDeviceDepthClipEnableFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT;
+ PhysicalDeviceDescriptorBufferFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_FEATURES_EXT;
PhysicalDeviceDescriptorIndexingFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES;
PhysicalDeviceDeviceMemoryReportFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_MEMORY_REPORT_FEATURES_EXT;
PhysicalDeviceDynamicRenderingFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES;
+ PhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_UNUSED_ATTACHMENTS_FEATURES_EXT;
PhysicalDeviceExtendedDynamicState2FeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_2_FEATURES_EXT;
PhysicalDeviceExtendedDynamicState3FeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_3_FEATURES_EXT;
PhysicalDeviceExtendedDynamicStateFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_FEATURES_EXT;
@@ -3257,13 +3641,16 @@
PhysicalDeviceFragmentShaderBarycentricFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_KHR;
PhysicalDeviceFragmentShaderInterlockFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_INTERLOCK_FEATURES_EXT;
PhysicalDeviceFragmentShadingRateFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_FEATURES_KHR;
+ PhysicalDeviceFrameBoundaryFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAME_BOUNDARY_FEATURES_EXT;
PhysicalDeviceGlobalPriorityQueryFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR;
PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GRAPHICS_PIPELINE_LIBRARY_FEATURES_EXT;
+ PhysicalDeviceHostImageCopyFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_FEATURES_EXT;
PhysicalDeviceHostQueryResetFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES;
PhysicalDeviceImage2DViewOf3DFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_2D_VIEW_OF_3D_FEATURES_EXT;
PhysicalDeviceImageCompressionControlFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_COMPRESSION_CONTROL_FEATURES_EXT;
PhysicalDeviceImageCompressionControlSwapchainFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_COMPRESSION_CONTROL_SWAPCHAIN_FEATURES_EXT;
PhysicalDeviceImageRobustnessFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES;
+ PhysicalDeviceImageSlicedViewOf3DFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_SLICED_VIEW_OF_3D_FEATURES_EXT;
PhysicalDeviceImageViewMinLodFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT;
PhysicalDeviceImagelessFramebufferFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES;
PhysicalDeviceIndexTypeUint8FeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_EXT;
@@ -3271,18 +3658,21 @@
PhysicalDeviceLegacyDitheringFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_DITHERING_FEATURES_EXT;
PhysicalDeviceLineRasterizationFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_EXT;
PhysicalDeviceMaintenance4Features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES;
+ PhysicalDeviceMaintenance5FeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES_KHR;
PhysicalDeviceMemoryPriorityFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PRIORITY_FEATURES_EXT;
PhysicalDeviceMeshShaderFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_FEATURES_EXT;
PhysicalDeviceMultiDrawFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_FEATURES_EXT;
PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_FEATURES_EXT;
PhysicalDeviceMultiviewFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES;
PhysicalDeviceMutableDescriptorTypeFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT;
+ PhysicalDeviceNestedCommandBufferFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_FEATURES_EXT;
PhysicalDeviceNonSeamlessCubeMapFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NON_SEAMLESS_CUBE_MAP_FEATURES_EXT;
PhysicalDeviceOpacityMicromapFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_OPACITY_MICROMAP_FEATURES_EXT;
PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT;
PhysicalDevicePerformanceQueryFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_QUERY_FEATURES_KHR;
PhysicalDevicePipelineCreationCacheControlFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES;
PhysicalDevicePipelineExecutablePropertiesFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_EXECUTABLE_PROPERTIES_FEATURES_KHR;
+ PhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_LIBRARY_GROUP_HANDLES_FEATURES_EXT;
PhysicalDevicePipelinePropertiesFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROPERTIES_FEATURES_EXT;
PhysicalDevicePipelineProtectedAccessFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROTECTED_ACCESS_FEATURES_EXT;
PhysicalDevicePipelineRobustnessFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_FEATURES_EXT;
@@ -3301,6 +3691,7 @@
PhysicalDeviceRayQueryFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_QUERY_FEATURES_KHR;
PhysicalDeviceRayTracingMaintenance1FeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_MAINTENANCE_1_FEATURES_KHR;
PhysicalDeviceRayTracingPipelineFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_FEATURES_KHR;
+ PhysicalDeviceRayTracingPositionFetchFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_POSITION_FETCH_FEATURES_KHR;
PhysicalDeviceRobustness2FeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT;
PhysicalDeviceSamplerYcbcrConversionFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES;
PhysicalDeviceScalarBlockLayoutFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES;
@@ -3315,11 +3706,14 @@
PhysicalDeviceShaderImageAtomicInt64FeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT;
PhysicalDeviceShaderIntegerDotProductFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES;
PhysicalDeviceShaderModuleIdentifierFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MODULE_IDENTIFIER_FEATURES_EXT;
+ PhysicalDeviceShaderObjectFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_FEATURES_EXT;
PhysicalDeviceShaderSubgroupExtendedTypesFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES;
PhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_UNIFORM_CONTROL_FLOW_FEATURES_KHR;
PhysicalDeviceShaderTerminateInvocationFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES;
+ PhysicalDeviceShaderTileImageFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TILE_IMAGE_FEATURES_EXT;
PhysicalDeviceSubgroupSizeControlFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES;
PhysicalDeviceSubpassMergeFeedbackFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBPASS_MERGE_FEEDBACK_FEATURES_EXT;
+ PhysicalDeviceSwapchainMaintenance1FeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_EXT;
PhysicalDeviceSynchronization2Features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES;
PhysicalDeviceTexelBufferAlignmentFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_FEATURES_EXT;
PhysicalDeviceTextureCompressionASTCHDRFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES;
@@ -3344,6 +3738,7 @@
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceASTCDecodeFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceAccelerationStructureFeaturesKHR));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceAddressBindingReportFeaturesEXT));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceBlendOperationAdvancedFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceBorderColorSwizzleFeaturesEXT));
@@ -3351,13 +3746,17 @@
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceBufferDeviceAddressFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceColorWriteEnableFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceConditionalRenderingFeaturesEXT));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceCooperativeMatrixFeaturesKHR));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceCustomBorderColorFeaturesEXT));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceDepthBiasControlFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceDepthClampZeroOneFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceDepthClipControlFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceDepthClipEnableFeaturesEXT));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceDescriptorBufferFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceDescriptorIndexingFeatures));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceDeviceMemoryReportFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceDynamicRenderingFeatures));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceExtendedDynamicState2FeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceExtendedDynamicState3FeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceExtendedDynamicStateFeaturesEXT));
@@ -3367,13 +3766,16 @@
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceFragmentShaderBarycentricFeaturesKHR));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceFragmentShaderInterlockFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceFragmentShadingRateFeaturesKHR));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceFrameBoundaryFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceGlobalPriorityQueryFeaturesKHR));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceHostImageCopyFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceHostQueryResetFeatures));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceImage2DViewOf3DFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceImageCompressionControlFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceImageCompressionControlSwapchainFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceImageRobustnessFeatures));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceImageSlicedViewOf3DFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceImageViewMinLodFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceImagelessFramebufferFeatures));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceIndexTypeUint8FeaturesEXT));
@@ -3381,18 +3783,21 @@
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceLegacyDitheringFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceLineRasterizationFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceMaintenance4Features));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceMaintenance5FeaturesKHR));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceMemoryPriorityFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceMeshShaderFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceMultiDrawFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceMultiviewFeatures));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceMutableDescriptorTypeFeaturesEXT));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceNestedCommandBufferFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceNonSeamlessCubeMapFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceOpacityMicromapFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDevicePerformanceQueryFeaturesKHR));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDevicePipelineCreationCacheControlFeatures));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDevicePipelineExecutablePropertiesFeaturesKHR));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDevicePipelinePropertiesFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDevicePipelineProtectedAccessFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDevicePipelineRobustnessFeaturesEXT));
@@ -3411,6 +3816,7 @@
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceRayQueryFeaturesKHR));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceRayTracingMaintenance1FeaturesKHR));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceRayTracingPipelineFeaturesKHR));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceRayTracingPositionFetchFeaturesKHR));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceRobustness2FeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceSamplerYcbcrConversionFeatures));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceScalarBlockLayoutFeatures));
@@ -3425,11 +3831,14 @@
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceShaderImageAtomicInt64FeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceShaderIntegerDotProductFeatures));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceShaderModuleIdentifierFeaturesEXT));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceShaderObjectFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceShaderSubgroupExtendedTypesFeatures));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceShaderTerminateInvocationFeatures));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceShaderTileImageFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceSubgroupSizeControlFeatures));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceSubpassMergeFeedbackFeaturesEXT));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceSwapchainMaintenance1FeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceSynchronization2Features));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceTexelBufferAlignmentFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceTextureCompressionASTCHDRFeatures));
@@ -3530,28 +3939,16 @@
queue_properties2_chain& operator=(queue_properties2_chain &&) = delete;
void* start_of_chain = nullptr;
VkQueueFamilyGlobalPriorityPropertiesKHR QueueFamilyGlobalPriorityPropertiesKHR{};
-#ifdef VK_ENABLE_BETA_EXTENSIONS
VkQueueFamilyQueryResultStatusPropertiesKHR QueueFamilyQueryResultStatusPropertiesKHR{};
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
VkQueueFamilyVideoPropertiesKHR QueueFamilyVideoPropertiesKHR{};
-#endif // VK_ENABLE_BETA_EXTENSIONS
void initialize_chain() noexcept {
QueueFamilyGlobalPriorityPropertiesKHR.sType = VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR;
-#ifdef VK_ENABLE_BETA_EXTENSIONS
QueueFamilyQueryResultStatusPropertiesKHR.sType = VK_STRUCTURE_TYPE_QUEUE_FAMILY_QUERY_RESULT_STATUS_PROPERTIES_KHR;
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
QueueFamilyVideoPropertiesKHR.sType = VK_STRUCTURE_TYPE_QUEUE_FAMILY_VIDEO_PROPERTIES_KHR;
-#endif // VK_ENABLE_BETA_EXTENSIONS
std::vector<VkBaseOutStructure*> chain_members;
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&QueueFamilyGlobalPriorityPropertiesKHR));
-#ifdef VK_ENABLE_BETA_EXTENSIONS
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&QueueFamilyQueryResultStatusPropertiesKHR));
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&QueueFamilyVideoPropertiesKHR));
-#endif // VK_ENABLE_BETA_EXTENSIONS
for(size_t i = 0; i < chain_members.size() - 1; i++){
chain_members[i]->pNext = chain_members[i + 1];
@@ -3586,6 +3983,12 @@
DumpVkPhysicalDeviceConservativeRasterizationPropertiesEXT(p, "VkPhysicalDeviceConservativeRasterizationPropertiesEXT", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_PROPERTIES_KHR &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_COOPERATIVE_MATRIX_EXTENSION_NAME))) {
+ VkPhysicalDeviceCooperativeMatrixPropertiesKHR* props = (VkPhysicalDeviceCooperativeMatrixPropertiesKHR*)structure;
+ DumpVkPhysicalDeviceCooperativeMatrixPropertiesKHR(p, "VkPhysicalDeviceCooperativeMatrixPropertiesKHR", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_PROPERTIES_EXT &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_CUSTOM_BORDER_COLOR_EXTENSION_NAME))) {
VkPhysicalDeviceCustomBorderColorPropertiesEXT* props = (VkPhysicalDeviceCustomBorderColorPropertiesEXT*)structure;
@@ -3599,6 +4002,18 @@
DumpVkPhysicalDeviceDepthStencilResolveProperties(p, gpu.api_version.minor >= 2 ?"VkPhysicalDeviceDepthStencilResolveProperties":"VkPhysicalDeviceDepthStencilResolvePropertiesKHR", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_DENSITY_MAP_PROPERTIES_EXT &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_DESCRIPTOR_BUFFER_EXTENSION_NAME))) {
+ VkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT* props = (VkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT*)structure;
+ DumpVkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT(p, "VkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT", *props);
+ p.AddNewline();
+ }
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_PROPERTIES_EXT &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_DESCRIPTOR_BUFFER_EXTENSION_NAME))) {
+ VkPhysicalDeviceDescriptorBufferPropertiesEXT* props = (VkPhysicalDeviceDescriptorBufferPropertiesEXT*)structure;
+ DumpVkPhysicalDeviceDescriptorBufferPropertiesEXT(p, "VkPhysicalDeviceDescriptorBufferPropertiesEXT", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME) ||
gpu.api_version.minor >= 2)) {
@@ -3708,6 +4123,12 @@
DumpVkPhysicalDeviceMaintenance4Properties(p, gpu.api_version.minor >= 3 ?"VkPhysicalDeviceMaintenance4Properties":"VkPhysicalDeviceMaintenance4PropertiesKHR", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES_KHR &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_MAINTENANCE_5_EXTENSION_NAME))) {
+ VkPhysicalDeviceMaintenance5PropertiesKHR* props = (VkPhysicalDeviceMaintenance5PropertiesKHR*)structure;
+ DumpVkPhysicalDeviceMaintenance5PropertiesKHR(p, "VkPhysicalDeviceMaintenance5PropertiesKHR", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_PROPERTIES_EXT &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_MESH_SHADER_EXTENSION_NAME))) {
VkPhysicalDeviceMeshShaderPropertiesEXT* props = (VkPhysicalDeviceMeshShaderPropertiesEXT*)structure;
@@ -3727,6 +4148,12 @@
DumpVkPhysicalDeviceMultiviewProperties(p, gpu.api_version.minor >= 1 ?"VkPhysicalDeviceMultiviewProperties":"VkPhysicalDeviceMultiviewPropertiesKHR", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_PROPERTIES_EXT &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_NESTED_COMMAND_BUFFER_EXTENSION_NAME))) {
+ VkPhysicalDeviceNestedCommandBufferPropertiesEXT* props = (VkPhysicalDeviceNestedCommandBufferPropertiesEXT*)structure;
+ DumpVkPhysicalDeviceNestedCommandBufferPropertiesEXT(p, "VkPhysicalDeviceNestedCommandBufferPropertiesEXT", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_OPACITY_MICROMAP_PROPERTIES_EXT &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_OPACITY_MICROMAP_EXTENSION_NAME))) {
VkPhysicalDeviceOpacityMicromapPropertiesEXT* props = (VkPhysicalDeviceOpacityMicromapPropertiesEXT*)structure;
@@ -3822,6 +4249,18 @@
DumpVkPhysicalDeviceShaderModuleIdentifierPropertiesEXT(p, "VkPhysicalDeviceShaderModuleIdentifierPropertiesEXT", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_PROPERTIES_EXT &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_SHADER_OBJECT_EXTENSION_NAME))) {
+ VkPhysicalDeviceShaderObjectPropertiesEXT* props = (VkPhysicalDeviceShaderObjectPropertiesEXT*)structure;
+ DumpVkPhysicalDeviceShaderObjectPropertiesEXT(p, "VkPhysicalDeviceShaderObjectPropertiesEXT", *props);
+ p.AddNewline();
+ }
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TILE_IMAGE_PROPERTIES_EXT &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_SHADER_TILE_IMAGE_EXTENSION_NAME))) {
+ VkPhysicalDeviceShaderTileImagePropertiesEXT* props = (VkPhysicalDeviceShaderTileImagePropertiesEXT*)structure;
+ DumpVkPhysicalDeviceShaderTileImagePropertiesEXT(p, "VkPhysicalDeviceShaderTileImagePropertiesEXT", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES &&
(gpu.api_version.minor >= 1)) {
VkPhysicalDeviceSubgroupProperties* props = (VkPhysicalDeviceSubgroupProperties*)structure;
@@ -3924,6 +4363,12 @@
DumpVkPhysicalDeviceAddressBindingReportFeaturesEXT(p, "VkPhysicalDeviceAddressBindingReportFeaturesEXT", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ATTACHMENT_FEEDBACK_LOOP_DYNAMIC_STATE_FEATURES_EXT &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_ATTACHMENT_FEEDBACK_LOOP_DYNAMIC_STATE_EXTENSION_NAME))) {
+ VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT* props = (VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT*)structure;
+ DumpVkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT(p, "VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ATTACHMENT_FEEDBACK_LOOP_LAYOUT_FEATURES_EXT &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_ATTACHMENT_FEEDBACK_LOOP_LAYOUT_EXTENSION_NAME))) {
VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT* props = (VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT*)structure;
@@ -3967,12 +4412,24 @@
DumpVkPhysicalDeviceConditionalRenderingFeaturesEXT(p, "VkPhysicalDeviceConditionalRenderingFeaturesEXT", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_FEATURES_KHR &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_COOPERATIVE_MATRIX_EXTENSION_NAME))) {
+ VkPhysicalDeviceCooperativeMatrixFeaturesKHR* props = (VkPhysicalDeviceCooperativeMatrixFeaturesKHR*)structure;
+ DumpVkPhysicalDeviceCooperativeMatrixFeaturesKHR(p, "VkPhysicalDeviceCooperativeMatrixFeaturesKHR", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_FEATURES_EXT &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_CUSTOM_BORDER_COLOR_EXTENSION_NAME))) {
VkPhysicalDeviceCustomBorderColorFeaturesEXT* props = (VkPhysicalDeviceCustomBorderColorFeaturesEXT*)structure;
DumpVkPhysicalDeviceCustomBorderColorFeaturesEXT(p, "VkPhysicalDeviceCustomBorderColorFeaturesEXT", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_BIAS_CONTROL_FEATURES_EXT &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_DEPTH_BIAS_CONTROL_EXTENSION_NAME))) {
+ VkPhysicalDeviceDepthBiasControlFeaturesEXT* props = (VkPhysicalDeviceDepthBiasControlFeaturesEXT*)structure;
+ DumpVkPhysicalDeviceDepthBiasControlFeaturesEXT(p, "VkPhysicalDeviceDepthBiasControlFeaturesEXT", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_ZERO_ONE_FEATURES_EXT &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_DEPTH_CLAMP_ZERO_ONE_EXTENSION_NAME))) {
VkPhysicalDeviceDepthClampZeroOneFeaturesEXT* props = (VkPhysicalDeviceDepthClampZeroOneFeaturesEXT*)structure;
@@ -3991,6 +4448,12 @@
DumpVkPhysicalDeviceDepthClipEnableFeaturesEXT(p, "VkPhysicalDeviceDepthClipEnableFeaturesEXT", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_FEATURES_EXT &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_DESCRIPTOR_BUFFER_EXTENSION_NAME))) {
+ VkPhysicalDeviceDescriptorBufferFeaturesEXT* props = (VkPhysicalDeviceDescriptorBufferFeaturesEXT*)structure;
+ DumpVkPhysicalDeviceDescriptorBufferFeaturesEXT(p, "VkPhysicalDeviceDescriptorBufferFeaturesEXT", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME) ||
gpu.api_version.minor >= 2)) {
@@ -4011,6 +4474,12 @@
DumpVkPhysicalDeviceDynamicRenderingFeatures(p, gpu.api_version.minor >= 3 ?"VkPhysicalDeviceDynamicRenderingFeatures":"VkPhysicalDeviceDynamicRenderingFeaturesKHR", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_UNUSED_ATTACHMENTS_FEATURES_EXT &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_DYNAMIC_RENDERING_UNUSED_ATTACHMENTS_EXTENSION_NAME))) {
+ VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT* props = (VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT*)structure;
+ DumpVkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT(p, "VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_2_FEATURES_EXT &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME))) {
VkPhysicalDeviceExtendedDynamicState2FeaturesEXT* props = (VkPhysicalDeviceExtendedDynamicState2FeaturesEXT*)structure;
@@ -4065,6 +4534,12 @@
DumpVkPhysicalDeviceFragmentShadingRateFeaturesKHR(p, "VkPhysicalDeviceFragmentShadingRateFeaturesKHR", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAME_BOUNDARY_FEATURES_EXT &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_FRAME_BOUNDARY_EXTENSION_NAME))) {
+ VkPhysicalDeviceFrameBoundaryFeaturesEXT* props = (VkPhysicalDeviceFrameBoundaryFeaturesEXT*)structure;
+ DumpVkPhysicalDeviceFrameBoundaryFeaturesEXT(p, "VkPhysicalDeviceFrameBoundaryFeaturesEXT", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_GLOBAL_PRIORITY_EXTENSION_NAME) || gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_GLOBAL_PRIORITY_QUERY_EXTENSION_NAME))) {
VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR* props = (VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR*)structure;
@@ -4077,6 +4552,12 @@
DumpVkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT(p, "VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_FEATURES_EXT &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_HOST_IMAGE_COPY_EXTENSION_NAME))) {
+ VkPhysicalDeviceHostImageCopyFeaturesEXT* props = (VkPhysicalDeviceHostImageCopyFeaturesEXT*)structure;
+ DumpVkPhysicalDeviceHostImageCopyFeaturesEXT(p, "VkPhysicalDeviceHostImageCopyFeaturesEXT", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_HOST_QUERY_RESET_EXTENSION_NAME) ||
gpu.api_version.minor >= 2)) {
@@ -4109,6 +4590,12 @@
DumpVkPhysicalDeviceImageRobustnessFeatures(p, gpu.api_version.minor >= 3 ?"VkPhysicalDeviceImageRobustnessFeatures":"VkPhysicalDeviceImageRobustnessFeaturesEXT", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_SLICED_VIEW_OF_3D_FEATURES_EXT &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_IMAGE_SLICED_VIEW_OF_3D_EXTENSION_NAME))) {
+ VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT* props = (VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT*)structure;
+ DumpVkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT(p, "VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_IMAGE_VIEW_MIN_LOD_EXTENSION_NAME))) {
VkPhysicalDeviceImageViewMinLodFeaturesEXT* props = (VkPhysicalDeviceImageViewMinLodFeaturesEXT*)structure;
@@ -4154,6 +4641,12 @@
DumpVkPhysicalDeviceMaintenance4Features(p, gpu.api_version.minor >= 3 ?"VkPhysicalDeviceMaintenance4Features":"VkPhysicalDeviceMaintenance4FeaturesKHR", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES_KHR &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_MAINTENANCE_5_EXTENSION_NAME))) {
+ VkPhysicalDeviceMaintenance5FeaturesKHR* props = (VkPhysicalDeviceMaintenance5FeaturesKHR*)structure;
+ DumpVkPhysicalDeviceMaintenance5FeaturesKHR(p, "VkPhysicalDeviceMaintenance5FeaturesKHR", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PRIORITY_FEATURES_EXT &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_MEMORY_PRIORITY_EXTENSION_NAME))) {
VkPhysicalDeviceMemoryPriorityFeaturesEXT* props = (VkPhysicalDeviceMemoryPriorityFeaturesEXT*)structure;
@@ -4191,6 +4684,12 @@
DumpVkPhysicalDeviceMutableDescriptorTypeFeaturesEXT(p, "VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_FEATURES_EXT &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_NESTED_COMMAND_BUFFER_EXTENSION_NAME))) {
+ VkPhysicalDeviceNestedCommandBufferFeaturesEXT* props = (VkPhysicalDeviceNestedCommandBufferFeaturesEXT*)structure;
+ DumpVkPhysicalDeviceNestedCommandBufferFeaturesEXT(p, "VkPhysicalDeviceNestedCommandBufferFeaturesEXT", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NON_SEAMLESS_CUBE_MAP_FEATURES_EXT &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_NON_SEAMLESS_CUBE_MAP_EXTENSION_NAME))) {
VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT* props = (VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT*)structure;
@@ -4228,6 +4727,12 @@
DumpVkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR(p, "VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_LIBRARY_GROUP_HANDLES_FEATURES_EXT &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_PIPELINE_LIBRARY_GROUP_HANDLES_EXTENSION_NAME))) {
+ VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT* props = (VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT*)structure;
+ DumpVkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT(p, "VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROPERTIES_FEATURES_EXT &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_PIPELINE_PROPERTIES_EXTENSION_NAME))) {
VkPhysicalDevicePipelinePropertiesFeaturesEXT* props = (VkPhysicalDevicePipelinePropertiesFeaturesEXT*)structure;
@@ -4327,6 +4832,12 @@
DumpVkPhysicalDeviceRayTracingPipelineFeaturesKHR(p, "VkPhysicalDeviceRayTracingPipelineFeaturesKHR", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_POSITION_FETCH_FEATURES_KHR &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_RAY_TRACING_POSITION_FETCH_EXTENSION_NAME))) {
+ VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR* props = (VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR*)structure;
+ DumpVkPhysicalDeviceRayTracingPositionFetchFeaturesKHR(p, "VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_ROBUSTNESS_2_EXTENSION_NAME))) {
VkPhysicalDeviceRobustness2FeaturesEXT* props = (VkPhysicalDeviceRobustness2FeaturesEXT*)structure;
@@ -4418,6 +4929,12 @@
DumpVkPhysicalDeviceShaderModuleIdentifierFeaturesEXT(p, "VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_FEATURES_EXT &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_SHADER_OBJECT_EXTENSION_NAME))) {
+ VkPhysicalDeviceShaderObjectFeaturesEXT* props = (VkPhysicalDeviceShaderObjectFeaturesEXT*)structure;
+ DumpVkPhysicalDeviceShaderObjectFeaturesEXT(p, "VkPhysicalDeviceShaderObjectFeaturesEXT", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_SHADER_SUBGROUP_EXTENDED_TYPES_EXTENSION_NAME) ||
gpu.api_version.minor >= 2)) {
@@ -4438,6 +4955,12 @@
DumpVkPhysicalDeviceShaderTerminateInvocationFeatures(p, gpu.api_version.minor >= 3 ?"VkPhysicalDeviceShaderTerminateInvocationFeatures":"VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TILE_IMAGE_FEATURES_EXT &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_SHADER_TILE_IMAGE_EXTENSION_NAME))) {
+ VkPhysicalDeviceShaderTileImageFeaturesEXT* props = (VkPhysicalDeviceShaderTileImageFeaturesEXT*)structure;
+ DumpVkPhysicalDeviceShaderTileImageFeaturesEXT(p, "VkPhysicalDeviceShaderTileImageFeaturesEXT", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_SUBGROUP_SIZE_CONTROL_EXTENSION_NAME) ||
gpu.api_version.minor >= 3)) {
@@ -4451,6 +4974,12 @@
DumpVkPhysicalDeviceSubpassMergeFeedbackFeaturesEXT(p, "VkPhysicalDeviceSubpassMergeFeedbackFeaturesEXT", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_EXT &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_SWAPCHAIN_MAINTENANCE_1_EXTENSION_NAME))) {
+ VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT* props = (VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT*)structure;
+ DumpVkPhysicalDeviceSwapchainMaintenance1FeaturesEXT(p, "VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME) ||
gpu.api_version.minor >= 3)) {
@@ -4620,22 +5149,18 @@
DumpVkQueueFamilyGlobalPriorityPropertiesKHR(p, "VkQueueFamilyGlobalPriorityPropertiesKHR", *props);
p.AddNewline();
}
-#ifdef VK_ENABLE_BETA_EXTENSIONS
if (structure->sType == VK_STRUCTURE_TYPE_QUEUE_FAMILY_QUERY_RESULT_STATUS_PROPERTIES_KHR &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_VIDEO_QUEUE_EXTENSION_NAME))) {
VkQueueFamilyQueryResultStatusPropertiesKHR* props = (VkQueueFamilyQueryResultStatusPropertiesKHR*)structure;
DumpVkQueueFamilyQueryResultStatusPropertiesKHR(p, "VkQueueFamilyQueryResultStatusPropertiesKHR", *props);
p.AddNewline();
}
-#endif // VK_ENABLE_BETA_EXTENSIONS
-#ifdef VK_ENABLE_BETA_EXTENSIONS
if (structure->sType == VK_STRUCTURE_TYPE_QUEUE_FAMILY_VIDEO_PROPERTIES_KHR &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_VIDEO_QUEUE_EXTENSION_NAME))) {
VkQueueFamilyVideoPropertiesKHR* props = (VkQueueFamilyVideoPropertiesKHR*)structure;
DumpVkQueueFamilyVideoPropertiesKHR(p, "VkQueueFamilyVideoPropertiesKHR", *props);
p.AddNewline();
}
-#endif // VK_ENABLE_BETA_EXTENSIONS
place = structure->pNext;
}
}
diff --git a/vulkaninfo/json_validation_process.md b/vulkaninfo/json_validation_process.md
index a469533..32df4f6 100644
--- a/vulkaninfo/json_validation_process.md
+++ b/vulkaninfo/json_validation_process.md
@@ -1,4 +1,4 @@
-# Validating [vulkaninfo](https://github.com/KhronosGroup/Vulkan-Tools/tree/master/vulkaninfo) JSON output
+# Validating [vulkaninfo](https://github.com/KhronosGroup/Vulkan-Tools/tree/main/vulkaninfo) JSON output
The format of vulkaninfo's JSON output is designed to be used as input for the
[Vulkan Profiles](https://github.com/KhronosGroup/Vulkan-Profiles)
diff --git a/vulkaninfo/macOS/Info.plist b/vulkaninfo/macOS/Info.plist
deleted file mode 100644
index cc7b234..0000000
--- a/vulkaninfo/macOS/Info.plist
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>vulkaninfo.sh</string>
- <key>CFBundleGetInfoString</key>
- <string>VulkanInfo</string>
- <key>CFBundleIconFile</key>
- <string>VulkanIcon.icns</string>
- <key>CFBundleIdentifier</key>
- <string>com.lunarg.vulkaninfo</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleLongVersionString</key>
- <string>1.0</string>
- <key>CFBundleName</key>
- <string>VulkanInfo</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
- <string>1.0</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>1.0</string>
- <key>CSResourcesFileMapped</key>
- <true/>
- <key>NSHumanReadableCopyright</key>
- <string>Copyright (c) 2018 The Khronos Group Inc. LunarG Inc. All rights reserved.</string>
-</dict>
-</plist>
diff --git a/vulkaninfo/macOS/Resources/VulkanIcon.icns b/vulkaninfo/macOS/Resources/VulkanIcon.icns
deleted file mode 100644
index fb82fb7..0000000
--- a/vulkaninfo/macOS/Resources/VulkanIcon.icns
+++ /dev/null
Binary files differ
diff --git a/vulkaninfo/macOS/vulkaninfo.cmake b/vulkaninfo/macOS/vulkaninfo.cmake
deleted file mode 100644
index 9614530..0000000
--- a/vulkaninfo/macOS/vulkaninfo.cmake
+++ /dev/null
@@ -1,73 +0,0 @@
-# ~~~
-# Copyright (c) 2018-2019 Valve Corporation
-# Copyright (c) 2018-2019 LunarG, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ~~~
-
-# Vulkaninfo Application Bundle
-
-# We already have a "vulkaninfo" target, so create a new target with a different name and use the OUTPUT_NAME property to rename the
-# target to the desired name. The standalone binary is called "vulkaninfo" and the bundle is called "vulkaninfo.app". Note that the
-# executable is a script that launches Terminal to see the output.
-add_executable(vulkaninfo-bundle
- MACOSX_BUNDLE
- vulkaninfo.cpp
- ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json
- ${CMAKE_CURRENT_SOURCE_DIR}/macOS/vulkaninfo.sh
- ${CMAKE_CURRENT_SOURCE_DIR}/macOS/Resources/VulkanIcon.icns
- ${CMAKE_CURRENT_SOURCE_DIR}/macOS/vulkaninfo/metal_view.mm
- ${CMAKE_CURRENT_SOURCE_DIR}/macOS/vulkaninfo/metal_view.h)
-set_target_properties(vulkaninfo-bundle
- PROPERTIES OUTPUT_NAME
- vulkaninfo
- MACOSX_BUNDLE_INFO_PLIST
- ${CMAKE_CURRENT_SOURCE_DIR}/macOS/Info.plist)
-# We do this so vulkaninfo is linked to an individual library and NOT a framework.
-target_link_libraries(vulkaninfo-bundle ${Vulkan_LIBRARY} "-framework AppKit -framework QuartzCore")
-target_include_directories(vulkaninfo-bundle PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/macOS/vulkaninfo ${CMAKE_CURRENT_SOURCE_DIR}/generated ${CMAKE_BINARY_DIR}/vulkaninfo ${VulkanHeaders_INCLUDE_DIR})
-add_dependencies(vulkaninfo-bundle MoltenVK_icd-staging-json)
-
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/macOS/vulkaninfo.sh PROPERTIES MACOSX_PACKAGE_LOCATION "MacOS")
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/macOS/Resources/VulkanIcon.icns
- PROPERTIES
- MACOSX_PACKAGE_LOCATION
- "Resources")
-set_source_files_properties(${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json
- PROPERTIES
- MACOSX_PACKAGE_LOCATION
- "Resources/vulkan/icd.d")
-
-# Xcode projects need some extra help with what would be install steps.
-if(${CMAKE_GENERATOR} MATCHES "^Xcode.*")
- add_custom_command(TARGET vulkaninfo-bundle POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib"
- ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vulkaninfo.app/Contents/Frameworks/libMoltenVK.dylib
- DEPENDS vulkan)
-else()
- add_custom_command(TARGET vulkaninfo-bundle POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib"
- ${CMAKE_CURRENT_BINARY_DIR}/vulkaninfo.app/Contents/Frameworks/libMoltenVK.dylib
- DEPENDS vulkan)
-endif()
-
-# Keep RPATH so fixup_bundle can use it to find libraries
-set_target_properties(vulkaninfo-bundle PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
-install(TARGETS vulkaninfo-bundle BUNDLE DESTINATION "vulkaninfo")
-# Fix up the library search path in the executable to find (loader) libraries in the bundle. When fixup_bundle() is passed a bundle
-# in the first argument, it looks at the Info.plist file to determine the BundleExecutable. In this case, the executable is a
-# script, which can't be fixed up. Instead pass it the explicit name of the executable.
-install(CODE "
- include(BundleUtilities)
- fixup_bundle(\${CMAKE_INSTALL_PREFIX}/vulkaninfo/vulkaninfo.app/Contents/MacOS/vulkaninfo \"\" \"${Vulkan_LIBRARY_DIR}\")
- ")
diff --git a/vulkaninfo/macOS/vulkaninfo.sh b/vulkaninfo/macOS/vulkaninfo.sh
deleted file mode 100755
index 0ee910e..0000000
--- a/vulkaninfo/macOS/vulkaninfo.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-BASEDIR=`dirname $0`
-
-if [ -d /System/Applications/Utilities/Terminal.app ]
-then
- open /System/Applications/Utilities/Terminal.app $BASEDIR/vulkaninfo
-else
- open /Applications/Utilities/Terminal.app $BASEDIR/vulkaninfo
-fi
-
diff --git a/vulkaninfo/outputprinter.h b/vulkaninfo/outputprinter.h
index e176780..35a60c5 100644
--- a/vulkaninfo/outputprinter.h
+++ b/vulkaninfo/outputprinter.h
@@ -32,7 +32,7 @@
std::string insert_quotes(std::string s) { return "\"" + s + "\""; }
-std::string to_string_16(const uint8_t uid[16]) {
+std::string to_string(const std::array<uint8_t, 16> &uid) {
std::stringstream ss;
ss << std::hex << std::setfill('0');
for (int i = 0; i < 16; ++i) {
@@ -41,8 +41,7 @@
}
return ss.str();
}
-
-std::string to_string_8(const uint8_t uid[8]) {
+std::string to_string(const std::array<uint8_t, 8> &uid) {
std::stringstream ss;
ss << std::hex << std::setfill('0');
for (int i = 0; i < 8; ++i) {
@@ -52,20 +51,9 @@
return ss.str();
}
-std::string VkVersionString(uint32_t version) {
- uint32_t major = version >> 22;
- uint32_t minor = (version >> 12) & 0x3ff;
- uint32_t patch = version & 0xfff;
- return std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(patch);
-}
-
-std::string VkVersionString(VulkanVersion v) {
- return std::to_string(v.major) + "." + std::to_string(v.minor) + "." + std::to_string(v.patch);
-}
-
-std::string VkConformanceVersionString(const VkConformanceVersion &c) {
- return std::to_string(c.major) + "." + std::to_string(c.minor) + "." + std::to_string(c.subminor) + "." +
- std::to_string(c.patch);
+std::ostream &operator<<(std::ostream &out, const VkConformanceVersion &v) {
+ return out << static_cast<unsigned>(v.major) << "." << static_cast<unsigned>(v.minor) << "."
+ << static_cast<unsigned>(v.subminor) << "." << static_cast<unsigned>(v.patch);
}
enum class OutputType { text, html, json, vkconfig_output };
@@ -89,7 +77,7 @@
out << "==========\n";
out << "VULKANINFO\n";
out << "==========\n\n";
- out << "Vulkan Instance Version: " << VkVersionString(vulkan_version) << "\n\n\n";
+ out << "Vulkan Instance Version: " << VulkanVersion(vulkan_version) << "\n\n\n";
break;
case (OutputType::html):
@@ -181,7 +169,7 @@
out << "\t\t\t<h1>vulkaninfo</h1>\n";
out << "\t\t</div>\n";
out << "\t\t<div id='wrapper'>\n";
- out << "\t\t\t<details><summary>Vulkan Instance Version: <span class='val'>" << VkVersionString(vulkan_version)
+ out << "\t\t\t<details><summary>Vulkan Instance Version: <span class='val'>" << VulkanVersion(vulkan_version)
<< "</span></summary></details>\n\t\t\t<br />\n";
node.indents = 3;
break;
@@ -294,11 +282,19 @@
get_top().element_index = index;
return *this;
}
+ Printer &SetValueDescription(std::string str) {
+ value_description = str;
+ return *this;
+ }
void ObjectStart(std::string object_name, int32_t count_subobjects = -1) {
switch (output_type) {
case (OutputType::text): {
out << std::string(static_cast<size_t>(get_top().indents), '\t') << object_name;
+ if (!value_description.empty()) {
+ out << " (" << value_description << ")";
+ value_description = {};
+ }
if (get_top().element_index != -1) {
out << "[" << get_top().element_index << "]";
}
@@ -333,6 +329,10 @@
} else {
out << object_name;
}
+ if (!value_description.empty()) {
+ out << " (" << value_description << ")";
+ value_description = {};
+ }
if (get_top().element_index != -1) {
out << "[<span class='val'>" << get_top().element_index << "</span>]";
get_top().element_index = -1;
@@ -356,6 +356,9 @@
} else {
out << "\"" << object_name << "\": {\n";
}
+ if (!value_description.empty()) {
+ value_description = {};
+ }
break;
case (OutputType::vkconfig_output):
if (!get_top().is_first_item) {
@@ -371,6 +374,9 @@
} else {
out << "\"" << object_name << "\": {\n";
}
+ if (!value_description.empty()) {
+ value_description = {};
+ }
break;
default:
break;
@@ -462,7 +468,7 @@
// For printing key-value pairs.
// value_description is for reference information and is displayed inside parenthesis after the value
template <typename T>
- void PrintKeyValue(std::string key, T value, std::string value_description = "") {
+ void PrintKeyValue(std::string key, T value) {
switch (output_type) {
case (OutputType::text):
out << std::string(static_cast<size_t>(get_top().indents), '\t') << key;
@@ -472,6 +478,7 @@
out << " = " << value;
if (value_description != "") {
out << " (" << value_description << ")";
+ value_description = {};
}
out << "\n";
break;
@@ -486,19 +493,13 @@
} else {
out << " = <span class='val'>" << value << "</span>";
}
- if (value_description != "") {
+ if (!value_description.empty()) {
out << " (<span class='val'>" << value_description << "</span>)";
+ value_description = {};
}
out << "</summary></details>\n";
break;
case (OutputType::json):
- if (!get_top().is_first_item) {
- out << ",\n";
- } else {
- get_top().is_first_item = false;
- }
- out << std::string(static_cast<size_t>(get_top().indents), '\t') << "\"" << key << "\": " << value;
- break;
case (OutputType::vkconfig_output):
if (!get_top().is_first_item) {
out << ",\n";
@@ -506,8 +507,9 @@
get_top().is_first_item = false;
}
out << std::string(static_cast<size_t>(get_top().indents), '\t') << "\"" << key << "\": ";
- if (value_description != "") {
+ if (!value_description.empty()) {
out << "\"" << value << " (" << value_description << ")\"";
+ value_description = {};
} else {
out << value;
}
@@ -516,16 +518,42 @@
}
}
+ // Need a specialization to handle C style arrays since they are implicitly converted to pointers
+ template <size_t N>
+ void PrintKeyValue(std::string key, const uint8_t (&values)[N]) {
+ switch (output_type) {
+ case (OutputType::json): {
+ ArrayStart(key, N);
+ for (uint32_t i = 0; i < N; i++) {
+ PrintElement(static_cast<uint32_t>(values[i]));
+ }
+ ArrayEnd();
+ break;
+ }
+ default: {
+ std::array<uint8_t, N> arr{};
+ std::copy(std::begin(values), std::end(values), std::begin(arr));
+ PrintKeyString(key, to_string(arr));
+ break;
+ }
+ }
+ }
+
// For printing key - string pairs (necessary because of json)
- void PrintKeyString(std::string key, std::string value, std::string value_description = "") {
+ void PrintKeyString(std::string key, std::string value) {
switch (output_type) {
case (OutputType::text):
case (OutputType::html):
- PrintKeyValue(key, value, value_description);
+ PrintKeyValue(key, value);
break;
case (OutputType::json):
case (OutputType::vkconfig_output):
- PrintKeyValue(key, std::string("\"") + value + "\"", value_description);
+ if (!value_description.empty()) {
+ // PrintKeyValue adds the necessary quotes when printing with a value description set
+ PrintKeyValue(key, EscapeJSONCString(value));
+ } else {
+ PrintKeyValue(key, std::string("\"") + EscapeJSONCString(value) + "\"");
+ }
break;
default:
break;
@@ -533,20 +561,14 @@
}
// For printing key - string pairs (necessary because of json)
- void PrintKeyBool(std::string key, bool value, std::string value_description = "") {
- PrintKeyValue(key, value ? "true" : "false", value_description);
- }
+ void PrintKeyBool(std::string key, bool value) { PrintKeyValue(key, value ? "true" : "false"); }
// print inside array
template <typename T>
- void PrintElement(T element, std::string value_description = "") {
+ void PrintElement(T element) {
switch (output_type) {
case (OutputType::text):
- out << std::string(static_cast<size_t>(get_top().indents), '\t') << element;
- if (value_description != "") {
- out << " (" << value_description << ")";
- }
- out << "\n";
+ out << std::string(static_cast<size_t>(get_top().indents), '\t') << element << "\n";
break;
case (OutputType::html):
out << std::string(static_cast<size_t>(get_top().indents), '\t') << "<details><summary>";
@@ -556,9 +578,6 @@
} else {
out << "<span class='val'>" << element << "</span>";
}
- if (value_description != "") {
- out << " (<span class='val'>" << value_description << "</span>)";
- }
out << "</summary></details>\n";
break;
case (OutputType::json):
@@ -574,15 +593,15 @@
break;
}
}
- void PrintString(std::string string, std::string value_description = "") {
+ void PrintString(std::string string) {
switch (output_type) {
case (OutputType::text):
case (OutputType::html):
- PrintElement(string, value_description);
+ PrintElement(string);
break;
case (OutputType::json):
case (OutputType::vkconfig_output):
- PrintElement("\"" + string + "\"", value_description);
+ PrintElement("\"" + EscapeJSONCString(string) + "\"");
default:
break;
}
@@ -687,6 +706,10 @@
// Helper to get the current top of the object_stack
StackNode &get_top() { return object_stack.top(); }
+ // Optional 'description' for values
+ // Must be set right before the Print() function is called
+ std::string value_description;
+
// can only be called after a node was manually pushed onto the stack in the constructor
void push_node(bool array) {
StackNode node{};
@@ -709,6 +732,46 @@
get_top().set_next_subheader = false;
}
}
+
+ // Replace special characters in strings with their escaped versions.
+ // <https://www.json.org/json-en.html>
+ std::string EscapeJSONCString(std::string string) {
+ if (output_type == OutputType::text || output_type == OutputType::html) return string;
+ std::string out{};
+ for (size_t i = 0; i < string.size(); i++) {
+ char c = string[i];
+ char out_c = c;
+ switch (c) {
+ case '\"':
+ case '\\':
+ out.push_back('\\');
+ break;
+ case '\b':
+ out.push_back('\\');
+ out_c = 'b';
+ break;
+ case '\f':
+ out.push_back('\\');
+ out_c = 'f';
+ break;
+ case '\n':
+ out.push_back('\\');
+ out_c = 'n';
+ break;
+ case '\r':
+ out.push_back('\\');
+ out_c = 'r';
+ break;
+ case '\t':
+ out.push_back('\\');
+ out_c = 't';
+ break;
+ }
+ out.push_back(out_c);
+ }
+
+ return out;
+ }
};
// Purpose: When a Printer starts an object or array it will automatically indent the output. This isn't
// always desired, requiring a manual decrease of indention. This wrapper facilitates that while also
diff --git a/vulkaninfo/vulkaninfo.cpp b/vulkaninfo/vulkaninfo.cpp
index 8574b17..e8e4241 100644
--- a/vulkaninfo/vulkaninfo.cpp
+++ b/vulkaninfo/vulkaninfo.cpp
@@ -69,7 +69,7 @@
IndentWrapper indent(p);
for (auto &layer : layers) {
- auto v_str = VkVersionString(layer.layer_properties.specVersion);
+ std::string v_str = VulkanVersion(layer.layer_properties.specVersion);
auto props = layer.layer_properties;
std::string header = p.DecorateAsType(props.layerName) + " (" + props.description + ") Vulkan version " +
@@ -80,7 +80,7 @@
ArrayWrapper arr_devices(p, "Devices", gpus.size());
for (auto &gpu : gpus) {
- p.PrintKeyValue("GPU id", gpu->id, gpu->props.deviceName);
+ p.SetValueDescription(std::string(gpu->props.deviceName)).PrintKeyValue("GPU id", gpu->id);
auto exts = gpu->inst.AppGetPhysicalDeviceLayerExtensions(gpu->phys_device, props.layerName);
DumpExtensions(p, "Layer-Device Extensions", exts);
p.AddNewline();
@@ -99,14 +99,14 @@
ObjectWrapper obj_name(p, layer.layer_properties.layerName);
p.SetMinKeyWidth(21);
p.PrintKeyString("layerName", layer.layer_properties.layerName);
- p.PrintKeyString("version", VkVersionString(layer.layer_properties.specVersion));
+ p.PrintKeyString("version", VulkanVersion(layer.layer_properties.specVersion).str());
p.PrintKeyValue("implementation version", layer.layer_properties.implementationVersion);
p.PrintKeyString("description", layer.layer_properties.description);
DumpExtensions(p, "Layer Extensions", layer.extension_properties);
ObjectWrapper obj_devices(p, "Devices");
for (auto &gpu : gpus) {
ObjectWrapper obj_gpu(p, gpu->props.deviceName);
- p.PrintKeyValue("GPU id", gpu->id, gpu->props.deviceName);
+ p.SetValueDescription(std::string(gpu->props.deviceName)).PrintKeyValue("GPU id", gpu->id);
auto exts = gpu->inst.AppGetPhysicalDeviceLayerExtensions(gpu->phys_device, layer.layer_properties.layerName);
DumpExtensions(p, "Layer-Device Extensions", exts);
}
@@ -155,6 +155,50 @@
if (inst.CheckExtensionEnabled(VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME)) {
chain_iterator_surface_capabilities2(p, inst, gpu, surface.surface_capabilities2_khr.pNext);
}
+ if (inst.CheckExtensionEnabled(VK_EXT_SURFACE_MAINTENANCE_1_EXTENSION_NAME)) {
+ p.SetSubHeader();
+ ObjectWrapper obj(p, "VK_EXT_surface_maintenance_1");
+ for (auto &mode : surface.surf_present_modes) {
+ VkSurfacePresentModeEXT present_mode{};
+ present_mode.sType = VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_EXT;
+ present_mode.presentMode = mode;
+
+ VkPhysicalDeviceSurfaceInfo2KHR surface_info{};
+ surface_info.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR;
+ surface_info.surface = surface.surface_extension.surface;
+ surface_info.pNext = &present_mode;
+
+ VkSurfacePresentModeCompatibilityEXT SurfacePresentModeCompatibilityEXT{};
+ SurfacePresentModeCompatibilityEXT.sType = VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_EXT;
+
+ VkSurfacePresentScalingCapabilitiesEXT SurfacePresentScalingCapabilitiesEXT{};
+ SurfacePresentScalingCapabilitiesEXT.sType = VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_EXT;
+ SurfacePresentScalingCapabilitiesEXT.pNext = &SurfacePresentModeCompatibilityEXT;
+
+ VkSurfaceCapabilities2KHR surface_caps2{};
+ surface_caps2.sType = VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_KHR;
+ surface_caps2.pNext = &SurfacePresentScalingCapabilitiesEXT;
+
+ VkResult err =
+ inst.ext_funcs.vkGetPhysicalDeviceSurfaceCapabilities2KHR(gpu.phys_device, &surface_info, &surface_caps2);
+ if (err != VK_SUCCESS) {
+ continue;
+ }
+
+ std::vector<VkPresentModeKHR> compatible_present_modes{SurfacePresentModeCompatibilityEXT.presentModeCount};
+ SurfacePresentModeCompatibilityEXT.pPresentModes = compatible_present_modes.data();
+
+ err = inst.ext_funcs.vkGetPhysicalDeviceSurfaceCapabilities2KHR(gpu.phys_device, &surface_info, &surface_caps2);
+
+ if (err == VK_SUCCESS) {
+ ObjectWrapper present_mode_obj(p, VkPresentModeKHRString(mode));
+ DumpVkSurfacePresentScalingCapabilitiesEXT(p, "VkSurfacePresentScalingCapabilitiesEXT",
+ SurfacePresentScalingCapabilitiesEXT);
+ DumpVkSurfacePresentModeCompatibilityEXT(p, "VkSurfacePresentModeCompatibilityEXT",
+ SurfacePresentModeCompatibilityEXT);
+ }
+ }
+ }
}
void DumpSurface(Printer &p, AppInstance &inst, AppGpu &gpu, AppSurface &surface, std::set<std::string> surface_types) {
@@ -289,19 +333,41 @@
}
}
+void GetAndDumpHostImageCopyPropertiesEXT(Printer &p, AppGpu &gpu) {
+ // Manually implement VkPhysicalDeviceHostImageCopyPropertiesEXT due to it needing to be called twice
+ VkPhysicalDeviceHostImageCopyPropertiesEXT host_image_copy_properties_ext{};
+ host_image_copy_properties_ext.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_PROPERTIES_EXT;
+ VkPhysicalDeviceProperties2KHR props2{};
+ props2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR;
+ props2.pNext = static_cast<void *>(&host_image_copy_properties_ext);
+ gpu.inst.ext_funcs.vkGetPhysicalDeviceProperties2KHR(gpu.phys_device, &props2);
+ std::vector<VkImageLayout> src_layouts(host_image_copy_properties_ext.copySrcLayoutCount);
+ host_image_copy_properties_ext.pCopySrcLayouts = src_layouts.data();
+ std::vector<VkImageLayout> dst_layouts(host_image_copy_properties_ext.copyDstLayoutCount);
+ host_image_copy_properties_ext.pCopyDstLayouts = dst_layouts.data();
+ gpu.inst.ext_funcs.vkGetPhysicalDeviceProperties2KHR(gpu.phys_device, &props2);
+ DumpVkPhysicalDeviceHostImageCopyPropertiesEXT(p, "VkPhysicalDeviceHostImageCopyPropertiesEXT", host_image_copy_properties_ext);
+}
+
void GpuDumpProps(Printer &p, AppGpu &gpu) {
auto props = gpu.GetDeviceProperties();
p.SetSubHeader();
{
ObjectWrapper obj(p, "VkPhysicalDeviceProperties");
p.SetMinKeyWidth(17);
- p.PrintKeyValue("apiVersion", props.apiVersion, VkVersionString(props.apiVersion));
- p.PrintKeyValue("driverVersion", props.driverVersion, to_hex_str(props.driverVersion));
+ if (p.Type() == OutputType::json) {
+ p.PrintKeyValue("apiVersion", props.apiVersion);
+ p.PrintKeyValue("driverVersion", props.driverVersion);
+ } else {
+ p.SetValueDescription(std::to_string(props.apiVersion)).PrintKeyString("apiVersion", VulkanVersion(props.apiVersion));
+ p.SetValueDescription(std::to_string(props.driverVersion))
+ .PrintKeyString("driverVersion", gpu.GetDriverVersionString());
+ }
p.PrintKeyString("vendorID", to_hex_str(props.vendorID));
p.PrintKeyString("deviceID", to_hex_str(props.deviceID));
p.PrintKeyString("deviceType", VkPhysicalDeviceTypeString(props.deviceType));
p.PrintKeyString("deviceName", props.deviceName);
- p.PrintKeyString("pipelineCacheUUID", to_string_16(props.pipelineCacheUUID));
+ p.PrintKeyValue("pipelineCacheUUID", props.pipelineCacheUUID);
}
p.AddNewline();
DumpVkPhysicalDeviceLimits(p, "VkPhysicalDeviceLimits", gpu.props.limits);
@@ -312,6 +378,7 @@
void *place = gpu.props2.pNext;
chain_iterator_phys_device_props2(p, gpu.inst, gpu, place);
p.AddNewline();
+ GetAndDumpHostImageCopyPropertiesEXT(p, gpu);
}
}
@@ -466,34 +533,28 @@
}
}
-void GpuDumpFormatProperty(Printer &p, VkFormat fmt, VkFormatProperties prop) {
- std::string name{};
- switch (p.Type()) {
- case OutputType::text: {
- name = "Properties";
- break;
- }
- case OutputType::html: {
- name = VkFormatString(fmt);
- break;
- }
- case OutputType::json: {
- name = "VkFormatProperties";
- break;
- }
- case OutputType::vkconfig_output: {
- name = VkFormatString(fmt);
- break;
+void GpuDumpTextFormatProperty(Printer &p, const AppGpu &gpu, PropFlags formats, std::vector<VkFormat> format_list,
+ uint32_t counter) {
+ p.SetElementIndex(counter);
+ ObjectWrapper obj_common_group(p, "Common Format Group");
+ IndentWrapper indent_inner(p);
+ {
+ ArrayWrapper arr_formats(p, "Formats", format_list.size());
+ for (auto &fmt : format_list) {
+ p.SetAsType().PrintString(VkFormatString(fmt));
}
}
- p.SetTitleAsType();
- ObjectWrapper obj(p, name);
- p.SetOpenDetails();
- DumpVkFormatFeatureFlags(p, "linearTilingFeatures", prop.linearTilingFeatures);
- p.SetOpenDetails();
- DumpVkFormatFeatureFlags(p, "optimalTilingFeatures", prop.optimalTilingFeatures);
- p.SetOpenDetails();
- DumpVkFormatFeatureFlags(p, "bufferFeatures", prop.bufferFeatures);
+ ObjectWrapper obj(p, "Properties");
+ if (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_FORMAT_FEATURE_FLAGS_2_EXTENSION_NAME)) {
+ DumpVkFormatFeatureFlags2(p, "linearTilingFeatures", formats.props3.linearTilingFeatures);
+ DumpVkFormatFeatureFlags2(p, "optimalTilingFeatures", formats.props3.optimalTilingFeatures);
+ DumpVkFormatFeatureFlags2(p, "bufferFeatures", formats.props3.bufferFeatures);
+ } else {
+ DumpVkFormatFeatureFlags(p, "linearTilingFeatures", formats.props.linearTilingFeatures);
+ DumpVkFormatFeatureFlags(p, "optimalTilingFeatures", formats.props.optimalTilingFeatures);
+ DumpVkFormatFeatureFlags(p, "bufferFeatures", formats.props.bufferFeatures);
+ }
+ p.AddNewline();
}
void GpuDumpToolingInfo(Printer &p, AppGpu &gpu) {
@@ -519,26 +580,14 @@
int counter = 0;
std::vector<VkFormat> unsupported_formats;
for (auto &prop : fmtPropMap) {
- VkFormatProperties props;
- props.linearTilingFeatures = prop.first.linear;
- props.optimalTilingFeatures = prop.first.optimal;
- props.bufferFeatures = prop.first.buffer;
- if (props.linearTilingFeatures == 0 && props.optimalTilingFeatures == 0 && props.bufferFeatures == 0) {
+ VkFormatProperties props = prop.first.props;
+ VkFormatProperties3 props3 = prop.first.props3;
+ if (props.linearTilingFeatures == 0 && props.optimalTilingFeatures == 0 && props.bufferFeatures == 0 &&
+ props3.linearTilingFeatures == 0 && props3.optimalTilingFeatures == 0 && props3.bufferFeatures == 0) {
unsupported_formats = prop.second;
continue;
}
-
- p.SetElementIndex(counter++);
- ObjectWrapper obj_common_group(p, "Common Format Group");
- IndentWrapper indent_inner(p);
- {
- ArrayWrapper arr_formats(p, "Formats", prop.second.size());
- for (auto &fmt : prop.second) {
- p.SetAsType().PrintString(VkFormatString(fmt));
- }
- }
- GpuDumpFormatProperty(p, VK_FORMAT_UNDEFINED, props);
- p.AddNewline();
+ GpuDumpTextFormatProperty(p, gpu, prop.first, prop.second, counter++);
}
ArrayWrapper arr_unsupported_formats(p, "Unsupported Formats", unsupported_formats.size());
@@ -550,11 +599,13 @@
if (gpu.FormatRangeSupported(format)) {
for (int32_t fmt_counter = format.first_format; fmt_counter <= format.last_format; ++fmt_counter) {
VkFormat fmt = static_cast<VkFormat>(fmt_counter);
-
- VkFormatProperties props;
- gpu.inst.dll.fp_vkGetPhysicalDeviceFormatProperties(gpu.phys_device, fmt, &props);
-
- GpuDumpFormatProperty(p, fmt, props);
+ auto formats = get_format_properties(gpu, fmt);
+ p.SetTitleAsType();
+ if (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_FORMAT_FEATURE_FLAGS_2_EXTENSION_NAME)) {
+ DumpVkFormatProperties3(p, VkFormatString(fmt), formats.props3);
+ } else {
+ DumpVkFormatProperties(p, VkFormatString(fmt), formats.props);
+ }
}
}
}
@@ -607,11 +658,12 @@
{
ObjectWrapper props_obj(p, "VkPhysicalDeviceProperties");
auto props = gpu.GetDeviceProperties();
- p.PrintKeyValue("apiVersion", props.apiVersion, VkVersionString(props.apiVersion));
+ p.PrintKeyValue("apiVersion", props.apiVersion);
p.PrintKeyValue("deviceID", props.deviceID);
p.PrintKeyString("deviceName", props.deviceName);
p.PrintKeyString("deviceType", std::string("VK_") + VkPhysicalDeviceTypeString(props.deviceType));
p.PrintKeyValue("driverVersion", props.driverVersion);
+
DumpVkPhysicalDeviceLimits(p, "VkPhysicalDeviceLimits", gpu.props.limits);
{
ArrayWrapper arr(p, "pipelineCacheUUID");
@@ -623,6 +675,7 @@
if (gpu.inst.CheckExtensionEnabled(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME)) {
void *place = gpu.props2.pNext;
chain_iterator_phys_device_props2(p, gpu.inst, gpu, place);
+ GetAndDumpHostImageCopyPropertiesEXT(p, gpu);
}
}
{
@@ -631,20 +684,21 @@
if (gpu.FormatRangeSupported(format)) {
for (int32_t fmt_counter = format.first_format; fmt_counter <= format.last_format; ++fmt_counter) {
VkFormat fmt = static_cast<VkFormat>(fmt_counter);
-
- VkFormatProperties props;
- gpu.inst.dll.fp_vkGetPhysicalDeviceFormatProperties(gpu.phys_device, fmt, &props);
+ auto formats = get_format_properties(gpu, fmt);
// don't print format properties that are unsupported
- if ((props.linearTilingFeatures || props.optimalTilingFeatures || props.bufferFeatures) == 0) continue;
+ if (formats.props.linearTilingFeatures == 0 && formats.props.optimalTilingFeatures == 0 &&
+ formats.props.bufferFeatures == 0 && formats.props3.linearTilingFeatures == 0 &&
+ formats.props3.optimalTilingFeatures == 0 && formats.props3.bufferFeatures == 0)
+ continue;
ObjectWrapper format_obj(p, std::string("VK_") + VkFormatString(fmt));
{
- GpuDumpFormatProperty(p, fmt, props);
-
+ // Want to explicitly list VkFormatProperties in addition to VkFormatProperties3 if available
+ DumpVkFormatProperties(p, "VkFormatProperties", formats.props);
VkFormatProperties2 format_props2{};
format_props2.sType = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2;
- format_props2.formatProperties = props;
+ format_props2.formatProperties = formats.props;
std::unique_ptr<format_properties2_chain> chain_for_format_props2;
setup_format_properties2_chain(format_props2, chain_for_format_props2);
gpu.inst.ext_funcs.vkGetPhysicalDeviceFormatProperties2KHR(gpu.phys_device, fmt, &format_props2);
@@ -718,7 +772,7 @@
const std::vector<std::string> &capabilities) {
ObjectWrapper vk_info(p, device_name);
p.PrintKeyValue("version", 1);
- p.PrintKeyString("api-version", VkVersionString(apiVersion));
+ p.PrintKeyString("api-version", VulkanVersion(apiVersion).str());
p.PrintKeyString("label", device_label);
p.PrintKeyString("description", "Exported from vulkaninfo");
{ ObjectWrapper contributors(p, "contributors"); }
@@ -742,9 +796,9 @@
void DumpGpuProfileInfo(Printer &p, AppGpu &gpu) {
ObjectWrapper profiles(p, "profiles");
- std::string device_label = std::string(gpu.props.deviceName) + " driver " + VkVersionString(gpu.props.driverVersion);
+ std::string device_label = std::string(gpu.props.deviceName) + " driver " + gpu.GetDriverVersionString();
std::string device_name =
- std::string("VP_VULKANINFO_") + std::string(gpu.props.deviceName) + "_" + VkVersionString(gpu.props.driverVersion);
+ std::string("VP_VULKANINFO_") + std::string(gpu.props.deviceName) + "_" + gpu.GetDriverVersionString();
;
for (auto &c : device_name) {
if (c == ' ' || c == '.') c = '_';
@@ -781,10 +835,10 @@
auto props = layer.layer_properties;
layer_name_max = std::max(layer_name_max, strlen(props.layerName));
layer_desc_max = std::max(layer_desc_max, strlen(props.description));
- layer_version_max = std::max(layer_version_max, VkVersionString(layer.layer_properties.specVersion).size());
+ layer_version_max = std::max(layer_version_max, VulkanVersion(layer.layer_properties.specVersion).str().size());
}
for (auto &layer : inst.global_layers) {
- auto v_str = VkVersionString(layer.layer_properties.specVersion);
+ auto v_str = VulkanVersion(layer.layer_properties.specVersion).str();
auto props = layer.layer_properties;
auto name_padding = std::string(layer_name_max - strlen(props.layerName), ' ');
@@ -800,32 +854,26 @@
ObjectWrapper obj(p, "GPU" + std::to_string(gpu.id));
p.SetMinKeyWidth(18);
auto props = gpu.GetDeviceProperties();
- p.PrintKeyValue("apiVersion", props.apiVersion, VkVersionString(props.apiVersion));
- p.PrintKeyValue("driverVersion", props.driverVersion, to_hex_str(props.driverVersion));
+ p.PrintKeyValue("apiVersion", VulkanVersion(props.apiVersion));
+ if (gpu.found_driver_props) {
+ p.PrintKeyString("driverVersion", gpu.GetDriverVersionString());
+ } else {
+ p.PrintKeyValue("driverVersion", props.driverVersion);
+ }
p.PrintKeyString("vendorID", to_hex_str(props.vendorID));
p.PrintKeyString("deviceID", to_hex_str(props.deviceID));
p.PrintKeyString("deviceType", VkPhysicalDeviceTypeString(props.deviceType));
p.PrintKeyString("deviceName", props.deviceName);
- if (gpu.inst.CheckExtensionEnabled(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME) &&
- (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME) || gpu.api_version.minor >= 2)) {
- void *place = gpu.props2.pNext;
- while (place) {
- VkBaseOutStructure *structure = static_cast<VkBaseOutStructure *>(place);
- if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES) {
- VkPhysicalDeviceDriverProperties *driver_props = reinterpret_cast<VkPhysicalDeviceDriverProperties *>(structure);
- DumpVkDriverId(p, "driverID", driver_props->driverID);
- p.PrintKeyString("driverName", driver_props->driverName);
- p.PrintKeyString("driverInfo", driver_props->driverInfo);
- p.PrintKeyString("conformanceVersion", VkConformanceVersionString(driver_props->conformanceVersion));
- }
- if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES) {
- VkPhysicalDeviceIDProperties *device_id_props = reinterpret_cast<VkPhysicalDeviceIDProperties *>(structure);
- p.PrintKeyString("deviceUUID", to_string_16(device_id_props->deviceUUID));
- p.PrintKeyString("driverUUID", to_string_16(device_id_props->driverUUID));
- }
- place = structure->pNext;
- }
+ if (gpu.found_driver_props) {
+ DumpVkDriverId(p, "driverID", gpu.driver_props.driverID);
+ p.PrintKeyString("driverName", gpu.driver_props.driverName);
+ p.PrintKeyString("driverInfo", gpu.driver_props.driverInfo);
+ p.PrintKeyValue("conformanceVersion", gpu.driver_props.conformanceVersion);
+ }
+ if (gpu.found_device_id_props) {
+ p.PrintKeyValue("deviceUUID", gpu.device_id_props.deviceUUID);
+ p.PrintKeyValue("driverUUID", gpu.device_id_props.driverUUID);
}
}
@@ -927,11 +975,15 @@
#endif
++i;
}
- } else if (strncmp("--json", argv[i], 6) == 0 || strcmp(argv[i], "-j") == 0) {
+ } else if (strncmp("--json", argv[i], 6) == 0 || strncmp(argv[i], "-j", 2) == 0) {
if (strlen(argv[i]) > 7 && strncmp("--json=", argv[i], 7) == 0) {
results.selected_gpu = static_cast<uint32_t>(strtol(argv[i] + 7, nullptr, 10));
results.has_selected_gpu = true;
}
+ if (strlen(argv[i]) > 3 && strncmp("-j=", argv[i], 3) == 0) {
+ results.selected_gpu = static_cast<uint32_t>(strtol(argv[i] + 3, nullptr, 10));
+ results.has_selected_gpu = true;
+ }
results.output_category = OutputCategory::profile_json;
results.default_filename = "vulkaninfo.json";
results.print_to_file = true;
@@ -986,7 +1038,7 @@
std::string("{\n\t\"$schema\": ") + "\"https://schema.khronos.org/vulkan/profiles-0.8-latest.json\"";
if (parse_data.filename.empty()) {
create.file_name = std::string("VP_VULKANINFO_") + std::string(selected_gpu.props.deviceName) + "_" +
- VkVersionString(selected_gpu.props.driverVersion);
+ selected_gpu.GetDriverVersionString();
for (auto &c : create.file_name) {
if (c == ' ' || c == '.') c = '_';
}
@@ -995,7 +1047,7 @@
break;
case (OutputCategory::vkconfig_output):
create.output_type = OutputType::vkconfig_output;
- create.start_string = "{\n\t\"Vulkan Instance Version\": \"" + VkVersionString(inst.vk_version) + "\"";
+ create.start_string = "{\n\t\"Vulkan Instance Version\": \"" + VulkanVersion(inst.vk_version).str() + "\"";
break;
}
return create;
@@ -1103,6 +1155,12 @@
surface_extension.surface = surface_extension.create_surface(instance);
for (auto &phys_device : phys_devices) {
try {
+ // check if the surface is supported by the physical device before adding it to the list
+ VkBool32 supported = VK_FALSE;
+ VkResult err = instance.ext_funcs.vkGetPhysicalDeviceSurfaceSupportKHR(phys_device, 0,
+ surface_extension.surface, &supported);
+ if (err != VK_SUCCESS || supported == VK_FALSE) continue;
+
surfaces.push_back(std::unique_ptr<AppSurface>(new AppSurface(instance, phys_device, surface_extension)));
} catch (std::exception &e) {
std::cerr << "ERROR while creating surface for extension " << surface_extension.name << " : " << e.what()
@@ -1147,6 +1205,8 @@
RunPrinter(*(printer.get()), parse_data, instance, gpus, surfaces);
+ // Call the printer's destructor before the file handle gets closed
+ printer.reset(nullptr);
#if defined(VULKANINFO_WSI_ENABLED)
for (auto &surface_extension : instance.surface_extensions) {
AppDestroySurface(instance, surface_extension.surface);
@@ -1160,9 +1220,10 @@
printer->FinishOutput();
}
return_code = 1;
+
+ // Call the printer's destructor before the file handle gets closed
+ printer.reset(nullptr);
}
- // Call the printer's destructor before the file handle gets closed
- printer.reset(nullptr);
#ifdef _WIN32
if (parse_data.output_category == OutputCategory::text && !parse_data.print_to_file) wait_for_console_destroy();
diff --git a/vulkaninfo/vulkaninfo.h b/vulkaninfo/vulkaninfo.h
index 34ffb35..79d141e 100644
--- a/vulkaninfo/vulkaninfo.h
+++ b/vulkaninfo/vulkaninfo.h
@@ -67,7 +67,7 @@
#endif
#endif // _WIN32
-#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__Fuchsia__)
+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__QNX__) || defined(__Fuchsia__)
#include <dlfcn.h>
#endif
@@ -252,7 +252,7 @@
// ----------- Instance Setup ------- //
struct VkDll {
VkResult Initialize() {
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__Fuchsia__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__QNX__) || defined(__Fuchsia__)
library = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
if (!library) library = dlopen("libvulkan.so.1", RTLD_NOW | RTLD_LOCAL);
#elif defined(_WIN32)
@@ -264,7 +264,7 @@
return VK_SUCCESS;
}
void Close() {
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__QNX__)
dlclose(library);
#elif defined(_WIN32)
FreeLibrary(library);
@@ -356,6 +356,11 @@
#ifdef VK_USE_PLATFORM_METAL_EXT
PFN_vkCreateMetalSurfaceEXT fp_vkCreateMetalSurfaceEXT = APPLE_FP(vkCreateMetalSurfaceEXT);
#endif // VK_USE_PLATFORM_METAL_EXT
+#ifdef VK_USE_PLATFORM_SCREEN_QNX
+ PFN_vkCreateScreenSurfaceQNX fp_vkCreateScreenSurfaceQNX = APPLE_FP(vkCreateScreenSurfaceQNX);
+ PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX fp_vkGetPhysicalDeviceScreenPresentationSupportQNX =
+ APPLE_FP(vkGetPhysicalDeviceScreenPresentationSupportQNX);
+#endif // VK_USE_PLATFORM_SCREEN_QNX
void InitializeDispatchPointers() {
Load(fp_vkCreateInstance, "vkCreateInstance");
Load(fp_vkDestroyInstance, "vkDestroyInstance");
@@ -420,18 +425,21 @@
#ifdef VK_USE_PLATFORM_METAL_EXT
Load(fp_vkCreateMetalSurfaceEXT, "vkCreateMetalSurfaceEXT");
#endif // VK_USE_PLATFORM_METAL_EXT
+#ifdef VK_USE_PLATFORM_SCREEN_QNX
+ Load(fp_vkCreateScreenSurfaceQNX, "vkCreateScreenSurfaceQNX");
+#endif // VK_USE_PLATFORM_SCREEN_QNX
}
private:
template <typename T>
void Load(T &func_dest, const char *func_name) {
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__Fuchsia__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__QNX__) || defined(__Fuchsia__)
func_dest = reinterpret_cast<T>(dlsym(library, func_name));
#elif defined(_WIN32)
func_dest = reinterpret_cast<T>(GetProcAddress(library, func_name));
#endif
}
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__Fuchsia__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__QNX__) || defined(__Fuchsia__)
void *library;
#elif defined(_WIN32)
HMODULE library;
@@ -558,21 +566,23 @@
};
struct VulkanVersion {
- uint32_t major;
- uint32_t minor;
- uint32_t patch;
+ uint32_t major = 1;
+ uint32_t minor = 0;
+ uint32_t patch = 0;
+ VulkanVersion() = default;
+ VulkanVersion(uint32_t version) noexcept
+ : major{VK_VERSION_MAJOR(version)}, minor{VK_VERSION_MINOR(version)}, patch{VK_VERSION_PATCH(version)} {}
+ std::string str() { return std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(patch); }
+ operator std::string() { return str(); }
};
-
-VulkanVersion make_vulkan_version(uint32_t version) {
- return {VK_VERSION_MAJOR(version), VK_VERSION_MINOR(version), VK_VERSION_PATCH(version)};
-}
+std::ostream &operator<<(std::ostream &out, const VulkanVersion &v) { return out << v.major << "." << v.minor << "." << v.patch; }
struct AppInstance {
VkDll dll;
VkInstance instance;
uint32_t instance_version;
- VulkanVersion vk_version{};
+ VulkanVersion vk_version;
VkDebugReportCallbackEXT debug_callback = VK_NULL_HANDLE;
@@ -620,6 +630,10 @@
#ifdef VK_USE_PLATFORM_ANDROID_KHR // TODO
ANativeWindow *window;
#endif
+#ifdef VK_USE_PLATFORM_SCREEN_QNX
+ struct _screen_context *context;
+ struct _screen_window *window;
+#endif
AppInstance() {
VkResult dllErr = dll.Initialize();
if (dllErr != VK_SUCCESS) {
@@ -634,7 +648,7 @@
if (err) THROW_VK_ERR("vkEnumerateInstanceVersion", err);
}
- vk_version = make_vulkan_version(instance_version);
+ vk_version = VulkanVersion(instance_version);
// fallback to baked header version if loader returns 0 for the patch version
if (VK_VERSION_PATCH(instance_version) == 0) vk_version.patch = VK_VERSION_PATCH(VK_HEADER_VERSION);
@@ -650,7 +664,9 @@
AppCompileInstanceExtensionsToEnable();
std::vector<const char *> inst_exts;
- for (const auto &ext : inst_extensions) inst_exts.push_back(ext.c_str());
+ for (const auto &ext : inst_extensions) {
+ inst_exts.push_back(ext.c_str());
+ }
const VkInstanceCreateInfo inst_info = {
VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
@@ -690,7 +706,7 @@
AppInstance(const AppInstance &) = delete;
const AppInstance &operator=(const AppInstance &) = delete;
- bool CheckExtensionEnabled(std::string extension_to_check) {
+ bool CheckExtensionEnabled(std::string extension_to_check) const {
return std::any_of(inst_extensions.begin(), inst_extensions.end(),
[extension_to_check](std::string str) { return str == extension_to_check; });
}
@@ -710,9 +726,96 @@
global_extensions = AppGetGlobalLayerExtensions(nullptr);
}
void AppCompileInstanceExtensionsToEnable() {
- // Get all supported Instance extensions (excl. layer-provided ones)
for (const auto &ext : global_extensions) {
- inst_extensions.push_back(ext.extensionName);
+ if (strcmp(VK_EXT_DEBUG_REPORT_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
+ if (strcmp(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
+ if (strcmp(VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
+ if (strcmp(VK_KHR_SURFACE_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+ if (strcmp(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
+#endif
+#ifdef VK_USE_PLATFORM_FUCHSIA
+ if (strcmp(VK_FUCHSIA_IMAGEPIPE_SURFACE_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
+#endif
+#ifdef VK_USE_PLATFORM_IOS_MVK
+ if (strcmp(VK_MVK_IOS_SURFACE_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
+#endif
+#ifdef VK_USE_PLATFORM_MACOS_MVK
+ if (strcmp(VK_MVK_MACOS_SURFACE_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
+#endif
+#ifdef VK_USE_PLATFORM_METAL_EXT
+ if (strcmp(VK_EXT_METAL_SURFACE_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
+#endif
+#ifdef VK_USE_PLATFORM_VI_NN
+ if (strcmp(VK_NN_VI_SURFACE_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
+#endif
+#ifdef VK_USE_PLATFORM_WAYLAND_KHR
+ if (strcmp(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
+#endif
+#ifdef VK_USE_PLATFORM_WIN32_KHR
+ if (strcmp(VK_KHR_WIN32_SURFACE_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
+#endif
+#ifdef VK_USE_PLATFORM_XCB_KHR
+ if (strcmp(VK_KHR_XCB_SURFACE_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
+#endif
+#ifdef VK_USE_PLATFORM_XLIB_KHR
+ if (strcmp(VK_KHR_XLIB_SURFACE_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
+#endif
+#ifdef VK_USE_PLATFORM_DIRECTFB_EXT
+ if (strcmp(VK_EXT_DIRECTFB_SURFACE_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
+#endif
+#ifdef VK_USE_PLATFORM_GGP
+ if (strcmp(VK_GGP_STREAM_DESCRIPTOR_SURFACE_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
+#endif
+#ifdef VK_USE_PLATFORM_SCREEN_QNX
+ if (strcmp(VK_QNX_SCREEN_SURFACE_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
+#endif
+ if (strcmp(VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
+ if (strcmp(VK_KHR_SURFACE_PROTECTED_CAPABILITIES_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
+ if (strcmp(VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
+ if (strcmp(VK_EXT_SURFACE_MAINTENANCE_1_EXTENSION_NAME, ext.extensionName) == 0) {
+ inst_extensions.push_back(ext.extensionName);
+ }
}
}
@@ -737,9 +840,19 @@
#if defined(VK_USE_PLATFORM_XCB_KHR) || defined(VK_USE_PLATFORM_XLIB_KHR) || defined(VK_USE_PLATFORM_WIN32_KHR) || \
defined(VK_USE_PLATFORM_MACOS_MVK) || defined(VK_USE_PLATFORM_METAL_EXT) || defined(VK_USE_PLATFORM_WAYLAND_KHR) || \
- defined(VK_USE_PLATFORM_DIRECTFB_EXT) || defined(VK_USE_PLATFORM_ANDROID_KHR) || defined(VK_USE_PLATFORM_GGP)
+ defined(VK_USE_PLATFORM_DIRECTFB_EXT) || defined(VK_USE_PLATFORM_GGP) || defined(VK_USE_PLATFORM_SCREEN_QNX)
+
#define VULKANINFO_WSI_ENABLED
#endif
+
+//-----------------------------------------------------------
+#if defined(VULKANINFO_WSI_ENABLED)
+static void AppDestroySurface(AppInstance &inst, VkSurfaceKHR surface) { // same for all platforms
+ inst.dll.fp_vkDestroySurfaceKHR(inst.instance, surface, nullptr);
+}
+#endif // defined(VULKANINFO_WSI_ENABLED)
+//-----------------------------------------------------------
+
//---------------------------Win32---------------------------
#ifdef VK_USE_PLATFORM_WIN32_KHR
@@ -811,13 +924,7 @@
#endif // VK_USE_PLATFORM_WIN32_KHR
//-----------------------------------------------------------
-#if defined(VULKANINFO_WSI_ENABLED)
-static void AppDestroySurface(AppInstance &inst, VkSurfaceKHR surface) { // same for all platforms
- inst.dll.fp_vkDestroySurfaceKHR(inst.instance, surface, nullptr);
-}
-#endif // defined(VULKANINFO_WSI_ENABLED)
//----------------------------XCB----------------------------
-
#ifdef VK_USE_PLATFORM_XCB_KHR
static void AppCreateXcbWindow(AppInstance &inst) {
//--Init Connection--
@@ -1073,10 +1180,12 @@
createInfo.flags = 0;
createInfo.window = (struct ANativeWindow *)(inst.window);
- err = inst.dll.fp_vkCreateAndroidSurfaceKHR(inst.inst, &createInfo, NULL, &inst.surface);
- THROW_VK_ERR("vkCreateAndroidSurfaceKHR", err);
+ VkSurfaceKHR surface;
+ VkResult err = inst.dll.fp_vkCreateAndroidSurfaceKHR(inst.instance, &createInfo, NULL, &surface);
+ if (err) THROW_VK_ERR("vkCreateAndroidSurfaceKHR", err);
+ return surface;
}
-static VkSurfaceKHR AppDestroyAndroidSurface(AppInstance &inst) {}
+static void AppDestroyAndroidWindow(AppInstance &inst) {}
#endif
//-----------------------------------------------------------
//---------------------------GGP-----------------------------
@@ -1097,6 +1206,46 @@
static void AppDestroyGgpWindow(AppInstance &inst) {}
#endif
//-----------------------------------------------------------
+//----------------------QNX SCREEN---------------------------
+#ifdef VK_USE_PLATFORM_SCREEN_QNX
+static void AppCreateScreenWindow(AppInstance &inst) {
+ int usage = SCREEN_USAGE_VULKAN;
+ int rc;
+
+ rc = screen_create_context(&inst.context, 0);
+ if (rc) {
+ THROW_ERR("Could not create a QNX Screen context.\nExiting...");
+ }
+ rc = screen_create_window(&inst.window, inst.context);
+ if (rc) {
+ THROW_ERR("Could not create a QNX Screen window.\nExiting...");
+ }
+ rc = screen_set_window_property_iv(inst.window, SCREEN_PROPERTY_USAGE, &usage);
+ if (rc) {
+ THROW_ERR("Could not set SCREEN_USAGE_VULKAN flag for QNX Screen window!\nExiting...");
+ }
+}
+
+static VkSurfaceKHR AppCreateScreenSurface(AppInstance &inst) {
+ VkScreenSurfaceCreateInfoQNX createInfo;
+ createInfo.sType = VK_STRUCTURE_TYPE_SCREEN_SURFACE_CREATE_INFO_QNX;
+ createInfo.pNext = nullptr;
+ createInfo.flags = 0;
+ createInfo.context = inst.context;
+ createInfo.window = inst.window;
+
+ VkSurfaceKHR surface;
+ VkResult err = inst.dll.fp_vkCreateScreenSurfaceQNX(inst.instance, &createInfo, nullptr, &surface);
+ if (err) THROW_VK_ERR("vkCreateScreenSurfaceQNX", err);
+ return surface;
+}
+
+static void AppDestroyScreenWindow(AppInstance &inst) {
+ screen_destroy_window(inst.window);
+ screen_destroy_context(inst.context);
+}
+#endif // VK_USE_PLATFORM_SCREEN_QNX
+//-----------------------------------------------------------
// ------------ Setup Windows ------------- //
void SetupWindowExtensions(AppInstance &inst) {
@@ -1208,8 +1357,8 @@
//--ANDROID--
#ifdef VK_USE_PLATFORM_ANDROID_KHR
SurfaceExtension surface_ext_android;
- if (inst.CheckExtensionEnabled(VK_ANDROID_SURFACE_EXTENSION_NAME)) {
- surface_ext_android.name = VK_ANDROID_SURFACE_EXTENSION_NAME;
+ if (inst.CheckExtensionEnabled(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME)) {
+ surface_ext_android.name = VK_KHR_ANDROID_SURFACE_EXTENSION_NAME;
surface_ext_android.create_window = AppCreateAndroidWindow;
surface_ext_android.create_surface = AppCreateAndroidSurface;
surface_ext_android.destroy_window = AppDestroyAndroidWindow;
@@ -1229,6 +1378,18 @@
inst.AddSurfaceExtension(surface_ext_ggp);
}
#endif
+//--QNX_SCREEN--
+#ifdef VK_USE_PLATFORM_SCREEN_QNX
+ SurfaceExtension surface_ext_qnx_screen;
+ if (inst.CheckExtensionEnabled(VK_QNX_SCREEN_SURFACE_EXTENSION_NAME)) {
+ surface_ext_qnx_screen.name = VK_QNX_SCREEN_SURFACE_EXTENSION_NAME;
+ surface_ext_qnx_screen.create_window = AppCreateScreenWindow;
+ surface_ext_qnx_screen.create_surface = AppCreateScreenSurface;
+ surface_ext_qnx_screen.destroy_window = AppDestroyScreenWindow;
+
+ inst.AddSurfaceExtension(surface_ext_qnx_screen);
+ }
+#endif
}
// ---------- Surfaces -------------- //
@@ -1251,12 +1412,10 @@
std::unique_ptr<surface_capabilities2_chain> chain_for_surface_capabilities2;
AppSurface(AppInstance &inst, VkPhysicalDevice phys_device, SurfaceExtension surface_extension)
- : inst(inst),
- phys_device(phys_device),
- surface_extension(surface_extension),
- surf_present_modes(GetVector<VkPresentModeKHR>("vkGetPhysicalDeviceSurfacePresentModesKHR",
+ : inst(inst), phys_device(phys_device), surface_extension(surface_extension) {
+ surf_present_modes = GetVector<VkPresentModeKHR>("vkGetPhysicalDeviceSurfacePresentModesKHR",
inst.ext_funcs.vkGetPhysicalDeviceSurfacePresentModesKHR, phys_device,
- surface_extension.surface)) {
+ surface_extension.surface);
const VkPhysicalDeviceSurfaceInfo2KHR surface_info2 = {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR, nullptr,
surface_extension.surface};
@@ -1484,11 +1643,16 @@
AppInstance &inst;
uint32_t id{};
VkPhysicalDevice phys_device = VK_NULL_HANDLE;
- VulkanVersion api_version{};
+ VulkanVersion api_version;
VkPhysicalDeviceProperties props{};
VkPhysicalDeviceProperties2KHR props2{};
+ VkPhysicalDeviceDriverProperties driver_props{};
+ VkPhysicalDeviceIDProperties device_id_props{};
+ bool found_driver_props = false;
+ bool found_device_id_props = false;
+
std::vector<VkQueueFamilyProperties> queue_props;
std::vector<VkQueueFamilyProperties2KHR> queue_props2;
std::vector<AppQueueFamilyProperties> extended_queue_props;
@@ -1520,7 +1684,7 @@
inst.dll.fp_vkGetPhysicalDeviceProperties(phys_device, &props);
// needs to find the minimum of the instance and device version, and use that to print the device info
- api_version = make_vulkan_version(props.apiVersion);
+ api_version = VulkanVersion(props.apiVersion);
inst.dll.fp_vkGetPhysicalDeviceMemoryProperties(phys_device, &memory_props);
@@ -1560,6 +1724,22 @@
setup_queue_properties2_chain(queue_props2[i], chain_for_queue_props2[i]);
}
inst.ext_funcs.vkGetPhysicalDeviceQueueFamilyProperties2KHR(phys_device, &queue_prop2_count, queue_props2.data());
+
+ if (CheckPhysicalDeviceExtensionIncluded(VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME) || api_version.minor >= 2) {
+ void *place = props2.pNext;
+ while (place) {
+ VkBaseOutStructure *structure = static_cast<VkBaseOutStructure *>(place);
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES) {
+ driver_props = *reinterpret_cast<VkPhysicalDeviceDriverProperties *>(structure);
+ found_driver_props = true;
+
+ } else if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES) {
+ device_id_props = *reinterpret_cast<VkPhysicalDeviceIDProperties *>(structure);
+ found_device_id_props = true;
+ }
+ place = structure->pNext;
+ }
+ }
}
// Use the queue_props2 if they exist, else fallback on vulkan 1.0 queue_props
@@ -1633,6 +1813,7 @@
if (tiling == VK_IMAGE_TILING_LINEAR) {
if (format == color_format) {
image_ci_regular.usage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
+ image_ci_transient.usage |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
} else {
// linear tiling is only applicable to color image types
continue;
@@ -1728,13 +1909,14 @@
AppGpu(const AppGpu &) = delete;
const AppGpu &operator=(const AppGpu &) = delete;
- bool CheckPhysicalDeviceExtensionIncluded(std::string extension_to_check) {
- return std::any_of(device_extensions.begin(), device_extensions.end(),
- [extension_to_check](VkExtensionProperties &prop) { return prop.extensionName == extension_to_check; });
+ bool CheckPhysicalDeviceExtensionIncluded(std::string extension_to_check) const {
+ return std::any_of(
+ device_extensions.begin(), device_extensions.end(),
+ [extension_to_check](const VkExtensionProperties &prop) { return prop.extensionName == extension_to_check; });
}
// Helper function to determine whether a format range is currently supported.
- bool FormatRangeSupported(FormatRange &format_range) {
+ bool FormatRangeSupported(FormatRange &format_range) const {
// True if standard and supported by both this instance and this GPU
if (format_range.minimum_instance_version > 0 && inst.instance_version >= format_range.minimum_instance_version &&
props.apiVersion >= format_range.minimum_instance_version) {
@@ -1757,6 +1939,26 @@
return props;
}
}
+
+ // Vendor specific driverVersion mapping scheme
+ // If one isn't present, fall back to the standard Vulkan scheme
+ std::string GetDriverVersionString() {
+ uint32_t v = props.driverVersion;
+ if ((found_driver_props && driver_props.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY) ||
+ (!found_driver_props && props.deviceID == 4318)) {
+ return std::to_string((v >> 22) & 0x3ff) + "." + std::to_string((v >> 14) & 0x0ff) + "." +
+ std::to_string((v >> 6) & 0x0ff) + "." + std::to_string(v & 0x003f);
+ } else if ((found_driver_props && driver_props.driverID == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS)
+#if defined(WIN32)
+ || (!found_driver_props && props.deviceID == 0x8086) // only do the fallback check if running in windows
+#endif
+ ) {
+ return std::to_string(v >> 14) + "." + std::to_string(v & 0x3fff);
+ } else {
+ // AMD uses the standard vulkan scheme
+ return VulkanVersion(v).str();
+ }
+ }
};
std::vector<VkPhysicalDeviceToolPropertiesEXT> GetToolingInfo(AppGpu &gpu) {
@@ -1766,23 +1968,60 @@
}
// --------- Format Properties ----------//
+// can't use autogen because that is put in a header that we can't include because that header depends on stuff defined here
+bool operator==(const VkFormatProperties &a, const VkFormatProperties b) {
+ return a.linearTilingFeatures == b.linearTilingFeatures && a.optimalTilingFeatures == b.optimalTilingFeatures &&
+ a.bufferFeatures == b.bufferFeatures;
+}
+bool operator==(const VkFormatProperties3 &a, const VkFormatProperties3 b) {
+ return a.linearTilingFeatures == b.linearTilingFeatures && a.optimalTilingFeatures == b.optimalTilingFeatures &&
+ a.bufferFeatures == b.bufferFeatures;
+}
struct PropFlags {
- uint32_t linear;
- uint32_t optimal;
- uint32_t buffer;
+ VkFormatProperties props;
+ VkFormatProperties3 props3;
- bool operator==(const PropFlags &other) const {
- return (linear == other.linear && optimal == other.optimal && buffer == other.buffer);
- }
+ bool operator==(const PropFlags &other) const { return props == other.props && props3 == other.props3; }
};
+PropFlags get_format_properties(const AppGpu &gpu, VkFormat fmt) {
+ VkFormatProperties props;
+ gpu.inst.dll.fp_vkGetPhysicalDeviceFormatProperties(gpu.phys_device, fmt, &props);
+
+ VkFormatProperties3 props3{};
+ props3.sType = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3;
+
+ if (gpu.inst.CheckExtensionEnabled(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME) &&
+ gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_FORMAT_FEATURE_FLAGS_2_EXTENSION_NAME)) {
+ VkFormatProperties2 props2{};
+ props2.sType = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2;
+ props2.formatProperties = props;
+ props2.pNext = static_cast<void *>(&props3);
+ gpu.inst.ext_funcs.vkGetPhysicalDeviceFormatProperties2KHR(gpu.phys_device, fmt, &props2);
+ }
+ return {props, props3};
+}
+
namespace std {
template <>
+struct hash<VkFormatProperties> {
+ std::size_t operator()(const VkFormatProperties &k) const {
+ return ((std::hash<uint32_t>()(k.linearTilingFeatures) ^ (std::hash<uint32_t>()(k.optimalTilingFeatures) << 1)) >> 1) ^
+ (std::hash<uint32_t>()(k.bufferFeatures) << 1);
+ }
+};
+template <>
+struct hash<VkFormatProperties3> {
+ std::size_t operator()(const VkFormatProperties3 &k) const {
+ return ((std::hash<uint64_t>()(k.linearTilingFeatures) ^ (std::hash<uint64_t>()(k.optimalTilingFeatures) << 1)) >> 1) ^
+ (std::hash<uint64_t>()(k.bufferFeatures) << 1);
+ }
+};
+template <>
struct hash<PropFlags> {
std::size_t operator()(const PropFlags &k) const {
- return ((std::hash<uint32_t>()(k.linear) ^ (std::hash<uint32_t>()(k.optimal) << 1)) >> 1) ^
- (std::hash<uint32_t>()(k.buffer) << 1);
+ return (std::hash<VkFormatProperties>()(k.props) ^ std::hash<VkFormatProperties3>()(k.props3)) >> 1;
}
};
} // namespace std
@@ -1792,11 +2031,7 @@
std::unordered_map<PropFlags, std::vector<VkFormat>> map;
for (auto fmtRange : gpu.supported_format_ranges) {
for (int32_t fmt = fmtRange.first_format; fmt <= fmtRange.last_format; ++fmt) {
- VkFormatProperties props;
- gpu.inst.dll.fp_vkGetPhysicalDeviceFormatProperties(gpu.phys_device, static_cast<VkFormat>(fmt), &props);
-
- PropFlags pf = {props.linearTilingFeatures, props.optimalTilingFeatures, props.bufferFeatures};
-
+ PropFlags pf = get_format_properties(gpu, static_cast<VkFormat>(fmt));
map[pf].push_back(static_cast<VkFormat>(fmt));
}
}
diff --git a/vulkaninfo/vulkaninfo.md b/vulkaninfo/vulkaninfo.md
index 7f1f287..8755b41 100644
--- a/vulkaninfo/vulkaninfo.md
+++ b/vulkaninfo/vulkaninfo.md
@@ -1,5 +1,5 @@
<!-- markdownlint-disable MD041 -->
-<!-- Copyright 2015-2019 LunarG, Inc. -->
+<!-- Copyright 2015-2023 LunarG, Inc. -->
[![Khronos Vulkan][1]][2]
@@ -98,7 +98,7 @@
Vulkan Info is now avaialble for iOS devices, but must be built manually.
-The Vulkan Info project contains a folder at [vulkaninfo/ios](https://github.com/KhronosGroup/Vulkan-Tools/tree/master/vulkaninfo/iOS) that contains an XCode project that will build Vulkan Info for iOS devices. In order to deploy to an iOS device, the developer must be a member of the [Apple Developer Program](https://developer.apple.com/programs/). In addition, Vulkan Info makes use of the [MoltenVK](https://github.com/KhronosGroup/MoltenVK) libraries, which is a seperate project from Vulkan-Tools and you will need to add the MoltenVK libraries to your XCode project manually. See the [LunarG Getting Started with the macOS SDK](https://vulkan.lunarg.com/doc/sdk/latest/mac/getting_started.html) guide for more information about using MoltenVK in the Vulkan SDK.
+The Vulkan Info project contains a folder at [vulkaninfo/ios](https://github.com/KhronosGroup/Vulkan-Tools/tree/main/vulkaninfo/iOS) that contains an XCode project that will build Vulkan Info for iOS devices. In order to deploy to an iOS device, the developer must be a member of the [Apple Developer Program](https://developer.apple.com/programs/). In addition, Vulkan Info makes use of the [MoltenVK](https://github.com/KhronosGroup/MoltenVK) libraries, which is a seperate project from Vulkan-Tools and you will need to add the MoltenVK libraries to your XCode project manually. See the [LunarG Getting Started with the macOS SDK](https://vulkan.lunarg.com/doc/sdk/latest/mac/getting_started.html) guide for more information about using MoltenVK in the Vulkan SDK.
When Vulkan Info is run on an iOS device, it will create the standard vulkaninfo.json file and also a portability.json file. An HTML file is also created, and is displayed in a webview on the iOS device when the application is run. These files are located on the iOS device, and are available via the [iOS application file sharing mechanism](https://support.apple.com/en-us/HT201301) via iTunes for Windows or macOS. You can also access these files using the macOS Finder or Windows Explorer when the device is attached to the host computer via a USB cable. Select the device, and navigate to the "vulkaninfo" folder to access these files. There is currently no supported means to access these files on an iOS device from a Linux host computer.
diff --git a/vulkaninfo/vulkaninfo.rc.in b/vulkaninfo/vulkaninfo.rc.in
index ef97692..dd5562f 100644
--- a/vulkaninfo/vulkaninfo.rc.in
+++ b/vulkaninfo/vulkaninfo.rc.in
@@ -1,7 +1,7 @@
//
-// Copyright (c) 2018-2019 The Khronos Group Inc.
-// Copyright (c) 2018-2019 Valve Corporation
-// Copyright (c) 2018-2019 LunarG, Inc.
+// Copyright (c) 2018-2023 The Khronos Group Inc.
+// Copyright (c) 2018-2023 Valve Corporation
+// Copyright (c) 2018-2023 LunarG, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
#define VER_FILE_VERSION ${VULKANINFO_VER_FILE_VERSION}
#define VER_FILE_VERSION_STR ${VULKANINFO_VER_FILE_VERSION_STR}
#define VER_FILE_DESCRIPTION_STR ${VULKANINFO_VER_FILE_DESCRIPTION_STR}
+#define VER_COPYRIGHT_STR "Copyright (C) 2015-${VULKANINFO_CUR_COPYRIGHT_STR}"
VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILE_VERSION
@@ -45,8 +46,8 @@
BEGIN
VALUE "FileDescription", VER_FILE_DESCRIPTION_STR
VALUE "FileVersion", VER_FILE_VERSION_STR
- VALUE "LegalCopyright", "Copyright (C) 2015-2021"
- VALUE "ProductName", "Vulkan Runtime"
+ VALUE "LegalCopyright", VER_COPYRIGHT_STR
+ VALUE "ProductName", "Vulkaninfo"
VALUE "ProductVersion", VER_FILE_VERSION_STR
END
END
diff --git a/windows-runtime-installer/CMakeLists.txt b/windows-runtime-installer/CMakeLists.txt
new file mode 100644
index 0000000..d27bef8
--- /dev/null
+++ b/windows-runtime-installer/CMakeLists.txt
@@ -0,0 +1,26 @@
+# ~~~
+# Copyright (c) 2023 Valve Corporation
+# Copyright (c) 2023 LunarG, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ~~~
+
+string(TIMESTAMP CURRENT_YEAR "%Y")
+
+# Keep windows-runtime-installer/VulkanRT-License.txt up to date.
+# https://github.com/KhronosGroup/Vulkan-Tools/issues/754
+configure_file(
+ ${CMAKE_CURRENT_LIST_DIR}/VulkanRT-License.txt.in
+ ${CMAKE_CURRENT_LIST_DIR}/VulkanRT-License.txt
+ @ONLY
+)
diff --git a/windows-runtime-installer/README.md b/windows-runtime-installer/README.md
index d0dd595..81c5812 100644
--- a/windows-runtime-installer/README.md
+++ b/windows-runtime-installer/README.md
@@ -1,5 +1,4 @@
-
-## Windows Runtime Installer
+# Windows Runtime Installer
This directory contains the files required for building the Windows Vulkan Runtime Installer package.
The runtime installer is a method of delivering a Vulkan loader to system.
diff --git a/windows-runtime-installer/VulkanRT-License.txt b/windows-runtime-installer/VulkanRT-License.txt
index 23ce2c3..b799d85 100644
--- a/windows-runtime-installer/VulkanRT-License.txt
+++ b/windows-runtime-installer/VulkanRT-License.txt
@@ -1,6 +1,6 @@
-Copyright (c) 2015-2021 The Khronos Group Inc.
-Copyright (c) 2015-2021 LunarG, Inc.
-Copyright (c) 2015-2021 Valve Corporation
+Copyright (c) 2015-2023 The Khronos Group Inc.
+Copyright (c) 2015-2023 LunarG, Inc.
+Copyright (c) 2015-2023 Valve Corporation
The Vulkan Runtime is comprised of 100% open-source components (MIT, and
Apache 2.0). The text of such licenses is included below along with the
@@ -30,9 +30,9 @@
============================MIT============================
Copyright (c) 2009 Dave Gamble
-Copyright (c) 2015-2017 The Khronos Group Inc.
-Copyright (c) 2015-2017 Valve Corporation
-Copyright (c) 2015-2017 LunarG, Inc.
+Copyright (c) 2015-2023 The Khronos Group Inc.
+Copyright (c) 2015-2023 Valve Corporation
+Copyright (c) 2015-2023 LunarG, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -55,9 +55,9 @@
============================MIT============================
Copyright (c) 2014 joseph werle <joseph.werle@gmail.com>
-Copyright (c) 2015-2017 The Khronos Group Inc.
-Copyright (c) 2015-2017 Valve Corporation
-Copyright (c) 2015-2017 LunarG, Inc.
+Copyright (c) 2015-2023 The Khronos Group Inc.
+Copyright (c) 2015-2023 Valve Corporation
+Copyright (c) 2015-2023 LunarG, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and/or associated documentation files (the "Materials"), to
diff --git a/windows-runtime-installer/VulkanRT-License.txt.in b/windows-runtime-installer/VulkanRT-License.txt.in
new file mode 100644
index 0000000..06c5f24
--- /dev/null
+++ b/windows-runtime-installer/VulkanRT-License.txt.in
@@ -0,0 +1,79 @@
+Copyright (c) 2015-@CURRENT_YEAR@ The Khronos Group Inc.
+Copyright (c) 2015-@CURRENT_YEAR@ LunarG, Inc.
+Copyright (c) 2015-@CURRENT_YEAR@ Valve Corporation
+
+The Vulkan Runtime is comprised of 100% open-source components (MIT, and
+Apache 2.0). The text of such licenses is included below along with the
+copyrights.
+
+ALL INFORMATION HERE IS PROVIDED "AS IS." LUNARG MAKES NO REPRESENTATIONS OR
+WARRANTIES, EXPRESS OR IMPLIED, WITH REGARD TO THIS LIST OR ITS ACCURACY OR
+COMPLETENESS, OR WITH RESPECT TO ANY RESULTS TO BE OBTAINED FROM USE OR
+DISTRIBUTION OF THE LIST. BY USING OR DISTRIBUTING THIS LIST, YOU AGREE THAT
+IN NO EVENT SHALL LUNARG BE HELD LIABLE FOR ANY DAMAGES WHATSOEVER RESULTING
+FROM ANY USE OR DISTRIBUTION OF THIS LIST, INCLUDING, WITHOUT LIMITATION, ANY
+SPECIAL, CONSEQUENTIAL, INCIDENTAL OR OTHER DIRECT OR INDIRECT DAMAGES.
+
+=========================Apache 2.0=========================
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy
+of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on as "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+the License for the specific language governing permissions and limitations
+under the License.
+
+============================MIT============================
+
+Copyright (c) 2009 Dave Gamble
+Copyright (c) 2015-@CURRENT_YEAR@ The Khronos Group Inc.
+Copyright (c) 2015-@CURRENT_YEAR@ Valve Corporation
+Copyright (c) 2015-@CURRENT_YEAR@ LunarG, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+============================MIT============================
+
+Copyright (c) 2014 joseph werle <joseph.werle@gmail.com>
+Copyright (c) 2015-@CURRENT_YEAR@ The Khronos Group Inc.
+Copyright (c) 2015-@CURRENT_YEAR@ Valve Corporation
+Copyright (c) 2015-@CURRENT_YEAR@ LunarG, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and/or associated documentation files (the "Materials"), to
+deal in the Materials without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Materials, and to permit persons to whom the Materials are
+furnished to do so, subject to the following conditions:
+
+The above copyright notice(s) and this permission notice shall be included in
+all copies or substantial portions of the Materials.
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE
+USE OR OTHER DEALINGS IN THE MATERIALS.
