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
467d3e37
Verified
Commit
467d3e37
authored
2 years ago
by
Tobias Frisch
Browse files
Options
Downloads
Patches
Plain Diff
Updated VMA to use newest official hpp version
Signed-off-by:
Tobias Frisch
<
tfrisch@uni-koblenz.de
>
parent
6a6433bb
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
lib/VulkanMemoryAllocator-Hpp
+1
-1
1 addition, 1 deletion
lib/VulkanMemoryAllocator-Hpp
src/vkcv/Context.cpp
+2
-11
2 additions, 11 deletions
src/vkcv/Context.cpp
with
3 additions
and
12 deletions
VulkanMemoryAllocator-Hpp
@
da6ea76e
Compare
c6c3c665
...
da6ea76e
Subproject commit
c6c3c665b6a29ae546bdec60606a3ef0757ea108
Subproject commit
da6ea76eecf12a1decc76f58a3e096bcc555bd94
This diff is collapsed.
Click to expand it.
src/vkcv/Context.cpp
+
2
−
11
View file @
467d3e37
...
@@ -341,25 +341,16 @@ namespace vkcv
...
@@ -341,25 +341,16 @@ namespace vkcv
vma
::
AllocatorCreateFlags
vmaFlags
;
vma
::
AllocatorCreateFlags
vmaFlags
;
const
vma
::
AllocatorCreateInfo
allocatorCreateInfo
(
const
vma
::
AllocatorCreateInfo
allocatorCreateInfo
(
vma
::
AllocatorCreate
Flags
()
,
vmaFlags
,
physicalDevice
,
physicalDevice
,
device
,
device
,
0
,
0
,
nullptr
,
nullptr
,
nullptr
,
nullptr
,
0
,
nullptr
,
nullptr
,
nullptr
,
nullptr
,
nullptr
,
instance
,
instance
,
VK_HEADER_VERSION_COMPLETE
/* Uses default version when set to 0 (currently VK_VERSION_1_0):
*
* The reason for this is that the allocator restricts the allowed version
* to be at maximum VK_VERSION_1_1 which is already less than
* VK_HEADER_VERSION_COMPLETE at most platforms.
* */
0
);
);
vma
::
Allocator
allocator
=
vma
::
createAllocator
(
allocatorCreateInfo
);
vma
::
Allocator
allocator
=
vma
::
createAllocator
(
allocatorCreateInfo
);
...
...
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