From e99f6f2ea14ce4c3c0d69250b818ea0ab58ce02b Mon Sep 17 00:00:00 2001
From: "Kristian H. Kristensen" <hoegsberg@google.com>
Date: Tue, 7 Apr 2020 08:45:03 -0700
Subject: [PATCH] turnip: Add missing VKAPI_ATTR annotations

Make sure the types match.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4478>
---
 src/freedreno/vulkan/tu_device.c           | 6 +++---
 src/freedreno/vulkan/tu_entrypoints_gen.py | 2 +-
 src/freedreno/vulkan/tu_wsi.c              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/freedreno/vulkan/tu_device.c b/src/freedreno/vulkan/tu_device.c
index c96c793e617..67269457f08 100644
--- a/src/freedreno/vulkan/tu_device.c
+++ b/src/freedreno/vulkan/tu_device.c
@@ -338,7 +338,7 @@ tu_physical_device_finish(struct tu_physical_device *device)
       close(device->master_fd);
 }
 
-static void *
+static VKAPI_ATTR void *
 default_alloc_func(void *pUserData,
                    size_t size,
                    size_t align,
@@ -347,7 +347,7 @@ default_alloc_func(void *pUserData,
    return malloc(size);
 }
 
-static void *
+static VKAPI_ATTR void *
 default_realloc_func(void *pUserData,
                      void *pOriginal,
                      size_t size,
@@ -357,7 +357,7 @@ default_realloc_func(void *pUserData,
    return realloc(pOriginal, size);
 }
 
-static void
+static VKAPI_ATTR void
 default_free_func(void *pUserData, void *pMemory)
 {
    free(pMemory);
diff --git a/src/freedreno/vulkan/tu_entrypoints_gen.py b/src/freedreno/vulkan/tu_entrypoints_gen.py
index 03c3afc3e7f..263ef6f05f4 100644
--- a/src/freedreno/vulkan/tu_entrypoints_gen.py
+++ b/src/freedreno/vulkan/tu_entrypoints_gen.py
@@ -75,7 +75,7 @@ struct tu_dispatch_table {
 #ifdef ${e.guard}
   % endif
   % for layer in LAYERS:
-  ${e.return_type} ${e.prefixed_name(layer)}(${e.decl_params()});
+  VKAPI_ATTR ${e.return_type} ${e.prefixed_name(layer)}(${e.decl_params()});
   % endfor
   % if e.guard is not None:
 #endif // ${e.guard}
diff --git a/src/freedreno/vulkan/tu_wsi.c b/src/freedreno/vulkan/tu_wsi.c
index b172ba15569..a4af4982508 100644
--- a/src/freedreno/vulkan/tu_wsi.c
+++ b/src/freedreno/vulkan/tu_wsi.c
@@ -29,7 +29,7 @@
 #include "wsi_common.h"
 #include "drm-uapi/drm_fourcc.h"
 
-static PFN_vkVoidFunction
+static VKAPI_PTR PFN_vkVoidFunction
 tu_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName)
 {
    return tu_lookup_entrypoint_unchecked(pName);
-- 
2.30.2