Merge branch 'main' of github.com:KhronosGroup/SPIRV-Headers into header_4_hlsl

Author: AnastaZIuk

.github/workflows/presubmit.yml

@@ -38,6 +38,16 @@ jobs:
           ./bin/makeHeaders
       - name: Check generated headers
         run: git diff --exit-code
+      - name: Check for legacy asciidoc in JSON
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          grep \"\'".*"\'\" include/spirv/unified1/*.json >build/bad-asciidoc.txt || true
+          if [ 0 -lt $(cat build/bad-asciidoc.txt | wc -l) ]; then
+            echo "Legacy asciidoc italics detected, like \"'foo'\". Text formating aren't used anymore. Please use \"foo\" instead."
+            head -10 build/bad-asciidoc.txt
+            exit 1
+          fi
+
 
   test_cmake_min_required:
     runs-on: ubuntu-latest
@@ -121,3 +131,16 @@ jobs:
         run: |
           cmake -S tests/pkg_config -B tests/pkg_config/build/ -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/build/install
           cmake --build tests/pkg_config/build/
+
+  license-check:
+    name: Verify repository license compliance
+    runs-on: ubuntu-latest
+    # We now refer to the container by its SHA instead of the name, to prevent
+    # caching problems when updating the image.
+    # container: khronosgroup/docker-images:asciidoctor-spec.20240726
+    container: khronosgroup/docker-images@sha256:724f67d8562445523644abf017d5d192b369fafc122de75e9d26792c649821a0
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: REUSE license checker
+        run: reuse lint

.gitignore

@@ -1,3 +1,5 @@
 build
 out
 .DS_Store
+bazel-*
+MODULE.bazel.lock

BUILD.bazel

@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(
     default_visibility = ["//visibility:public"],
 )
@@ -121,6 +123,11 @@ filegroup(
     srcs = ["include/spirv/unified1/extinst.spv-amd-shader-trinary-minmax.grammar.json"],
 )
 
+filegroup(
+    name = "spirv_ext_inst_tosa_001000_1",
+    srcs = ["include/spirv/unified1/extinst.tosa.001000.1.grammar.json"],
+)
+
 cc_library(
     name = "spirv_common_headers",
     hdrs = [
@@ -136,6 +143,7 @@ cc_library(
         "include/spirv/unified1/NonSemanticShaderDebugInfo100.h",
         "include/spirv/unified1/NonSemanticVkspReflection.h",
         "include/spirv/unified1/OpenCL.std.h",
+        "include/spirv/unified1/TOSA.001000.1.h",
     ],
     includes = ["include"],
 )
@@ -175,4 +183,3 @@ cc_library(
     includes = ["include"],
     deps = [":spirv_common_headers"],
 )
-

BUILD.gn

@@ -1,26 +1,10 @@
-# Copyright (c) 2020-2024 Google LLC
+# SPDX-FileCopyrightText: 2020-2024 Google LLC
+# SPDX-License-Identifier: MIT
 #
-# 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 and this permission notice shall be included in
-# all copies or substantial portions of the Materials.
-#
-# MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
-# STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
-# HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
-#
-# 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.
+# MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS
+# KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS
+# SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT
+#    https://www.khronos.org/registry/
 
 config("spv_headers_public_config") {
   include_dirs = [ "include" ]

CMakeLists.txt

@@ -1,28 +1,11 @@
-# Copyright (c) 2015-2024 The Khronos Group 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 and this permission notice shall be included
-# in all copies or substantial portions of the Materials.
-#
+# SPDX-FileCopyrightText: 2015-2024 The Khronos Group Inc.
+# SPDX-License-Identifier: MIT
+# 
 # MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS
 # KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS
 # SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT
 #    https://www.khronos.org/registry/
-#
-# 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.
+
 cmake_minimum_required(VERSION 3.14)
 project(SPIRV-Headers LANGUAGES C CXX VERSION 1.5.5)