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 <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/at_exit.h" | 9 #include "base/at_exit.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 attribs.push_back(EGL_ALPHA_SIZE); | 125 attribs.push_back(EGL_ALPHA_SIZE); |
126 attribs.push_back(8); | 126 attribs.push_back(8); |
127 attribs.push_back(EGL_DEPTH_SIZE); | 127 attribs.push_back(EGL_DEPTH_SIZE); |
128 attribs.push_back(16); | 128 attribs.push_back(16); |
129 attribs.push_back(EGL_NONE); | 129 attribs.push_back(EGL_NONE); |
130 | 130 |
131 if (!context_group) { | 131 if (!context_group) { |
132 context_group = new gles2::ContextGroup(mailbox_manager_.get(), | 132 context_group = new gles2::ContextGroup(mailbox_manager_.get(), |
133 options.image_manager, | 133 options.image_manager, |
134 NULL, | 134 NULL, |
135 NULL, | |
136 options.bind_generates_resource); | 135 options.bind_generates_resource); |
137 } | 136 } |
138 | 137 |
139 decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group)); | 138 decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group)); |
140 | 139 |
141 command_buffer_.reset(new CommandBufferService( | 140 command_buffer_.reset(new CommandBufferService( |
142 decoder_->GetContextGroup()->transfer_buffer_manager())); | 141 decoder_->GetContextGroup()->transfer_buffer_manager())); |
143 ASSERT_TRUE(command_buffer_->Initialize()) | 142 ASSERT_TRUE(command_buffer_->Initialize()) |
144 << "could not create command buffer service"; | 143 << "could not create command buffer service"; |
145 | 144 |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
264 if (!context_lost_allowed_) { | 263 if (!context_lost_allowed_) { |
265 ASSERT_EQ(::gpu::error::kNoError, state.error); | 264 ASSERT_EQ(::gpu::error::kNoError, state.error); |
266 } | 265 } |
267 } | 266 } |
268 | 267 |
269 bool GLManager::GetBufferChanged(int32 transfer_buffer_id) { | 268 bool GLManager::GetBufferChanged(int32 transfer_buffer_id) { |
270 return gpu_scheduler_->SetGetBuffer(transfer_buffer_id); | 269 return gpu_scheduler_->SetGetBuffer(transfer_buffer_id); |
271 } | 270 } |
272 | 271 |
273 } // namespace gpu | 272 } // namespace gpu |
OLD | NEW |