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

Side by Side Diff: components/mus/gles2/command_buffer_driver.cc

Issue 1331843005: Implemented new fence syncs which replaces the old sync points. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reverted mojo readme, changed wait() to take a pointer Created 5 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 "components/mus/gles2/command_buffer_driver.h" 5 #include "components/mus/gles2/command_buffer_driver.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/shared_memory.h" 9 #include "base/memory/shared_memory.h"
10 #include "base/process/process_handle.h" 10 #include "base/process/process_handle.h"
11 #include "components/mus/gles2/command_buffer_type_conversions.h" 11 #include "components/mus/gles2/command_buffer_type_conversions.h"
12 #include "components/mus/gles2/gpu_memory_tracker.h" 12 #include "components/mus/gles2/gpu_memory_tracker.h"
13 #include "components/mus/gles2/gpu_state.h" 13 #include "components/mus/gles2/gpu_state.h"
14 #include "components/mus/gles2/mojo_buffer_backing.h" 14 #include "components/mus/gles2/mojo_buffer_backing.h"
15 #include "gpu/command_buffer/common/constants.h"
16 #include "gpu/command_buffer/common/value_state.h" 15 #include "gpu/command_buffer/common/value_state.h"
17 #include "gpu/command_buffer/service/command_buffer_service.h" 16 #include "gpu/command_buffer/service/command_buffer_service.h"
18 #include "gpu/command_buffer/service/context_group.h" 17 #include "gpu/command_buffer/service/context_group.h"
19 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" 18 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
20 #include "gpu/command_buffer/service/gpu_scheduler.h" 19 #include "gpu/command_buffer/service/gpu_scheduler.h"
21 #include "gpu/command_buffer/service/image_factory.h" 20 #include "gpu/command_buffer/service/image_factory.h"
22 #include "gpu/command_buffer/service/image_manager.h" 21 #include "gpu/command_buffer/service/image_manager.h"
23 #include "gpu/command_buffer/service/mailbox_manager.h" 22 #include "gpu/command_buffer/service/mailbox_manager.h"
24 #include "gpu/command_buffer/service/memory_tracking.h" 23 #include "gpu/command_buffer/service/memory_tracking.h"
25 #include "gpu/command_buffer/service/sync_point_manager.h" 24 #include "gpu/command_buffer/service/sync_point_manager.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 DCHECK(result); 109 DCHECK(result);
111 110
112 decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group.get())); 111 decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group.get()));
113 scheduler_.reset(new gpu::GpuScheduler(command_buffer_.get(), decoder_.get(), 112 scheduler_.reset(new gpu::GpuScheduler(command_buffer_.get(), decoder_.get(),
114 decoder_.get())); 113 decoder_.get()));
115 decoder_->set_engine(scheduler_.get()); 114 decoder_->set_engine(scheduler_.get());
116 decoder_->SetResizeCallback( 115 decoder_->SetResizeCallback(
117 base::Bind(&CommandBufferDriver::OnResize, base::Unretained(this))); 116 base::Bind(&CommandBufferDriver::OnResize, base::Unretained(this)));
118 decoder_->SetWaitSyncPointCallback(base::Bind( 117 decoder_->SetWaitSyncPointCallback(base::Bind(
119 &CommandBufferDriver::OnWaitSyncPoint, base::Unretained(this))); 118 &CommandBufferDriver::OnWaitSyncPoint, base::Unretained(this)));
119 decoder_->SetFenceSyncReleaseCallback(base::Bind(
120 &CommandBufferDriver::OnFenceSyncRelease, base::Unretained(this)));
121 decoder_->SetWaitFenceSyncCallback(base::Bind(
122 &CommandBufferDriver::OnWaitFenceSync, base::Unretained(this)));
120 123
121 gpu::gles2::DisallowedFeatures disallowed_features; 124 gpu::gles2::DisallowedFeatures disallowed_features;
122 125
123 const bool offscreen = true; 126 const bool offscreen = true;
124 std::vector<int32> attrib_vector; 127 std::vector<int32> attrib_vector;
125 attrib_helper.Serialize(&attrib_vector); 128 attrib_helper.Serialize(&attrib_vector);
126 if (!decoder_->Initialize(surface_, context_, offscreen, gfx::Size(1, 1), 129 if (!decoder_->Initialize(surface_, context_, offscreen, gfx::Size(1, 1),
127 disallowed_features, attrib_vector)) 130 disallowed_features, attrib_vector))
128 return false; 131 return false;
129 132
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 return true; 289 return true;
287 if (gpu_state_->sync_point_manager()->IsSyncPointRetired(sync_point)) 290 if (gpu_state_->sync_point_manager()->IsSyncPointRetired(sync_point))
288 return true; 291 return true;
289 scheduler_->SetScheduled(false); 292 scheduler_->SetScheduled(false);
290 gpu_state_->sync_point_manager()->AddSyncPointCallback( 293 gpu_state_->sync_point_manager()->AddSyncPointCallback(
291 sync_point, base::Bind(&CommandBufferDriver::OnSyncPointRetired, 294 sync_point, base::Bind(&CommandBufferDriver::OnSyncPointRetired,
292 weak_factory_.GetWeakPtr())); 295 weak_factory_.GetWeakPtr()));
293 return scheduler_->scheduled(); 296 return scheduler_->scheduled();
294 } 297 }
295 298
299 void CommandBufferDriver::OnFenceSyncRelease(uint64_t release) {
300 // TODO(dyen): Implement once CommandBufferID has been figured out and
301 // we have a SyncPointClient. It would probably look like what is commented
302 // out below:
303 // if (!sync_point_client_->client_state()->IsFenceSyncReleased(release))
304 // sync_point_client_->ReleaseFenceSync(release);
305 NOTIMPLEMENTED();
306 }
307
308 bool CommandBufferDriver::OnWaitFenceSync(
309 gpu::CommandBufferNamespace namespace_id,
310 uint64_t command_buffer_id,
311 uint64_t release) {
312 gpu::SyncPointManager* sync_point_manager = gpu_state_->sync_point_manager();
313 DCHECK(sync_point_manager);
314
315 scoped_refptr<gpu::SyncPointClientState> release_state =
316 sync_point_manager->GetSyncPointClientState(namespace_id,
317 command_buffer_id);
318
319 if (!release_state)
320 return true;
321
322 if (release_state->IsFenceSyncReleased(release))
323 return true;
324
325 // TODO(dyen): Implement once CommandBufferID has been figured out and
326 // we have a SyncPointClient. It would probably look like what is commented
327 // out below:
328 // scheduler_->SetScheduled(false);
329 // sync_point_client_->Wait(
330 // release_state.get(),
331 // release,
332 // base::Bind(&CommandBufferDriver::OnSyncPointRetired,
333 // weak_factory_.GetWeakPtr()));
334 NOTIMPLEMENTED();
335 return scheduler_->scheduled();
336 }
337
296 void CommandBufferDriver::OnSyncPointRetired() { 338 void CommandBufferDriver::OnSyncPointRetired() {
297 scheduler_->SetScheduled(true); 339 scheduler_->SetScheduled(true);
298 } 340 }
299 341
300 void CommandBufferDriver::OnContextLost(uint32_t reason) { 342 void CommandBufferDriver::OnContextLost(uint32_t reason) {
301 loss_observer_->DidLoseContext(reason); 343 loss_observer_->DidLoseContext(reason);
302 client_->DidLoseContext(); 344 client_->DidLoseContext();
303 } 345 }
304 346
305 void CommandBufferDriver::DestroyDecoder() { 347 void CommandBufferDriver::DestroyDecoder() {
306 if (decoder_) { 348 if (decoder_) {
307 bool have_context = decoder_->MakeCurrent(); 349 bool have_context = decoder_->MakeCurrent();
308 decoder_->Destroy(have_context); 350 decoder_->Destroy(have_context);
309 decoder_.reset(); 351 decoder_.reset();
310 } 352 }
311 } 353 }
312 354
313 } // namespace mus 355 } // namespace mus
OLDNEW
« no previous file with comments | « components/mus/gles2/command_buffer_driver.h ('k') | components/mus/gles2/command_buffer_local.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698