Chromium Code Reviews| 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/demos/framework/window.h" | 5 #include "gpu/demos/framework/window.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 22 using gpu::gles2::GLES2CmdHelper; | 22 using gpu::gles2::GLES2CmdHelper; |
| 23 using gpu::gles2::GLES2Implementation; | 23 using gpu::gles2::GLES2Implementation; |
| 24 using gpu::TransferBuffer; | 24 using gpu::TransferBuffer; |
| 25 | 25 |
| 26 namespace { | 26 namespace { |
| 27 const int32 kCommandBufferSize = 1024 * 1024; | 27 const int32 kCommandBufferSize = 1024 * 1024; |
| 28 const int32 kTransferBufferSize = 512 * 1024; | 28 const int32 kTransferBufferSize = 512 * 1024; |
| 29 } // namespace. | 29 } // namespace. |
| 30 | 30 |
| 31 namespace gpu { | 31 namespace gpu { |
| 32 | |
|
greggman
2012/06/26 23:00:27
no need to add this line?
dmurph
2012/07/04 00:01:29
Done.
| |
| 32 namespace demos { | 33 namespace demos { |
| 33 | 34 |
| 34 Window::Window() | 35 Window::Window() |
| 35 : window_handle_(NULL), | 36 : window_handle_(NULL), |
| 36 demo_(CreateDemo()) { | 37 demo_(CreateDemo()) { |
| 37 } | 38 } |
| 38 | 39 |
| 39 Window::~Window() { | 40 Window::~Window() { |
| 40 demo_.reset(); | 41 demo_.reset(); |
| 41 | 42 |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 70 TransferBufferManager* manager = new TransferBufferManager(); | 71 TransferBufferManager* manager = new TransferBufferManager(); |
| 71 transfer_buffer_manager_.reset(manager); | 72 transfer_buffer_manager_.reset(manager); |
| 72 EXPECT_TRUE(manager->Initialize()); | 73 EXPECT_TRUE(manager->Initialize()); |
| 73 } | 74 } |
| 74 command_buffer_.reset( | 75 command_buffer_.reset( |
| 75 new CommandBufferService(transfer_buffer_manager_.get())); | 76 new CommandBufferService(transfer_buffer_manager_.get())); |
| 76 if (!command_buffer_->Initialize()) { | 77 if (!command_buffer_->Initialize()) { |
| 77 return false; | 78 return false; |
| 78 } | 79 } |
| 79 | 80 |
| 80 gpu::gles2::ContextGroup::Ref group(new gpu::gles2::ContextGroup(NULL, true)); | 81 gpu::gles2::ContextGroup::Ref group(new gpu::gles2::ContextGroup(NULL, |
| 82 true, | |
| 83 NULL)); | |
| 81 | 84 |
| 82 decoder_.reset(gpu::gles2::GLES2Decoder::Create(group.get())); | 85 decoder_.reset(gpu::gles2::GLES2Decoder::Create(group.get())); |
| 83 if (!decoder_.get()) | 86 if (!decoder_.get()) |
| 84 return false; | 87 return false; |
| 85 | 88 |
| 86 gpu_scheduler_.reset(new gpu::GpuScheduler(command_buffer_.get(), | 89 gpu_scheduler_.reset(new gpu::GpuScheduler(command_buffer_.get(), |
| 87 decoder_.get(), | 90 decoder_.get(), |
| 88 NULL)); | 91 NULL)); |
| 89 | 92 |
| 90 decoder_->set_engine(gpu_scheduler_.get()); | 93 decoder_->set_engine(gpu_scheduler_.get()); |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 139 kTransferBufferSize, | 142 kTransferBufferSize, |
| 140 kTransferBufferSize)) { | 143 kTransferBufferSize)) { |
| 141 return false; | 144 return false; |
| 142 } | 145 } |
| 143 | 146 |
| 144 return true; | 147 return true; |
| 145 } | 148 } |
| 146 | 149 |
| 147 } // namespace demos | 150 } // namespace demos |
| 148 } // namespace gpu | 151 } // namespace gpu |
| OLD | NEW |