Fix Fuchsia build
remaining issues:
tiles_ctl works, but on ToT fuchsia, vkcube fails with extension
VK_FUCHSIA_buffer_collection not found
shadertoy: [00166.317] 10840.10852> [ERROR:garnet/lib/ui/scenic/session.cc(185)] GpuImage::CreateFromMemory(): the Image must fit within the size of the Memory
[00166.319] 17787.17799> [ERROR:garnet/examples/ui/shadertoy/client/view.cc(281)] Received Scenic Session error: GpuImage::CreateFromMemory(): the Image must fit within the size of the Memory
[00166.511] 10840.10852> [ERROR:garnet/lib/ui/scenic/session.cc(185)] GpuImage::CreateFromMemory(): the Image must fit within the size of the Memory
[00166.513] 17787.17799> [ERROR:garnet/examples/ui/shadertoy/client/view.cc(281)] Received Scenic Session error: GpuImage::CreateFromMemory(): the Image must fit within the size of the Memory
Change-Id: I8ec86d11e3b2202769201067913353e53b02afa5
diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index 2ff7569..4cc20ee 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -55,19 +55,6 @@
struct AHardwareBuffer;
-typedef struct VkImportAndroidHardwareBufferInfoANDROID {
- VkStructureType sType;
- const void* pNext;
- struct AHardwareBuffer* buffer;
-} VkImportAndroidHardwareBufferInfoANDROID;
-
-typedef struct VkAndroidHardwareBufferPropertiesANDROID {
- VkStructureType sType;
- void* pNext;
- VkDeviceSize allocationSize;
- uint32_t memoryTypeBits;
-} VkAndroidHardwareBufferPropertiesANDROID;
-
void AHardwareBuffer_release(AHardwareBuffer*) { }
native_handle_t *AHardwareBuffer_getNativeHandle(AHardwareBuffer*) { return NULL; }
@@ -92,6 +79,18 @@
return VK_SUCCESS;
}
+namespace goldfish_vk {
+struct HostVisibleMemoryVirtualizationInfo;
+}
+
+VkResult getAndroidHardwareBufferPropertiesANDROID(
+ const goldfish_vk::HostVisibleMemoryVirtualizationInfo*,
+ VkDevice,
+ const AHardwareBuffer*,
+ VkAndroidHardwareBufferPropertiesANDROID*) { return VK_SUCCESS; }
+
+VkResult getMemoryAndroidHardwareBufferANDROID(struct AHardwareBuffer **) { return VK_SUCCESS; }
+
#endif // VK_USE_PLATFORM_FUCHSIA
#include "HostVisibleMemoryVirtualization.h"
@@ -116,11 +115,11 @@
#include <stdlib.h>
#include <sync/sync.h>
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+
#include <sys/mman.h>
#include <sys/syscall.h>
-#ifdef VK_USE_PLATFORM_ANDROID_KHR
-
#ifdef HOST_BUILD
#include "android/utils/tempfile.h"
#endif
@@ -1032,7 +1031,6 @@
}
}
-#ifdef VK_USE_PLATFORM_ANDROID_KHR
VkResult on_vkGetAndroidHardwareBufferPropertiesANDROID(
void*, VkResult,
VkDevice device,
@@ -1077,7 +1075,6 @@
return queryRes;
}
-#endif
#ifdef VK_USE_PLATFORM_FUCHSIA
VkResult on_vkGetMemoryFuchsiaHandleKHR(
@@ -3015,7 +3012,7 @@
context, input_result, device, pInfo, pHandle);
}
-VkResult on_vkGetMemoryFuchsiaHandlePropertiesKHR(
+VkResult ResourceTracker::on_vkGetMemoryFuchsiaHandlePropertiesKHR(
void* context, VkResult input_result,
VkDevice device,
VkExternalMemoryHandleTypeFlagBitsKHR handleType,
@@ -3043,7 +3040,6 @@
}
#endif
-#ifdef VK_USE_PLATFORM_ANDROID_KHR
VkResult ResourceTracker::on_vkGetAndroidHardwareBufferPropertiesANDROID(
void* context, VkResult input_result,
VkDevice device,
@@ -3061,7 +3057,6 @@
context, input_result,
device, pInfo, pBuffer);
}
-#endif
VkResult ResourceTracker::on_vkCreateSamplerYcbcrConversion(
void* context, VkResult input_result,
