Change command buffer client code to use structures....

command_buffer/client/cross/cmd_buffer_helper.cc

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 25 matching lines @@
 
 namespace o3d {
 namespace command_buffer {
 
 CommandBufferHelper::CommandBufferHelper(BufferSyncInterface *interface)
     : interface_(interface),
       entries_(NULL),
       entry_count_(0),
       token_(0) {
   // The interface should be connected already.
-  DCHECK_NE(BufferSyncInterface::NOT_CONNECTED, interface_->GetStatus());
+  DCHECK_NE(BufferSyncInterface::kNotConnected, interface_->GetStatus());
 }
 
 bool CommandBufferHelper::Init(unsigned int entry_count) {
   if (entry_count == 0)
     return false;
   size_t size = entry_count * sizeof(CommandBufferEntry);  // NOLINT
   shm_handle_ = CreateShm(size);
   if (shm_handle_ == kRPCInvalidHandle)
     return false;
   void *address = MapShm(shm_handle_, size);
@@ skipping 30 matching lines @@
 }
 
 // Inserts a new token into the command stream. It uses an increasing value
 // scheme so that we don't lose tokens (a token has passed if the current token
 // value is higher than that token). Calls Finish() if the token value wraps,
 // which will be rare.
 unsigned int CommandBufferHelper::InsertToken() {
   ++token_;
   CommandBufferEntry args;
   args.value_uint32 = token_;
-  AddCommand(SET_TOKEN, 1, &args);
+  AddCommand(command_buffer::kSetToken, 1, &args);
   if (token_ == 0) {
     // we wrapped
     Finish();
     last_token_read_ = interface_->GetToken();
     DCHECK_EQ(token_, last_token_read_);
   }
   return token_;
 }
 
 // Waits until the current token value is greater or equal to the value passed
@@ skipping 14 matching lines @@
 }
 
 // Waits for get to change. In case get doesn't change or becomes invalid,
 // check for an error.
 void CommandBufferHelper::WaitForGetChange() {
   CommandBufferOffset new_get = interface_->WaitGetChanges(get_);
   if (new_get == get_ || new_get == -1) {
     // If get_ didn't change or is invalid (-1), it means an error may have
     // occured. Check that.
     BufferSyncInterface::ParserStatus status = interface_->GetStatus();
-    if (status != BufferSyncInterface::PARSING) {
+    if (status != BufferSyncInterface::kParsing) {
       switch (status) {
-        case BufferSyncInterface::NOT_CONNECTED:
+        case BufferSyncInterface::kNotConnected:
           LOG(FATAL) << "Service disconnected.";
           return;
-        case BufferSyncInterface::NO_BUFFER:
+        case BufferSyncInterface::kNoBuffer:
           LOG(FATAL) << "Service doesn't have a buffer set.";
           return;
-        case BufferSyncInterface::PARSE_ERROR: {
+        case BufferSyncInterface::kParseError: {
           BufferSyncInterface::ParseError error = interface_->GetParseError();
           LOG(WARNING) << "Parse error: " << error;
           return;
         }
-        case BufferSyncInterface::PARSING:
+        case BufferSyncInterface::kParsing:
           break;
       }
     }
   }
   get_ = new_get;
 }
 
 // Waits for available entries, basically waiting until get >= put + count + 1.
 // It actually waits for contiguous entries, so it may need to wrap the buffer
 // around, adding noops. Thus this function may change the value of put_.
@@ skipping 18 matching lines @@
     }
     put_ = 0;
   }
   // If we have enough room, return immediatly.
   if (count <= AvailableEntries()) return;
   // Otherwise flush, and wait until we do have enough room.
   Flush();
   while (AvailableEntries() < count) WaitForGetChange();
 }
 
+CommandBufferEntry* CommandBufferHelper::GetSpace(uint32 entries) {
+  WaitForAvailableEntries(entries);
+  CommandBufferEntry* space = &entries_[put_];
+  put_ += entries;
+  return space;
+}
+
 }  // namespace command_buffer
 }  // namespace o3d