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/client/gl_in_process_context.h" | 5 #include "gpu/command_buffer/client/gl_in_process_context.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
243 transfer_buffer_.reset(new TransferBuffer(gles2_helper_.get())); | 243 transfer_buffer_.reset(new TransferBuffer(gles2_helper_.get())); |
244 | 244 |
245 bool bind_generates_resources = false; | 245 bool bind_generates_resources = false; |
246 | 246 |
247 // Create the object exposing the OpenGL API. | 247 // Create the object exposing the OpenGL API. |
248 gles2_implementation_.reset(new gles2::GLES2Implementation( | 248 gles2_implementation_.reset(new gles2::GLES2Implementation( |
249 gles2_helper_.get(), | 249 gles2_helper_.get(), |
250 share_group, | 250 share_group, |
251 transfer_buffer_.get(), | 251 transfer_buffer_.get(), |
252 bind_generates_resources, | 252 bind_generates_resources, |
253 command_buffer_.get())); | 253 command_buffer_.get(), |
| 254 command_buffer_->capabilities())); |
254 | 255 |
255 if (use_global_share_group) { | 256 if (use_global_share_group) { |
256 g_all_shared_contexts.Get().insert(this); | 257 g_all_shared_contexts.Get().insert(this); |
257 scoped_shared_context_lock.reset(); | 258 scoped_shared_context_lock.reset(); |
258 } | 259 } |
259 | 260 |
260 if (!gles2_implementation_->Initialize( | 261 if (!gles2_implementation_->Initialize( |
261 kStartTransferBufferSize, | 262 kStartTransferBufferSize, |
262 kMinTransferBufferSize, | 263 kMinTransferBufferSize, |
263 kMaxTransferBufferSize, | 264 kMaxTransferBufferSize, |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
347 surface->GetSize(), | 348 surface->GetSize(), |
348 attribs, | 349 attribs, |
349 gpu_preference, | 350 gpu_preference, |
350 service)) | 351 service)) |
351 return NULL; | 352 return NULL; |
352 | 353 |
353 return context.release(); | 354 return context.release(); |
354 } | 355 } |
355 | 356 |
356 } // namespace gpu | 357 } // namespace gpu |
OLD | NEW |