diff options
author | Cody Northrop <cnorthrop@google.com> | 2019-09-16 07:57:01 -0600 |
---|---|---|
committer | Cody Northrop <cnorthrop@google.com> | 2019-09-16 07:57:01 -0600 |
commit | 75992cfa407810b03676cd144cd3f33c776fd986 (patch) | |
tree | 7c06496cf5701863e05127929e60710d03a09c19 /scripts/known_good.json | |
parent | 7c9c8f85d5e35e2417310bbcaee31b946eaaf47d (diff) | |
parent | bcabc204a27a93d6b686920a6d46c17f9aaa3ce0 (diff) | |
download | vulkan-tools-75992cfa407810b03676cd144cd3f33c776fd986.tar.gz |
Merge commit 'bcabc204a27a93d6b686920a6d46c17f9aaa3ce0' into merge-vulkan-1.1.121HEADndk-r23-beta6ndk-r23-beta5ndk-r23-beta4ndk-r23-beta3ndk-r23-beta2ndk-r23-beta1ndk-r22-beta1ndk-r22ndk-r21endk-r21dndk-r21cndk-r21bndk-r21-rc1ndk-r21-beta2ndk-r21-beta1ndk-r21ndk-release-r23ndk-release-r22ndk-release-r21mastermainbusytown-mac1010-release
Change-Id: Ie9b538ca65a94162269c74e96d279b7fac342b7c
Diffstat (limited to 'scripts/known_good.json')
-rw-r--r-- | scripts/known_good.json | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/scripts/known_good.json b/scripts/known_good.json index 46a6c3ea..7adfa728 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -6,7 +6,7 @@ "sub_dir" : "glslang", "build_dir" : "glslang/build", "install_dir" : "glslang/build/install", - "commit" : "21eebe74214488264bbf0d19323a03c13a9e53a7", + "commit" : "333d1c95792692205472c457d7bec915a94c8000", "prebuild" : [ "python update_glslang_sources.py" ] @@ -17,7 +17,7 @@ "sub_dir" : "Vulkan-Headers", "build_dir" : "Vulkan-Headers/build", "install_dir" : "Vulkan-Headers/build/install", - "commit" : "v1.1.114" + "commit" : "v1.1.121" }, { "name" : "MoltenVK", @@ -25,7 +25,7 @@ "sub_dir" : "MoltenVK", "build_dir" : "MoltenVK", "install_dir" : "MoltenVK", - "commit" : "v1.0.35", + "commit" : "v1.0.36", "custom_build" : [ "./fetchDependencies --v-headers-root {0[Vulkan-Headers][repo_dir]} --glslang-root {0[glslang][repo_dir]}", "xcodebuild -project MoltenVKPackaging.xcodeproj GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS MVK_CONFIG_LOG_LEVEL=1' -scheme \"MoltenVK Package\" build" @@ -41,7 +41,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit" : "v1.1.114", + "commit" : "v1.1.121", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR", @@ -50,6 +50,10 @@ ], "cmake_options" : [ "-DBUILD_TESTS=NO" + ], + "build_platforms" : [ + "linux", + "darwin" ] } ], |