Merge pull request #15 from zangold/zja-sdk-fixes-2

Fixes for 1.0.14 SDK release (v2)
KhronosGroup · Jun 19, 2024 · 449dbde · 449dbde
2 parents 9bc108b + 3cba0a6
commit 449dbde
Show file tree

Hide file tree

Showing 455 changed files with 3,864 additions and 134,401 deletions.
diff --git a/.github/workflows/ci_build.yml → .github/workflows/ci.yml b/.github/workflows/ci_build.yml → .github/workflows/ci.yml
@@ -1,7 +1,6 @@
-#!/usr/bin/env python3
-# Copyright (c) 2021 Valve Corporation
-# Copyright (c) 2021 LunarG, 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
@@ -13,42 +12,17 @@
 # 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>
-# Author: Tony Barbour <tony@lunarg.com>
 
-name: CI Build
+name: ci
 
-# Perform CI builds for pull requests targeting the master branch or any pushes to the repo.
 on:
  push:
  pull_request:
  branches:
- - master
+ - main
  - sc_main
 
 jobs:
- code-format:
- name: ${{ matrix.config.name }}
- runs-on: ${{ matrix.config.os }}
- strategy:
- fail-fast: false
- matrix:
- config:
- - {
- name: "Source Code Format Testing",
- os: ubuntu-latest,
- cc: "gcc", cxx: "g++"
- }
- steps:
- - name: Install Qt
- uses: jurplel/install-qt-action@v2
- - name: Clone repository
- uses: actions/checkout@v1
- - name: Execute Source Code Format Checking Script
- run: |
- scripts/check_code_format.sh --target-refspec=origin/${{ github.base_ref }}
-
  linux:
  name: ${{ matrix.config.name }}
  runs-on: ${{ matrix.config.os }}
@@ -72,9 +46,9 @@ jobs:
  }
  steps:
  - name: Install Qt
- uses: jurplel/install-qt-action@v2
+ uses: jurplel/install-qt-action@v3
  - name: Clone repository
- uses: actions/checkout@v1
+ uses: actions/checkout@v3
  - name: Install build dependencies
  run: |
  sudo apt-get -qq update
@@ -96,37 +70,35 @@ jobs:
  os: [ windows-latest, windows-2019 ]
  steps:
  - name: Install Qt
- uses: jurplel/install-qt-action@v2
- - uses: actions/checkout@v2
- - uses: actions/setup-python@v2
+ uses: jurplel/install-qt-action@v3
+ - uses: actions/checkout@v3
+ - uses: actions/setup-python@v4
  with:
  python-version: '3.7'
  - name: Install OpenSSL
  run: choco install openssl
  - name: Build and Test VulkanTools
  run: python3 scripts/github_ci_win.py --config ${{ matrix.config }} --arch ${{ matrix.arch }}
 
- android:
- name: ${{ matrix.config.name }}
- runs-on: ${{ matrix.config.os }}
- strategy:
- fail-fast: false
- matrix:
- config:
- - {
- name: "Android armeabi-v8a",
- os: ubuntu-latest,
- abi: arm64-v8a,
- ndk: r21d,
- }
- - {
- name: "Android armeabi-v7a",
- os: ubuntu-latest,
- abi: armeabi-v7a,
- ndk: r21d,
- }
+ android-cmake:
+ runs-on: ubuntu-22.04
  steps:
- - name: Clone repository
- uses: actions/checkout@v1
- - name: Build VulkanTools
- run: python3 scripts/github_ci_android.py --abi ${{ matrix.config.abi }}
+ - 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=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"
+ - name: Build
+ run: cmake --build build
+ - name: Install
+ run: cmake --install build --prefix build/install
diff --git a/build-android/jni/Application.mk → .github/workflows/format.yml b/build-android/jni/Application.mk → .github/workflows/format.yml
@@ -1,20 +1,32 @@
-# Copyright 2015 The Android Open Source Project
-# Copyright (C) 2015 Valve Corporation
-
+# 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
-
+#
+# 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-26
-APP_STL := c++_static
-NDK_TOOLCHAIN_VERSION := clang
-NDK_MODULE_PATH := .
+name: format
+
+on:
+ push:
+ pull_request:
+ branches:
+ - main
+
+jobs:
+ code-format:
+ name: Source Code Format Testing
+ runs-on: ubuntu-22.04
+ steps:
+ - uses: actions/checkout@v3
+ - name: Execute Source Code Format Checking Script
+ run: |
+ scripts/check_code_format.sh --target-refspec=origin/${{ github.base_ref }}
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+CMakeUserPresets.json
 CMakeCache.txt
 CMakeLists.txt.user
 CMakeFiles/
@@ -36,5 +37,4 @@ build-android/external
 helper.cmake
 Vulkan-Headers/
 Vulkan-Tools/
-Vulkan-ValidationLayers/
 build-vkconfig*/
diff --git a/.gitmodules b/.gitmodules