commit 9e9c68e9c3ac6dde8b18cc98d22253e52a8da629
author Jason Macnak <natsu@google.com> Thu Feb 23 00:40:01 2023 +0000
committer Jason Macnak <natsu@google.com> Wed Feb 22 16:57:08 2023 -0800
tree b54cecbc0a896b894cdb720cd269e0025ea8c5fe
parent 5fb227182854051ffbafdacc6b4d64e8172436aa

(Reland) Make Gfxstream VK ColorBuffer setup not depend on GL

... and instead have FrameBuffer coordinate the memory import.
Upcoming changes aim to completely disable GL when running on a
host without GL so VK can not depend on GL.

Note: this makes VK ColorBuffer creation no longer deferred in
all cases (previously, it was deferred when running without a
DisplayVk and without guest ANGLE).

Reland note: no changes from previous aosp/2385354.

Bug: b/233939967
Test: android build
Test: cmake build
Test: cvd start --gpu_mode=gfxstream
Test: gfxstream unit tests
Change-Id: I8544c74de074c2096e32cb15c4c63930865e1e05

stream-servers/vulkan/VkCommonOperations.cpp

diff --git a/stream-servers/vulkan/VkCommonOperations.cpp b/stream-servers/vulkan/VkCommonOperations.cpp
index 49418e0..f8b8f9a 100644
--- a/stream-servers/vulkan/VkCommonOperations.cpp
+++ b/stream-servers/vulkan/VkCommonOperations.cpp
@@ -1544,18 +1544,8 @@
     }
 };
 
-bool isColorBufferVulkanCompatible(uint32_t colorBufferHandle) {
-    auto fb = FrameBuffer::getFB();
-
-    int width;
-    int height;
-    GLint internalformat;
-
-    if (!fb->getColorBufferInfo(colorBufferHandle, &width, &height, &internalformat)) {
-        return false;
-    }
-
-    VkFormat vkFormat = glFormat2VkFormat(internalformat);
+static bool isFormatVulkanCompatible(GLenum internalFormat) {
+    VkFormat vkFormat = glFormat2VkFormat(internalFormat);
 
     for (const auto& supportInfo : sVkEmulation->imageSupportInfo) {
         if (supportInfo.format == vkFormat && supportInfo.supported) {
@@ -1721,20 +1711,10 @@
 // We should make it so the guest can only allocate external images/
 // buffers of one type index for image and one type index for buffer
 // to begin with, via filtering from the host.
-bool setupVkColorBuffer(uint32_t colorBufferHandle, bool vulkanOnly, uint32_t memoryProperty) {
-    if (!isColorBufferVulkanCompatible(colorBufferHandle)) return false;
-
-    auto fb = FrameBuffer::getFB();
-
-    int width;
-    int height;
-    GLint internalFormat;
-    FrameworkFormat frameworkFormat;
-
-    if (!fb->getColorBufferInfo(colorBufferHandle, &width, &height, &internalFormat,
-                                &frameworkFormat)) {
-        return false;
-    }
+bool setupVkColorBuffer(uint32_t width, uint32_t height, GLenum internalFormat,
+                        FrameworkFormat frameworkFormat, uint32_t colorBufferHandle,
+                        bool vulkanOnly, uint32_t memoryProperty) {
+    if (!isFormatVulkanCompatible(internalFormat)) return false;
 
     AutoLock lock(sVkEmulationLock);
 
@@ -1905,15 +1885,6 @@
     }
 #endif
 
-    bool glExported = sVkEmulation->deviceInfo.supportsExternalMemory &&
-                      sVkEmulation->deviceInfo.glInteropSupported && glCompatible && !vulkanOnly;
-    if (glExported) {
-        ManagedDescriptor exportedHandle(dupExternalMemory(res.memory.exportedHandle));
-        glExported = FrameBuffer::getFB()->importMemoryToColorBuffer(
-            std::move(exportedHandle), res.memory.size, false /* dedicated */, vulkanOnly,
-            colorBufferHandle, res.image, *imageCi);
-    }
-    res.glExported = glExported;
     if (vulkanOnly) {
         res.vulkanMode = VkEmulation::VulkanMode::VulkanOnly;
     }
@@ -1922,6 +1893,38 @@
     return true;
 }
 
+std::optional<VkColorBufferMemoryExport> exportColorBufferMemory(uint32_t colorBufferHandle) {
+    if (!sVkEmulation || !sVkEmulation->live) {
+        return std::nullopt;
+    }
+
+    AutoLock lock(sVkEmulationLock);
+
+    const auto& deviceInfo = sVkEmulation->deviceInfo;
+    if (!deviceInfo.supportsExternalMemory || !deviceInfo.glInteropSupported) {
+        return std::nullopt;
+    }
+
+    auto info = android::base::find(sVkEmulation->colorBuffers, colorBufferHandle);
+    if (!info) {
+        return std::nullopt;
+    }
+
+    if (info->frameworkFormat != FRAMEWORK_FORMAT_GL_COMPATIBLE) {
+        return std::nullopt;
+    }
+
+    ManagedDescriptor descriptor(dupExternalMemory(info->memory.exportedHandle));
+
+    info->glExported = true;
+
+    return VkColorBufferMemoryExport{
+        .descriptor = std::move(descriptor),
+        .size = info->memory.size,
+        .linearTiling = info->imageCreateInfoShallow.tiling == VK_IMAGE_TILING_LINEAR,
+    };
+}
+
 bool teardownVkColorBuffer(uint32_t colorBufferHandle) {
     if (!sVkEmulation || !sVkEmulation->live) return false;