Mesa (master): vulkan: Use ALWAYS_INLINE for multialloc

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: c22267262ee1b6817df368a51168fa82bd17293c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c22267262ee1b6817df368a51168fa82bd17293c

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Wed Mar 10 16:11:07 2021 -0600

vulkan: Use ALWAYS_INLINE for multialloc

This way it properly compiles on Visual Studio.

Fixes: 145444d2651b "anv: Move multialloc to common code"
Acked-by: Daniel Stone <daniels at collabora.com>
Acked-by: Rob Clark <robdclark at chromium.org>
Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9506>

---

 src/vulkan/util/vk_alloc.h | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/vulkan/util/vk_alloc.h b/src/vulkan/util/vk_alloc.h
index 769d8a17fad..9620d7cdcc9 100644
--- a/src/vulkan/util/vk_alloc.h
+++ b/src/vulkan/util/vk_alloc.h
@@ -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,