| 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/ipc/service/gpu_command_buffer_stub.h" | 5 #include "gpu/ipc/service/gpu_command_buffer_stub.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 564 channel_->gpu_channel_manager()->gpu_memory_buffer_factory(); | 564 channel_->gpu_channel_manager()->gpu_memory_buffer_factory(); |
| 565 context_group_ = new gles2::ContextGroup( | 565 context_group_ = new gles2::ContextGroup( |
| 566 manager->gpu_preferences(), channel_->mailbox_manager(), | 566 manager->gpu_preferences(), channel_->mailbox_manager(), |
| 567 new GpuCommandBufferMemoryTracker( | 567 new GpuCommandBufferMemoryTracker( |
| 568 channel_, command_buffer_id_.GetUnsafeValue(), | 568 channel_, command_buffer_id_.GetUnsafeValue(), |
| 569 init_params.attribs.context_type, channel_->task_runner()), | 569 init_params.attribs.context_type, channel_->task_runner()), |
| 570 manager->shader_translator_cache(), | 570 manager->shader_translator_cache(), |
| 571 manager->framebuffer_completeness_cache(), feature_info, | 571 manager->framebuffer_completeness_cache(), feature_info, |
| 572 init_params.attribs.bind_generates_resource, | 572 init_params.attribs.bind_generates_resource, |
| 573 gmb_factory ? gmb_factory->AsImageFactory() : nullptr, | 573 gmb_factory ? gmb_factory->AsImageFactory() : nullptr, |
| 574 channel_->watchdog() /* progress_reporter */); | 574 channel_->watchdog() /* progress_reporter */, |
| 575 manager->gpu_feature_info()); |
| 575 } | 576 } |
| 576 | 577 |
| 577 #if defined(OS_MACOSX) | 578 #if defined(OS_MACOSX) |
| 578 // Virtualize PreferIntegratedGpu contexts by default on OS X to prevent | 579 // Virtualize PreferIntegratedGpu contexts by default on OS X to prevent |
| 579 // performance regressions when enabling FCM. | 580 // performance regressions when enabling FCM. |
| 580 // http://crbug.com/180463 | 581 // http://crbug.com/180463 |
| 581 if (init_params.attribs.gpu_preference == gl::PreferIntegratedGpu) | 582 if (init_params.attribs.gpu_preference == gl::PreferIntegratedGpu) |
| 582 use_virtualized_gl_context_ = true; | 583 use_virtualized_gl_context_ = true; |
| 583 #endif | 584 #endif |
| 584 | 585 |
| (...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1205 command_buffer_->GetLastState().error == error::kLostContext) | 1206 command_buffer_->GetLastState().error == error::kLostContext) |
| 1206 return; | 1207 return; |
| 1207 | 1208 |
| 1208 command_buffer_->SetContextLostReason(error::kUnknown); | 1209 command_buffer_->SetContextLostReason(error::kUnknown); |
| 1209 if (decoder_) | 1210 if (decoder_) |
| 1210 decoder_->MarkContextLost(error::kUnknown); | 1211 decoder_->MarkContextLost(error::kUnknown); |
| 1211 command_buffer_->SetParseError(error::kLostContext); | 1212 command_buffer_->SetParseError(error::kLostContext); |
| 1212 } | 1213 } |
| 1213 | 1214 |
| 1214 } // namespace gpu | 1215 } // namespace gpu |
| OLD | NEW |