From b48d98e067d16fb13f4878237bc2f1567d635394 Mon Sep 17 00:00:00 2001 From: freiling Date: Fri, 21 Jul 2017 14:12:55 -0700 Subject: [PATCH] [content handler] move to MX_EVENT_SIGNALED for fences (#3912) --- content_handler/vulkan_surface.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/content_handler/vulkan_surface.cc b/content_handler/vulkan_surface.cc index 128e972d3..44f25b892 100644 --- a/content_handler/vulkan_surface.cc +++ b/content_handler/vulkan_surface.cc @@ -39,7 +39,7 @@ VulkanSurface::VulkanSurface(vulkan::VulkanProcTable& p_vk, } event_handler_key_ = mtl::MessageLoop::GetCurrent()->AddHandler( - this, release_event_.get(), MX_USER_SIGNAL_0); + this, release_event_.get(), MX_EVENT_SIGNALED); // Probably not necessary as the events should be in the unsignalled state // already. @@ -302,7 +302,7 @@ void VulkanSurface::SignalWritesFinished( "has not yet been acknowledged by the compositor."; // Signal the acquire end to the compositor. - if (acquire_event_.signal(0u, MX_USER_SIGNAL_0) != MX_OK) { + if (acquire_event_.signal(0u, MX_EVENT_SIGNALED) != MX_OK) { on_writes_committed(); return; } @@ -313,8 +313,8 @@ void VulkanSurface::SignalWritesFinished( void VulkanSurface::Reset() { ASSERT_IS_GPU_THREAD; - if (acquire_event_.signal(MX_USER_SIGNAL_0, 0u) != MX_OK || - release_event_.signal(MX_USER_SIGNAL_0, 0u) != MX_OK) { + if (acquire_event_.signal(MX_EVENT_SIGNALED, 0u) != MX_OK || + release_event_.signal(MX_EVENT_SIGNALED, 0u) != MX_OK) { valid_ = false; FTL_DLOG(ERROR) << "Could not reset fences. The surface is no longer valid."; @@ -332,7 +332,7 @@ void VulkanSurface::OnHandleReady(mx_handle_t handle, mx_signals_t pending, uint64_t count) { ASSERT_IS_GPU_THREAD; - FTL_DCHECK(pending & MX_USER_SIGNAL_0); + FTL_DCHECK(pending & MX_EVENT_SIGNALED); FTL_DCHECK(handle == release_event_.get()); Reset(); } -- GitLab