commit d7b994a0cfb9054aafc1dadc85085a7d0ef8789a
author Jesse Hall <jessehall@google.com> Mon Sep 07 14:17:37 2015 -0700
committer Jesse Hall <jessehall@google.com> Mon Jan 25 13:49:31 2016 -0800
tree 66731b2c7ab51632ceac0807e076aed6b3208e38
parent b1352bce9cd82ceaef287b8b3cd7a5c39703a14c

vulkan: Implement vk_ext_khr_*swapchain extensions

Change-Id: I46312c9ba1332e0a5b8ac4c1b5608f0465c3962c
(cherry picked from commit e5ca41cb11212bbfbd608eddb92d794e12e1528e)

vulkan/nulldrv/null_driver.cpp

diff --git a/vulkan/nulldrv/null_driver.cpp b/vulkan/nulldrv/null_driver.cpp
index 766abc9..10fb5c9 100644
--- a/vulkan/nulldrv/null_driver.cpp
+++ b/vulkan/nulldrv/null_driver.cpp
@@ -139,7 +139,7 @@
                         VkInstance* out_instance) {
     // Assume the loader provided alloc callbacks even if the app didn't.
     ALOG_ASSERT(
-        !create_info->pAllocCb,
+        create_info->pAllocCb,
         "Missing alloc callbacks, loader or app should have provided them");
 
     VkInstance_T* instance =
@@ -695,6 +695,16 @@
     return VK_SUCCESS;
 }
 
+VkResult ImportNativeFenceANDROID(VkDevice, VkSemaphore, int fence) {
+    close(fence);
+    return VK_SUCCESS;
+}
+
+VkResult QueueSignalNativeFenceANDROID(VkQueue, int* fence) {
+    *fence = -1;
+    return VK_SUCCESS;
+}
+
 // -----------------------------------------------------------------------------
 // No-op entrypoints
 
@@ -785,7 +795,6 @@
 }
 
 VkResult BindImageMemory(VkDevice device, VkImage image, VkDeviceMemory mem, VkDeviceSize memOffset) {
-    ALOGV("TODO: vk%s", __FUNCTION__);
     return VK_SUCCESS;
 }
 
@@ -841,7 +850,6 @@
 }
 
 VkResult QueueWaitSemaphore(VkQueue queue, VkSemaphore semaphore) {
-    ALOGV("TODO: vk%s", __FUNCTION__);
     return VK_SUCCESS;
 }
 
@@ -1123,16 +1131,6 @@
 void CmdExecuteCommands(VkCmdBuffer cmdBuffer, uint32_t cmdBuffersCount, const VkCmdBuffer* pCmdBuffers) {
 }
 
-VkResult ImportNativeFenceANDROID(VkDevice device, VkSemaphore semaphore, int nativeFenceFd) {
-    ALOGV("TODO: vk%s", __FUNCTION__);
-    return VK_SUCCESS;
-}
-
-VkResult QueueSignalNativeFenceANDROID(VkQueue queue, int* pNativeFenceFd) {
-    ALOGV("TODO: vk%s", __FUNCTION__);
-    return VK_SUCCESS;
-}
-
 #pragma clang diagnostic pop
 // clang-format on