diff options
author | Niklas Haas <git@haasn.xyz> | 2017-09-27 00:24:03 +0200 |
---|---|---|
committer | Niklas Haas <git@haasn.xyz> | 2017-09-27 00:25:18 +0200 |
commit | 5b6b77b8dceac346b4d279b8e5c0d8eebec2f0e8 (patch) | |
tree | f32ae2c32ca51b2868a78ead1ffe60a0a1c2c09f /video/out/vulkan/malloc.h | |
parent | 0ba6c7d73f2886b23ca2c5e7d09296140bf84f35 (diff) | |
download | mpv-5b6b77b8dceac346b4d279b8e5c0d8eebec2f0e8.tar.bz2 mpv-5b6b77b8dceac346b4d279b8e5c0d8eebec2f0e8.tar.xz |
vo_gpu: vulkan: normalize use of *Flags and *FlagBits
FlagBits is just the name of the enum. The actual data type representing
a combination of these flags follows the *Flags convention. (The
relevant difference is that the latter is defined to be uint32_t instead
of left implicit)
For consistency, use *Flags everywhere instead of randomly switching
between *Flags and *FlagBits.
Also fix a wrong type name on `stageFlags`, pointed out by @atomnuker
Diffstat (limited to 'video/out/vulkan/malloc.h')
-rw-r--r-- | video/out/vulkan/malloc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/video/out/vulkan/malloc.h b/video/out/vulkan/malloc.h index 65c1036929..466c8d81bd 100644 --- a/video/out/vulkan/malloc.h +++ b/video/out/vulkan/malloc.h @@ -16,7 +16,7 @@ struct vk_memslice { void vk_free_memslice(struct mpvk_ctx *vk, struct vk_memslice slice); bool vk_malloc_generic(struct mpvk_ctx *vk, VkMemoryRequirements reqs, - VkMemoryPropertyFlagBits flags, struct vk_memslice *out); + VkMemoryPropertyFlags flags, struct vk_memslice *out); // Represents a single "slice" of a larger buffer struct vk_bufslice { @@ -30,6 +30,6 @@ struct vk_bufslice { // Allocate a buffer slice. This is more efficient than vk_malloc_generic for // when the user needs lots of buffers, since it doesn't require // creating/destroying lots of (little) VkBuffers. -bool vk_malloc_buffer(struct mpvk_ctx *vk, VkBufferUsageFlagBits bufFlags, - VkMemoryPropertyFlagBits memFlags, VkDeviceSize size, +bool vk_malloc_buffer(struct mpvk_ctx *vk, VkBufferUsageFlags bufFlags, + VkMemoryPropertyFlags memFlags, VkDeviceSize size, VkDeviceSize alignment, struct vk_bufslice *out); |