Update VMA integration again.

This time using a simpler integration and no template. Bug: chromium:1074162 Change-Id: Ia770f2bf724ffb9b8120dbdbc707133fc61e16c6 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2182173Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Update VMA integration again.
20e631fe · Jamie Madill · Commit Bot · 17545eae · 20e631fe · 20e631fe
Commit 20e631fe authored May 05, 2020 by Jamie Madill Committed by Commit Bot May 08, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 10 deletions

DEPS DEPS +2 -2

angle.gni build_overrides/angle.gni +1 -1

BUILD.gn src/libANGLE/renderer/vulkan/BUILD.gn +1 -7

No files found.
--- a/DEPS
+++ b/DEPS
@@ -89,8 +89,8 @@ deps = {
    'condition': 'not build_with_chromium',
  },
-  'third_party/VulkanMemoryAllocator': {
+  'third_party/vulkan_memory_allocator': {
-    'url': '{chromium_git}/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator@7425dc136ffa08842ece43f71a57fe768046259b',
+    'url': '{chromium_git}/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator@dac952eb0a27736571bf10ac42fbfcc59192f310',
    'condition': 'not build_with_chromium',
  },

--- a/build_overrides/angle.gni
+++ b/build_overrides/angle.gni
@@ -17,4 +17,4 @@ angle_libpng_dir = "//third_party/libpng"
 angle_spirv_cross_dir = "//third_party/spirv-cross/src"
 angle_spirv_headers_dir = "//third_party/spirv-headers/src"
 angle_spirv_tools_dir = "//third_party/spirv-tools/src"
-angle_vulkan_memory_allocator_dir = "//third_party/VulkanMemoryAllocator"
+angle_vulkan_memory_allocator_dir = "//third_party/vulkan_memory_allocator"
--- a/src/libANGLE/renderer/vulkan/BUILD.gn
+++ b/src/libANGLE/renderer/vulkan/BUILD.gn
@@ -178,12 +178,6 @@ angle_source_set("angle_vulkan_headers") {
  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") {
  public_configs = [ ":angle_vulkan_lib_android" ]
  public_deps = [ ":angle_vulkan_headers" ]
@@ -218,7 +212,7 @@ config("angle_vulkan_backend_config") {
 angle_source_set("angle_vk_mem_alloc_wrapper") {
  deps = [
    ":angle_vulkan_headers",
-    ":angle_vulkan_memory_allocator",
+    "$angle_vulkan_memory_allocator_dir",
  ]
  sources = [
    "vk_mem_alloc_wrapper.cpp",