| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "mojo/gles2/command_buffer_client_impl.h" | 5 #include "mojo/gles2/command_buffer_client_impl.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/process/process_handle.h" | 10 #include "base/process/process_handle.h" |
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 | 281 |
| 282 void CommandBufferClientImpl::TryUpdateState() { | 282 void CommandBufferClientImpl::TryUpdateState() { |
| 283 if (last_state_.error == gpu::error::kNoError) | 283 if (last_state_.error == gpu::error::kNoError) |
| 284 shared_state()->Read(&last_state_); | 284 shared_state()->Read(&last_state_); |
| 285 } | 285 } |
| 286 | 286 |
| 287 void CommandBufferClientImpl::MakeProgressAndUpdateState() { | 287 void CommandBufferClientImpl::MakeProgressAndUpdateState() { |
| 288 command_buffer_->MakeProgress(last_state_.get_offset); | 288 command_buffer_->MakeProgress(last_state_.get_offset); |
| 289 | 289 |
| 290 CommandBufferStatePtr state = sync_client_impl_->WaitForProgress(); | 290 CommandBufferStatePtr state = sync_client_impl_->WaitForProgress(); |
| 291 if (!state.get()) { | 291 if (!state) { |
| 292 VLOG(1) << "Channel encountered error while waiting for command buffer"; | 292 VLOG(1) << "Channel encountered error while waiting for command buffer"; |
| 293 // TODO(piman): is it ok for this to re-enter? | 293 // TODO(piman): is it ok for this to re-enter? |
| 294 DidDestroy(); | 294 DidDestroy(); |
| 295 return; | 295 return; |
| 296 } | 296 } |
| 297 | 297 |
| 298 if (state->generation - last_state_.generation < 0x80000000U) | 298 if (state->generation - last_state_.generation < 0x80000000U) |
| 299 last_state_ = state.To<State>(); | 299 last_state_ = state.To<State>(); |
| 300 } | 300 } |
| 301 | 301 |
| 302 } // namespace gles2 | 302 } // namespace gles2 |
| 303 } // namespace mojo | 303 } // namespace mojo |
| OLD | NEW |