Merge tag 'vulkan-sdk-1.3.268.0'
Bug:b/319117470
Change-Id: Ifa16007c332ff937bb3fca9a72b073d8e647386f
diff --git a/BUILD.gn b/BUILD.gn
index 0bb0d42..985da51 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -31,6 +31,7 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+import("//build/checkout.gni")
import("//build_overrides/glslang.gni")
# Both Chromium and Fuchsia use by default a set of warning errors
@@ -39,6 +40,14 @@
# definitions. To work around this, determine which configs to
# add and remove in order to succesfully build the project.
if (defined(is_fuchsia_tree) && is_fuchsia_tree) {
+ import("//build/licenses/license.gni")
+
+ license("license") {
+ public_package_name = "glslang"
+ license_files = [ "LICENSE.txt" ]
+ }
+ applicable_licenses = [ ":license" ]
+
_configs_to_remove = [ "//build/config:default_warnings" ]
_configs_to_add = []
} else {
@@ -46,6 +55,16 @@
_configs_to_add = [ "//build/config/compiler:no_chromium_code" ]
}
+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("glslang_build_info") {
script = "build_info.py"
@@ -58,6 +77,7 @@
changes_file,
script,
template_file,
+ git_head,
]
outputs = [ out_file ]
args = [
@@ -106,6 +126,8 @@
config("glslang_hlsl") {
defines = [ "ENABLE_HLSL=1" ]
+
+ cflags = [ "-Wno-conversion" ]
}
template("glslang_sources_common") {
@@ -256,6 +278,12 @@
"-Wno-ignored-qualifiers",
"-Wno-implicit-fallthrough",
"-Wno-inconsistent-missing-override",
+
+ # TODO(rosasco): Fuchsia-only flags
+ "-Wno-unused-variable",
+ "-Wno-unknown-warning-option",
+ "-Wno-extra-semi",
+
"-Wno-missing-field-initializers",
"-Wno-newline-eof",
"-Wno-sign-compare",
@@ -264,6 +292,7 @@
"-Wno-unused-variable",
]
}
+
if (is_win && !is_clang) {
cflags = [
"/wd4018", # signed/unsigned mismatch
@@ -322,8 +351,8 @@
deps = [
":glslang_build_info",
":glslang_default_resource_limits_sources",
- ":glslang_sources",
":glslang_extension_headers",
+ ":glslang_sources",
]
public_configs = [ ":glslang_hlsl" ]
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..d2a5192
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,3 @@
+jjosh@google.com
+liyl@google.com
+
