Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull latest SPIRV-Cross, fixing Metal shader compilation #14850

Merged
merged 4 commits into from
Jan 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions deps/SPIRV-Cross/.clang-format
Original file line number Diff line number Diff line change
@@ -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

Expand Down
70 changes: 70 additions & 0 deletions deps/SPIRV-Cross/.github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# 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-18.04, ubuntu-20.04, macos-latest]
env:
PARALLEL: -j 2

runs-on: "${{ matrix.platform }}"
steps:
- uses: actions/checkout@v2

- uses: actions/setup-python@v2
with:
python-version: '3.x'

- name: Pull glslang / SPIRV-Tools
shell: bash
working-directory: ${{github.workspace}}
run: ./checkout_glslang_spirv_tools.sh

- name: Build glslang / SPIRV-Tools
shell: bash
working-directory: ${{github.workspace}}
run: ./build_glslang_spirv_tools.sh Release

- 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
cmake --build . --config Release --target install

- 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@v2

# REUSE license checker
- name: license-check
run: |
reuse lint


4 changes: 4 additions & 0 deletions deps/SPIRV-Cross/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright 2016-2021 The Khronos Group Inc.
# SPDX-License-Identifier: Apache-2.0

*.o
*.d
*.txt
Expand All @@ -18,3 +21,4 @@
*.vcxproj.user

!CMakeLists.txt
!LICENSES/*.txt
11 changes: 11 additions & 0 deletions deps/SPIRV-Cross/.reuse/dep5
Original file line number Diff line number Diff line change
@@ -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: MIT
72 changes: 0 additions & 72 deletions deps/SPIRV-Cross/.travis.yml

This file was deleted.