1*4882a593SmuzhiyunFrom 96e5f317bc2923f4bb8192ead3c67987314fc2f1 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com> 3*4882a593SmuzhiyunDate: Mon, 31 May 2021 01:29:11 +0800 4*4882a593SmuzhiyunSubject: [PATCH 10/14] Create new fence when there's no in-fences 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThere're cases that in-fences are not provided. 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 9*4882a593Smuzhiyun--- 10*4882a593Smuzhiyun .../wayland/gpu/gbm_surfaceless_wayland.cc | 21 +++++++++++++++++-- 11*4882a593Smuzhiyun 1 file changed, 19 insertions(+), 2 deletions(-) 12*4882a593Smuzhiyun 13*4882a593Smuzhiyundiff --git a/ui/ozone/platform/wayland/gpu/gbm_surfaceless_wayland.cc b/ui/ozone/platform/wayland/gpu/gbm_surfaceless_wayland.cc 14*4882a593Smuzhiyunindex 0f2eb6ec..b283e438 100644 15*4882a593Smuzhiyun--- a/ui/ozone/platform/wayland/gpu/gbm_surfaceless_wayland.cc 16*4882a593Smuzhiyun+++ b/ui/ozone/platform/wayland/gpu/gbm_surfaceless_wayland.cc 17*4882a593Smuzhiyun@@ -30,6 +30,12 @@ static constexpr size_t kMaxSolidColorBuffers = 12; 18*4882a593Smuzhiyun 19*4882a593Smuzhiyun static constexpr gfx::Size kSolidColorBufferSize{4, 4}; 20*4882a593Smuzhiyun 21*4882a593Smuzhiyun+void WaitForEGLFence(EGLDisplay display, EGLSyncKHR fence) { 22*4882a593Smuzhiyun+ eglClientWaitSyncKHR(display, fence, EGL_SYNC_FLUSH_COMMANDS_BIT_KHR, 23*4882a593Smuzhiyun+ EGL_FOREVER_KHR); 24*4882a593Smuzhiyun+ eglDestroySyncKHR(display, fence); 25*4882a593Smuzhiyun+} 26*4882a593Smuzhiyun+ 27*4882a593Smuzhiyun void WaitForGpuFences(std::vector<std::unique_ptr<gfx::GpuFence>> fences) { 28*4882a593Smuzhiyun for (auto& fence : fences) 29*4882a593Smuzhiyun fence->Wait(); 30*4882a593Smuzhiyun@@ -211,14 +217,25 @@ void GbmSurfacelessWayland::SwapBuffersAsync( 31*4882a593Smuzhiyun return; 32*4882a593Smuzhiyun } 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun- base::OnceClosure fence_wait_task; 35*4882a593Smuzhiyun std::vector<std::unique_ptr<gfx::GpuFence>> fences; 36*4882a593Smuzhiyun+ // Uset in-fences provided in the overlays. If there are none, we insert our 37*4882a593Smuzhiyun+ // own fence and wait. 38*4882a593Smuzhiyun for (auto& plane : frame->planes) { 39*4882a593Smuzhiyun if (plane.second.gpu_fence) 40*4882a593Smuzhiyun fences.push_back(std::move(plane.second.gpu_fence)); 41*4882a593Smuzhiyun } 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun- fence_wait_task = base::BindOnce(&WaitForGpuFences, std::move(fences)); 44*4882a593Smuzhiyun+ base::OnceClosure fence_wait_task; 45*4882a593Smuzhiyun+ if (!fences.empty()) { 46*4882a593Smuzhiyun+ fence_wait_task = base::BindOnce(&WaitForGpuFences, std::move(fences)); 47*4882a593Smuzhiyun+ } else { 48*4882a593Smuzhiyun+ // TODO(fangzhoug): the following should be replaced by a per surface flush 49*4882a593Smuzhiyun+ // as it gets implemented in GL drivers. 50*4882a593Smuzhiyun+ EGLSyncKHR fence = InsertFence(has_implicit_external_sync_); 51*4882a593Smuzhiyun+ CHECK_NE(fence, EGL_NO_SYNC_KHR) << "eglCreateSyncKHR failed"; 52*4882a593Smuzhiyun+ 53*4882a593Smuzhiyun+ fence_wait_task = base::BindOnce(&WaitForEGLFence, GetDisplay(), fence); 54*4882a593Smuzhiyun+ } 55*4882a593Smuzhiyun 56*4882a593Smuzhiyun base::OnceClosure fence_retired_callback = base::BindOnce( 57*4882a593Smuzhiyun &GbmSurfacelessWayland::FenceRetired, weak_factory_.GetWeakPtr(), frame); 58*4882a593Smuzhiyun-- 59*4882a593Smuzhiyun2.20.1 60*4882a593Smuzhiyun 61