Removing the JumpRelative, Call, CallRelative and Return commands.

gpu/command_buffer/client/cmd_buffer_helper.h

 // 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.
 
 // 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 131 matching lines @@
     }
   }
 
   void SetToken(uint32 token) {
     cmd::SetToken* cmd = GetCmdSpace<cmd::SetToken>();
     if (cmd) {
       cmd->Init(token);
     }
   }
 
-  void Jump(uint32 offset) {
-    cmd::Jump* cmd = GetCmdSpace<cmd::Jump>();
-    if (cmd) {
-      cmd->Init(offset);
-    }
-  }
-
-  void JumpRelative(int32 offset) {
-    cmd::JumpRelative* cmd = GetCmdSpace<cmd::JumpRelative>();
-    if (cmd) {
-      cmd->Init(offset);
-    }
-  }
-
-  void Call(uint32 offset) {
-    cmd::Call* cmd = GetCmdSpace<cmd::Call>();
-    if (cmd) {
-      cmd->Init(offset);
-    }
-  }
-
-  void CallRelative(int32 offset) {
-    cmd::CallRelative* cmd = GetCmdSpace<cmd::CallRelative>();
-    if (cmd) {
-      cmd->Init(offset);
-    }
-  }
-
-  void Return() {
-    cmd::Return* cmd = GetCmdSpace<cmd::Return>();
-    if (cmd) {
-      cmd->Init();
-    }
-  }
-
   void SetBucketSize(uint32 bucket_id, uint32 size) {
     cmd::SetBucketSize* cmd = GetCmdSpace<cmd::SetBucketSize>();
     if (cmd) {
       cmd->Init(bucket_id, size);
     }
   }
 
   void SetBucketData(uint32 bucket_id,
                      uint32 offset,
                      uint32 size,
@@ skipping 72 matching lines @@
   void ClearUsable() {
     usable_ = false;
   }
 
  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_offset() - put_ - 1 + total_entry_count_) % total_entry_count_;
   }
 
   bool AllocateRingBuffer();
   void FreeResources();
 
   CommandBuffer* command_buffer_;
   int32 ring_buffer_id_;
   int32 ring_buffer_size_;
   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 put_;
   int32 last_put_sent_;
   int commands_issued_;
   bool usable_;
   bool context_lost_;
   bool flush_automatically_;
 
   // Using C runtime instead of base because this file cannot depend on base.
   clock_t last_flush_time_;
 
   friend class CommandBufferHelperTest;
   DISALLOW_COPY_AND_ASSIGN(CommandBufferHelper);
 };
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_CMD_BUFFER_HELPER_H_