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

Unified Diff: gpu/ipc/client/gpu_channel_host.cc

Issue 2531963002: gfx: Fix sending native ozone pixmaps from InProcessCommandBuffer. (Closed)
Patch Set: . 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 | « gpu/ipc/client/gpu_channel_host.h ('k') | gpu/ipc/in_process_command_buffer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/ipc/client/gpu_channel_host.cc
diff --git a/gpu/ipc/client/gpu_channel_host.cc b/gpu/ipc/client/gpu_channel_host.cc
index b639d8ffa54f83f61e2adb13312e1fef91feffd3..5e41fd9e274d839f547a794b86c859236e6dc92e 100644
--- a/gpu/ipc/client/gpu_channel_host.cc
+++ b/gpu/ipc/client/gpu_channel_host.cc
@@ -220,7 +220,7 @@ void GpuChannelHost::RemoveRoute(int route_id) {
}
base::SharedMemoryHandle GpuChannelHost::ShareToGpuProcess(
- base::SharedMemoryHandle source_handle) {
+ const base::SharedMemoryHandle& source_handle) {
if (IsLost())
return base::SharedMemory::NULLHandle();
@@ -232,52 +232,6 @@ int32_t GpuChannelHost::ReserveTransferBufferId() {
return g_next_transfer_buffer_id.GetNext() + 1;
}
-gfx::GpuMemoryBufferHandle GpuChannelHost::ShareGpuMemoryBufferToGpuProcess(
- const gfx::GpuMemoryBufferHandle& source_handle,
- bool* requires_sync_point) {
- switch (source_handle.type) {
- case gfx::SHARED_MEMORY_BUFFER: {
- gfx::GpuMemoryBufferHandle handle;
- handle.type = gfx::SHARED_MEMORY_BUFFER;
- handle.handle = ShareToGpuProcess(source_handle.handle);
- handle.offset = source_handle.offset;
- handle.stride = source_handle.stride;
- *requires_sync_point = false;
- return handle;
- }
-#if defined(USE_OZONE)
- case gfx::OZONE_NATIVE_PIXMAP: {
- std::vector<base::ScopedFD> scoped_fds;
- for (auto& fd : source_handle.native_pixmap_handle.fds) {
- base::ScopedFD scoped_fd(HANDLE_EINTR(dup(fd.fd)));
- if (!scoped_fd.is_valid()) {
- PLOG(ERROR) << "dup";
- return gfx::GpuMemoryBufferHandle();
- }
- scoped_fds.emplace_back(std::move(scoped_fd));
- }
- gfx::GpuMemoryBufferHandle handle;
- handle.type = gfx::OZONE_NATIVE_PIXMAP;
- handle.id = source_handle.id;
- for (auto& scoped_fd : scoped_fds) {
- handle.native_pixmap_handle.fds.emplace_back(scoped_fd.release(),
- true /* auto_close */);
- }
- handle.native_pixmap_handle.planes =
- source_handle.native_pixmap_handle.planes;
- *requires_sync_point = false;
- return handle;
- }
-#endif
- case gfx::IO_SURFACE_BUFFER:
- *requires_sync_point = true;
- return source_handle;
- default:
- NOTREACHED();
- return gfx::GpuMemoryBufferHandle();
- }
-}
-
int32_t GpuChannelHost::ReserveImageId() {
return next_image_id_.GetNext();
}
« no previous file with comments | « gpu/ipc/client/gpu_channel_host.h ('k') | gpu/ipc/in_process_command_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698