Modified old wait sync point functions to also accept new sync tokens.

gpu/command_buffer/client/gles2_implementation.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // A class to emulate GLES2 over command buffers.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
@@ skipping 5368 matching lines @@
                      << sync_point << ")");
   DCHECK(capabilities_.future_sync_points);
   helper_->CommandBufferHelper::Flush();
   gpu_control_->RetireSyncPoint(sync_point);
 }
 
 uint64_t GLES2Implementation::ShareGroupTracingGUID() const {
   return share_group_->TracingGUID();
 }
 
+void GLES2Implementation::WaitSyncPointCHROMIUM(GLuint sync_point,
+                                                const GLbyte* sync_token) {
+  // Copy the data over before data access to ensure alignment.
+  SyncToken sync_token_data;
+  if (sync_token)
+    memcpy(&sync_token_data, sync_token, sizeof(SyncToken));
+
+  if (sync_token_data.HasData()) {
+    WaitSyncTokenCHROMIUM(sync_token);
+  } else {
+    helper_->WaitSyncPointCHROMIUM(sync_point);
+  }
+}
+
 GLuint64 GLES2Implementation::InsertFenceSyncCHROMIUM() {
   const uint64_t release = gpu_control_->GenerateFenceSyncRelease();
   helper_->InsertFenceSyncCHROMIUM(release);
   return release;
 }
 
 void GLES2Implementation::GenSyncTokenCHROMIUM(GLuint64 fence_sync,
                                                GLbyte* sync_token) {
   if (!sync_token) {
     SetGLError(GL_INVALID_VALUE, "glGenSyncTokenCHROMIUM", "empty sync_token");
@@ skipping 571 matching lines @@
   CheckGLError();
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/client/gles2_implementation_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu