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 5348 matching lines @@
   return true;
 }
 
 GLuint GLES2Implementation::InsertSyncPointCHROMIUM() {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glInsertSyncPointCHROMIUM");
   helper_->CommandBufferHelper::Flush();
   return gpu_control_->InsertSyncPoint();
 }
 
+void GLES2Implementation::WaitSyncPointCHROMIUM(GLuint sync_point) {
+  // This should no longer be called.
+  NOTREACHED();
+}
+
 GLuint GLES2Implementation::InsertFutureSyncPointCHROMIUM() {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glInsertFutureSyncPointCHROMIUM");
   DCHECK(capabilities_.future_sync_points);
   return gpu_control_->InsertFutureSyncPoint();
 }
 
 void GLES2Implementation::RetireSyncPointCHROMIUM(GLuint sync_point) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glRetireSyncPointCHROMIUM("
@@ skipping 51 matching lines @@
     return;
   }
 
   // Copy the data over after setting the data to ensure alignment.
   SyncToken sync_token_data(gpu_control_->GetNamespaceID(),
                             gpu_control_->GetCommandBufferID(), fence_sync);
   memcpy(sync_token, &sync_token_data, sizeof(sync_token_data));
 }
 
 void GLES2Implementation::WaitSyncTokenCHROMIUM(const GLbyte* sync_token) {
-  if (!sync_token) {
-    SetGLError(GL_INVALID_VALUE, "glWaitSyncTokenCHROMIUM", "empty sync_token");
-    return;
-  };
+  if (sync_token) {
+    // Copy the data over before data access to ensure alignment.
+    SyncToken sync_token_data;
+    memcpy(&sync_token_data, sync_token, sizeof(SyncToken));
+    if (sync_token_data.HasData()) {
+      if (!sync_token_data.verified_flush() &&
+          !gpu_control_->CanWaitUnverifiedSyncToken(&sync_token_data)) {
+        SetGLError(GL_INVALID_VALUE, "glWaitSyncTokenCHROMIUM",
+                   "Cannot wait on sync_token which has not been verified");
+        return;
+      }
 
-  // Copy the data over before data access to ensure alignment.
-  SyncToken sync_token_data;
-  memcpy(&sync_token_data, sync_token, sizeof(SyncToken));
+      // TODO(dyen): Temporarily support old sync points, remove once all old
+      // sync points have been removed.
+      const gpu::CommandBufferNamespace namespace_id =
+          sync_token_data.namespace_id();
+      if (namespace_id == gpu::CommandBufferNamespace::OLD_SYNC_POINTS) {
+        const uint32_t sync_point =
+            static_cast<uint32_t>(sync_token_data.release_count());
+        helper_->WaitSyncPointCHROMIUM(sync_point);
+        return;
+      }
 
-  if (!sync_token_data.verified_flush() &&
-      !gpu_control_->CanWaitUnverifiedSyncToken(&sync_token_data)) {
-    SetGLError(GL_INVALID_VALUE, "glWaitSyncTokenCHROMIUM",
-               "Cannot wait on sync_token which has not been verified");
-    return;
+      helper_->WaitSyncTokenCHROMIUM(
+          static_cast<GLuint>(sync_token_data.namespace_id()),
+          sync_token_data.command_buffer_id(), sync_token_data.release_count());
+    }
   }
-
-  helper_->WaitSyncTokenCHROMIUM(sync_token_data.namespace_id(),
-                                 sync_token_data.command_buffer_id(),
-                                 sync_token_data.release_count());
 }
 
 namespace {
 
 bool ValidImageFormat(GLenum internalformat,
                       const Capabilities& capabilities) {
   switch (internalformat) {
     case GL_ATC_RGB_AMD:
     case GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD:
       return capabilities.texture_format_atc;
@@ skipping 878 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