AuroraMiddleware/VulkanMemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator synced 2024-11-05 12:20:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #147 from res2k/move-some-preproc-defn

Browse Source 
Move some preprocessor directives that may influence user code into "implementation" block
This commit is contained in:
Adam Sawicki 2020-08-31 12:38:43 +02:00 committed by GitHub
commit 6074de0c4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/vk_mem_alloc.h
View File

@ -2000,16 +2000,6 @@ Features deliberately excluded from the scope of this library:
*/ */
#if VMA_RECORDING_ENABLED
#include <chrono>
#if defined(_WIN32)
#include <windows.h>
#else
#include <sstream>
#include <thread>
#endif
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -2022,7 +2012,7 @@ available through VmaAllocatorCreateInfo::pRecordSettings.
#define VMA_RECORDING_ENABLED 0 #define VMA_RECORDING_ENABLED 0
#endif #endif
#ifndef NOMINMAX #if !defined(NOMINMAX) && defined(VMA_IMPLEMENTATION)
#define NOMINMAX // For windows.h #define NOMINMAX // For windows.h
#endif #endif
@ -3966,6 +3956,16 @@ VMA_CALL_PRE void VMA_CALL_POST vmaDestroyImage(
#include <cstring> #include <cstring>
#include <utility> #include <utility>
#if VMA_RECORDING_ENABLED
#include <chrono>
#if defined(_WIN32)
#include <windows.h>
#else
#include <sstream>
#include <thread>
#endif
#endif
/******************************************************************************* /*******************************************************************************
CONFIGURATION SECTION CONFIGURATION SECTION