Skip to content

Commit

Permalink
build: Downstream Vulkan-Headers 1.3.278
Browse files Browse the repository at this point in the history
  • Loading branch information
aqnuep committed Feb 28, 2024
1 parent c2cd2b1 commit 80abb0b
Show file tree
Hide file tree
Showing 44 changed files with 2,544 additions and 1,368 deletions.
34 changes: 0 additions & 34 deletions .cmake-format.py

This file was deleted.

8 changes: 8 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# ~~~
# Copyright 2018-2023 The Khronos Group Inc.
# Copyright 2018-2023 Valve Corporation
# Copyright 2018-2023 LunarG, Inc.
#
# SPDX-License-Identifier: Apache-2.0
# ~~~

# See https://git-scm.com/docs/gitattributes
# See https://help.github.com/articles/dealing-with-line-endings/

Expand Down
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@ This repository is responsible for the following files

* BUILD.gn
* BUILD.md
* cmake/
* cmake/*
* CMakeLists.txt
* tests/*
* CODE_OF_CONDUCT.md
* INTEGRATION.md
* LICENSE.txt
* README.md
* Non-API headers
Expand Down
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# ~~~
# Copyright 2023 LunarG, Inc.
#
# SPDX-License-Identifier: Apache-2.0
# ~~~
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
open-pull-requests-limit: 3
19 changes: 19 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!-- Please note when contributing what files this repository actually is responsible for.
VulkanSC-Headers exists as a publishing mechanism for headers and related material sourced from multiple other repositories. If you have a problem with that material, it should *not* be reported here, but in the appropriate repository:
This repository is responsible for the following files
* BUILD.gn
* BUILD.md
* cmake/*
* CMakeLists.txt
* tests/*
* CODE_OF_CONDUCT.md
* LICENSE.txt
* README.md
* Non-API headers
* include/vulkan/vk_icd.h
* include/vulkan/vk_layer.h
-->
66 changes: 66 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# Copyright 2022-2023 LunarG, Inc.
# Copyright 2023-2024 RasterGrid Kft.
#
# SPDX-License-Identifier: Apache-2.0

name: ci

on:
push:
pull_request:
branches:
- main
- sc_main

env:
CMAKE_GENERATOR: Ninja

permissions:
contents: read

jobs:
cmake:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ ubuntu-latest, windows-latest, macos-latest ]
cmake-version: [ '3.15', 'latest']
steps:
- uses: actions/checkout@v4
- uses: lukka/get-cmake@latest
with:
cmakeVersion: ${{ matrix.cmake-version }}
- uses: ilammy/msvc-dev-cmd@v1
- run: cmake -S . -B build -D BUILD_TESTS=ON -G Ninja -DVULKANSC=ON
- run: cmake --build build
- run: cmake --install build --prefix ${GITHUB_WORKSPACE}/build/install
- run: ctest --output-on-failure
working-directory: build

cmake-combined-headers:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ ubuntu-latest, windows-latest, macos-latest ]
cmake-version: [ '3.15', 'latest']
steps:
- uses: actions/checkout@v4
- uses: lukka/get-cmake@latest
with:
cmakeVersion: ${{ matrix.cmake-version }}
- uses: actions/setup-python@v4
with:
python-version: '3.8'
- uses: ilammy/msvc-dev-cmd@v1
- run: cmake -S . -B build -D BUILD_TESTS=ON -G Ninja -DVULKANSC=ON -DGEN_VULKANSC_COMBINED=ON
- run: cmake --build build
- run: cmake --install build --prefix ${GITHUB_WORKSPACE}/build/install
- run: ctest --output-on-failure
working-directory: build

reuse:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: REUSE Compliance Check
uses: fsfe/reuse-action@v2
107 changes: 0 additions & 107 deletions .github/workflows/linux.yml

This file was deleted.

8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# ~~~
# Copyright 2018-2023 The Khronos Group Inc.
# Copyright 2018-2023 Valve Corporation
# Copyright 2018-2023 LunarG, Inc.
#
# SPDX-License-Identifier: Apache-2.0
# ~~~

# Python cache
__pycache__
*.pyc
Expand Down
15 changes: 15 additions & 0 deletions .reuse/dep5
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: VulkanSC-Headers
Source: https://github.com/KhronosGroup/VulkanSC-Headers

Files: json/vk.json json/vkppc.json
Copyright: 2022-2024 The Khronos Group Inc.
License: Apache-2.0

Files: registry/validusage.json
Copyright: 2018-2024 The Khronos Group Inc.
License: Apache-2.0

Files: .github/ISSUE_TEMPLATE/bug_report.md .github/pull_request_template.md
Copyright: 2022-2024 The Khronos Group Inc.
License: Apache-2.0
34 changes: 19 additions & 15 deletions BUILD.gn
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
# Copyright (C) 2018-2023 The ANGLE Project Authors.
# Copyright (C) 2019-2023 LunarG, Inc.
# Copyright 2018-2023 The ANGLE Project Authors.
# Copyright 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.
# 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.
# SPDX-License-Identifier: Apache-2.0

import("//build_overrides/vulkan_headers.gni")

Expand All @@ -37,9 +27,15 @@ config("vulkan_headers_config") {
if (is_fuchsia) {
defines += [ "VK_USE_PLATFORM_FUCHSIA" ]
}
if (is_mac) {
if (is_apple) {
defines += [ "VK_USE_PLATFORM_METAL_EXT" ]
}
if (is_mac) {
defines += [ "VK_USE_PLATFORM_MACOS_MVK" ]
}
if (is_ios) {
defines += [ "VK_USE_PLATFORM_IOS_MVK" ]
}
if (defined(is_ggp) && is_ggp) {
defines += [ "VK_USE_PLATFORM_GGP" ]
}
Expand All @@ -60,7 +56,15 @@ source_set("vulkan_headers") {
"include/vulkan/vulkan.hpp",
"include/vulkan/vulkan_core.h",
"include/vulkan/vulkan_screen.h",
"include/vk_video/vulkan_video_codec_av1std_decode.h",
"include/vk_video/vulkan_video_codec_av1std.h",
"include/vk_video/vulkan_video_codec_h264std_decode.h",
"include/vk_video/vulkan_video_codec_h264std_encode.h",
"include/vk_video/vulkan_video_codec_h264std.h",
"include/vk_video/vulkan_video_codec_h265std_decode.h",
"include/vk_video/vulkan_video_codec_h265std_encode.h",
"include/vk_video/vulkan_video_codec_h265std.h",
"include/vk_video/vulkan_video_codecs_common.h",
]
public_configs = [ ":vulkan_headers_config" ]
}

10 changes: 7 additions & 3 deletions BUILD.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!--
Copyright 2018-2024 The Khronos Group Inc.
SPDX-License-Identifier: Apache-2.0
-->

# Vulkan SC Build Instructions

Build the Vulkan SC headers from this repository as follows:
Expand Down Expand Up @@ -53,7 +59,5 @@ find_package(VulkanHeaders REQUIRED CONFIG)
target_link_libraries(foobar PRIVATE Vulkan::Headers)
message(STATUS "Vulkan Headers Registry: ${VULKAN_HEADERS_REGISTRY_DIRECTORY}")
message(STATUS "Vulkan Headers Version: ${VulkanHeaders_VERSION}")
message(STATUS "Vulkan SC Headers Version: ${VulkanHeaders_VERSION}")
```
Loading

0 comments on commit 80abb0b

Please sign in to comment.