diff options
| author | dyen <dyen@chromium.org> | 2015-10-08 16:23:38 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-08 23:24:17 +0000 |
| commit | 6a219f8ccdd5148f28458b8184f31859babb9848 (patch) | |
| tree | 76b1c97b3a670afa022dc0b4951a9050fa11392c /gpu/command_buffer/client/gles2_implementation.cc | |
| parent | a0c83f7682345086c296e8815fdca732d16664b6 (diff) | |
| download | chromium_src-6a219f8ccdd5148f28458b8184f31859babb9848.zip chromium_src-6a219f8ccdd5148f28458b8184f31859babb9848.tar.gz chromium_src-6a219f8ccdd5148f28458b8184f31859babb9848.tar.bz2 | |
Added SyncToken command buffer trait to help with IPC messages.
R=piman@chromium.org
BUG=514815
Review URL: https://codereview.chromium.org/1394543003
Cr-Commit-Position: refs/heads/master@{#353170}
Diffstat (limited to 'gpu/command_buffer/client/gles2_implementation.cc')
| -rw-r--r-- | gpu/command_buffer/client/gles2_implementation.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc index 27bdd8a..bdeaef4 100644 --- a/gpu/command_buffer/client/gles2_implementation.cc +++ b/gpu/command_buffer/client/gles2_implementation.cc @@ -30,6 +30,7 @@ #include "gpu/command_buffer/client/vertex_array_object_manager.h" #include "gpu/command_buffer/common/gles2_cmd_utils.h" #include "gpu/command_buffer/common/id_allocator.h" +#include "gpu/command_buffer/common/sync_token.h" #include "gpu/command_buffer/common/trace_event.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect_f.h" @@ -5388,9 +5389,9 @@ void GLES2Implementation::GenSyncTokenCHROMIUM(GLuint64 fence_sync, SyncToken* sync_token_data = reinterpret_cast<SyncToken*>(sync_token); memset(sync_token_data, 0, sizeof(SyncToken)); - sync_token_data->namespace_id = gpu_control_->GetNamespaceID(); - sync_token_data->command_buffer_id = gpu_control_->GetCommandBufferID(); - sync_token_data->release_count = fence_sync; + sync_token_data->SetData(gpu_control_->GetNamespaceID(), + gpu_control_->GetCommandBufferID(), + fence_sync); } void GLES2Implementation::WaitSyncTokenCHROMIUM(const GLbyte* sync_token) { @@ -5401,9 +5402,9 @@ void GLES2Implementation::WaitSyncTokenCHROMIUM(const GLbyte* sync_token) { const SyncToken* sync_token_data = reinterpret_cast<const SyncToken*>(sync_token); - helper_->WaitSyncTokenCHROMIUM(sync_token_data->namespace_id, - sync_token_data->command_buffer_id, - sync_token_data->release_count); + helper_->WaitSyncTokenCHROMIUM(sync_token_data->GetNamespaceId(), + sync_token_data->GetCommandBufferId(), + sync_token_data->GetReleaseCount()); } namespace { |