From 18dbfd05e435bdfbc85d436f0ec29ccbbc450291 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Tue, 29 May 2018 10:46:51 -0400 Subject: Reland "Create API for GrVkMemoryAllocator and impliment use of AMD VulkanMemoryAllocator on this API." This reverts commit 98bddf930e4a8767bca60d84d585c386fabfc6b7. Reason for revert: Original change's description: > Revert "Create API for GrVkMemoryAllocator and impliment use of AMD VulkanMemoryAllocator on this API." > > This reverts commit 26c0e4c1f54759249c2d61b50fb5430bd73793f2. > > Reason for revert: breaks roll into fuchsia > > Original change's description: > > Create API for GrVkMemoryAllocator and impliment use of AMD VulkanMemoryAllocator on this API. > > > > Bug: skia: > > Change-Id: I1e122e1b11ab308c2f83cb98c36c81511f4507d0 > > Reviewed-on: https://skia-review.googlesource.com/129980 > > Commit-Queue: Greg Daniel > > Reviewed-by: Brian Salomon > > Reviewed-by: Jim Van Verth > > > > Change-Id: I6c74978f778987c422e6162e7dd85ea9c6baa0e4 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/130182 > Reviewed-by: Greg Daniel > Commit-Queue: Greg Daniel Bug: skia: Change-Id: I422ffb3562da567f2e85c806286ad1a17c3862cd Reviewed-on: https://skia-review.googlesource.com/130183 Reviewed-by: Greg Daniel Commit-Queue: Greg Daniel --- gn/gn_to_bp_utils.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gn/gn_to_bp_utils.py') diff --git a/gn/gn_to_bp_utils.py b/gn/gn_to_bp_utils.py index 65456408cd..78217a79db 100644 --- a/gn/gn_to_bp_utils.py +++ b/gn/gn_to_bp_utils.py @@ -45,6 +45,13 @@ def GrabDependentValues(js, name, value_type, list_to_extend, exclude): def CleanupCFlags(cflags): # Only use the generated flags related to warnings. cflags = {s for s in cflags if s.startswith('-W')} + # Add additional warning suppressions so we can build + # third_party/vulkanmemoryallocator + cflags = cflags.union([ + "-Wno-thread-safety-analysis", + "-Wno-missing-field-initializers", + "-Wno-unused-variable", + ]) # Add the rest of the flags we want. cflags = cflags.union([ "-fvisibility=hidden", -- cgit v1.2.3