Merge remote-tracking branch 'origin/upstream/main' into main
Change-Id: I31d1d40472a29d98aa3ce8de00676ca0992d7ec3
diff --git a/BUILD.gn b/BUILD.gn
index 9fb5fb7..02eaa32 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -22,6 +22,13 @@
include_dirs = [ "libshaderc_util/include" ]
}
+config("suppress_warnings") {
+ cflags = [
+ "-Wno-deprecated-copy",
+ "-Wno-extra-semi",
+ ]
+}
+
source_set("shaderc_util_sources") {
sources = [
"libshaderc_util/include/libshaderc_util/counting_includer.h",
@@ -56,6 +63,8 @@
"${spirv_tools_dir}:spvtools",
]
+ configs += [ ":suppress_warnings" ]
+
if (build_with_chromium) {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -89,9 +98,9 @@
deps = [
":shaderc_util_sources",
+ "${glslang_dir}:glslang_sources",
"${spirv_tools_dir}:spvtools",
"${spirv_tools_dir}:spvtools_val",
- "${glslang_dir}:glslang_sources",
]
if (build_with_chromium) {
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..b5ae8b9
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,6 @@
+cfontas@google.com
+cstout@google.com
+jbauman@google.com
+jjosh@google.com
+liyl@google.com
+rosasco@google.com
diff --git a/README.fuchsia b/README.fuchsia
new file mode 100644
index 0000000..e69b7b2
--- /dev/null
+++ b/README.fuchsia
@@ -0,0 +1,6 @@
+Name: shaderc
+Upstream git: https://github.com/google/shaderc
+Description:
+
+A collection of tools, libraries and tests for shader compilation.
+
diff --git a/libshaderc_util/include/libshaderc_util/string_piece.h b/libshaderc_util/include/libshaderc_util/string_piece.h
index 89049d9..275c6a1 100644
--- a/libshaderc_util/include/libshaderc_util/string_piece.h
+++ b/libshaderc_util/include/libshaderc_util/string_piece.h
@@ -332,7 +332,7 @@
}
inline bool operator==(const char* first, const string_piece second) {
- return second == first;
+ return string_piece(first) == second;
}
inline bool operator!=(const char* first, const string_piece second) {
