diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-05-29 10:46:51 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-30 13:27:38 +0000 |
| commit | 18dbfd05e435bdfbc85d436f0ec29ccbbc450291 (patch) | |
| tree | 1977593452e34dd277a7a26805d1167f6a4e74a3 /third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.cpp | |
| parent | 93540dd15715057e00b4f136977f441720317b60 (diff) | |
Reland "Create API for GrVkMemoryAllocator and impliment use of AMD VulkanMemoryAllocator on this API."
This reverts commit 98bddf930e4a8767bca60d84d585c386fabfc6b7.
Reason for revert: <INSERT REASONING HERE>
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 <egdaniel@google.com>
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
> > Reviewed-by: Jim Van Verth <jvanverth@google.com>
>
>
>
> 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 <egdaniel@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>
Bug: skia:
Change-Id: I422ffb3562da567f2e85c806286ad1a17c3862cd
Reviewed-on: https://skia-review.googlesource.com/130183
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.cpp')
| -rw-r--r-- | third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.cpp b/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.cpp new file mode 100644 index 0000000000..58884630c5 --- /dev/null +++ b/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.cpp @@ -0,0 +1,16 @@ +/* + * Copyright 2018 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +// Workaround to make sure we align non-coherent memory to nonCoherentAtomSize. +#define VMA_DEBUG_ALIGNMENT 256 + +// We use our own functions pointers +#define VMA_STATIC_VULKAN_FUNCTIONS 0 + +#define VMA_IMPLEMENTATION +#include "GrVulkanMemoryAllocator.h" + |