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

gpu/ipc/gpu_command_buffer_traits.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.
 
 #include "gpu/ipc/gpu_command_buffer_traits.h"
 
 #include "gpu/command_buffer/common/mailbox_holder.h"
 #include "gpu/command_buffer/common/sync_token.h"
 #include "gpu/command_buffer/common/value_state.h"
 
@@ skipping 39 matching lines @@
     return false;
   }
 }
 
 void ParamTraits<gpu::CommandBuffer::State> ::Log(const param_type& p,
                                                   std::string* l) {
   l->append("<CommandBuffer::State>");
 }
 
 void ParamTraits<gpu::SyncToken>::Write(Message* m, const param_type& p) {
+  DCHECK(!p.HasData() || p.verified_flush());
+  const bool verified_flush = p.verified_flush();
   const int namespace_id = static_cast<int>(p.namespace_id());
   const uint64_t command_buffer_id = p.command_buffer_id();
   const uint64_t release_count = p.release_count();
 
-  m->WriteBytes(&namespace_id, sizeof(namespace_id));
-  m->WriteBytes(&command_buffer_id, sizeof(command_buffer_id));
-  m->WriteBytes(&release_count, sizeof(release_count));
+  m->WriteBool(verified_flush);
+  m->WriteInt(namespace_id);
+  m->WriteUInt64(command_buffer_id);
+  m->WriteUInt64(release_count);
 }
 
 bool ParamTraits<gpu::SyncToken>::Read(const Message* m,
                                        base::PickleIterator* iter,
                                        param_type* p) {
+  bool verified_flush = false;
+  if (!iter->ReadBool(&verified_flush))
+    return false;
+
   int namespace_id = -1;
   if (!iter->ReadInt(&namespace_id))
     return false;
 
   uint64_t command_buffer_id = 0;
   if (!iter->ReadUInt64(&command_buffer_id))
     return false;
 
   uint64_t release_count = 0;
   if (!iter->ReadUInt64(&release_count))
     return false;
 
   p->Set(static_cast<gpu::CommandBufferNamespace>(namespace_id),
          command_buffer_id,
          release_count);
+
+  if (p->HasData()) {
+    if (!verified_flush)
+      return false;
+    p->SetVerifyFlush();
+  }
+
   return true;
 }
 
 void ParamTraits<gpu::SyncToken>::Log(const param_type& p, std::string* l) {
   *l +=
       base::StringPrintf("[%d:%llX] %llu", static_cast<int>(p.namespace_id()),
                          static_cast<unsigned long long>(p.command_buffer_id()),
                          static_cast<unsigned long long>(p.release_count()));
 }
 
@@ skipping 12 matching lines @@
   return true;
 }
 
 void ParamTraits<gpu::Mailbox>::Log(const param_type& p, std::string* l) {
   for (size_t i = 0; i < sizeof(p.name); ++i)
     *l += base::StringPrintf("%02x", p.name[i]);
 }
 
 void ParamTraits<gpu::MailboxHolder>::Write(Message* m, const param_type& p) {
   WriteParam(m, p.mailbox);
+  WriteParam(m, p.sync_token);
   WriteParam(m, p.texture_target);
-  WriteParam(m, p.sync_point);
 }
 
 bool ParamTraits<gpu::MailboxHolder> ::Read(const Message* m,
                                             base::PickleIterator* iter,
                                             param_type* p) {
   if (!ReadParam(m, iter, &p->mailbox) ||
-      !ReadParam(m, iter, &p->texture_target) ||
-      !ReadParam(m, iter, &p->sync_point))
+      !ReadParam(m, iter, &p->sync_token) ||
+      !ReadParam(m, iter, &p->texture_target))
     return false;
   return true;
 }
 
 void ParamTraits<gpu::MailboxHolder>::Log(const param_type& p, std::string* l) {
   ParamTraits<gpu::Mailbox>::Log(p.mailbox, l);
-  *l += base::StringPrintf(":%04x@%d", p.texture_target, p.sync_point);
+  ParamTraits<gpu::SyncToken>::Log(p.sync_token, l);

[dcheng, 2015/11/03 07:39:29]

Nit: LogParam (here and previous line) for magical type-deduction.

[David Yen, 2015/11/03 18:09:28]

Done.

+  *l += base::StringPrintf(":%04x@", p.texture_target);
 }
 
 void ParamTraits<gpu::ValueState>::Write(Message* m, const param_type& p) {
   m->WriteData(reinterpret_cast<const char*>(&p),
                sizeof(gpu::ValueState));
 }
 
 bool ParamTraits<gpu::ValueState> ::Read(const Message* m,
                                          base::PickleIterator* iter,
                                          param_type* p) {
@@ skipping 10 matching lines @@
   l->append("<ValueState (");
   for (int value : p.int_value)
     *l += base::StringPrintf("%i ", value);
   l->append(" int values ");
   for (float value : p.float_value)
     *l += base::StringPrintf("%f ", value);
   l->append(" float values)>");
 }
 
 }  // namespace IPC