goldfish-opengl: be more platform agnostic with
- enable HostVisibleVirtualization on Linux builds
- don't need to #ifdef mRenderNodeFd since it's just an int
BUG=202552093
TEST=./deqp-vk
Change-Id: Iafa9e60a1b10686e01c7e567166b3d659d024578
diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index 75db67e..2c38dad 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -68,11 +68,6 @@
#include "../egl/goldfish_sync.h"
#include "AndroidHardwareBuffer.h"
-#ifndef HOST_BUILD
-#include "virtgpu_drm.h"
-#include <xf86drm.h>
-#endif
-
#else
#include <android/hardware_buffer.h>
@@ -144,13 +139,17 @@
#include <stdlib.h>
#include <sync/sync.h>
-#ifdef VK_USE_PLATFORM_ANDROID_KHR
+#if defined(__ANDROID__) || defined(__linux__)
#include <sys/mman.h>
+#include <unistd.h>
#include <sys/syscall.h>
#ifdef HOST_BUILD
#include "android/utils/tempfile.h"
+#else
+#include "virtgpu_drm.h"
+#include <xf86drm.h>
#endif
static inline int
@@ -163,8 +162,9 @@
return syscall(SYS_memfd_create, name, flags);
#endif
}
+
#define memfd_create inline_memfd_create
-#endif // !VK_USE_PLATFORM_ANDROID_KHR
+#endif
#define RESOURCE_TRACKER_DEBUG 0
@@ -1048,7 +1048,7 @@
if (mFeatureInfo->hasVulkanQueueSubmitWithCommands) {
ResourceTracker::streamFeatureBits |= VULKAN_STREAM_FEATURE_QUEUE_SUBMIT_WITH_COMMANDS_BIT;
}
-#if !defined(HOST_BUILD) && defined(VK_USE_PLATFORM_ANDROID_KHR)
+#if !defined(HOST_BUILD) && defined(VIRTIO_GPU)
if (mFeatureInfo->hasVirtioGpuNext) {
ALOGD("%s: has virtio-gpu-next; create auxiliary rendernode\n", __func__);
mRendernodeFd = drmOpenRender(128 /* RENDERNODE_MINOR */);
@@ -3715,7 +3715,7 @@
(unsigned long long)directMappedAddr);
mLock.lock();
} else if (mFeatureInfo->hasVirtioGpuNext) {
-#if !defined(HOST_BUILD) && defined(VK_USE_PLATFORM_ANDROID_KHR)
+#if !defined(HOST_BUILD) && defined(VIRTIO_GPU)
uint64_t hvaSizeId[3];
int rendernodeFdForMem = drmOpenRender(128 /* RENDERNODE_MINOR */);
@@ -7910,9 +7910,7 @@
std::vector<VkExtensionProperties> mHostDeviceExtensions;
int mSyncDeviceFd = -1;
-#ifdef VK_USE_PLATFORM_ANDROID_KHR
int mRendernodeFd = -1;
-#endif
#ifdef VK_USE_PLATFORM_FUCHSIA
fidl::WireSyncClient<fuchsia_hardware_goldfish::ControlDevice>
