commit 808a631b15d54292035137e00f84dae13a947bf0
author Lingfeng Yang <lfy@google.com> Tue Nov 13 21:06:15 2018 -0800
committer Lingfeng Yang <lfy@google.com> Thu Nov 29 09:37:05 2018 -0800
tree 265d09592902c6a7c76be0320cbc58115cb27e8d
parent 60b411df03681a10873d948a21b9f6ca6136ff6a

[vulkan] VK_ANDROID_native_buffer skeleton (taking autogenerated code)

bug: 111137294
bug: 119426975
Change-Id: I1f4066101ed008e3d7722a0a88094f934a572a7a

system/vulkan/func_table.cpp

diff --git a/system/vulkan/func_table.cpp b/system/vulkan/func_table.cpp
index 0a27b11..ea87560 100644
--- a/system/vulkan/func_table.cpp
+++ b/system/vulkan/func_table.cpp
@@ -28,6 +28,8 @@
 #include "VkEncoder.h"
 #include "HostConnection.h"
 
+#include "goldfish_vk_private_defs.h"
+
 // Stuff we are not going to use but if included,
 // will cause compile errors. These are Android Vulkan
 // required extensions, but the approach will be to
@@ -2548,6 +2550,43 @@
 #endif
 #ifdef VK_KHR_8bit_storage
 #endif
+#ifdef VK_ANDROID_native_buffer
+static VkResult entry_vkGetSwapchainGrallocUsageANDROID(
+    VkDevice device,
+    VkFormat format,
+    VkImageUsageFlags imageUsage,
+    int* grallocUsage)
+{
+    auto vkEnc = HostConnection::get()->vkEncoder();
+    VkResult vkGetSwapchainGrallocUsageANDROID_VkResult_return = (VkResult)0;
+    vkGetSwapchainGrallocUsageANDROID_VkResult_return = vkEnc->vkGetSwapchainGrallocUsageANDROID(device, format, imageUsage, grallocUsage);
+    return vkGetSwapchainGrallocUsageANDROID_VkResult_return;
+}
+static VkResult entry_vkAcquireImageANDROID(
+    VkDevice device,
+    VkImage image,
+    int nativeFenceFd,
+    VkSemaphore semaphore,
+    VkFence fence)
+{
+    auto vkEnc = HostConnection::get()->vkEncoder();
+    VkResult vkAcquireImageANDROID_VkResult_return = (VkResult)0;
+    vkAcquireImageANDROID_VkResult_return = vkEnc->vkAcquireImageANDROID(device, image, nativeFenceFd, semaphore, fence);
+    return vkAcquireImageANDROID_VkResult_return;
+}
+static VkResult entry_vkQueueSignalReleaseImageANDROID(
+    VkQueue queue,
+    uint32_t waitSemaphoreCount,
+    const VkSemaphore* pWaitSemaphores,
+    VkImage image,
+    int* pNativeFenceFd)
+{
+    auto vkEnc = HostConnection::get()->vkEncoder();
+    VkResult vkQueueSignalReleaseImageANDROID_VkResult_return = (VkResult)0;
+    vkQueueSignalReleaseImageANDROID_VkResult_return = vkEnc->vkQueueSignalReleaseImageANDROID(queue, waitSemaphoreCount, pWaitSemaphores, image, pNativeFenceFd);
+    return vkQueueSignalReleaseImageANDROID_VkResult_return;
+}
+#endif
 #ifdef VK_EXT_debug_report
 static VkResult entry_vkCreateDebugReportCallbackEXT(
     VkInstance instance,
@@ -4358,6 +4397,20 @@
         return (void*)entry_vkCmdDrawIndexedIndirectCountKHR;
     }
 #endif
+#ifdef VK_ANDROID_native_buffer
+    if (!strcmp(name, "vkGetSwapchainGrallocUsageANDROID"))
+    {
+        return (void*)entry_vkGetSwapchainGrallocUsageANDROID;
+    }
+    if (!strcmp(name, "vkAcquireImageANDROID"))
+    {
+        return (void*)entry_vkAcquireImageANDROID;
+    }
+    if (!strcmp(name, "vkQueueSignalReleaseImageANDROID"))
+    {
+        return (void*)entry_vkQueueSignalReleaseImageANDROID;
+    }
+#endif
 #ifdef VK_EXT_debug_report
     if (!strcmp(name, "vkCreateDebugReportCallbackEXT"))
     {

system/vulkan/func_table.h

diff --git a/system/vulkan/func_table.h b/system/vulkan/func_table.h
index 3db8b8d..358eec4 100644
--- a/system/vulkan/func_table.h
+++ b/system/vulkan/func_table.h
@@ -134,6 +134,8 @@
 #endif
 #ifdef VK_KHR_8bit_storage
 #endif
+#ifdef VK_ANDROID_native_buffer
+#endif
 #ifdef VK_EXT_debug_report
 #endif
 #ifdef VK_NV_glsl_shader