Skip to content

A
angle
Commit ca50ad42 by Jamie Madill Committed by Commit Bot
Options

Vulkan: Update VMA integration.

This will allow ANGLE to share the same source location as Chromium. Bug: chromium:1074162 Change-Id: I3ea9820cc1fe9cd0bfec81d734168213e5c1bb0b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2176067Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 73bf99b7
Showing with 10 additions and 2 deletions
DEPS
...@@ -90,7 +90,8 @@ deps = { ...@@ -90,7 +90,8 @@ deps = {
}, },
'third_party/VulkanMemoryAllocator': { 'third_party/VulkanMemoryAllocator': {
'url': '{chromium_git}/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator@ebd397e6524227c623604c0cb2d4c5f225a5282d', 'url': '{chromium_git}/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator@7425dc136ffa08842ece43f71a57fe768046259b',
'condition': 'not build_with_chromium',
}, },
'third_party/VK-GL-CTS/src': { 'third_party/VK-GL-CTS/src': {
......
build_overrides/angle.gni
...@@ -17,3 +17,4 @@ angle_libpng_dir = "//third_party/libpng" ...@@ -17,3 +17,4 @@ angle_libpng_dir = "//third_party/libpng"
angle_spirv_cross_dir = "//third_party/spirv-cross/src" angle_spirv_cross_dir = "//third_party/spirv-cross/src"
angle_spirv_headers_dir = "//third_party/spirv-headers/src" angle_spirv_headers_dir = "//third_party/spirv-headers/src"
angle_spirv_tools_dir = "//third_party/spirv-tools/src" angle_spirv_tools_dir = "//third_party/spirv-tools/src"
angle_vulkan_memory_allocator_dir = "//third_party/VulkanMemoryAllocator"
src/libANGLE/renderer/vulkan/BUILD.gn
...@@ -178,6 +178,12 @@ angle_source_set("angle_vulkan_headers") { ...@@ -178,6 +178,12 @@ angle_source_set("angle_vulkan_headers") {
public_configs = [ ":angle_vulkan_headers_config" ] public_configs = [ ":angle_vulkan_headers_config" ]
} }
import("$angle_vulkan_memory_allocator_dir/vulkan_memory_allocator.gni")
vulkan_memory_allocator("angle_vulkan_memory_allocator") {
deps = [ ":angle_vulkan_headers" ]
vulkan_memory_allocator_dir = "$angle_vulkan_memory_allocator_dir"
}
group("angle_vulkan_entry_points") { group("angle_vulkan_entry_points") {
public_configs = [ ":angle_vulkan_lib_android" ] public_configs = [ ":angle_vulkan_lib_android" ]
public_deps = [ ":angle_vulkan_headers" ] public_deps = [ ":angle_vulkan_headers" ]
...@@ -212,7 +218,7 @@ config("angle_vulkan_backend_config") { ...@@ -212,7 +218,7 @@ config("angle_vulkan_backend_config") {
angle_source_set("angle_vk_mem_alloc_wrapper") { angle_source_set("angle_vk_mem_alloc_wrapper") {
deps = [ deps = [
":angle_vulkan_headers", ":angle_vulkan_headers",
"$angle_root/third_party/VulkanMemoryAllocator:vulkan_memory_allocator", ":angle_vulkan_memory_allocator",
] ]
sources = [ sources = [
"vk_mem_alloc_wrapper.cpp", "vk_mem_alloc_wrapper.cpp",
......
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