DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[async] Adapt to libasync API changes. (#4980)

Browse Source
This commit is contained in:
Jeff Brown 2018-04-12 12:56:29 -07:00 committed by Adam Barth
parent 76cb311d9c
commit 1dd1264944
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
content_handler/vulkan_surface.cc
View File

@ -44,8 +44,7 @@ VulkanSurface::VulkanSurface(vulkan::VulkanProvider& vulkan_provider,
wait_.set_object(release_event_.get());
wait_.set_trigger(ZX_EVENT_SIGNALED);
async_ = async_get_default();
wait_.Begin(async_);
wait_.Begin(async_get_default());
// Probably not necessary as the events should be in the unsignalled state
// already.
@ -56,11 +55,8 @@ VulkanSurface::VulkanSurface(vulkan::VulkanProvider& vulkan_provider,
VulkanSurface::~VulkanSurface() {
ASSERT_IS_GPU_THREAD;
if (async_) {
wait_.Cancel(async_);
wait_.set_object(ZX_HANDLE_INVALID);
async_ = nullptr;
}
wait_.Cancel();
wait_.set_object(ZX_HANDLE_INVALID);
}
bool VulkanSurface::IsValid() const {
@ -410,15 +406,16 @@ void VulkanSurface::Reset() {
}
}
async_wait_result_t VulkanSurface::OnHandleReady(async_t* async,
zx_status_t status,
const zx_packet_signal_t* signal) {
void VulkanSurface::OnHandleReady(async_t* async,
async::WaitBase* wait,
zx_status_t status,
const zx_packet_signal_t* signal) {
ASSERT_IS_GPU_THREAD;
if (status != ZX_OK)
return ASYNC_WAIT_FINISHED;
return;
FXL_DCHECK(signal->observed & ZX_EVENT_SIGNALED);
Reset();
return ASYNC_WAIT_AGAIN;
wait->Begin(async);
}
} // namespace flutter_runner

8
content_handler/vulkan_surface.h
View File

@ -70,9 +70,10 @@ class VulkanSurface : public flow::SceneUpdateContext::SurfaceProducerSurface {
}
private:
async_wait_result_t OnHandleReady(async_t* async,
zx_status_t status,
const zx_packet_signal_t* signal);
void OnHandleReady(async_t* async,
async::WaitBase* wait,
zx_status_t status,
const zx_packet_signal_t* signal);
bool AllocateDeviceMemory(sk_sp<GrContext> context,
const SkISize& size,
@ -106,7 +107,6 @@ class VulkanSurface : public flow::SceneUpdateContext::SurfaceProducerSurface {
vulkan::VulkanHandle<VkSemaphore> acquire_semaphore_;
std::unique_ptr<vulkan::VulkanCommandBuffer> command_buffer_;
zx::event release_event_;
async_t* async_;
async::WaitMethod<VulkanSurface, &VulkanSurface::OnHandleReady> wait_;
std::function<void()> pending_on_writes_committed_;
size_t age_ = 0;