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

Side by Side Diff: gpu/command_buffer/service/gpu_control_service.cc

Issue 205193006: gpu: Remove map_image field from gpu::Capabilities. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move TODO Created 6 years, 9 months 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "gpu/command_buffer/service/gpu_control_service.h" 5 #include "gpu/command_buffer/service/gpu_control_service.h"
6 6
7 #include "gpu/command_buffer/client/gpu_memory_buffer_factory.h" 7 #include "gpu/command_buffer/client/gpu_memory_buffer_factory.h"
8 #include "gpu/command_buffer/service/gpu_memory_buffer_manager.h" 8 #include "gpu/command_buffer/service/gpu_memory_buffer_manager.h"
9 #include "gpu/command_buffer/service/mailbox_manager.h" 9 #include "gpu/command_buffer/service/mailbox_manager.h"
10 #include "gpu/command_buffer/service/query_manager.h" 10 #include "gpu/command_buffer/service/query_manager.h"
11 11
12 namespace gpu { 12 namespace gpu {
13 13
14 GpuControlService::GpuControlService( 14 GpuControlService::GpuControlService(
15 GpuMemoryBufferManagerInterface* gpu_memory_buffer_manager, 15 GpuMemoryBufferManagerInterface* gpu_memory_buffer_manager,
16 GpuMemoryBufferFactory* gpu_memory_buffer_factory, 16 GpuMemoryBufferFactory* gpu_memory_buffer_factory,
17 gles2::MailboxManager* mailbox_manager, 17 gles2::MailboxManager* mailbox_manager,
18 gles2::QueryManager* query_manager, 18 gles2::QueryManager* query_manager)
19 const gpu::Capabilities& decoder_capabilities)
20 : gpu_memory_buffer_manager_(gpu_memory_buffer_manager), 19 : gpu_memory_buffer_manager_(gpu_memory_buffer_manager),
21 gpu_memory_buffer_factory_(gpu_memory_buffer_factory), 20 gpu_memory_buffer_factory_(gpu_memory_buffer_factory),
22 mailbox_manager_(mailbox_manager), 21 mailbox_manager_(mailbox_manager),
23 query_manager_(query_manager), 22 query_manager_(query_manager) {
24 capabilities_(decoder_capabilities) {
25 capabilities_.map_image =
26 gpu_memory_buffer_manager_ && gpu_memory_buffer_factory_;
27 } 23 }
28 24
29 GpuControlService::~GpuControlService() { 25 GpuControlService::~GpuControlService() {
30 } 26 }
31 27
32 gpu::Capabilities GpuControlService::GetCapabilities() {
33 return capabilities_;
34 }
35
36 gfx::GpuMemoryBuffer* GpuControlService::CreateGpuMemoryBuffer( 28 gfx::GpuMemoryBuffer* GpuControlService::CreateGpuMemoryBuffer(
37 size_t width, 29 size_t width,
38 size_t height, 30 size_t height,
39 unsigned internalformat, 31 unsigned internalformat,
40 int32* id) { 32 int32* id) {
41 *id = -1; 33 *id = -1;
42 34
43 CHECK(gpu_memory_buffer_factory_) << "No GPU memory buffer factory provided"; 35 DCHECK(gpu_memory_buffer_factory_);
44 linked_ptr<gfx::GpuMemoryBuffer> buffer = make_linked_ptr( 36 linked_ptr<gfx::GpuMemoryBuffer> buffer = make_linked_ptr(
45 gpu_memory_buffer_factory_->CreateGpuMemoryBuffer(width, 37 gpu_memory_buffer_factory_->CreateGpuMemoryBuffer(width,
46 height, 38 height,
47 internalformat)); 39 internalformat));
48 if (!buffer.get()) 40 if (!buffer.get())
49 return NULL; 41 return NULL;
50 42
51 static int32 next_id = 1; 43 static int32 next_id = 1;
52 *id = next_id++; 44 *id = next_id++;
53 45
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 NOTREACHED(); 101 NOTREACHED();
110 return 0; 102 return 0;
111 } 103 }
112 104
113 bool GpuControlService::RegisterGpuMemoryBuffer( 105 bool GpuControlService::RegisterGpuMemoryBuffer(
114 int32 id, 106 int32 id,
115 gfx::GpuMemoryBufferHandle buffer, 107 gfx::GpuMemoryBufferHandle buffer,
116 size_t width, 108 size_t width,
117 size_t height, 109 size_t height,
118 unsigned internalformat) { 110 unsigned internalformat) {
111 DCHECK(gpu_memory_buffer_manager_);
119 return gpu_memory_buffer_manager_->RegisterGpuMemoryBuffer(id, 112 return gpu_memory_buffer_manager_->RegisterGpuMemoryBuffer(id,
120 buffer, 113 buffer,
121 width, 114 width,
122 height, 115 height,
123 internalformat); 116 internalformat);
124 } 117 }
125 118
126 } // namespace gpu 119 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gpu_control_service.h ('k') | gpu/command_buffer/service/in_process_command_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698