Revert 93066 - Execute all GL commands up to the put offset reported by a each flush.This means g...

gpu/command_buffer/client/cmd_buffer_helper.h

 // Copyright (c) 2011 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.
 
 // This file contains the command buffer helper class.
 
 #ifndef GPU_COMMAND_BUFFER_CLIENT_CMD_BUFFER_HELPER_H_
 #define GPU_COMMAND_BUFFER_CLIENT_CMD_BUFFER_HELPER_H_
 
 #include <string.h>
@@ skipping 65 matching lines @@
   //   shutdown.
   int32 InsertToken();
 
   // Waits until the token of a particular value has passed through the command
   // stream (i.e. commands inserted before that token have been executed).
   // NOTE: This will call Flush if it needs to block.
   // Parameters:
   //   the value of the token to wait for.
   void WaitForToken(int32 token);
 
+  // Inserts a yield command, signaling the scheduler that this is a good point
+  // to update the state and schedule other command buffers. This is
+  // particularly useful after inserting a token that will be waited on.
+  void YieldScheduler();
+
   // Called prior to each command being issued. Waits for a certain amount of
   // space to be available. Returns address of space.
   CommandBufferEntry* GetSpace(uint32 entries);
 
   // Typed version of GetSpace. Gets enough room for the given type and returns
   // a reference to it.
   template <typename T>
   T& GetCmdSpace() {
     COMPILE_ASSERT(T::kArgFlags == cmd::kFixed, Cmd_kArgFlags_not_kFixed);
     uint32 space_needed = ComputeNumEntries(sizeof(T));
@@ skipping 13 matching lines @@
   // Typed version of GetSpace for immediate commands.
   template <typename T>
   T& GetImmediateCmdSpaceTotalSize(size_t total_space) {
     COMPILE_ASSERT(T::kArgFlags == cmd::kAtLeastN, Cmd_kArgFlags_not_kAtLeastN);
     uint32 space_needed = ComputeNumEntries(total_space);
     void* data = GetSpace(space_needed);
     return *reinterpret_cast<T*>(data);
   }
 
   int32 last_token_read() const {
-    return command_buffer_->GetLastState().token;
-  }
-
-  int32 get_offset() const {
-    return command_buffer_->GetLastState().get_offset;
+    return last_token_read_;
   }
 
   error::Error GetError();
 
   // Common Commands
   void Noop(uint32 skip_count) {
     cmd::Noop& cmd = GetImmediateCmdSpace<cmd::Noop>(
         skip_count * sizeof(CommandBufferEntry));
     cmd.Init(skip_count);
   }
@@ skipping 79 matching lines @@
   CommandBuffer* command_buffer() const {
     return command_buffer_;
   }
 
  private:
   // Waits until get changes, updating the value of get_.
   void WaitForGetChange();
 
   // Returns the number of available entries (they may not be contiguous).
   int32 AvailableEntries() {
-    return (get_offset() - put_ - 1 + usable_entry_count_) %
-        usable_entry_count_;
+    return (get_ - put_ - 1 + usable_entry_count_) % usable_entry_count_;
   }
 
+  // Synchronize with current service state.
+  void SynchronizeState(const CommandBuffer::State& state);
+
   CommandBuffer* command_buffer_;
   Buffer ring_buffer_;
   CommandBufferEntry *entries_;
   int32 total_entry_count_;  // the total number of entries
   int32 usable_entry_count_;  // the usable number (ie, minus space for jump)
   int32 token_;
+  int32 last_token_read_;
+  int32 get_;
   int32 put_;
   int32 last_put_sent_;
   int commands_issued_;
 
   // Using C runtime instead of base because this file cannot depend on base.
   time_t last_flush_time_;
 
   friend class CommandBufferHelperTest;
   DISALLOW_COPY_AND_ASSIGN(CommandBufferHelper);
 };
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_CMD_BUFFER_HELPER_H_