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

Unified Diff: gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.cc

Issue 2705213005: Add NativePixmapDmabufStub to finalize glCreateImageCHROMIUM on Linux. (Closed)
Patch Set: Rebase Created 3 years, 7 months 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 | « gpu/ipc/service/BUILD.gn ('k') | ui/gfx/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.cc
diff --git a/gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.cc b/gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.cc
index cc08eb86e4138313138022a66430604fce455a76..8750d97918da853b7fc4eb95b71046cb3ba9580a 100644
--- a/gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.cc
+++ b/gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.cc
@@ -11,6 +11,8 @@
#if defined(USE_OZONE)
#include "ui/ozone/public/ozone_platform.h"
#include "ui/ozone/public/surface_factory_ozone.h"
+#elif defined(OS_LINUX)
+#include "ui/gfx/linux/native_pixmap_dmabuf.h"
#endif
namespace gpu {
@@ -101,9 +103,8 @@ GpuMemoryBufferFactoryNativePixmap::CreateImageForGpuMemoryBuffer(
->CreateNativePixmapFromHandle(surface_handle, size, format,
handle.native_pixmap_handle);
#else
- // TODO(j.isorce): implement this to enable glCreateImageCHROMIUM on Linux.
- // On going in http://codereview.chromium.org/2705213005, crbug.com/584248.
- NOTIMPLEMENTED();
+ pixmap = make_scoped_refptr(
+ new gfx::NativePixmapDmaBuf(size, format, handle.native_pixmap_handle));
#endif
if (!pixmap.get()) {
DLOG(ERROR) << "Failed to create pixmap from handle";
« no previous file with comments | « gpu/ipc/service/BUILD.gn ('k') | ui/gfx/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698