Skip to content

S
swiftshader
Commit a27dfcf8 by David 'Digit' Turner Committed by David Turner
Options

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: 's avatarChris Forbes <chrisforbes@google.com> Tested-by: 's avatarDavid Turner <digit@google.com> Presubmit-Ready: David Turner <digit@google.com>
parent 7c4d0a0f
Showing with 4 additions and 9 deletions
src/Vulkan/VkSemaphoreExternalLinux.hpp
...@@ -38,9 +38,6 @@ ...@@ -38,9 +38,6 @@
// VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT) instead. // VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT) instead.
// //
namespace linux
{
// A process-shared semaphore implementation that can be stored in // A process-shared semaphore implementation that can be stored in
// a process-shared memory region. It also includes a reference count to // 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. // ensure it is only destroyed when the last reference to it is dropped.
...@@ -130,8 +127,6 @@ private: ...@@ -130,8 +127,6 @@ private:
bool signaled = false; bool signaled = false;
}; };
} // namespace linux
namespace vk namespace vk
{ {
...@@ -226,10 +221,10 @@ private: ...@@ -226,10 +221,10 @@ private:
{ {
ABORT("mmap() failed: %s", strerror(errno)); ABORT("mmap() failed: %s", strerror(errno));
} }
semaphore = reinterpret_cast<linux::SharedSemaphore *>(addr); semaphore = reinterpret_cast<SharedSemaphore *>(addr);
if (needInitialization) if (needInitialization)
{ {
new (semaphore) linux::SharedSemaphore(); new (semaphore) SharedSemaphore();
} }
else else
{ {
...@@ -237,8 +232,8 @@ private: ...@@ -237,8 +232,8 @@ private:
} }
} }
linux::MemFd memfd; LinuxMemFd memfd;
linux::SharedSemaphore* semaphore = nullptr; SharedSemaphore* semaphore = nullptr;
}; };
} // namespace vk } // namespace vk
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment