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 #include <stddef.h> | 10 #include <stddef.h> |
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
312 attribs.bind_generates_resource = options.bind_generates_resource; | 312 attribs.bind_generates_resource = options.bind_generates_resource; |
313 | 313 |
314 if (!context_group) { | 314 if (!context_group) { |
315 GpuDriverBugWorkarounds gpu_driver_bug_workaround(&command_line); | 315 GpuDriverBugWorkarounds gpu_driver_bug_workaround(&command_line); |
316 scoped_refptr<gles2::FeatureInfo> feature_info = | 316 scoped_refptr<gles2::FeatureInfo> feature_info = |
317 new gles2::FeatureInfo(command_line, gpu_driver_bug_workaround); | 317 new gles2::FeatureInfo(command_line, gpu_driver_bug_workaround); |
318 context_group = new gles2::ContextGroup( | 318 context_group = new gles2::ContextGroup( |
319 gpu_preferences_, mailbox_manager_.get(), nullptr, | 319 gpu_preferences_, mailbox_manager_.get(), nullptr, |
320 new gpu::gles2::ShaderTranslatorCache(gpu_preferences_), | 320 new gpu::gles2::ShaderTranslatorCache(gpu_preferences_), |
321 new gpu::gles2::FramebufferCompletenessCache, feature_info, | 321 new gpu::gles2::FramebufferCompletenessCache, feature_info, |
322 options.bind_generates_resource, options.image_factory, nullptr); | 322 options.bind_generates_resource, options.image_factory, nullptr, |
| 323 GpuFeatureInfo()); |
323 } | 324 } |
324 | 325 |
325 decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group)); | 326 decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group)); |
326 if (options.force_shader_name_hashing) { | 327 if (options.force_shader_name_hashing) { |
327 decoder_->SetForceShaderNameHashingForTest(true); | 328 decoder_->SetForceShaderNameHashingForTest(true); |
328 } | 329 } |
329 command_buffer_.reset(new CommandBufferService( | 330 command_buffer_.reset(new CommandBufferService( |
330 decoder_->GetContextGroup()->transfer_buffer_manager())); | 331 decoder_->GetContextGroup()->transfer_buffer_manager())); |
331 | 332 |
332 executor_.reset(new CommandExecutor(command_buffer_.get(), decoder_.get(), | 333 executor_.reset(new CommandExecutor(command_buffer_.get(), decoder_.get(), |
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
658 | 659 |
659 // Something went wrong, just run the callback now. | 660 // Something went wrong, just run the callback now. |
660 callback.Run(); | 661 callback.Run(); |
661 } | 662 } |
662 | 663 |
663 bool GLManager::CanWaitUnverifiedSyncToken(const gpu::SyncToken* sync_token) { | 664 bool GLManager::CanWaitUnverifiedSyncToken(const gpu::SyncToken* sync_token) { |
664 return false; | 665 return false; |
665 } | 666 } |
666 | 667 |
667 } // namespace gpu | 668 } // namespace gpu |
OLD | NEW |