Fix Linux build.
https://swiftshader-review.googlesource.com/c/SwiftShader/+/35939
was submitted without being properly rebased. Unfortunately, the
merge was successful on the gerrit server, but led to a broken
Linux build for swiftshader_libvulkan. This fixes the issue.
Bug: 140419396
Change-Id: Ib3167e11ea4c4957cf28fa7b45305e98ca27c413
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/37289
Kokoro-Presubmit: David Turner <digit@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
Tested-by: David Turner <digit@google.com>
Presubmit-Ready: David Turner <digit@google.com>
diff --git a/src/Vulkan/VkSemaphoreExternalLinux.hpp b/src/Vulkan/VkSemaphoreExternalLinux.hpp
index 05983cf..89ab2dc 100644
--- a/src/Vulkan/VkSemaphoreExternalLinux.hpp
+++ b/src/Vulkan/VkSemaphoreExternalLinux.hpp
@@ -38,9 +38,6 @@
// VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT) instead.
//
-namespace linux
-{
-
// A process-shared semaphore implementation that can be stored in
// a process-shared memory region. It also includes a reference count to
// ensure it is only destroyed when the last reference to it is dropped.
@@ -130,8 +127,6 @@
bool signaled = false;
};
-} // namespace linux
-
namespace vk
{
@@ -226,10 +221,10 @@
{
ABORT("mmap() failed: %s", strerror(errno));
}
- semaphore = reinterpret_cast<linux::SharedSemaphore *>(addr);
+ semaphore = reinterpret_cast<SharedSemaphore *>(addr);
if (needInitialization)
{
- new (semaphore) linux::SharedSemaphore();
+ new (semaphore) SharedSemaphore();
}
else
{
@@ -237,8 +232,8 @@
}
}
- linux::MemFd memfd;
- linux::SharedSemaphore* semaphore = nullptr;
+ LinuxMemFd memfd;
+ SharedSemaphore* semaphore = nullptr;
};
} // namespace vk
