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

Side by Side Diff: services/ui/common/server_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
« no previous file with comments | « services/ui/common/server_gpu_memory_buffer_manager.h ('k') | services/ui/gpu/gpu_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/common/mus_gpu_memory_buffer_manager.h" 5 #include "services/ui/common/server_gpu_memory_buffer_manager.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "gpu/ipc/client/gpu_memory_buffer_impl.h" 8 #include "gpu/ipc/client/gpu_memory_buffer_impl.h"
9 #include "gpu/ipc/client/gpu_memory_buffer_impl_shared_memory.h" 9 #include "gpu/ipc/client/gpu_memory_buffer_impl_shared_memory.h"
10 #include "gpu/ipc/common/gpu_memory_buffer_support.h" 10 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
11 #include "services/ui/gpu/interfaces/gpu_service_internal.mojom.h" 11 #include "services/ui/gpu/interfaces/gpu_service_internal.mojom.h"
12 12
13 namespace ui { 13 namespace ui {
14 14
15 MusGpuMemoryBufferManager::MusGpuMemoryBufferManager( 15 ServerGpuMemoryBufferManager::ServerGpuMemoryBufferManager(
16 mojom::GpuServiceInternal* gpu_service, 16 mojom::GpuServiceInternal* gpu_service,
17 int client_id) 17 int client_id)
18 : gpu_service_(gpu_service), 18 : gpu_service_(gpu_service),
19 client_id_(client_id), 19 client_id_(client_id),
20 native_configurations_(gpu::GetNativeGpuMemoryBufferConfigurations()), 20 native_configurations_(gpu::GetNativeGpuMemoryBufferConfigurations()),
21 weak_factory_(this) {} 21 weak_factory_(this) {}
22 22
23 MusGpuMemoryBufferManager::~MusGpuMemoryBufferManager() {} 23 ServerGpuMemoryBufferManager::~ServerGpuMemoryBufferManager() {}
24 24
25 gfx::GpuMemoryBufferHandle 25 gfx::GpuMemoryBufferHandle
26 MusGpuMemoryBufferManager::CreateGpuMemoryBufferHandle( 26 ServerGpuMemoryBufferManager::CreateGpuMemoryBufferHandle(
27 gfx::GpuMemoryBufferId id, 27 gfx::GpuMemoryBufferId id,
28 int client_id, 28 int client_id,
29 const gfx::Size& size, 29 const gfx::Size& size,
30 gfx::BufferFormat format, 30 gfx::BufferFormat format,
31 gfx::BufferUsage usage, 31 gfx::BufferUsage usage,
32 gpu::SurfaceHandle surface_handle) { 32 gpu::SurfaceHandle surface_handle) {
33 DCHECK(CalledOnValidThread()); 33 DCHECK(CalledOnValidThread());
34 if (gpu::GetNativeGpuMemoryBufferType() != gfx::EMPTY_BUFFER) { 34 if (gpu::GetNativeGpuMemoryBufferType() != gfx::EMPTY_BUFFER) {
35 const bool is_native = native_configurations_.find(std::make_pair( 35 const bool is_native = native_configurations_.find(std::make_pair(
36 format, usage)) != native_configurations_.end(); 36 format, usage)) != native_configurations_.end();
37 if (is_native) { 37 if (is_native) {
38 gfx::GpuMemoryBufferHandle handle; 38 gfx::GpuMemoryBufferHandle handle;
39 gpu_service_->CreateGpuMemoryBuffer(id, size, format, usage, client_id, 39 gpu_service_->CreateGpuMemoryBuffer(id, size, format, usage, client_id,
40 surface_handle, &handle); 40 surface_handle, &handle);
41 if (!handle.is_null()) 41 if (!handle.is_null())
42 native_buffers_[client_id].insert(handle.id); 42 native_buffers_[client_id].insert(handle.id);
43 return handle; 43 return handle;
44 } 44 }
45 } 45 }
46 46
47 DCHECK(gpu::GpuMemoryBufferImplSharedMemory::IsUsageSupported(usage)) 47 DCHECK(gpu::GpuMemoryBufferImplSharedMemory::IsUsageSupported(usage))
48 << static_cast<int>(usage); 48 << static_cast<int>(usage);
49 return gpu::GpuMemoryBufferImplSharedMemory::CreateGpuMemoryBuffer(id, size, 49 return gpu::GpuMemoryBufferImplSharedMemory::CreateGpuMemoryBuffer(id, size,
50 format); 50 format);
51 } 51 }
52 52
53 std::unique_ptr<gfx::GpuMemoryBuffer> 53 std::unique_ptr<gfx::GpuMemoryBuffer>
54 MusGpuMemoryBufferManager::CreateGpuMemoryBuffer( 54 ServerGpuMemoryBufferManager::CreateGpuMemoryBuffer(
55 const gfx::Size& size, 55 const gfx::Size& size,
56 gfx::BufferFormat format, 56 gfx::BufferFormat format,
57 gfx::BufferUsage usage, 57 gfx::BufferUsage usage,
58 gpu::SurfaceHandle surface_handle) { 58 gpu::SurfaceHandle surface_handle) {
59 gfx::GpuMemoryBufferId id(next_gpu_memory_id_++); 59 gfx::GpuMemoryBufferId id(next_gpu_memory_id_++);
60 gfx::GpuMemoryBufferHandle handle = CreateGpuMemoryBufferHandle( 60 gfx::GpuMemoryBufferHandle handle = CreateGpuMemoryBufferHandle(
61 id, client_id_, size, format, usage, surface_handle); 61 id, client_id_, size, format, usage, surface_handle);
62 if (handle.is_null()) 62 if (handle.is_null())
63 return nullptr; 63 return nullptr;
64 return gpu::GpuMemoryBufferImpl::CreateFromHandle( 64 return gpu::GpuMemoryBufferImpl::CreateFromHandle(
65 handle, size, format, usage, 65 handle, size, format, usage,
66 base::Bind(&MusGpuMemoryBufferManager::DestroyGpuMemoryBuffer, 66 base::Bind(&ServerGpuMemoryBufferManager::DestroyGpuMemoryBuffer,
67 weak_factory_.GetWeakPtr(), id, client_id_)); 67 weak_factory_.GetWeakPtr(), id, client_id_));
68 } 68 }
69 69
70 std::unique_ptr<gfx::GpuMemoryBuffer> 70 std::unique_ptr<gfx::GpuMemoryBuffer>
71 MusGpuMemoryBufferManager::CreateGpuMemoryBufferFromHandle( 71 ServerGpuMemoryBufferManager::CreateGpuMemoryBufferFromHandle(
72 const gfx::GpuMemoryBufferHandle& handle, 72 const gfx::GpuMemoryBufferHandle& handle,
73 const gfx::Size& size, 73 const gfx::Size& size,
74 gfx::BufferFormat format) { 74 gfx::BufferFormat format) {
75 NOTIMPLEMENTED(); 75 NOTIMPLEMENTED();
76 return nullptr; 76 return nullptr;
77 } 77 }
78 78
79 void MusGpuMemoryBufferManager::SetDestructionSyncToken( 79 void ServerGpuMemoryBufferManager::SetDestructionSyncToken(
80 gfx::GpuMemoryBuffer* buffer, 80 gfx::GpuMemoryBuffer* buffer,
81 const gpu::SyncToken& sync_token) { 81 const gpu::SyncToken& sync_token) {
82 DCHECK(CalledOnValidThread()); 82 DCHECK(CalledOnValidThread());
83 static_cast<gpu::GpuMemoryBufferImpl*>(buffer)->set_destruction_sync_token( 83 static_cast<gpu::GpuMemoryBufferImpl*>(buffer)->set_destruction_sync_token(
84 sync_token); 84 sync_token);
85 } 85 }
86 86
87 void MusGpuMemoryBufferManager::DestroyGpuMemoryBuffer( 87 void ServerGpuMemoryBufferManager::DestroyGpuMemoryBuffer(
88 gfx::GpuMemoryBufferId id, 88 gfx::GpuMemoryBufferId id,
89 int client_id, 89 int client_id,
90 const gpu::SyncToken& sync_token) { 90 const gpu::SyncToken& sync_token) {
91 DCHECK(CalledOnValidThread()); 91 DCHECK(CalledOnValidThread());
92 if (native_buffers_[client_id].erase(id)) 92 if (native_buffers_[client_id].erase(id))
93 gpu_service_->DestroyGpuMemoryBuffer(id, client_id, sync_token); 93 gpu_service_->DestroyGpuMemoryBuffer(id, client_id, sync_token);
94 } 94 }
95 95
96 void MusGpuMemoryBufferManager::DestroyAllGpuMemoryBufferForClient( 96 void ServerGpuMemoryBufferManager::DestroyAllGpuMemoryBufferForClient(
97 int client_id) { 97 int client_id) {
98 DCHECK(CalledOnValidThread()); 98 DCHECK(CalledOnValidThread());
99 for (gfx::GpuMemoryBufferId id : native_buffers_[client_id]) 99 for (gfx::GpuMemoryBufferId id : native_buffers_[client_id])
100 gpu_service_->DestroyGpuMemoryBuffer(id, client_id, gpu::SyncToken()); 100 gpu_service_->DestroyGpuMemoryBuffer(id, client_id, gpu::SyncToken());
101 native_buffers_.erase(client_id); 101 native_buffers_.erase(client_id);
102 } 102 }
103 103
104 } // namespace ui 104 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/common/server_gpu_memory_buffer_manager.h ('k') | services/ui/gpu/gpu_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698