Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f277ba69 authored by Chia-I Wu's avatar Chia-I Wu Committed by Android (Google) Code Review
Browse files

Merge "libvulkan: Fix for -Wcast-calling-convention"

parents f26b0fc1 6a9b20a6

vulkan/libvulkan/Android.mk

+1 −2
Original line number Original line Diff line number Diff line
@@ -25,8 +25,7 @@ LOCAL_CFLAGS := -DLOG_TAG=\"vulkan\" \ 
	-Weverything -Werror \

	-Weverything -Werror \

	-Wno-padded \

	-Wno-padded \

	-Wno-switch-enum \

	-Wno-switch-enum \

	-Wno-undef \

	-Wno-undef

	-Wno-cast-calling-convention





#LOCAL_CFLAGS += -DLOG_NDEBUG=0

#LOCAL_CFLAGS += -DLOG_NDEBUG=0

LOCAL_CPPFLAGS := -std=c++14 \

LOCAL_CPPFLAGS := -std=c++14 \

vulkan/libvulkan/stubhal.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ static std::mutex g_instance_mutex; 
static std::bitset<kMaxInstances> g_instance_used(false);

static std::bitset<kMaxInstances> g_instance_used(false);

static std::array<hwvulkan_dispatch_t, kMaxInstances> g_instances;

static std::array<hwvulkan_dispatch_t, kMaxInstances> g_instances;





[[noreturn]] void NoOp() {

[[noreturn]] VKAPI_ATTR void NoOp() {

    LOG_ALWAYS_FATAL("invalid stub function called");

    LOG_ALWAYS_FATAL("invalid stub function called");

}

}