fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-08 12:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan: Use ALWAYS_INLINE for multialloc

Browse source 
This way it properly compiles on Visual Studio.

Fixes: 145444d265 "anv: Move multialloc to common code"
Acked-by: Daniel Stone <daniels@collabora.com>
Acked-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9506>
This commit is contained in:
Jason Ekstrand 2021-03-10 16:11:07 -06:00 • committed by Marge Bot
parent 96e251bde7
commit c22267262e
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/vulkan/util/vk_alloc.h
View file

@ -155,8 +155,7 @@ struct vk_multialloc {
#define VK_MULTIALLOC(_name) \
struct vk_multialloc _name = VK_MULTIALLOC_INIT
__attribute__((always_inline))
static inline void
static ALWAYS_INLINE void
_vk_multialloc_add(struct vk_multialloc *ma,
void **ptr, size_t size, size_t align)
{
@ -178,8 +177,7 @@ _vk_multialloc_add(struct vk_multialloc *ma,
#define vk_multialloc_add(_ma, _ptr, _count) \
vk_multialloc_add_size(_ma, _ptr, (_count) * sizeof(**(_ptr)));
__attribute__((always_inline))
static inline void *
static ALWAYS_INLINE void *
vk_multialloc_alloc(struct vk_multialloc *ma,
const VkAllocationCallbacks *alloc,
VkSystemAllocationScope scope)
@ -214,8 +212,7 @@ vk_multialloc_alloc(struct vk_multialloc *ma,
return ptr;
}
__attribute__((always_inline))
static inline void *
static ALWAYS_INLINE void *
vk_multialloc_alloc2(struct vk_multialloc *ma,
const VkAllocationCallbacks *parent_alloc,
const VkAllocationCallbacks *alloc,