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

Side by Side Diff: services/ui/public/cpp/gpu/client_gpu_memory_buffer_manager.cc

Issue 2562623005: mus/gpu: Rename the client/server side memory buffer managers. (Closed)
Patch Set: tot merge Created 4 years 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
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/gpu/mojo_gpu_memory_buffer_manager.h" 5 #include "services/ui/public/cpp/gpu/client_gpu_memory_buffer_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/memory/shared_memory.h" 10 #include "base/memory/shared_memory.h"
11 #include "base/synchronization/waitable_event.h" 11 #include "base/synchronization/waitable_event.h"
12 #include "gpu/ipc/client/gpu_memory_buffer_impl.h" 12 #include "gpu/ipc/client/gpu_memory_buffer_impl.h"
13 #include "mojo/public/cpp/system/buffer.h" 13 #include "mojo/public/cpp/system/buffer.h"
14 #include "mojo/public/cpp/system/platform_handle.h" 14 #include "mojo/public/cpp/system/platform_handle.h"
15 #include "services/service_manager/public/cpp/connector.h" 15 #include "services/service_manager/public/cpp/connector.h"
(...skipping 15 matching lines...) Expand all
31 31
32 void NotifyDestructionOnCorrectThread( 32 void NotifyDestructionOnCorrectThread(
33 scoped_refptr<base::SingleThreadTaskRunner> task_runner, 33 scoped_refptr<base::SingleThreadTaskRunner> task_runner,
34 const DestructionCallback& callback, 34 const DestructionCallback& callback,
35 const gpu::SyncToken& sync_token) { 35 const gpu::SyncToken& sync_token) {
36 task_runner->PostTask(FROM_HERE, base::Bind(callback, sync_token)); 36 task_runner->PostTask(FROM_HERE, base::Bind(callback, sync_token));
37 } 37 }
38 38
39 } // namespace 39 } // namespace
40 40
41 MojoGpuMemoryBufferManager::MojoGpuMemoryBufferManager( 41 ClientGpuMemoryBufferManager::ClientGpuMemoryBufferManager(
42 mojom::GpuServicePtr gpu_service) 42 mojom::GpuServicePtr gpu_service)
43 : thread_("GpuMemoryThread"), weak_ptr_factory_(this) { 43 : thread_("GpuMemoryThread"), weak_ptr_factory_(this) {
44 CHECK(thread_.Start()); 44 CHECK(thread_.Start());
45 // The thread is owned by this object. Which means the task will not run if 45 // The thread is owned by this object. Which means the task will not run if
46 // the object has been destroyed. So Unretained() is safe. 46 // the object has been destroyed. So Unretained() is safe.
47 thread_.task_runner()->PostTask( 47 thread_.task_runner()->PostTask(
48 FROM_HERE, base::Bind(&MojoGpuMemoryBufferManager::InitThread, 48 FROM_HERE, base::Bind(&ClientGpuMemoryBufferManager::InitThread,
49 base::Unretained(this), 49 base::Unretained(this),
50 base::Passed(gpu_service.PassInterface()))); 50 base::Passed(gpu_service.PassInterface())));
51 } 51 }
52 52
53 MojoGpuMemoryBufferManager::~MojoGpuMemoryBufferManager() { 53 ClientGpuMemoryBufferManager::~ClientGpuMemoryBufferManager() {
54 thread_.task_runner()->PostTask( 54 thread_.task_runner()->PostTask(
55 FROM_HERE, base::Bind(&MojoGpuMemoryBufferManager::TearDownThread, 55 FROM_HERE, base::Bind(&ClientGpuMemoryBufferManager::TearDownThread,
56 base::Unretained(this))); 56 base::Unretained(this)));
57 thread_.Stop(); 57 thread_.Stop();
58 } 58 }
59 59
60 void MojoGpuMemoryBufferManager::InitThread( 60 void ClientGpuMemoryBufferManager::InitThread(
61 mojo::InterfacePtrInfo<mojom::GpuService> gpu_service_info) { 61 mojo::InterfacePtrInfo<mojom::GpuService> gpu_service_info) {
62 gpu_service_.Bind(std::move(gpu_service_info)); 62 gpu_service_.Bind(std::move(gpu_service_info));
63 weak_ptr_ = weak_ptr_factory_.GetWeakPtr(); 63 weak_ptr_ = weak_ptr_factory_.GetWeakPtr();
64 } 64 }
65 65
66 void MojoGpuMemoryBufferManager::TearDownThread() { 66 void ClientGpuMemoryBufferManager::TearDownThread() {
67 weak_ptr_factory_.InvalidateWeakPtrs(); 67 weak_ptr_factory_.InvalidateWeakPtrs();
68 gpu_service_.reset(); 68 gpu_service_.reset();
69 } 69 }
70 70
71 void MojoGpuMemoryBufferManager::AllocateGpuMemoryBufferOnThread( 71 void ClientGpuMemoryBufferManager::AllocateGpuMemoryBufferOnThread(
72 const gfx::Size& size, 72 const gfx::Size& size,
73 gfx::BufferFormat format, 73 gfx::BufferFormat format,
74 gfx::BufferUsage usage, 74 gfx::BufferUsage usage,
75 gfx::GpuMemoryBufferHandle* handle, 75 gfx::GpuMemoryBufferHandle* handle,
76 base::WaitableEvent* wait) { 76 base::WaitableEvent* wait) {
77 DCHECK(thread_.task_runner()->BelongsToCurrentThread()); 77 DCHECK(thread_.task_runner()->BelongsToCurrentThread());
78 // |handle| and |wait| are both on the stack, and will be alive until |wait| 78 // |handle| and |wait| are both on the stack, and will be alive until |wait|
79 // is signaled. So it is safe for OnGpuMemoryBufferAllocated() to operate on 79 // is signaled. So it is safe for OnGpuMemoryBufferAllocated() to operate on
80 // these. 80 // these.
81 gpu_service_->CreateGpuMemoryBuffer( 81 gpu_service_->CreateGpuMemoryBuffer(
82 gfx::GpuMemoryBufferId(++counter_), size, format, usage, 82 gfx::GpuMemoryBufferId(++counter_), size, format, usage,
83 base::Bind(&OnGpuMemoryBufferAllocated, handle, wait)); 83 base::Bind(&OnGpuMemoryBufferAllocated, handle, wait));
84 } 84 }
85 85
86 void MojoGpuMemoryBufferManager::DeletedGpuMemoryBuffer( 86 void ClientGpuMemoryBufferManager::DeletedGpuMemoryBuffer(
87 gfx::GpuMemoryBufferId id, 87 gfx::GpuMemoryBufferId id,
88 const gpu::SyncToken& sync_token) { 88 const gpu::SyncToken& sync_token) {
89 if (!thread_.task_runner()->BelongsToCurrentThread()) { 89 if (!thread_.task_runner()->BelongsToCurrentThread()) {
90 thread_.task_runner()->PostTask( 90 thread_.task_runner()->PostTask(
91 FROM_HERE, 91 FROM_HERE,
92 base::Bind(&MojoGpuMemoryBufferManager::DeletedGpuMemoryBuffer, 92 base::Bind(&ClientGpuMemoryBufferManager::DeletedGpuMemoryBuffer,
93 base::Unretained(this), id, sync_token)); 93 base::Unretained(this), id, sync_token));
94 return; 94 return;
95 } 95 }
96 gpu_service_->DestroyGpuMemoryBuffer(id, sync_token); 96 gpu_service_->DestroyGpuMemoryBuffer(id, sync_token);
97 } 97 }
98 98
99 std::unique_ptr<gfx::GpuMemoryBuffer> 99 std::unique_ptr<gfx::GpuMemoryBuffer>
100 MojoGpuMemoryBufferManager::CreateGpuMemoryBuffer( 100 ClientGpuMemoryBufferManager::CreateGpuMemoryBuffer(
101 const gfx::Size& size, 101 const gfx::Size& size,
102 gfx::BufferFormat format, 102 gfx::BufferFormat format,
103 gfx::BufferUsage usage, 103 gfx::BufferUsage usage,
104 gpu::SurfaceHandle surface_handle) { 104 gpu::SurfaceHandle surface_handle) {
105 // Note: this can be called from multiple threads at the same time. Some of 105 // Note: this can be called from multiple threads at the same time. Some of
106 // those threads may not have a TaskRunner set. 106 // those threads may not have a TaskRunner set.
107 DCHECK_EQ(gpu::kNullSurfaceHandle, surface_handle); 107 DCHECK_EQ(gpu::kNullSurfaceHandle, surface_handle);
108 CHECK(!thread_.task_runner()->BelongsToCurrentThread()); 108 CHECK(!thread_.task_runner()->BelongsToCurrentThread());
109 gfx::GpuMemoryBufferHandle gmb_handle; 109 gfx::GpuMemoryBufferHandle gmb_handle;
110 base::WaitableEvent wait(base::WaitableEvent::ResetPolicy::AUTOMATIC, 110 base::WaitableEvent wait(base::WaitableEvent::ResetPolicy::AUTOMATIC,
111 base::WaitableEvent::InitialState::NOT_SIGNALED); 111 base::WaitableEvent::InitialState::NOT_SIGNALED);
112 thread_.task_runner()->PostTask( 112 thread_.task_runner()->PostTask(
113 FROM_HERE, 113 FROM_HERE,
114 base::Bind(&MojoGpuMemoryBufferManager::AllocateGpuMemoryBufferOnThread, 114 base::Bind(&ClientGpuMemoryBufferManager::AllocateGpuMemoryBufferOnThread,
115 base::Unretained(this), size, format, usage, &gmb_handle, 115 base::Unretained(this), size, format, usage, &gmb_handle,
116 &wait)); 116 &wait));
117 wait.Wait(); 117 wait.Wait();
118 if (gmb_handle.is_null()) 118 if (gmb_handle.is_null())
119 return nullptr; 119 return nullptr;
120 120
121 DestructionCallback callback = 121 DestructionCallback callback =
122 base::Bind(&MojoGpuMemoryBufferManager::DeletedGpuMemoryBuffer, weak_ptr_, 122 base::Bind(&ClientGpuMemoryBufferManager::DeletedGpuMemoryBuffer,
123 gmb_handle.id); 123 weak_ptr_, gmb_handle.id);
124 std::unique_ptr<gpu::GpuMemoryBufferImpl> buffer( 124 std::unique_ptr<gpu::GpuMemoryBufferImpl> buffer(
125 gpu::GpuMemoryBufferImpl::CreateFromHandle( 125 gpu::GpuMemoryBufferImpl::CreateFromHandle(
126 gmb_handle, size, format, usage, 126 gmb_handle, size, format, usage,
127 base::Bind(&NotifyDestructionOnCorrectThread, thread_.task_runner(), 127 base::Bind(&NotifyDestructionOnCorrectThread, thread_.task_runner(),
128 callback))); 128 callback)));
129 if (!buffer) { 129 if (!buffer) {
130 DeletedGpuMemoryBuffer(gmb_handle.id, gpu::SyncToken()); 130 DeletedGpuMemoryBuffer(gmb_handle.id, gpu::SyncToken());
131 return nullptr; 131 return nullptr;
132 } 132 }
133 return std::move(buffer); 133 return std::move(buffer);
134 } 134 }
135 135
136 std::unique_ptr<gfx::GpuMemoryBuffer> 136 std::unique_ptr<gfx::GpuMemoryBuffer>
137 MojoGpuMemoryBufferManager::CreateGpuMemoryBufferFromHandle( 137 ClientGpuMemoryBufferManager::CreateGpuMemoryBufferFromHandle(
138 const gfx::GpuMemoryBufferHandle& handle, 138 const gfx::GpuMemoryBufferHandle& handle,
139 const gfx::Size& size, 139 const gfx::Size& size,
140 gfx::BufferFormat format) { 140 gfx::BufferFormat format) {
141 NOTIMPLEMENTED(); 141 NOTIMPLEMENTED();
142 return nullptr; 142 return nullptr;
143 } 143 }
144 144
145 void MojoGpuMemoryBufferManager::SetDestructionSyncToken( 145 void ClientGpuMemoryBufferManager::SetDestructionSyncToken(
146 gfx::GpuMemoryBuffer* buffer, 146 gfx::GpuMemoryBuffer* buffer,
147 const gpu::SyncToken& sync_token) { 147 const gpu::SyncToken& sync_token) {
148 static_cast<gpu::GpuMemoryBufferImpl*>(buffer)->set_destruction_sync_token( 148 static_cast<gpu::GpuMemoryBufferImpl*>(buffer)->set_destruction_sync_token(
149 sync_token); 149 sync_token);
150 } 150 }
151 151
152 } // namespace ui 152 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/public/cpp/gpu/client_gpu_memory_buffer_manager.h ('k') | services/ui/public/cpp/gpu/gpu_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698