Vulkan: Enable EGL_ANDROID_recordable for EGL configs on SwiftShader

There does not seem to be a way to query the Gralloc and Vulkan drivers for recordable support so keep this as a narrow hack restricted to SwiftShader. Bug: b/181163023 Test: `cts -m CtsMediaTestCases` on Cuttlefish w/ SwANGLE Change-Id: I0bfee01d43ea8e3d9965f5bfaa578a285d37db29 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2727874 Commit-Queue: Jason Macnak <natsu@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Tim Van Patten <timvp@google.com>

Vulkan: Enable EGL_ANDROID_recordable for EGL configs on SwiftShader
60ad763d · Jason Macnak · Commit Bot · 559cb622 · 60ad763d · 60ad763d
Commit 60ad763d authored Mar 01, 2021 by Jason Macnak Committed by Commit Bot Mar 04, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 0 deletions

DisplayVkAndroid.cpp src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp +19 -0

DisplayVkAndroid.h src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.h +2 -0

No files found.
--- a/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp
+++ b/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp
@@ -14,6 +14,7 @@
 #include <vulkan/vulkan.h>

 #include "common/angle_version.h"
+#include "libANGLE/renderer/driver_utils.h"
 #include "libANGLE/renderer/vulkan/RendererVk.h"
 #include "libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.h"
 #include "libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.h"
@@ -65,10 +66,28 @@ egl::ConfigSet DisplayVkAndroid::generateConfigs()
                                   depthStencilFormats.data(), depthStencilFormats.size(), this);
 }

+void DisplayVkAndroid::enableRecordableIfSupported(egl::Config *config)
+{
+    const VkPhysicalDeviceProperties &physicalDeviceProperties =
+        getRenderer()->getPhysicalDeviceProperties();
+
+    // TODO(b/181163023): Determine how to properly query for support. This is a hack to unblock
+    // launching SwANGLE on Cuttlefish.
+    bool isSwiftShader =
+        IsSwiftshader(physicalDeviceProperties.vendorID, physicalDeviceProperties.deviceID);
+
+    if (isSwiftShader)
+    {
+        config->recordable = true;
+    }
+}
+
 void DisplayVkAndroid::checkConfigSupport(egl::Config *config)
 {
    // TODO(geofflang): Test for native support and modify the config accordingly.
    // anglebug.com/2692
+
+    enableRecordableIfSupported(config);
 }

 egl::Error DisplayVkAndroid::validateImageClientBuffer(const gl::Context *context,

--- a/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.h
+++ b/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.h
@@ -45,6 +45,8 @@ class DisplayVkAndroid : public DisplayVk
    const AHBFunctions &getAHBFunctions() const { return mAHBFunctions; }

  private:
+    void enableRecordableIfSupported(egl::Config *config);
+
    AHBFunctions mAHBFunctions;
 };