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

Unified Diff: gpu/command_buffer/service/gpu_scheduler.cc

Issue 6993043: Fix the mac hangup when force-compositing-mode is enabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments Created 9 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/gpu_scheduler.cc
diff --git a/gpu/command_buffer/service/gpu_scheduler.cc b/gpu/command_buffer/service/gpu_scheduler.cc
index 53fcfa249f919ef41cc2b42f609b034cbbff2efa..f6d060788cea92685126e4fec95d44d21fcd9962 100644
--- a/gpu/command_buffer/service/gpu_scheduler.cc
+++ b/gpu/command_buffer/service/gpu_scheduler.cc
@@ -137,7 +137,7 @@ const unsigned int kMaxOutstandingSwapBuffersCallsPerOnscreenContext = 1;
#endif
void GpuScheduler::PutChanged(bool sync) {
- TRACE_EVENT0("gpu", "GpuScheduler:PutChanged");
+ TRACE_EVENT1("gpu", "GpuScheduler:PutChanged", "this", this);
CommandBuffer::State state = command_buffer_->GetState();
parser_->set_put(state.put_offset);
@@ -148,7 +148,7 @@ void GpuScheduler::PutChanged(bool sync) {
}
void GpuScheduler::ProcessCommands() {
- TRACE_EVENT0("gpu", "GpuScheduler:ProcessCommands");
+ TRACE_EVENT1("gpu", "GpuScheduler:ProcessCommands", "this", this);
CommandBuffer::State state = command_buffer_->GetState();
if (state.error != error::kNoError)
return;
@@ -173,6 +173,7 @@ void GpuScheduler::ProcessCommands() {
if (do_rate_limiting &&
swap_buffers_count_ - acknowledged_swap_buffers_count_ >=
kMaxOutstandingSwapBuffersCallsPerOnscreenContext) {
+ TRACE_EVENT0("gpu", "EarlyOut_OSX_Throttle");
// Stop doing work on this command buffer. In the GPU process,
// receipt of the GpuMsg_AcceleratedSurfaceBuffersSwappedACK
// message causes ProcessCommands to be scheduled again.
@@ -226,8 +227,9 @@ void GpuScheduler::ProcessCommands() {
}
void GpuScheduler::SetScheduled(bool scheduled) {
- TRACE_EVENT2("gpu", "GpuScheduler:SetScheduled", "scheduled", scheduled,
- "unscheduled_count_", unscheduled_count_);
+ TRACE_EVENT2("gpu", "GpuScheduler:SetScheduled", "this", this,
+ "new unscheduled_count_",
+ unscheduled_count_ + (scheduled? -1 : 1));
if (scheduled) {
--unscheduled_count_;
DCHECK_GE(unscheduled_count_, 0);

Powered by Google App Engine
This is Rietveld 408576698