Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Side by Side Diff: gpu/command_buffer/service/in_process_command_buffer.cc

Issue 2378583003: Ping watchdog thread during GpuChannel destruction (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/command_buffer/service/in_process_command_buffer.h" 5 #include "gpu/command_buffer/service/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 18 matching lines...) Expand all
29 #include "gpu/command_buffer/service/command_buffer_service.h" 29 #include "gpu/command_buffer/service/command_buffer_service.h"
30 #include "gpu/command_buffer/service/command_executor.h" 30 #include "gpu/command_buffer/service/command_executor.h"
31 #include "gpu/command_buffer/service/context_group.h" 31 #include "gpu/command_buffer/service/context_group.h"
32 #include "gpu/command_buffer/service/gl_context_virtual.h" 32 #include "gpu/command_buffer/service/gl_context_virtual.h"
33 #include "gpu/command_buffer/service/gpu_preferences.h" 33 #include "gpu/command_buffer/service/gpu_preferences.h"
34 #include "gpu/command_buffer/service/image_factory.h" 34 #include "gpu/command_buffer/service/image_factory.h"
35 #include "gpu/command_buffer/service/image_manager.h" 35 #include "gpu/command_buffer/service/image_manager.h"
36 #include "gpu/command_buffer/service/mailbox_manager.h" 36 #include "gpu/command_buffer/service/mailbox_manager.h"
37 #include "gpu/command_buffer/service/memory_program_cache.h" 37 #include "gpu/command_buffer/service/memory_program_cache.h"
38 #include "gpu/command_buffer/service/memory_tracking.h" 38 #include "gpu/command_buffer/service/memory_tracking.h"
39 #include "gpu/command_buffer/service/progress_reporter.h"
39 #include "gpu/command_buffer/service/query_manager.h" 40 #include "gpu/command_buffer/service/query_manager.h"
40 #include "gpu/command_buffer/service/sync_point_manager.h" 41 #include "gpu/command_buffer/service/sync_point_manager.h"
41 #include "gpu/command_buffer/service/transfer_buffer_manager.h" 42 #include "gpu/command_buffer/service/transfer_buffer_manager.h"
42 #include "ui/gfx/geometry/size.h" 43 #include "ui/gfx/geometry/size.h"
43 #include "ui/gl/gl_context.h" 44 #include "ui/gl/gl_context.h"
44 #include "ui/gl/gl_image.h" 45 #include "ui/gl/gl_image.h"
45 #include "ui/gl/gl_image_shared_memory.h" 46 #include "ui/gl/gl_image_shared_memory.h"
46 #include "ui/gl/gl_share_group.h" 47 #include "ui/gl/gl_share_group.h"
47 #include "ui/gl/init/gl_factory.h" 48 #include "ui/gl/init/gl_factory.h"
48 49
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 bool bind_generates_resource = false; 324 bool bind_generates_resource = false;
324 scoped_refptr<gles2::FeatureInfo> feature_info = 325 scoped_refptr<gles2::FeatureInfo> feature_info =
325 new gles2::FeatureInfo(service_->gpu_driver_bug_workarounds()); 326 new gles2::FeatureInfo(service_->gpu_driver_bug_workarounds());
326 decoder_.reset(gles2::GLES2Decoder::Create( 327 decoder_.reset(gles2::GLES2Decoder::Create(
327 params.context_group 328 params.context_group
328 ? params.context_group->decoder_->GetContextGroup() 329 ? params.context_group->decoder_->GetContextGroup()
329 : new gles2::ContextGroup( 330 : new gles2::ContextGroup(
330 service_->gpu_preferences(), service_->mailbox_manager(), NULL, 331 service_->gpu_preferences(), service_->mailbox_manager(), NULL,
331 service_->shader_translator_cache(), 332 service_->shader_translator_cache(),
332 service_->framebuffer_completeness_cache(), feature_info, 333 service_->framebuffer_completeness_cache(), feature_info,
333 bind_generates_resource, nullptr))); 334 bind_generates_resource, nullptr, nullptr)));
334 335
335 executor_.reset(new CommandExecutor(command_buffer.get(), decoder_.get(), 336 executor_.reset(new CommandExecutor(command_buffer.get(), decoder_.get(),
336 decoder_.get())); 337 decoder_.get()));
337 command_buffer->SetGetBufferChangeCallback(base::Bind( 338 command_buffer->SetGetBufferChangeCallback(base::Bind(
338 &CommandExecutor::SetGetBuffer, base::Unretained(executor_.get()))); 339 &CommandExecutor::SetGetBuffer, base::Unretained(executor_.get())));
339 command_buffer_ = std::move(command_buffer); 340 command_buffer_ = std::move(command_buffer);
340 341
341 decoder_->set_engine(executor_.get()); 342 decoder_->set_engine(executor_.get());
342 343
343 if (!surface_.get()) { 344 if (!surface_.get()) {
(...skipping 717 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 framebuffer_completeness_cache_ = 1062 framebuffer_completeness_cache_ =
1062 new gpu::gles2::FramebufferCompletenessCache; 1063 new gpu::gles2::FramebufferCompletenessCache;
1063 return framebuffer_completeness_cache_; 1064 return framebuffer_completeness_cache_;
1064 } 1065 }
1065 1066
1066 SyncPointManager* GpuInProcessThread::sync_point_manager() { 1067 SyncPointManager* GpuInProcessThread::sync_point_manager() {
1067 return sync_point_manager_; 1068 return sync_point_manager_;
1068 } 1069 }
1069 1070
1070 } // namespace gpu 1071 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698