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

Unified Diff: gpu/ipc/service/gpu_command_buffer_stub.cc

Issue 2726743002: gpu: Do not call MakeCurrent in wait sync token callback. (Closed)
Patch Set: rebase Created 3 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/ipc/service/gpu_command_buffer_stub.cc
diff --git a/gpu/ipc/service/gpu_command_buffer_stub.cc b/gpu/ipc/service/gpu_command_buffer_stub.cc
index ffa0a3c23bfcac4e0f8bcc846b14be68e04726b1..bfa53ed81777202dd74f2049e9c8d4876db3e015 100644
--- a/gpu/ipc/service/gpu_command_buffer_stub.cc
+++ b/gpu/ipc/service/gpu_command_buffer_stub.cc
@@ -1093,12 +1093,10 @@ void GpuCommandBufferStub::OnWaitSyncTokenCompleted(
DCHECK(waiting_for_sync_point_);
TRACE_EVENT_ASYNC_END1("gpu", "WaitSyncTokenCompleted", this,
"GpuCommandBufferStub", this);
+ // Don't call PullTextureUpdates here because we can't MakeCurrent if we're
+ // executing commands on another context. The WaitSyncToken command will run
+ // again and call PullTextureUpdates once this command buffer gets scheduled.
waiting_for_sync_point_ = false;
-
- gles2::MailboxManager* mailbox_manager = context_group_->mailbox_manager();
- if (mailbox_manager->UsesSync() && MakeCurrent())
- mailbox_manager->PullTextureUpdates(sync_token);
-
executor_->SetScheduled(true);
channel_->OnStreamRescheduled(stream_id_, true);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698