OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/callback.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" |
8 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
9 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
10 #include "gpu/command_buffer/client/gles2_implementation.h" | 11 #include "gpu/command_buffer/client/gles2_implementation.h" |
11 #include "gpu/command_buffer/client/gles2_lib.h" | 12 #include "gpu/command_buffer/client/gles2_lib.h" |
12 #include "gpu/command_buffer/service/context_group.h" | 13 #include "gpu/command_buffer/service/context_group.h" |
13 #include "gpu/demos/framework/demo.h" | 14 #include "gpu/demos/framework/demo.h" |
14 #include "gpu/demos/framework/demo_factory.h" | 15 #include "gpu/demos/framework/demo_factory.h" |
15 | 16 |
16 using gpu::Buffer; | 17 using gpu::Buffer; |
17 using gpu::CommandBufferService; | 18 using gpu::CommandBufferService; |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 if (!decoder_->Initialize(surface_.get(), | 83 if (!decoder_->Initialize(surface_.get(), |
83 context_.get(), | 84 context_.get(), |
84 gfx::Size(), | 85 gfx::Size(), |
85 gpu::gles2::DisallowedFeatures(), | 86 gpu::gles2::DisallowedFeatures(), |
86 NULL, | 87 NULL, |
87 attribs)) { | 88 attribs)) { |
88 return false; | 89 return false; |
89 } | 90 } |
90 | 91 |
91 command_buffer_->SetPutOffsetChangeCallback( | 92 command_buffer_->SetPutOffsetChangeCallback( |
92 NewCallback(gpu_scheduler_.get(), &GpuScheduler::PutChanged)); | 93 base::Bind(&GpuScheduler::PutChanged, |
| 94 base::Unretained(gpu_scheduler_.get()))); |
93 | 95 |
94 gles2_cmd_helper_.reset(new GLES2CmdHelper(command_buffer_.get())); | 96 gles2_cmd_helper_.reset(new GLES2CmdHelper(command_buffer_.get())); |
95 if (!gles2_cmd_helper_->Initialize(kCommandBufferSize)) | 97 if (!gles2_cmd_helper_->Initialize(kCommandBufferSize)) |
96 return false; | 98 return false; |
97 | 99 |
98 int32 transfer_buffer_id = | 100 int32 transfer_buffer_id = |
99 command_buffer_->CreateTransferBuffer(kTransferBufferSize, -1); | 101 command_buffer_->CreateTransferBuffer(kTransferBufferSize, -1); |
100 Buffer transfer_buffer = | 102 Buffer transfer_buffer = |
101 command_buffer_->GetTransferBuffer(transfer_buffer_id); | 103 command_buffer_->GetTransferBuffer(transfer_buffer_id); |
102 if (transfer_buffer.ptr == NULL) return false; | 104 if (transfer_buffer.ptr == NULL) return false; |
103 | 105 |
104 ::gles2::Initialize(); | 106 ::gles2::Initialize(); |
105 ::gles2::SetGLContext(new GLES2Implementation(gles2_cmd_helper_.get(), | 107 ::gles2::SetGLContext(new GLES2Implementation(gles2_cmd_helper_.get(), |
106 transfer_buffer.size, | 108 transfer_buffer.size, |
107 transfer_buffer.ptr, | 109 transfer_buffer.ptr, |
108 transfer_buffer_id, | 110 transfer_buffer_id, |
109 false, | 111 false, |
110 true)); | 112 true)); |
111 return true; | 113 return true; |
112 } | 114 } |
113 | 115 |
114 } // namespace demos | 116 } // namespace demos |
115 } // namespace gpu | 117 } // namespace gpu |
OLD | NEW |