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 /ppapi | |
| 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 'ppapi')
| -rw-r--r-- | ppapi/proxy/ppapi_command_buffer_proxy.cc | 4 | ||||
| -rw-r--r-- | ppapi/proxy/ppapi_command_buffer_proxy.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.cc b/ppapi/proxy/ppapi_command_buffer_proxy.cc index a77433d..9fe1899 100644 --- a/ppapi/proxy/ppapi_command_buffer_proxy.cc +++ b/ppapi/proxy/ppapi_command_buffer_proxy.cc @@ -213,6 +213,10 @@ bool PpapiCommandBufferProxy::CanWaitUnverifiedSyncToken( return false; } +int32_t PpapiCommandBufferProxy::GetExtraCommandBufferData() const { + return 0; +} + uint32 PpapiCommandBufferProxy::InsertSyncPoint() { uint32 sync_point = 0; if (last_state_.error == gpu::error::kNoError) { diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.h b/ppapi/proxy/ppapi_command_buffer_proxy.h index fedb362..0242d4c 100644 --- a/ppapi/proxy/ppapi_command_buffer_proxy.h +++ b/ppapi/proxy/ppapi_command_buffer_proxy.h @@ -75,6 +75,7 @@ class PPAPI_PROXY_EXPORT PpapiCommandBufferProxy : public gpu::CommandBuffer, void SignalSyncToken(const gpu::SyncToken& sync_token, const base::Closure& callback) override; bool CanWaitUnverifiedSyncToken(const gpu::SyncToken* sync_token) override; + int32_t GetExtraCommandBufferData() const override; private: bool Send(IPC::Message* msg); |