Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 #ifndef COMPONENTS_VIZ_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_ | 5 #ifndef COMPONENTS_VIZ_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_ |
| 6 #define COMPONENTS_VIZ_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_ | 6 #define COMPONENTS_VIZ_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/memory/weak_ptr.h" | 11 #include "base/memory/weak_ptr.h" |
| 12 #include "base/threading/thread_checker.h" | 12 #include "base/single_thread_task_runner.h" |
|
danakj
2017/06/15 23:02:42
sequenced (and forward declare?)
| |
| 13 #include "base/synchronization/waitable_event.h" | |
| 13 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" | 14 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" |
| 14 #include "gpu/ipc/host/gpu_memory_buffer_support.h" | 15 #include "gpu/ipc/host/gpu_memory_buffer_support.h" |
| 15 | 16 |
| 16 namespace ui { | 17 namespace ui { |
| 17 namespace mojom { | 18 namespace mojom { |
| 18 class GpuService; | 19 class GpuService; |
| 19 } | 20 } |
| 20 } | 21 } |
| 21 | 22 |
| 22 namespace viz { | 23 namespace viz { |
| 23 | 24 |
| 24 // This GpuMemoryBufferManager implementation is for [de]allocating gpu memory | 25 // This GpuMemoryBufferManager implementation is for [de]allocating gpu memory |
| 25 // from the gpu process over the mojom.GpuService api. | 26 // from the gpu process over the mojom.GpuService api. |
| 26 class ServerGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager, | 27 class ServerGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager { |
| 27 public base::ThreadChecker { | |
| 28 public: | 28 public: |
| 29 ServerGpuMemoryBufferManager(ui::mojom::GpuService* gpu_service, | 29 ServerGpuMemoryBufferManager(ui::mojom::GpuService* gpu_service, |
| 30 int client_id); | 30 int client_id); |
| 31 ~ServerGpuMemoryBufferManager() override; | 31 ~ServerGpuMemoryBufferManager() override; |
| 32 | 32 |
| 33 void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id, | 33 void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id, |
| 34 int client_id, | 34 int client_id, |
| 35 const gpu::SyncToken& sync_token); | 35 const gpu::SyncToken& sync_token); |
| 36 | 36 |
| 37 void DestroyAllGpuMemoryBufferForClient(int client_id); | 37 void DestroyAllGpuMemoryBufferForClient(int client_id); |
| 38 | 38 |
| 39 gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle( | 39 void AllocateGpuMemoryBuffer( |
| 40 gfx::GpuMemoryBufferId id, | 40 gfx::GpuMemoryBufferId id, |
| 41 int client_id, | 41 int client_id, |
| 42 const gfx::Size& size, | 42 const gfx::Size& size, |
| 43 gfx::BufferFormat format, | 43 gfx::BufferFormat format, |
| 44 gfx::BufferUsage usage, | 44 gfx::BufferUsage usage, |
| 45 gpu::SurfaceHandle surface_handle); | 45 gpu::SurfaceHandle surface_handle, |
| 46 base::OnceCallback<void(const gfx::GpuMemoryBufferHandle&)> callback); | |
| 46 | 47 |
| 47 // Overridden from gpu::GpuMemoryBufferManager: | 48 // Overridden from gpu::GpuMemoryBufferManager: |
| 48 std::unique_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBuffer( | 49 std::unique_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBuffer( |
|
danakj
2017/06/15 23:02:42
Please document threading restrictions clearly her
sadrul
2017/06/16 12:52:19
I can comment on the interface [1] that this can b
danakj
2017/06/20 16:27:26
That'd be good, and a top level class comment expl
sadrul
2017/06/20 18:21:02
Done.
| |
| 49 const gfx::Size& size, | 50 const gfx::Size& size, |
| 50 gfx::BufferFormat format, | 51 gfx::BufferFormat format, |
| 51 gfx::BufferUsage usage, | 52 gfx::BufferUsage usage, |
| 52 gpu::SurfaceHandle surface_handle) override; | 53 gpu::SurfaceHandle surface_handle) override; |
| 53 void SetDestructionSyncToken(gfx::GpuMemoryBuffer* buffer, | 54 void SetDestructionSyncToken(gfx::GpuMemoryBuffer* buffer, |
| 54 const gpu::SyncToken& sync_token) override; | 55 const gpu::SyncToken& sync_token) override; |
| 55 | 56 |
| 56 private: | 57 private: |
| 58 void OnGpuMemoryBufferAllocated( | |
| 59 int client_id, | |
| 60 base::OnceCallback<void(const gfx::GpuMemoryBufferHandle&)> callback, | |
| 61 const gfx::GpuMemoryBufferHandle& handle); | |
| 62 void SignalGpuMemoryBufferAllocated( | |
| 63 gfx::GpuMemoryBufferHandle* handle, | |
| 64 base::WaitableEvent* wait_event, | |
| 65 const gfx::GpuMemoryBufferHandle& allocated_buffer_handle); | |
| 66 | |
| 57 ui::mojom::GpuService* gpu_service_; | 67 ui::mojom::GpuService* gpu_service_; |
| 58 const int client_id_; | 68 const int client_id_; |
| 59 int next_gpu_memory_id_ = 1; | 69 int next_gpu_memory_id_ = 1; |
| 60 | 70 |
| 61 using NativeBuffers = | 71 using NativeBuffers = |
| 62 std::unordered_set<gfx::GpuMemoryBufferId, | 72 std::unordered_set<gfx::GpuMemoryBufferId, |
| 63 BASE_HASH_NAMESPACE::hash<gfx::GpuMemoryBufferId>>; | 73 BASE_HASH_NAMESPACE::hash<gfx::GpuMemoryBufferId>>; |
| 64 std::unordered_map<int, NativeBuffers> native_buffers_; | 74 std::unordered_map<int, NativeBuffers> native_buffers_; |
| 75 std::unordered_set<int> pending_buffers_; | |
| 65 | 76 |
| 66 const gpu::GpuMemoryBufferConfigurationSet native_configurations_; | 77 const gpu::GpuMemoryBufferConfigurationSet native_configurations_; |
| 78 scoped_refptr<base::SequencedTaskRunner> task_runner_; | |
| 67 base::WeakPtrFactory<ServerGpuMemoryBufferManager> weak_factory_; | 79 base::WeakPtrFactory<ServerGpuMemoryBufferManager> weak_factory_; |
| 68 | 80 |
| 69 DISALLOW_COPY_AND_ASSIGN(ServerGpuMemoryBufferManager); | 81 DISALLOW_COPY_AND_ASSIGN(ServerGpuMemoryBufferManager); |
| 70 }; | 82 }; |
| 71 | 83 |
| 72 } // namespace viz | 84 } // namespace viz |
| 73 | 85 |
| 74 #endif // COMPONENTS_VIZ_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_ | 86 #endif // COMPONENTS_VIZ_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_ |
| OLD | NEW |