summaryrefslogtreecommitdiff
path: root/vulkan/vkjson/vkjson.h
diff options
context:
space:
mode:
author Yiwei Zhang <zzyiwei@google.com> 2018-10-16 10:43:54 -0700
committer android-build-merger <android-build-merger@google.com> 2018-10-16 10:43:54 -0700
commit10ca1c3691026df8f66cdd2923b205533581f047 (patch)
treee207e08f756578a80c211aa4b3439ac51cae1c87 /vulkan/vkjson/vkjson.h
parentde7ddfe503a61b98bdacb6897491674a6eb45c5a (diff)
parenta56cc065c1508d6476f799ed0f57381c383553b0 (diff)
Merge "Suppress implicit-fallthrough warnings." am: c7e86caf44 am: d896cab7d0
am: a56cc065c1 Change-Id: I326dcd649dc9e08d26e744baeb04d00576d41574
Diffstat (limited to 'vulkan/vkjson/vkjson.h')
-rw-r--r--vulkan/vkjson/vkjson.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/vulkan/vkjson/vkjson.h b/vulkan/vkjson/vkjson.h
index 3373f194ba..450fb24862 100644
--- a/vulkan/vkjson/vkjson.h
+++ b/vulkan/vkjson/vkjson.h
@@ -41,6 +41,12 @@
#define VK_API_VERSION_1_1 VK_MAKE_VERSION(1, 1, 0)
#endif
+/*
+ * Annotation to tell clang that we intend to fall through from one case to
+ * another in a switch. Sourced from android-base/macros.h.
+ */
+#define FALLTHROUGH_INTENDED [[clang::fallthrough]]
+
struct VkJsonLayer {
VkLayerProperties properties;
std::vector<VkExtensionProperties> extensions;