Updated spirv-cross to vulkan-sdk-1.3.268.0

libs/spirv-cross/.clang-format

@@ -1,3 +1,6 @@
+# Copyright 2016-2021 The Khronos Group Inc.
+# SPDX-License-Identifier: Apache-2.0
+
 # The style used for all options not specifically set in the configuration.
 BasedOnStyle: LLVM
 

libs/spirv-cross/.github/workflows/main.yml

@@ -0,0 +1,83 @@
+# Copyright 2020-2021 The Khronos Group, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+name: CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    types: [ opened, synchronize, reopened ]
+
+jobs:
+  build:
+    name: "Build ${{ matrix.platform }}"
+    strategy:
+      matrix:
+        platform: [windows-latest, ubuntu-20.04, ubuntu-22.04, macos-latest]
+    env:
+      PARALLEL: -j 2
+
+    runs-on: "${{ matrix.platform }}"
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+
+      - name: Cache glslang / SPIRV-Tools
+        id: cache-externals
+        uses: actions/cache@v3
+        with:
+          path: external/*-build/output
+          key: ${{ matrix.platform }} externals ${{ hashFiles('checkout_glslang_spirv_tools.sh', 'build_glslang_spirv_tools.sh') }}
+
+      - name: Pull glslang / SPIRV-Tools
+        if: steps.cache-externals.outputs.cache-hit != 'true'
+        shell: bash
+        working-directory: ${{github.workspace}}
+        run: ./checkout_glslang_spirv_tools.sh
+
+      - name: Build glslang / SPIRV-Tools
+        if: steps.cache-externals.outputs.cache-hit != 'true'
+        shell: bash
+        working-directory: ${{github.workspace}}
+        run: ./build_glslang_spirv_tools.sh Release 4
+
+      - name: Configure SPIRV-Cross
+        shell: bash
+        run: |
+          mkdir build
+          cd build
+          cmake .. -DSPIRV_CROSS_WERROR=ON -DSPIRV_CROSS_MISC_WARNINGS=ON -DSPIRV_CROSS_SHARED=ON -DCMAKE_INSTALL_PREFIX=output -DCMAKE_BUILD_TYPE=Release -DSPIRV_CROSS_ENABLE_TESTS=ON
+
+      - name: Build SPIRV-Cross
+        shell: bash
+        working-directory: ${{github.workspace}}/build
+        run: |
+          cmake --build . --config Release --parallel 4
+          cmake --build . --config Release --target install
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.platform }}-binaries
+          path: build/output
+      - name: Test SPIRV-Cross
+        shell: bash
+        working-directory: ${{github.workspace}}/build
+        run: ctest --verbose -C Release
+  reuse:
+    name: "REUSE license check"
+    runs-on: ubuntu-latest
+    container: khronosgroup/docker-images:asciidoctor-spec
+
+    steps:
+      - uses: actions/checkout@v3
+
+      # REUSE license checker
+      - name: license-check
+        run: |
+          reuse lint
+
+

libs/spirv-cross/.gitignore

@@ -1,3 +1,6 @@
+# Copyright 2016-2021 The Khronos Group Inc.
+# SPDX-License-Identifier: Apache-2.0
+
 *.o
 *.d
 *.txt
@@ -18,3 +21,4 @@
 *.vcxproj.user
 
 !CMakeLists.txt
+!LICENSES/*.txt

libs/spirv-cross/.reuse/dep5

@@ -0,0 +1,11 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: SPIRV-Cross
+Source: https://github.com/KhronosGroup/SPIRV-Cross
+
+Files: shaders*/* reference/* tests-other/*
+Copyright: 2016-2021 The Khronos Group, Inc.
+License: Apache-2.0
+
+Files: spirv.h spirv.hpp GLSL.std.450.h
+Copyright: 2016-2021 The Khronos Group, Inc.
+License: LicenseRef-KhronosFreeUse

libs/spirv-cross/CMakeLists.txt

@@ -242,7 +242,19 @@ set(spirv-cross-util-sources
 		${CMAKE_CURRENT_SOURCE_DIR}/spirv_cross_util.cpp
 		${CMAKE_CURRENT_SOURCE_DIR}/spirv_cross_util.hpp)
 
+set(spirv-cross-abi-major 0)
+set(spirv-cross-abi-minor 57)
+set(spirv-cross-abi-patch 0)
+set(SPIRV_CROSS_VERSION ${spirv-cross-abi-major}.${spirv-cross-abi-minor}.${spirv-cross-abi-patch})
+
 if (SPIRV_CROSS_STATIC)
+	if (NOT SPIRV_CROSS_SKIP_INSTALL)
+		configure_file(
+			${CMAKE_CURRENT_SOURCE_DIR}/pkg-config/spirv-cross-c.pc.in
+			${CMAKE_CURRENT_BINARY_DIR}/spirv-cross-c.pc @ONLY)
+		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/spirv-cross-c.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+	endif()
+
 	spirv_cross_add_library(spirv-cross-core spirv_cross_core STATIC
 			${spirv-cross-core-sources})
 
@@ -331,13 +343,7 @@ if (SPIRV_CROSS_STATIC)
 	endif()
 endif()
 
-set(spirv-cross-abi-major 0)
-set(spirv-cross-abi-minor 48)
-set(spirv-cross-abi-patch 0)
-
 if (SPIRV_CROSS_SHARED)
-	set(SPIRV_CROSS_VERSION ${spirv-cross-abi-major}.${spirv-cross-abi-minor}.${spirv-cross-abi-patch})
-
 	if (NOT SPIRV_CROSS_SKIP_INSTALL)
 		configure_file(
 			${CMAKE_CURRENT_SOURCE_DIR}/pkg-config/spirv-cross-c-shared.pc.in