From 9f72b87bc7c0d0374bcc3133445cbe5238753bc9 Mon Sep 17 00:00:00 2001 From: Jake Turner Date: Mon, 24 Jul 2023 16:44:54 +0100 Subject: [PATCH] Fix Android Vulkan capturing Add __attribute__((visibility("default"))) to VK_LAYER_EXPORT on Android. It used to be defined in the Vulkan headers and changed when the update to the latest Vulkan headers was integrated in 5118f08e2387 --- renderdoc/driver/vulkan/vk_layer.cpp | 2 +- renderdoc/driver/vulkan/vk_layer_android.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_layer.cpp b/renderdoc/driver/vulkan/vk_layer.cpp index eb961344e..fecd05aa6 100644 --- a/renderdoc/driver/vulkan/vk_layer.cpp +++ b/renderdoc/driver/vulkan/vk_layer.cpp @@ -44,7 +44,7 @@ #undef VK_LAYER_EXPORT #define VK_LAYER_EXPORT extern "C" __declspec(dllexport) -#elif ENABLED(RDOC_LINUX) +#elif ENABLED(RDOC_LINUX) || ENABLED(RDOC_ANDROID) #undef VK_LAYER_EXPORT #define VK_LAYER_EXPORT __attribute__((visibility("default"))) diff --git a/renderdoc/driver/vulkan/vk_layer_android.cpp b/renderdoc/driver/vulkan/vk_layer_android.cpp index 5c7c4fbf9..ad60dd78e 100644 --- a/renderdoc/driver/vulkan/vk_layer_android.cpp +++ b/renderdoc/driver/vulkan/vk_layer_android.cpp @@ -33,7 +33,7 @@ #include "vk_resources.h" #undef VK_LAYER_EXPORT -#define VK_LAYER_EXPORT +#define VK_LAYER_EXPORT __attribute__((visibility("default"))) // The android loader has limitations at present that require the enumerate functions // to be exported with the precise canonical names. We just forward them to the