Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
VkCV Framework
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Vulkan2021
VkCV Framework
Commits
9bc4b8c4
Verified
Commit
9bc4b8c4
authored
3 years ago
by
Tobias Frisch
Browse files
Options
Downloads
Patches
Plain Diff
[
#59
] Try to fix MSVC magic
Signed-off-by:
Tobias Frisch
<
tfrisch@uni-koblenz.de
>
parent
292eb1de
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
config/lib/VulkanMemoryAllocator.cmake
+3
-4
3 additions, 4 deletions
config/lib/VulkanMemoryAllocator.cmake
vma/CMakeLists.txt
+62
-0
62 additions, 0 deletions
vma/CMakeLists.txt
with
65 additions
and
4 deletions
config/lib/VulkanMemoryAllocator.cmake
+
3
−
4
View file @
9bc4b8c4
if
((
EXISTS
"
${
vkcv_lib_path
}
/VulkanMemoryAllocator"
)
AND
(
EXISTS
"
${
vkcv_lib_path
}
/VulkanMemoryAllocator-Hpp"
))
set
(
VMA_BUILD_SAMPLE OFF CACHE INTERNAL
""
)
set
(
VMA_BUILD_SAMPLE_SHADERS OFF CACHE INTERNAL
""
)
set
(
VMA_BUILD_REPLAY OFF CACHE INTERNAL
""
)
set
(
VMA_PATH
"
${
vkcv_lib_path
}
/VulkanMemoryAllocator"
CACHE INTERNAL
""
)
set
(
VMA_HPP_PATH
"
${
vkcv_lib_path
}
/VulkanMemoryAllocator-Hpp"
CACHE INTERNAL
""
)
set
(
VMA_RECORDING_ENABLED OFF CACHE INTERNAL
""
)
set
(
VMA_USE_STL_CONTAINERS OFF CACHE INTERNAL
""
)
...
...
@@ -14,7 +13,7 @@ if ((EXISTS "${vkcv_lib_path}/VulkanMemoryAllocator") AND
set
(
VMA_DEBUG_GLOBAL_MUTEX OFF CACHE INTERNAL
""
)
set
(
VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT OFF CACHE INTERNAL
""
)
add_subdirectory
(
${
vkcv_lib
}
/VulkanMemoryAllocator
)
add_subdirectory
(
vma
)
list
(
APPEND vkcv_libraries VulkanMemoryAllocator
)
list
(
APPEND vkcv_includes
${
vkcv_lib_path
}
/VulkanMemoryAllocator-Hpp
)
...
...
This diff is collapsed.
Click to expand it.
vma/CMakeLists.txt
0 → 100644
+
62
−
0
View file @
9bc4b8c4
cmake_minimum_required
(
VERSION 3.9
)
project
(
VulkanMemoryAllocator
)
find_package
(
Vulkan REQUIRED
)
option
(
VMA_PATH
"Location of official API and headers"
""
)
option
(
VMA_HPP_PATH
"Location of C++ headers"
""
)
message
(
STATUS
"VMA_BUILD_SAMPLE =
${
VMA_BUILD_SAMPLE
}
"
)
message
(
STATUS
"VMA_BUILD_SAMPLE_SHADERS =
${
VMA_BUILD_SAMPLE_SHADERS
}
"
)
message
(
STATUS
"VMA_BUILD_REPLAY =
${
VMA_BUILD_REPLAY
}
"
)
option
(
VMA_RECORDING_ENABLED
"Enable VMA memory recording for debugging"
OFF
)
option
(
VMA_USE_STL_CONTAINERS
"Use C++ STL containers instead of VMA's containers"
OFF
)
option
(
VMA_STATIC_VULKAN_FUNCTIONS
"Link statically with Vulkan API"
OFF
)
option
(
VMA_DYNAMIC_VULKAN_FUNCTIONS
"Fetch pointers to Vulkan functions internally (no static linking)"
ON
)
option
(
VMA_DEBUG_ALWAYS_DEDICATED_MEMORY
"Every allocation will have its own memory block"
OFF
)
option
(
VMA_DEBUG_INITIALIZE_ALLOCATIONS
"Automatically fill new allocations and destroyed allocations with some bit pattern"
OFF
)
option
(
VMA_DEBUG_GLOBAL_MUTEX
"Enable single mutex protecting all entry calls to the library"
OFF
)
option
(
VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT
"Never exceed VkPhysicalDeviceLimits::maxMemoryAllocationCount and return error"
OFF
)
message
(
STATUS
"VMA_RECORDING_ENABLED =
${
VMA_RECORDING_ENABLED
}
"
)
message
(
STATUS
"VMA_USE_STL_CONTAINERS =
${
VMA_USE_STL_CONTAINERS
}
"
)
message
(
STATUS
"VMA_DYNAMIC_VULKAN_FUNCTIONS =
${
VMA_DYNAMIC_VULKAN_FUNCTIONS
}
"
)
message
(
STATUS
"VMA_DEBUG_ALWAYS_DEDICATED_MEMORY =
${
VMA_DEBUG_ALWAYS_DEDICATED_MEMORY
}
"
)
message
(
STATUS
"VMA_DEBUG_INITIALIZE_ALLOCATIONS =
${
VMA_DEBUG_INITIALIZE_ALLOCATIONS
}
"
)
message
(
STATUS
"VMA_DEBUG_GLOBAL_MUTEX =
${
VMA_DEBUG_GLOBAL_MUTEX
}
"
)
message
(
STATUS
"VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT =
${
VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT
}
"
)
set
(
VMA_LIBRARY_SOURCE_FILES
${
VMA_PATH
}
/src/VmaUsage.cpp
)
add_library
(
VulkanMemoryAllocator
${
VMA_LIBRARY_SOURCE_FILES
}
)
set_target_properties
(
VulkanMemoryAllocator PROPERTIES
CXX_EXTENSIONS OFF
# Use C++14
CXX_STANDARD 14
CXX_STANDARD_REQUIRED ON
)
target_include_directories
(
VulkanMemoryAllocator PUBLIC
${
VMA_HPP_PATH
}
)
# Only link to Vulkan if static linking is used
if
(
NOT
${
VMA_DYNAMIC_VULKAN_FUNCTIONS
}
)
target_link_libraries
(
VulkanMemoryAllocator PUBLIC Vulkan::Vulkan
)
endif
()
target_compile_definitions
(
VulkanMemoryAllocator
PUBLIC
VMA_USE_STL_CONTAINERS=$<BOOL:
${
VMA_USE_STL_CONTAINERS
}
>
VMA_DYNAMIC_VULKAN_FUNCTIONS=$<BOOL:
${
VMA_DYNAMIC_VULKAN_FUNCTIONS
}
>
VMA_DEBUG_ALWAYS_DEDICATED_MEMORY=$<BOOL:
${
VMA_DEBUG_ALWAYS_DEDICATED_MEMORY
}
>
VMA_DEBUG_INITIALIZE_ALLOCATIONS=$<BOOL:
${
VMA_DEBUG_INITIALIZE_ALLOCATIONS
}
>
VMA_DEBUG_GLOBAL_MUTEX=$<BOOL:
${
VMA_DEBUG_GLOBAL_MUTEX
}
>
VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT=$<BOOL:
${
VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT
}
>
VMA_RECORDING_ENABLED=$<BOOL:
${
VMA_RECORDING_ENABLED
}
>
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment