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

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

Issue 6955006: Revert 84486 - Merge gpu_trace_event back into base/debug/trace_event.Initial land attempt at htt... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/common/gpu_trace_event.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/gpu_scheduler.h" 5 #include "gpu/command_buffer/service/gpu_scheduler.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/debug/trace_event.h"
10 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "gpu/common/gpu_trace_event.h"
11 #include "ui/gfx/gl/gl_context.h" 11 #include "ui/gfx/gl/gl_context.h"
12 #include "ui/gfx/gl/gl_bindings.h" 12 #include "ui/gfx/gl/gl_bindings.h"
13 13
14 using ::base::SharedMemory; 14 using ::base::SharedMemory;
15 15
16 namespace gpu { 16 namespace gpu {
17 17
18 GpuScheduler::GpuScheduler(CommandBuffer* command_buffer, 18 GpuScheduler::GpuScheduler(CommandBuffer* command_buffer,
19 gles2::ContextGroup* group) 19 gles2::ContextGroup* group)
20 : command_buffer_(command_buffer), 20 : command_buffer_(command_buffer),
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 CommandBuffer::State state = command_buffer_->GetState(); 121 CommandBuffer::State state = command_buffer_->GetState();
122 parser_->set_put(state.put_offset); 122 parser_->set_put(state.put_offset);
123 123
124 if (sync) 124 if (sync)
125 ProcessCommands(); 125 ProcessCommands();
126 else 126 else
127 ScheduleProcessCommands(); 127 ScheduleProcessCommands();
128 } 128 }
129 129
130 void GpuScheduler::ProcessCommands() { 130 void GpuScheduler::ProcessCommands() {
131 TRACE_EVENT0("gpu", "GpuScheduler:ProcessCommands"); 131 GPU_TRACE_EVENT0("gpu", "GpuScheduler:ProcessCommands");
132 CommandBuffer::State state = command_buffer_->GetState(); 132 CommandBuffer::State state = command_buffer_->GetState();
133 if (state.error != error::kNoError) 133 if (state.error != error::kNoError)
134 return; 134 return;
135 135
136 if (unscheduled_count_ > 0) 136 if (unscheduled_count_ > 0)
137 return; 137 return;
138 138
139 if (decoder_.get()) { 139 if (decoder_.get()) {
140 if (!decoder_->MakeCurrent()) { 140 if (!decoder_->MakeCurrent()) {
141 LOG(ERROR) << "Context lost because MakeCurrent failed."; 141 LOG(ERROR) << "Context lost because MakeCurrent failed.";
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 command_processed_callback_.reset(callback); 244 command_processed_callback_.reset(callback);
245 } 245 }
246 246
247 void GpuScheduler::ScheduleProcessCommands() { 247 void GpuScheduler::ScheduleProcessCommands() {
248 MessageLoop::current()->PostTask( 248 MessageLoop::current()->PostTask(
249 FROM_HERE, 249 FROM_HERE,
250 method_factory_.NewRunnableMethod(&GpuScheduler::ProcessCommands)); 250 method_factory_.NewRunnableMethod(&GpuScheduler::ProcessCommands));
251 } 251 }
252 252
253 } // namespace gpu 253 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/common/gpu_trace_event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698