Add commands Jump, Call and Return...

gpu/command_buffer/common/cmd_buffer_common.h

 // Copyright (c) 2009 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 common parts of command buffer formats.
 
 #ifndef GPU_COMMAND_BUFFER_COMMON_CMD_BUFFER_COMMON_H_
 #define GPU_COMMAND_BUFFER_COMMON_CMD_BUFFER_COMMON_H_
 
 #include "base/basictypes.h"
@@ skipping 20 matching lines @@
 // Rounds up to a multiple of entries in bytes.
 inline size_t RoundSizeToMultipleOfEntries(size_t size_in_bytes) {
   return ComputeNumEntries(size_in_bytes) * sizeof(uint32);  // NOLINT
 }
 
 // Struct that defines the command header in the command buffer.
 struct CommandHeader {
   Uint32 size:21;
   Uint32 command:11;
 
-  void Init(uint32 _command, uint32 _size) {
-    DCHECK_LE(_size, 1u << 22);
+  static const int32 kMaxSize = (1 << 21) - 1;
+
+  void Init(uint32 _command, int32 _size) {
+    DCHECK_LE(_size, kMaxSize);
     command = _command;
     size = _size;
   }
 
   // Sets the header based on the passed in command. Can not be used for
   // variable sized commands like immediate commands or Noop.
   template <typename T>
   void SetCmd() {
     COMPILE_ASSERT(T::kArgFlags == cmd::kFixed, Cmd_kArgFlags_not_kFixed);
     Init(T::kCmdId, ComputeNumEntries(sizeof(T)));  // NOLINT
@@ skipping 120 matching lines @@
 
 const char* GetCommandName(CommandId id);
 
 // A Noop command.
 struct Noop {
   typedef Noop ValueType;
   static const CommandId kCmdId = kNoop;
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
 
   void SetHeader(uint32 skip_count) {
-    header.Init(kCmdId, skip_count + 1);
+    DCHECK_GT(skip_count, 0u);
+    header.Init(kCmdId, skip_count);
   }
 
   void Init(uint32 skip_count) {
     SetHeader(skip_count);
   }
 
   static void* Set(void* cmd, uint32 skip_count) {
     static_cast<ValueType*>(cmd)->Init(skip_count);
     return NextImmediateCmdAddress<ValueType>(
         cmd, skip_count * sizeof(CommandBufferEntry));  // NOLINT
@@ skipping 38 matching lines @@
 // The Jump command jumps to another place in the command buffer.
 struct Jump {
   typedef Jump ValueType;
   static const CommandId kCmdId = kJump;
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
 
   void SetHeader() {
     header.SetCmd<ValueType>();
   }
 
-  void Init(uint32 _shared_memory_id, uint32 _shared_memory_offset) {
+  void Init(uint32 _offset) {
     SetHeader();
-    shared_memory_id = _shared_memory_id;
-    shared_memory_offset = _shared_memory_offset;
+    offset = _offset;
   }
   static void* Set(
-      void* cmd, uint32 _shared_memory_id, uint32 _shared_memory_offset) {
-    static_cast<ValueType*>(cmd)->Init(
-        _shared_memory_id, _shared_memory_offset);
+      void* cmd, uint32 _offset) {
+    static_cast<ValueType*>(cmd)->Init(_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   CommandHeader header;
-  uint32 shared_memory_id;
-  uint32 shared_memory_offset;
+  uint32 offset;
 };
 
-COMPILE_ASSERT(sizeof(Jump) == 12, Sizeof_Jump_is_not_12);
+COMPILE_ASSERT(sizeof(Jump) == 8, Sizeof_Jump_is_not_8);
 COMPILE_ASSERT(offsetof(Jump, header) == 0,
                Offsetof_Jump_header_not_0);
-COMPILE_ASSERT(offsetof(Jump, shared_memory_id) == 4,
-               Offsetof_Jump_shared_memory_id_not_4);
-COMPILE_ASSERT(offsetof(Jump, shared_memory_offset) == 8,
-               Offsetof_Jump_shared_memory_offset_not_8);
+COMPILE_ASSERT(offsetof(Jump, offset) == 4,
+               Offsetof_Jump_offset_not_4);
 
 // The JumpRelative command jumps to another place in the command buffer
 // relative to the end of this command. In other words. JumpRelative with an
 // offset of zero is effectively a noop.
 struct JumpRelative {
   typedef JumpRelative ValueType;
   static const CommandId kCmdId = kJumpRelative;
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
 
   void SetHeader() {
@@ skipping 23 matching lines @@
 // Return command.
 struct Call {
   typedef Call ValueType;
   static const CommandId kCmdId = kCall;
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
 
   void SetHeader() {
     header.SetCmd<ValueType>();
   }
 
-  void Init(uint32 _shared_memory_id, uint32 _shared_memory_offset) {
+  void Init(uint32 _offset) {
     SetHeader();
-    shared_memory_id = _shared_memory_id;
-    shared_memory_offset = _shared_memory_offset;
+    offset = _offset;
   }
-  static void* Set(
-      void* cmd, uint32 _shared_memory_id, uint32 _shared_memory_offset) {
-    static_cast<ValueType*>(cmd)->Init(
-        _shared_memory_id, _shared_memory_offset);
+  static void* Set(void* cmd, uint32 _offset) {
+    static_cast<ValueType*>(cmd)->Init(_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   CommandHeader header;
-  uint32 shared_memory_id;
-  uint32 shared_memory_offset;
+  uint32 offset;
 };
 
-COMPILE_ASSERT(sizeof(Call) == 12, Sizeof_Call_is_not_12);
+COMPILE_ASSERT(sizeof(Call) == 8, Sizeof_Call_is_not_8);
 COMPILE_ASSERT(offsetof(Call, header) == 0,
                Offsetof_Call_header_not_0);
-COMPILE_ASSERT(offsetof(Call, shared_memory_id) == 4,
-               Offsetof_Call_shared_memory_id_not_4);
-COMPILE_ASSERT(offsetof(Call, shared_memory_offset) == 8,
-               Offsetof_Call_shared_memory_offset_not_8);
+COMPILE_ASSERT(offsetof(Call, offset) == 4,
+               Offsetof_Call_offset_not_4);
 
 // The CallRelative command jumps to a subroutine using a relative offset. The
 // offset is relative to the end of this command..
 struct CallRelative {
   typedef CallRelative ValueType;
   static const CommandId kCmdId = kCallRelative;
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
 
   void SetHeader() {
     header.SetCmd<ValueType>();
@@ skipping 306 matching lines @@
                Offsetof_GetBucketData_shared_memory_offset_not_20);
 
 }  // namespace cmd
 
 #pragma pack(pop)
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_COMMON_CMD_BUFFER_COMMON_H_