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

Commit a56cc065 authored by Yiwei Zhang's avatar Yiwei Zhang Committed by android-build-merger
Browse files

Merge "Suppress implicit-fallthrough warnings." am: c7e86caf 

am: d896cab7

Change-Id: I76010d077f96f6451b61cd358b30d0d59d1049ba
parents 3608311c d896cab7

vulkan/vkjson/Android.bp

+2 −0
Original line number Original line Diff line number Diff line
@@ -7,6 +7,7 @@ cc_library_static { 
    cflags: [

    cflags: [

        "-Wall",

        "-Wall",

        "-Werror",

        "-Werror",

        "-Wimplicit-fallthrough",

    ],

    ],

    cppflags: [

    cppflags: [

        "-std=c++11",

        "-std=c++11",
@@ -33,6 +34,7 @@ cc_library_static { 
    cflags: [

    cflags: [

        "-Wall",

        "-Wall",

        "-Werror",

        "-Werror",

        "-Wimplicit-fallthrough",

    ],

    ],

    cppflags: [

    cppflags: [

        "-std=c++11",

        "-std=c++11",

vulkan/vkjson/vkjson.cc

+2 −0
Original line number Original line Diff line number Diff line
@@ -766,6 +766,7 @@ inline bool Iterate(Visitor* visitor, VkJsonDevice* device) { 
                         &device->external_fence_properties) &&

                         &device->external_fence_properties) &&

          visitor->Visit("externalSemaphoreProperties",

          visitor->Visit("externalSemaphoreProperties",

                         &device->external_semaphore_properties);

                         &device->external_semaphore_properties);

      FALLTHROUGH_INTENDED;

    case VK_API_VERSION_1_0:

    case VK_API_VERSION_1_0:

      ret &= visitor->Visit("properties", &device->properties) &&

      ret &= visitor->Visit("properties", &device->properties) &&

             visitor->Visit("features", &device->features) &&

             visitor->Visit("features", &device->features) &&
@@ -786,6 +787,7 @@ inline bool Iterate(Visitor* visitor, VkJsonInstance* instance) { 
  switch (instance->api_version ^ VK_VERSION_PATCH(instance->api_version)) {

  switch (instance->api_version ^ VK_VERSION_PATCH(instance->api_version)) {

    case VK_API_VERSION_1_1:

    case VK_API_VERSION_1_1:

      ret &= visitor->Visit("deviceGroups", &instance->device_groups);

      ret &= visitor->Visit("deviceGroups", &instance->device_groups);

      FALLTHROUGH_INTENDED;

    case VK_API_VERSION_1_0:

    case VK_API_VERSION_1_0:

      ret &= visitor->Visit("layers", &instance->layers) &&

      ret &= visitor->Visit("layers", &instance->layers) &&

             visitor->Visit("extensions", &instance->extensions) &&

             visitor->Visit("extensions", &instance->extensions) &&

vulkan/vkjson/vkjson.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,12 @@ 
#define VK_API_VERSION_1_1 VK_MAKE_VERSION(1, 1, 0)

#define VK_API_VERSION_1_1 VK_MAKE_VERSION(1, 1, 0)

#endif

#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 {

struct VkJsonLayer {

  VkLayerProperties properties;

  VkLayerProperties properties;

  std::vector<VkExtensionProperties> extensions;

  std::vector<VkExtensionProperties> extensions;