Merge tag 'vulkan-sdk-1.3.268.0'
Bug:b/319117470
Change-Id: I4bc29354d96067c265a8bd5123d6b44f5c680029
diff --git a/BUILD.gn b/BUILD.gn
index 9ff36d8..88d24cd 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+import("//build/checkout.gni")
import("//build_overrides/build.gni")
import("//build_overrides/spirv_tools.gni")
if (build_with_chromium) {
@@ -259,12 +260,30 @@
]
}
+# When submodules are enabled, .git changes location.
+if (submodules) {
+ git_link_path_list =
+ read_file(".git", "list lines")
+ git_link_path = git_link_path_list[0]
+ relative_git_dir_split = string_split(git_link_path)
+ relative_git_dir = relative_git_dir_split[1]
+ git_head =
+ "${relative_git_dir}/HEAD"
+} else {
+ git_head = ".git/HEAD"
+}
+
action("spvtools_build_version") {
script = "utils/update_build_version.py"
changes_file = "CHANGES"
inc_file = "${target_gen_dir}/build-version.inc"
+ inputs = [
+ "CHANGES",
+ git_head,
+ ]
+
outputs = [ inc_file ]
args = [
rebase_path(changes_file, root_build_dir),
@@ -366,6 +385,8 @@
"-Wno-newline-eof",
"-Wno-unreachable-code-break",
"-Wno-unreachable-code-return",
+ "-Wno-unused-but-set-variable",
+ "-Wno-deprecated-copy",
]
} else if (!is_win) {
# Work around a false-positive on a Skia GCC 10 builder.
@@ -413,8 +434,8 @@
":spvtools_opencl_tables_opencl1-0",
]
foreach(table_def, spvtools_vendor_tables) {
- target_name = table_def[0]
- deps += [ ":spvtools_vendor_tables_$target_name" ]
+ _target_def_name = table_def[0]
+ deps += [ ":spvtools_vendor_tables_${_target_def_name}" ]
}
sources = [
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..201d65e
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,5 @@
+cstout@google.com
+jbauman@google.com
+jjosh@google.com
+liyl@google.com
+rosasco@google.com
