Commit dcc0bebf by Courtney Goeltzenleuchter Committed by Commit Bot

Vulkan: clean up comments, rename per request

Bug: b/170312581 Change-Id: Iefecb5776cac07477266e6a2e77af7d3c9f38ad6 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2585745Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Courtney Goeltzenleuchter <courtneygo@google.com>
parent 9912971c
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
namespace namespace
{ {
// Wait for file descriptor to be signaled // Wait for file descriptor to be signaled
VkResult SyncWait(int fd, uint64_t timeoutNs) VkResult SyncWaitFd(int fd, uint64_t timeoutNs)
{ {
#if !defined(ANGLE_PLATFORM_WINDOWS) #if !defined(ANGLE_PLATFORM_WINDOWS)
struct pollfd fds; struct pollfd fds;
...@@ -64,7 +64,7 @@ VkResult SyncWait(int fd, uint64_t timeoutNs) ...@@ -64,7 +64,7 @@ VkResult SyncWait(int fd, uint64_t timeoutNs)
return VK_ERROR_UNKNOWN; return VK_ERROR_UNKNOWN;
#else #else
UNREACHABLE(); UNREACHABLE();
return VK_TIMEOUT; return VK_ERROR_UNKNOWN;
#endif #endif
} }
...@@ -254,8 +254,8 @@ angle::Result SyncHelperNativeFence::initializeWithFd(ContextVk *contextVk, int ...@@ -254,8 +254,8 @@ angle::Result SyncHelperNativeFence::initializeWithFd(ContextVk *contextVk, int
Serial serialOut; Serial serialOut;
// exportFd is exporting VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT_KHR type handle which // exportFd is exporting VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT_KHR type handle which
// obeys copy semantics. This means that the fence must already be signaled or the work to // obeys copy semantics. This means that the fence must already be signaled or the work to
// signal in the graphics pipeline at the time we export the fd. Thus we need to // signal it is in the graphics pipeline at the time we export the fd. Thus we need to
// ensureSubmission here. // EnsureSubmitted here.
ANGLE_TRY(renderer->queueSubmitOneOff(contextVk, vk::PrimaryCommandBuffer(), ANGLE_TRY(renderer->queueSubmitOneOff(contextVk, vk::PrimaryCommandBuffer(),
contextVk->getPriority(), &fence.get(), contextVk->getPriority(), &fence.get(),
vk::SubmitPolicy::EnsureSubmitted, &serialOut)); vk::SubmitPolicy::EnsureSubmitted, &serialOut));
...@@ -311,7 +311,7 @@ angle::Result SyncHelperNativeFence::clientWait(Context *context, ...@@ -311,7 +311,7 @@ angle::Result SyncHelperNativeFence::clientWait(Context *context,
{ {
// We need to wait on the file descriptor // We need to wait on the file descriptor
status = SyncWait(mNativeFenceFd, timeout); status = SyncWaitFd(mNativeFenceFd, timeout);
if (status != VK_TIMEOUT) if (status != VK_TIMEOUT)
{ {
ANGLE_VK_TRY(contextVk, status); ANGLE_VK_TRY(contextVk, status);
...@@ -360,7 +360,7 @@ angle::Result SyncHelperNativeFence::getStatus(Context *context, bool *signaled) ...@@ -360,7 +360,7 @@ angle::Result SyncHelperNativeFence::getStatus(Context *context, bool *signaled)
} }
// We don't have a serial, check status of the file descriptor // We don't have a serial, check status of the file descriptor
VkResult result = SyncWait(mNativeFenceFd, 0); VkResult result = SyncWaitFd(mNativeFenceFd, 0);
if (result != VK_TIMEOUT) if (result != VK_TIMEOUT)
{ {
ANGLE_VK_TRY(context, result); ANGLE_VK_TRY(context, result);
......
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