Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/in_process_command_buffer.h" | 5 #include "gpu/ipc/in_process_command_buffer.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <queue> | 10 #include <queue> |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 31 #include "gpu/command_buffer/service/command_executor.h" | 31 #include "gpu/command_buffer/service/command_executor.h" |
| 32 #include "gpu/command_buffer/service/context_group.h" | 32 #include "gpu/command_buffer/service/context_group.h" |
| 33 #include "gpu/command_buffer/service/gl_context_virtual.h" | 33 #include "gpu/command_buffer/service/gl_context_virtual.h" |
| 34 #include "gpu/command_buffer/service/gpu_preferences.h" | 34 #include "gpu/command_buffer/service/gpu_preferences.h" |
| 35 #include "gpu/command_buffer/service/image_factory.h" | 35 #include "gpu/command_buffer/service/image_factory.h" |
| 36 #include "gpu/command_buffer/service/image_manager.h" | 36 #include "gpu/command_buffer/service/image_manager.h" |
| 37 #include "gpu/command_buffer/service/mailbox_manager.h" | 37 #include "gpu/command_buffer/service/mailbox_manager.h" |
| 38 #include "gpu/command_buffer/service/memory_program_cache.h" | 38 #include "gpu/command_buffer/service/memory_program_cache.h" |
| 39 #include "gpu/command_buffer/service/memory_tracking.h" | 39 #include "gpu/command_buffer/service/memory_tracking.h" |
| 40 #include "gpu/command_buffer/service/query_manager.h" | 40 #include "gpu/command_buffer/service/query_manager.h" |
| 41 #include "gpu/command_buffer/service/service_discardable_manager.h" | |
| 41 #include "gpu/command_buffer/service/service_utils.h" | 42 #include "gpu/command_buffer/service/service_utils.h" |
| 42 #include "gpu/command_buffer/service/sync_point_manager.h" | 43 #include "gpu/command_buffer/service/sync_point_manager.h" |
| 43 #include "gpu/command_buffer/service/transfer_buffer_manager.h" | 44 #include "gpu/command_buffer/service/transfer_buffer_manager.h" |
| 44 #include "gpu/config/gpu_feature_info.h" | 45 #include "gpu/config/gpu_feature_info.h" |
| 45 #include "gpu/ipc/gpu_in_process_thread_service.h" | 46 #include "gpu/ipc/gpu_in_process_thread_service.h" |
| 46 #include "gpu/ipc/service/image_transport_surface.h" | 47 #include "gpu/ipc/service/image_transport_surface.h" |
| 47 #include "ui/gfx/geometry/size.h" | 48 #include "ui/gfx/geometry/size.h" |
| 48 #include "ui/gl/gl_context.h" | 49 #include "ui/gl/gl_context.h" |
| 49 #include "ui/gl/gl_image.h" | 50 #include "ui/gl/gl_image.h" |
| 50 #include "ui/gl/gl_image_shared_memory.h" | 51 #include "ui/gl/gl_image_shared_memory.h" |
| (...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 301 command_buffer->SetParseErrorCallback(base::Bind( | 302 command_buffer->SetParseErrorCallback(base::Bind( |
| 302 &InProcessCommandBuffer::OnContextLostOnGpuThread, gpu_thread_weak_ptr_)); | 303 &InProcessCommandBuffer::OnContextLostOnGpuThread, gpu_thread_weak_ptr_)); |
| 303 | 304 |
| 304 gl_share_group_ = params.context_group ? params.context_group->gl_share_group_ | 305 gl_share_group_ = params.context_group ? params.context_group->gl_share_group_ |
| 305 : service_->share_group(); | 306 : service_->share_group(); |
| 306 | 307 |
| 307 bool bind_generates_resource = false; | 308 bool bind_generates_resource = false; |
| 308 scoped_refptr<gles2::FeatureInfo> feature_info = | 309 scoped_refptr<gles2::FeatureInfo> feature_info = |
| 309 new gles2::FeatureInfo(service_->gpu_driver_bug_workarounds()); | 310 new gles2::FeatureInfo(service_->gpu_driver_bug_workarounds()); |
| 310 | 311 |
| 312 discardable_manager_.reset(new ServiceDiscardableManager()); | |
| 311 context_group_ = | 313 context_group_ = |
| 312 params.context_group | 314 params.context_group |
| 313 ? params.context_group->decoder_->GetContextGroup() | 315 ? params.context_group->decoder_->GetContextGroup() |
| 314 : new gles2::ContextGroup( | 316 : new gles2::ContextGroup( |
| 315 service_->gpu_preferences(), service_->mailbox_manager(), NULL, | 317 service_->gpu_preferences(), service_->mailbox_manager(), NULL, |
| 316 service_->shader_translator_cache(), | 318 service_->shader_translator_cache(), |
| 317 service_->framebuffer_completeness_cache(), feature_info, | 319 service_->framebuffer_completeness_cache(), feature_info, |
| 318 bind_generates_resource, nullptr, nullptr, GpuFeatureInfo()); | 320 bind_generates_resource, nullptr, nullptr, GpuFeatureInfo(), |
| 321 discardable_manager_.get()); | |
|
piman
2017/05/10 22:13:59
So, it could be that the context_group outlives th
ericrk
2017/05/12 16:22:12
Ah, yes, forgot about this (I think this is why I
| |
| 319 | 322 |
| 320 decoder_.reset(gles2::GLES2Decoder::Create(context_group_.get())); | 323 decoder_.reset(gles2::GLES2Decoder::Create(context_group_.get())); |
| 321 | 324 |
| 322 executor_.reset(new CommandExecutor(command_buffer.get(), decoder_.get(), | 325 executor_.reset(new CommandExecutor(command_buffer.get(), decoder_.get(), |
| 323 decoder_.get())); | 326 decoder_.get())); |
| 324 command_buffer->SetGetBufferChangeCallback(base::Bind( | 327 command_buffer->SetGetBufferChangeCallback(base::Bind( |
| 325 &CommandExecutor::SetGetBuffer, base::Unretained(executor_.get()))); | 328 &CommandExecutor::SetGetBuffer, base::Unretained(executor_.get()))); |
| 326 command_buffer_ = std::move(command_buffer); | 329 command_buffer_ = std::move(command_buffer); |
| 327 | 330 |
| 328 decoder_->set_engine(executor_.get()); | 331 decoder_->set_engine(executor_.get()); |
| (...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1150 return wrapped_callback; | 1153 return wrapped_callback; |
| 1151 } | 1154 } |
| 1152 | 1155 |
| 1153 InProcessCommandBuffer::GpuTask::GpuTask(const base::Closure& callback, | 1156 InProcessCommandBuffer::GpuTask::GpuTask(const base::Closure& callback, |
| 1154 uint32_t order_number) | 1157 uint32_t order_number) |
| 1155 : callback(callback), order_number(order_number) {} | 1158 : callback(callback), order_number(order_number) {} |
| 1156 | 1159 |
| 1157 InProcessCommandBuffer::GpuTask::~GpuTask() {} | 1160 InProcessCommandBuffer::GpuTask::~GpuTask() {} |
| 1158 | 1161 |
| 1159 } // namespace gpu | 1162 } // namespace gpu |
| OLD | NEW |