diff options
author | Greg Daniel <egdaniel@google.com> | 2018-05-25 17:25:17 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-25 17:25:23 +0000 |
commit | 98bddf930e4a8767bca60d84d585c386fabfc6b7 (patch) | |
tree | 138c8f9b079fd50538c250101c948c946757064b /third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h | |
parent | 3b526b05d652ad6c310d9c636187b20b51c7648c (diff) |
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>
TBR=egdaniel@google.com,jvanverth@google.com,bsalomon@google.com,bungeman@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>
Diffstat (limited to 'third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h')
-rw-r--r-- | third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h b/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h deleted file mode 100644 index d1cbebc5e6..0000000000 --- a/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2018 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -// We use this header to include vk_mem_alloc.h to make sure we always include GrVkDefines.h first. -// We need to do this so that the corect defines are setup before we include vulkan.h inside of -// vk_mem_alloc.h - -#ifndef GrVulkanMemoryAllocator_DEFINED -#define GrVulkanMemoryAllocator_DEFINED - -#include "../../include/gpu/vk/GrVkDefines.h" -#include "include/vk_mem_alloc.h" - -#endif |