diff options
| author | dyen <dyen@chromium.org> | 2015-12-08 18:23:30 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-09 02:24:58 +0000 |
| commit | 1ed246478fcfa39bcf1f617ae35cfc4fdf5bad8b (patch) | |
| tree | 59870df5ba86f69c287132a5e580dc07ea53a155 /mojo/gles2 | |
| parent | a6787fb930bf687f90d44bc59805aa2c39b840b0 (diff) | |
| download | chromium_src-1ed246478fcfa39bcf1f617ae35cfc4fdf5bad8b.zip chromium_src-1ed246478fcfa39bcf1f617ae35cfc4fdf5bad8b.tar.gz chromium_src-1ed246478fcfa39bcf1f617ae35cfc4fdf5bad8b.tar.bz2 | |
Reland "Added an extra sync token field for extra command buffer..."
This reverts commit 5097a2103f86741a7d0e6567e57759be939182b0.
R=dalecurtis@chromium.org, dcheng@chromium.org, piman@chromium.org, sky@chromium.org
BUG=514815, 566291
Review URL: https://codereview.chromium.org/1499813003
Cr-Commit-Position: refs/heads/master@{#363922}
Diffstat (limited to 'mojo/gles2')
| -rw-r--r-- | mojo/gles2/command_buffer_client_impl.cc | 4 | ||||
| -rw-r--r-- | mojo/gles2/command_buffer_client_impl.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mojo/gles2/command_buffer_client_impl.cc b/mojo/gles2/command_buffer_client_impl.cc index 6e3e2a6..79f238a 100644 --- a/mojo/gles2/command_buffer_client_impl.cc +++ b/mojo/gles2/command_buffer_client_impl.cc @@ -413,6 +413,10 @@ uint64_t CommandBufferClientImpl::GetCommandBufferID() const { return sync_client_impl_->GetCommandBufferID(); } +int32_t CommandBufferClientImpl::GetExtraCommandBufferData() const { + return 0; +} + uint64_t CommandBufferClientImpl::GenerateFenceSyncRelease() { return next_fence_sync_release_++; } diff --git a/mojo/gles2/command_buffer_client_impl.h b/mojo/gles2/command_buffer_client_impl.h index 92524f6..c9f92c9 100644 --- a/mojo/gles2/command_buffer_client_impl.h +++ b/mojo/gles2/command_buffer_client_impl.h @@ -75,6 +75,7 @@ class CommandBufferClientImpl bool IsGpuChannelLost() override; gpu::CommandBufferNamespace GetNamespaceID() const override; uint64_t GetCommandBufferID() const override; + int32_t GetExtraCommandBufferData() const override; uint64_t GenerateFenceSyncRelease() override; bool IsFenceSyncRelease(uint64_t release) override; bool IsFenceSyncFlushed(uint64_t release) override; |