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

Side by Side Diff: services/ui/public/cpp/mojo_gpu_memory_buffer_manager.cc

Issue 2480023002: mus: Remove unnecessary GpuMemoryBuffer code from client-lib. (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 unified diff | Download patch
« no previous file with comments | « services/ui/public/cpp/mojo_gpu_memory_buffer_manager.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "services/ui/public/cpp/mojo_gpu_memory_buffer_manager.h" 5 #include "services/ui/public/cpp/mojo_gpu_memory_buffer_manager.h"
6 6
7 #include "base/bind.h"
7 #include "base/logging.h" 8 #include "base/logging.h"
8 #include "services/ui/public/cpp/mojo_gpu_memory_buffer.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/memory/shared_memory.h"
11 #include "gpu/ipc/client/gpu_memory_buffer_impl.h"
12 #include "mojo/public/cpp/system/buffer.h"
13 #include "mojo/public/cpp/system/platform_handle.h"
14 #include "ui/gfx/buffer_format_util.h"
9 15
10 namespace ui { 16 namespace ui {
11 17
12 MojoGpuMemoryBufferManager::MojoGpuMemoryBufferManager() {} 18 MojoGpuMemoryBufferManager::MojoGpuMemoryBufferManager()
19 : weak_ptr_factory_(this) {}
13 20
14 MojoGpuMemoryBufferManager::~MojoGpuMemoryBufferManager() {} 21 MojoGpuMemoryBufferManager::~MojoGpuMemoryBufferManager() {}
15 22
23 void MojoGpuMemoryBufferManager::DeletedGpuMemoryBuffer(
24 gfx::GpuMemoryBufferId id,
25 const gpu::SyncToken& sync_token) {
26 }
27
16 std::unique_ptr<gfx::GpuMemoryBuffer> 28 std::unique_ptr<gfx::GpuMemoryBuffer>
17 MojoGpuMemoryBufferManager::AllocateGpuMemoryBuffer( 29 MojoGpuMemoryBufferManager::AllocateGpuMemoryBuffer(
18 const gfx::Size& size, 30 const gfx::Size& size,
19 gfx::BufferFormat format, 31 gfx::BufferFormat format,
20 gfx::BufferUsage usage, 32 gfx::BufferUsage usage,
21 gpu::SurfaceHandle surface_handle) { 33 gpu::SurfaceHandle surface_handle) {
22 return MojoGpuMemoryBufferImpl::Create(size, format, usage); 34 // TODO(sad): Get the memory buffer handle from GpuService.
35 size_t bytes = gfx::BufferSizeForBufferFormat(size, format);
36
37 mojo::ScopedSharedBufferHandle handle =
38 mojo::SharedBufferHandle::Create(bytes);
39 if (!handle.is_valid())
40 return nullptr;
41
42 base::SharedMemoryHandle shm_handle;
43 size_t shared_memory_size;
44 bool readonly;
45 MojoResult result = mojo::UnwrapSharedMemoryHandle(
46 std::move(handle), &shm_handle, &shared_memory_size, &readonly);
47 if (result != MOJO_RESULT_OK)
48 return nullptr;
49 DCHECK_EQ(shared_memory_size, bytes);
50
51 const int stride = base::checked_cast<int>(
52 gfx::RowSizeForBufferFormat(size.width(), format, 0));
53
54 gfx::GpuMemoryBufferHandle gmb_handle;
55 gmb_handle.type = gfx::SHARED_MEMORY_BUFFER;
56 gmb_handle.id = gfx::GpuMemoryBufferId(++counter_);
57 gmb_handle.handle = shm_handle;
58 gmb_handle.offset = 0;
59 gmb_handle.stride = stride;
60
61 std::unique_ptr<gpu::GpuMemoryBufferImpl> buffer(
62 gpu::GpuMemoryBufferImpl::CreateFromHandle(
63 gmb_handle, size, format, usage,
64 base::Bind(&MojoGpuMemoryBufferManager::DeletedGpuMemoryBuffer,
65 weak_ptr_factory_.GetWeakPtr(), gmb_handle.id)));
66 if (!buffer)
67 return nullptr;
68
69 return std::move(buffer);
23 } 70 }
24 71
25 std::unique_ptr<gfx::GpuMemoryBuffer> 72 std::unique_ptr<gfx::GpuMemoryBuffer>
26 MojoGpuMemoryBufferManager::CreateGpuMemoryBufferFromHandle( 73 MojoGpuMemoryBufferManager::CreateGpuMemoryBufferFromHandle(
27 const gfx::GpuMemoryBufferHandle& handle, 74 const gfx::GpuMemoryBufferHandle& handle,
28 const gfx::Size& size, 75 const gfx::Size& size,
29 gfx::BufferFormat format) { 76 gfx::BufferFormat format) {
30 const gfx::BufferUsage usage = gfx::BufferUsage::GPU_READ; 77 NOTIMPLEMENTED();
31 return MojoGpuMemoryBufferImpl::CreateFromHandle(handle, size, format, usage); 78 return nullptr;
32 } 79 }
33 80
34 gfx::GpuMemoryBuffer* 81 gfx::GpuMemoryBuffer*
35 MojoGpuMemoryBufferManager::GpuMemoryBufferFromClientBuffer( 82 MojoGpuMemoryBufferManager::GpuMemoryBufferFromClientBuffer(
36 ClientBuffer buffer) { 83 ClientBuffer buffer) {
37 return MojoGpuMemoryBufferImpl::FromClientBuffer(buffer); 84 return gpu::GpuMemoryBufferImpl::FromClientBuffer(buffer);
38 } 85 }
39 86
40 void MojoGpuMemoryBufferManager::SetDestructionSyncToken( 87 void MojoGpuMemoryBufferManager::SetDestructionSyncToken(
41 gfx::GpuMemoryBuffer* buffer, 88 gfx::GpuMemoryBuffer* buffer,
42 const gpu::SyncToken& sync_token) { 89 const gpu::SyncToken& sync_token) {
43 NOTIMPLEMENTED(); 90 static_cast<gpu::GpuMemoryBufferImpl*>(buffer)->set_destruction_sync_token(
91 sync_token);
44 } 92 }
45 93
46 } // namespace ui 94 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/public/cpp/mojo_gpu_memory_buffer_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698