diff options
| -rw-r--r-- | vulkan/libvulkan/Android.mk | 3 | ||||
| -rw-r--r-- | vulkan/libvulkan/stubhal.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/vulkan/libvulkan/Android.mk b/vulkan/libvulkan/Android.mk index 4d2cffcba7..f1155ca47b 100644 --- a/vulkan/libvulkan/Android.mk +++ b/vulkan/libvulkan/Android.mk @@ -25,8 +25,7 @@ LOCAL_CFLAGS := -DLOG_TAG=\"vulkan\" \ -Weverything -Werror \ -Wno-padded \ -Wno-switch-enum \ - -Wno-undef \ - -Wno-cast-calling-convention + -Wno-undef #LOCAL_CFLAGS += -DLOG_NDEBUG=0 LOCAL_CPPFLAGS := -std=c++14 \ diff --git a/vulkan/libvulkan/stubhal.cpp b/vulkan/libvulkan/stubhal.cpp index a74d3708e0..869317bcb9 100644 --- a/vulkan/libvulkan/stubhal.cpp +++ b/vulkan/libvulkan/stubhal.cpp @@ -43,7 +43,7 @@ static std::mutex g_instance_mutex; static std::bitset<kMaxInstances> g_instance_used(false); static std::array<hwvulkan_dispatch_t, kMaxInstances> g_instances; -[[noreturn]] void NoOp() { +[[noreturn]] VKAPI_ATTR void NoOp() { LOG_ALWAYS_FATAL("invalid stub function called"); } |