Skip to content

A
angle
Commit 9af765dd by Jamie Madill Committed by Commit Bot
Options

Vulkan: Roll loader/validation layers SDK. (1/2)

This hasn't been updated in a while, so there are many changes. It should also include better validation for memory barriers. Also includes updated builds for SPIRV Tools and glslang. A few pull requests need to land before landing this in ANGLE. First part disables Vulkan and rolls the layers. The second part will re-enable Vulkan with the updated loader/layers build. Bug: angleproject:2237 Change-Id: I112521541ea66b26eadeb959852418dc91be2e18 Reviewed-on: https://chromium-review.googlesource.com/805417Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 21f67ae0
Showing with 14 additions and 10 deletions
DEPS
...@@ -22,7 +22,7 @@ deps = { ...@@ -22,7 +22,7 @@ deps = {
Var('android_git') + '/platform/external/deqp' + '@' + '455d82c60b096e7bd83b6a2f5ed70c61e4bfa759', Var('android_git') + '/platform/external/deqp' + '@' + '455d82c60b096e7bd83b6a2f5ed70c61e4bfa759',
'third_party/glslang-angle/src': 'third_party/glslang-angle/src':
Var('android_git') + '/platform/external/shaderc/glslang' + '@' + '1e275c8486325aaab34734ad9a650c0121c5efdb', Var('android_git') + '/platform/external/shaderc/glslang' + '@' + '2edde6665d9a56ead5ea0e55b4e64d9a803e6164',
'third_party/googletest/src': 'third_party/googletest/src':
Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + 'd175c8bf823e709d570772b038757fadf63bc632', Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + 'd175c8bf823e709d570772b038757fadf63bc632',
...@@ -31,13 +31,13 @@ deps = { ...@@ -31,13 +31,13 @@ deps = {
Var('android_git') + '/platform/external/libpng' + '@' + '094e181e79a3d6c23fd005679025058b7df1ad6c', Var('android_git') + '/platform/external/libpng' + '@' + '094e181e79a3d6c23fd005679025058b7df1ad6c',
'third_party/spirv-headers/src': 'third_party/spirv-headers/src':
Var('android_git') + '/platform/external/shaderc/spirv-headers' + '@' + 'c470b68225a04965bf87d35e143ae92f831e8110', Var('android_git') + '/platform/external/shaderc/spirv-headers' + '@' + '98b01515724c428d0f0a5d01deffcce0f5f5e61c',
'third_party/spirv-tools-angle/src': 'third_party/spirv-tools-angle/src':
Var('android_git') + '/platform/external/shaderc/spirv-tools' + '@' + '68c5f0436f1d4f1f137e608780190865d0b193ca', Var('android_git') + '/platform/external/shaderc/spirv-tools' + '@' + '9996173f363729b3a97309685dbd4d78547a63a7',
'third_party/vulkan-validation-layers/src': 'third_party/vulkan-validation-layers/src':
Var('android_git') + '/platform/external/vulkan-validation-layers' + '@' + 'f47c534fee2f26f6b783209d56e0ade48e30eb8d', Var('android_git') + '/platform/external/vulkan-validation-layers' + '@' + '3f948b98f9bca965fecca1fb5b60f8787e959464',
'third_party/zlib': 'third_party/zlib':
Var('chromium_git') + '/chromium/src/third_party/zlib' + '@' + '24ab14872e8e068ba08cc31cc3d43bcc6d5cb832', Var('chromium_git') + '/chromium/src/third_party/zlib' + '@' + '24ab14872e8e068ba08cc31cc3d43bcc6d5cb832',
......
DEPS.chromium
...@@ -16,16 +16,16 @@ vars = { ...@@ -16,16 +16,16 @@ vars = {
'deqp_revision': '455d82c60b096e7bd83b6a2f5ed70c61e4bfa759', 'deqp_revision': '455d82c60b096e7bd83b6a2f5ed70c61e4bfa759',
# Current revision of glslang, the Khronos SPIRV compiler. # Current revision of glslang, the Khronos SPIRV compiler.
'glslang_revision': '1e275c8486325aaab34734ad9a650c0121c5efdb', 'glslang_revision': '2edde6665d9a56ead5ea0e55b4e64d9a803e6164',
# Current revision fo the SPIRV-Headers Vulkan support library. # Current revision fo the SPIRV-Headers Vulkan support library.
'spirv_headers_revision': 'c470b68225a04965bf87d35e143ae92f831e8110', 'spirv_headers_revision': '98b01515724c428d0f0a5d01deffcce0f5f5e61c',
# Current revision of SPIRV-Tools for Vulkan. # Current revision of SPIRV-Tools for Vulkan.
'spirv_tools_revision': '68c5f0436f1d4f1f137e608780190865d0b193ca', 'spirv_tools_revision': '9996173f363729b3a97309685dbd4d78547a63a7',
# Current revision of the Vulkan Validation Layers SDK. # Current revision of the Vulkan Validation Layers SDK.
'vulkan_revision': 'f47c534fee2f26f6b783209d56e0ade48e30eb8d', 'vulkan_revision': '3f948b98f9bca965fecca1fb5b60f8787e959464',
} }
deps = { deps = {
......
gni/angle.gni
...@@ -29,13 +29,17 @@ if (is_win) { ...@@ -29,13 +29,17 @@ if (is_win) {
angle_enable_d3d11 = true angle_enable_d3d11 = true
angle_enable_gl = true angle_enable_gl = true
angle_enable_gl_null = true angle_enable_gl_null = true
angle_enable_vulkan = true
# TODO(jmadill): Re-enable after roll.
# angle_enable_vulkan = true
import("//build/config/win/visual_studio_version.gni") import("//build/config/win/visual_studio_version.gni")
} else if (is_linux && use_x11 && !is_chromeos) { } else if (is_linux && use_x11 && !is_chromeos) {
angle_enable_gl = true angle_enable_gl = true
angle_enable_gl_null = true angle_enable_gl_null = true
angle_enable_vulkan = true
# TODO(jmadill): Re-enable after roll.
# angle_enable_vulkan = true
} else if (is_mac || ozone_platform_gbm) { } else if (is_mac || ozone_platform_gbm) {
angle_enable_gl = true angle_enable_gl = true
angle_enable_gl_null = true angle_enable_gl_null = true
......
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