Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(399)

Unified Diff: components/exo/display.cc

Issue 2404513002: exo: Implement zcr_linux_explicit_synchronization_v1
Patch Set: rebase, pull in cl 2443823002 Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/exo/display.h ('k') | components/exo/display_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/exo/display.cc
diff --git a/components/exo/display.cc b/components/exo/display.cc
index 02b6d0ea11047a8ab8ac3f1645bedbeee1358965..573d9d88b9eb147a2126c3829233df6476d1a9d5 100644
--- a/components/exo/display.cc
+++ b/components/exo/display.cc
@@ -20,13 +20,16 @@
#include "components/exo/surface.h"
#include "ui/views/widget/widget.h"
+#if defined(OS_LINUX)
+#include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
+#include "ui/aura/env.h"
+#endif
+
#if defined(USE_OZONE)
#include <GLES2/gl2extchromium.h>
#include "components/exo/buffer.h"
-#include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "third_party/khronos/GLES2/gl2ext.h"
-#include "ui/aura/env.h"
#endif
namespace exo {
@@ -101,7 +104,22 @@ std::unique_ptr<Buffer> Display::CreateLinuxDMABufBuffer(
// COMMANDS_COMPLETED queries are required by native pixmaps.
GL_COMMANDS_COMPLETED_CHROMIUM, use_zero_copy, is_overlay_candidate);
}
-#endif
+#endif // defined(USE_OZONE)
+
+#if defined(OS_LINUX)
+std::unique_ptr<gfx::GpuFence> Display::CreateLinuxFence(base::ScopedFD fd) {
+ TRACE_EVENT1("exo", "Display::CreateLinuxFence", "fd", fd.get());
+
+ gfx::GpuFenceHandle handle;
+
+ handle.fd.fd = fd.release();
+
+ return aura::Env::GetInstance()
+ ->context_factory()
+ ->GetGpuMemoryBufferManager()
+ ->CreateGpuFenceFromHandle(handle);
+}
+#endif // defined(OS_LINUX)
std::unique_ptr<ShellSurface> Display::CreateShellSurface(Surface* surface) {
TRACE_EVENT1("exo", "Display::CreateShellSurface", "surface",
« no previous file with comments | « components/exo/display.h ('k') | components/exo/display_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698