Disable EGL_EXT_buffer_age for SwiftShader Vulkan

include/platform/FeaturesVk.h

@@ -481,6 +481,14 @@ struct FeaturesVk : FeatureSetBase
     Feature supportsNegativeViewport = {
         "supportsNegativeViewport", FeatureCategory::VulkanFeatures,
         "The driver supports inverting the viewport with a negative height.", &members};
+
+    // The EGL_EXT_buffer_age implementation causes
+    // android.graphics.cts.BitmapTest#testDrawingHardwareBitmapNotLeaking to fail on Cuttlefish
+    // with SwANGLE. Needs investigation whether this is a race condition which could affect other
+    // Vulkan drivers, or if it's a SwiftShader bug.
+    // http://anglebug.com/3529
+    Feature enableBufferAge = {"enableBufferAge", FeatureCategory::VulkanWorkarounds,
+                               "Expose EGL_EXT_buffer_age", &members, "http://anglebug.com/3529"};
 };
 
 inline FeaturesVk::FeaturesVk()  = default;

src/libANGLE/renderer/vulkan/DisplayVk.cpp

@@ -246,7 +246,7 @@ void DisplayVk::generateExtensions(egl::DisplayExtensions *outExtensions) const
     outExtensions->swapWithFrameToken  = getRenderer()->getFeatures().supportsGGPFrameToken.enabled;
 #endif  // defined(ANGLE_PLATFORM_GGP)
 
-    outExtensions->bufferAgeEXT = true;
+    outExtensions->bufferAgeEXT = getRenderer()->getFeatures().enableBufferAge.enabled;
 }
 
 void DisplayVk::generateCaps(egl::Caps *outCaps) const

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -2165,6 +2165,13 @@ void RendererVk::initFeatures(DisplayVk *displayVk,
     ANGLE_FEATURE_CONDITION(&mFeatures, exposeNonConformantExtensionsAndVersions,
                             kExposeNonConformantExtensionsAndVersions);
 
+    // The EGL_EXT_buffer_age implementation causes
+    // android.graphics.cts.BitmapTest#testDrawingHardwareBitmapNotLeaking to fail on Cuttlefish
+    // with SwANGLE. Needs investigation whether this is a race condition which could affect other
+    // Vulkan drivers, or if it's a SwiftShader bug.
+    // http://anglebug.com/3529
+    ANGLE_FEATURE_CONDITION(&mFeatures, enableBufferAge, !isSwiftShader);
+
     angle::PlatformMethods *platform = ANGLEPlatformCurrent();
     platform->overrideFeaturesVk(platform, &mFeatures);