Skip to content

A
angle
Commit 37ee8a6b by Jamie Madill Committed by Commit Bot
Options

Vulkan: Add Vulkan DEPS.

We will roll the DEPS through to Chromium first, so avoid the problem where DEPS rolls in ANGLE break the CQ (http://crbug.com/643346) We will follow up with build files after this CL makes it into Chrome. Likely we won't roll Vulkan DEPS until the above issue is fixed. BUG=angleproject:1319 Change-Id: I4121143887a614667affe750185d1bc7b8474fa7 Reviewed-on: https://chromium-review.googlesource.com/419720 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 72fc5547
Showing with 55 additions and 11 deletions
.gitignore
...@@ -26,8 +26,12 @@ debug.txt ...@@ -26,8 +26,12 @@ debug.txt
/testing/gtest /testing/gtest
/third_party/cherry /third_party/cherry
/third_party/deqp/src /third_party/deqp/src
/third_party/glslang-angle/src
/third_party/gyp /third_party/gyp
/third_party/libpng /third_party/libpng
/third_party/spirv-headers/src
/third_party/spirv-tools-angle/src
/third_party/vulkan-validation-layers/src
/third_party/zlib /third_party/zlib
/src/tests/third_party/gles_conformance_tests /src/tests/third_party/gles_conformance_tests
out out
......
DEPS
vars = { vars = {
'android_git': 'https://android.googlesource.com',
'chromium_git': 'https://chromium.googlesource.com', 'chromium_git': 'https://chromium.googlesource.com',
} }
deps = { deps = {
'third_party/gyp':
Var('chromium_git') + '/external/gyp' + '@' + '81c2e5ff92af29bab61c982808076ddce3d200a2',
'testing/gtest': 'buildtools':
Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '6f8a66431cb592dad629028a50b3dd418a408c87', Var('chromium_git') + '/chromium/buildtools.git' + '@' + '39b1db2ab4aa4b2ccaa263c29bdf63e7c1ee28aa',
'testing/gmock': 'testing/gmock':
Var('chromium_git') + '/external/googlemock.git' + '@' + '0421b6f358139f02e102c9c332ce19a33faf75be', # from svn revision 566 Var('chromium_git') + '/external/googlemock.git' + '@' + '0421b6f358139f02e102c9c332ce19a33faf75be', # from svn revision 566
'testing/gtest':
Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '6f8a66431cb592dad629028a50b3dd418a408c87',
# Cherry is a dEQP management GUI written in Go. We use it for viewing test results. # Cherry is a dEQP management GUI written in Go. We use it for viewing test results.
'third_party/cherry': 'third_party/cherry':
'https://android.googlesource.com/platform/external/cherry' + '@' + 'd2e26b4d864ec2a6757e7f1174e464949ca5bf73', Var('android_git') + '/platform/external/cherry' + '@' + 'd2e26b4d864ec2a6757e7f1174e464949ca5bf73',
'third_party/deqp/src': 'third_party/deqp/src':
'https://android.googlesource.com/platform/external/deqp' + '@' + '455d82c60b096e7bd83b6a2f5ed70c61e4bfa759', Var('android_git') + '/platform/external/deqp' + '@' + '455d82c60b096e7bd83b6a2f5ed70c61e4bfa759',
'third_party/glslang-angle/src':
Var('android_git') + '/platform/external/shaderc/glslang' + '@' + '1e275c8486325aaab34734ad9a650c0121c5efdb',
'third_party/gyp':
Var('chromium_git') + '/external/gyp' + '@' + '81c2e5ff92af29bab61c982808076ddce3d200a2',
'third_party/libpng': 'third_party/libpng':
'https://android.googlesource.com/platform/external/libpng' + '@' + '094e181e79a3d6c23fd005679025058b7df1ad6c', Var('android_git') + '/platform/external/libpng' + '@' + '094e181e79a3d6c23fd005679025058b7df1ad6c',
'third_party/zlib': 'third_party/spirv-headers/src':
Var('chromium_git') + '/chromium/src/third_party/zlib' + '@' + 'afd8c4593c010c045902f6c0501718f1823064a3', Var('android_git') + '/platform/external/shaderc/spirv-headers' + '@' + 'c470b68225a04965bf87d35e143ae92f831e8110',
'buildtools': 'third_party/spirv-tools-angle/src':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + '39b1db2ab4aa4b2ccaa263c29bdf63e7c1ee28aa', Var('android_git') + '/platform/external/shaderc/spirv-tools' + '@' + '68c5f0436f1d4f1f137e608780190865d0b193ca',
'third_party/vulkan-validation-layers/src':
Var('android_git') + '/platform/external/vulkan-validation-layers' + '@' + '38de34103bb8f7a91527ce04f9537b82dd526638',
'third_party/zlib':
Var('chromium_git') + '/chromium/src/third_party/zlib' + '@' + 'afd8c4593c010c045902f6c0501718f1823064a3',
} }
hooks = [ hooks = [
......
DEPS.chromium
...@@ -11,13 +11,39 @@ ...@@ -11,13 +11,39 @@
vars = { vars = {
'android_git': 'https://android.googlesource.com', 'android_git': 'https://android.googlesource.com',
# Current revision of dEQP.
'deqp_revision': '455d82c60b096e7bd83b6a2f5ed70c61e4bfa759', 'deqp_revision': '455d82c60b096e7bd83b6a2f5ed70c61e4bfa759',
# Current revision of glslang, the Khronos SPIRV compiler.
'glslang_revision': '1e275c8486325aaab34734ad9a650c0121c5efdb',
# Current revision fo the SPIRV-Headers Vulkan support library.
'spirv_headers_revision': 'c470b68225a04965bf87d35e143ae92f831e8110',
# Current revision of SPIRV-Tools for Vulkan.
'spirv_tools_revision': '68c5f0436f1d4f1f137e608780190865d0b193ca',
# Current revision of the Vulkan Validation Layers SDK.
'vulkan_revision': '38de34103bb8f7a91527ce04f9537b82dd526638',
} }
deps_os = { deps_os = {
'win': { 'win': {
'src/third_party/deqp/src': 'src/third_party/deqp/src':
Var('android_git') + '/platform/external/deqp@' + Var('deqp_revision'), Var('android_git') + '/platform/external/deqp@' + Var('deqp_revision'),
'src/third_party/glslang-angle/src':
Var('android_git') + '/platform/external/shaderc/glslang@' + Var('glslang_revision'),
'src/third_party/spirv-headers/src':
Var('android_git') + '/platform/external/shaderc/spirv-headers@' + Var('spirv_headers_revision'),
'src/third_party/spirv-tools-angle/src':
Var('android_git') + '/platform/external/shaderc/spirv-tools@' + Var('spirv_tools_revision'),
'src/third_party/vulkan-validation-layers/src':
Var('android_git') + '/platform/external/vulkan-validation-layers@' + Var('vulkan_revision'),
}, },
'unix': { 'unix': {
'src/third_party/deqp/src': 'src/third_party/deqp/src':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment