From 98e71a2a429b2ef2ba534e3e8fd0ce31e65d0518 Mon Sep 17 00:00:00 2001 From: Jorge Pineda Date: Wed, 8 May 2024 14:04:09 -0700 Subject: [PATCH] [ET-VK][EZ] Rename `Allocator.*` as `vma_api.*` We currently use `vk_api.h` for inclusion of third-party `vulkan-headers`. To adhere to the same style, we rename as `vma_api.h` for inclusion of third-party `VulkanMemoryAllocator`. (This also opens the door to renaming our wrapper `MemoryAllocator` to `Allocator` in the next change.) Differential Revision: [D57126895](https://our.internmc.facebook.com/intern/diff/D57126895/) [ghstack-poisoned] --- backends/vulkan/runtime/api/Resource.h | 2 +- backends/vulkan/runtime/api/{Allocator.cpp => vma_api.cpp} | 2 +- backends/vulkan/runtime/api/{Allocator.h => vma_api.h} | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) rename backends/vulkan/runtime/api/{Allocator.cpp => vma_api.cpp} (80%) rename backends/vulkan/runtime/api/{Allocator.h => vma_api.h} (92%) diff --git a/backends/vulkan/runtime/api/Resource.h b/backends/vulkan/runtime/api/Resource.h index 81388cdcb06..247e2f1c932 100644 --- a/backends/vulkan/runtime/api/Resource.h +++ b/backends/vulkan/runtime/api/Resource.h @@ -11,8 +11,8 @@ // @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName #include +#include -#include #include #include diff --git a/backends/vulkan/runtime/api/Allocator.cpp b/backends/vulkan/runtime/api/vma_api.cpp similarity index 80% rename from backends/vulkan/runtime/api/Allocator.cpp rename to backends/vulkan/runtime/api/vma_api.cpp index 3cedaa2f5af..26672339adf 100644 --- a/backends/vulkan/runtime/api/Allocator.cpp +++ b/backends/vulkan/runtime/api/vma_api.cpp @@ -7,4 +7,4 @@ */ #define VMA_IMPLEMENTATION -#include +#include diff --git a/backends/vulkan/runtime/api/Allocator.h b/backends/vulkan/runtime/api/vma_api.h similarity index 92% rename from backends/vulkan/runtime/api/Allocator.h rename to backends/vulkan/runtime/api/vma_api.h index a5a9ea02a98..34e3219d934 100644 --- a/backends/vulkan/runtime/api/Allocator.h +++ b/backends/vulkan/runtime/api/vma_api.h @@ -10,11 +10,9 @@ // // Do NOT include vk_mem_alloc.h directly. -// Always include this file (Allocator.h) instead. +// Always include this file (vma_api.h) instead. // -#include - #define VMA_VULKAN_VERSION 1000000 #ifdef USE_VULKAN_WRAPPER