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

Unified Diff: webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc

Issue 7458010: Revert 93066 - Execute all GL commands up to the put offset reported by a each flush.This means g... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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 | « ppapi/proxy/ppb_context_3d_proxy.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
===================================================================
--- webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc (revision 93137)
+++ webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc (working copy)
@@ -78,7 +78,7 @@
~GLInProcessContext();
- void PumpCommands();
+ void PumpCommands(bool sync);
// Create a GLInProcessContext that renders directly to a view. The view and
// the associated window must not be destroyed until the returned
@@ -384,10 +384,10 @@
}
}
-void GLInProcessContext::PumpCommands() {
+void GLInProcessContext::PumpCommands(bool /* sync */) {
::gpu::CommandBuffer::State state;
do {
- gpu_scheduler_->PutChanged();
+ gpu_scheduler_->PutChanged(true);
MessageLoop::current()->RunAllPending();
state = command_buffer_->GetState();
} while (state.get_offset != state.put_offset);
@@ -577,9 +577,7 @@
if (!command_buffer_->Initialize(kCommandBufferSize))
return false;
- gpu_scheduler_ = GpuScheduler::Create(command_buffer_.get(),
- NULL,
- NULL);
+ gpu_scheduler_ = new GpuScheduler(command_buffer_.get(), NULL, NULL);
if (onscreen) {
if (render_surface == gfx::kNullPluginWindow) {
@@ -1078,11 +1076,19 @@
void WebGraphicsContext3DInProcessCommandBufferImpl::waitLatchCHROMIUM(
WGC3Duint latch_id)
{
+ // TODO(gmam): See if we can comment this in.
+ // ClearContext();
+ gl_->WaitLatchCHROMIUM(latch_id);
}
void WebGraphicsContext3DInProcessCommandBufferImpl::setLatchCHROMIUM(
WGC3Duint latch_id)
{
+ // TODO(gmam): See if we can comment this in.
+ // ClearContext();
+ gl_->SetLatchCHROMIUM(latch_id);
+ // required to ensure set command is sent to GPU process
+ gl_->Flush();
}
void WebGraphicsContext3DInProcessCommandBufferImpl::
« no previous file with comments | « ppapi/proxy/ppb_context_3d_proxy.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698