OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/tests/gl_manager.h" | 5 #include "gpu/command_buffer/tests/gl_manager.h" |
6 | 6 |
7 #include <GLES2/gl2.h> | 7 #include <GLES2/gl2.h> |
8 #include <GLES2/gl2ext.h> | 8 #include <GLES2/gl2ext.h> |
9 #include <GLES2/gl2extchromium.h> | 9 #include <GLES2/gl2extchromium.h> |
10 | 10 |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 feature_info = new gles2::FeatureInfo(*command_line); | 207 feature_info = new gles2::FeatureInfo(*command_line); |
208 context_group = new gles2::ContextGroup( | 208 context_group = new gles2::ContextGroup( |
209 mailbox_manager_.get(), NULL, new gpu::gles2::ShaderTranslatorCache, | 209 mailbox_manager_.get(), NULL, new gpu::gles2::ShaderTranslatorCache, |
210 new gpu::gles2::FramebufferCompletenessCache, feature_info, NULL, NULL, | 210 new gpu::gles2::FramebufferCompletenessCache, feature_info, NULL, NULL, |
211 options.bind_generates_resource); | 211 options.bind_generates_resource); |
212 } | 212 } |
213 | 213 |
214 decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group)); | 214 decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group)); |
215 | 215 |
216 command_buffer_.reset(new CommandBufferService( | 216 command_buffer_.reset(new CommandBufferService( |
217 decoder_->GetContextGroup()->transfer_buffer_manager())); | 217 decoder_->GetContextGroup()->transfer_buffer_manager(), |
| 218 kCommandBufferNamespace_InProcess, |
| 219 0)); |
218 ASSERT_TRUE(command_buffer_->Initialize()) | 220 ASSERT_TRUE(command_buffer_->Initialize()) |
219 << "could not create command buffer service"; | 221 << "could not create command buffer service"; |
220 | 222 |
221 gpu_scheduler_.reset(new GpuScheduler(command_buffer_.get(), | 223 gpu_scheduler_.reset(new GpuScheduler(command_buffer_.get(), |
222 decoder_.get(), | 224 decoder_.get(), |
223 decoder_.get())); | 225 decoder_.get())); |
224 | 226 |
225 decoder_->set_engine(gpu_scheduler_.get()); | 227 decoder_->set_engine(gpu_scheduler_.get()); |
226 | 228 |
227 surface_ = gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size()); | 229 surface_ = gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size()); |
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
432 void GLManager::SetLock(base::Lock*) { | 434 void GLManager::SetLock(base::Lock*) { |
433 NOTIMPLEMENTED(); | 435 NOTIMPLEMENTED(); |
434 } | 436 } |
435 | 437 |
436 bool GLManager::IsGpuChannelLost() { | 438 bool GLManager::IsGpuChannelLost() { |
437 NOTIMPLEMENTED(); | 439 NOTIMPLEMENTED(); |
438 return false; | 440 return false; |
439 } | 441 } |
440 | 442 |
441 } // namespace gpu | 443 } // namespace gpu |
OLD | NEW |