Remove command_buffer/common/types.h.

Make its current clients use base/macros.h and stdint.h instead.
No behavior change.

BUG=138542
NOTRY=true

Review URL: https://codereview.chromium.org/268063002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268315 0039d316-1c4b-4281-b951-d872f2087c98

15 files changed, 4211 insertions, 3366 deletions

diff --git a/gpu/command_buffer/common/buffer.h b/gpu/command_buffer/common/buffer.h
index 5a31035..d8a8356 100644
--- a/gpu/command_buffer/common/buffer.h
+++ b/gpu/command_buffer/common/buffer.h
@@ -5,10 +5,10 @@
 #ifndef GPU_COMMAND_BUFFER_COMMON_BUFFER_H_
 #define GPU_COMMAND_BUFFER_COMMON_BUFFER_H_
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
-#include "gpu/command_buffer/common/types.h"
 #include "gpu/gpu_export.h"
 
 namespace base {
diff --git a/gpu/command_buffer/common/cmd_buffer_common.h b/gpu/command_buffer/common/cmd_buffer_common.h
index 979d746..828731b 100644
--- a/gpu/command_buffer/common/cmd_buffer_common.h
+++ b/gpu/command_buffer/common/cmd_buffer_common.h
@@ -8,10 +8,11 @@
 #define GPU_COMMAND_BUFFER_COMMON_CMD_BUFFER_COMMON_H_
 
 #include <stddef.h>
+#include <stdint.h>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "gpu/command_buffer/common/bitfield_helpers.h"
-#include "gpu/command_buffer/common/types.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
@@ -29,24 +30,24 @@ namespace cmd {
 
 // Computes the number of command buffer entries needed for a certain size. In
 // other words it rounds up to a multiple of entries.
-inline uint32 ComputeNumEntries(size_t size_in_bytes) {
-  return static_cast<uint32>(
-      (size_in_bytes + sizeof(uint32) - 1) / sizeof(uint32));  // NOLINT
+inline uint32_t ComputeNumEntries(size_t size_in_bytes) {
+  return static_cast<uint32_t>(
+      (size_in_bytes + sizeof(uint32_t) - 1) / sizeof(uint32_t));  // NOLINT
 }
 
 // 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
+  return ComputeNumEntries(size_in_bytes) * sizeof(uint32_t);  // NOLINT
 }
 
 // Struct that defines the command header in the command buffer.
 struct CommandHeader {
-  uint32 size:21;
-  uint32 command:11;
+  uint32_t size:21;
+  uint32_t command:11;
 
-  GPU_EXPORT static const int32 kMaxSize = (1 << 21) - 1;
+  GPU_EXPORT static const int32_t kMaxSize = (1 << 21) - 1;
 
-  void Init(uint32 _command, int32 _size) {
+  void Init(uint32_t _command, int32_t _size) {
     DCHECK_LE(_size, kMaxSize);
     command = _command;
     size = _size;
@@ -62,7 +63,7 @@ struct CommandHeader {
 
   // Sets the header by a size in bytes of the immediate data after the command.
   template <typename T>
-  void SetCmdBySize(uint32 size_of_data_in_bytes) {
+  void SetCmdBySize(uint32_t size_of_data_in_bytes) {
     COMPILE_ASSERT(T::kArgFlags == cmd::kAtLeastN, Cmd_kArgFlags_not_kAtLeastN);
     Init(T::kCmdId,
          ComputeNumEntries(sizeof(T) + size_of_data_in_bytes));  // NOLINT
@@ -70,7 +71,7 @@ struct CommandHeader {
 
   // Sets the header by a size in bytes.
   template <typename T>
-  void SetCmdByTotalSize(uint32 size_in_bytes) {
+  void SetCmdByTotalSize(uint32_t size_in_bytes) {
     COMPILE_ASSERT(T::kArgFlags == cmd::kAtLeastN, Cmd_kArgFlags_not_kAtLeastN);
     DCHECK_GE(size_in_bytes, sizeof(T));  // NOLINT
     Init(T::kCmdId, ComputeNumEntries(size_in_bytes));
@@ -82,8 +83,8 @@ COMPILE_ASSERT(sizeof(CommandHeader) == 4, Sizeof_CommandHeader_is_not_4);
 // Union that defines possible command buffer entries.
 union CommandBufferEntry {
   CommandHeader value_header;
-  uint32 value_uint32;
-  int32 value_int32;
+  uint32_t value_uint32;
+  int32_t value_int32;
   float value_float;
 };
 
@@ -123,7 +124,7 @@ void* NextCmdAddress(void* cmd) {
 //   cmd: Address of command.
 //   size_of_data_in_bytes: Size of the data for the command.
 template <typename T>
-void* NextImmediateCmdAddress(void* cmd, uint32 size_of_data_in_bytes) {
+void* NextImmediateCmdAddress(void* cmd, uint32_t size_of_data_in_bytes) {
   COMPILE_ASSERT(T::kArgFlags == cmd::kAtLeastN, Cmd_kArgFlags_not_kAtLeastN);
   return reinterpret_cast<char*>(cmd) + sizeof(T) +   // NOLINT
       RoundSizeToMultipleOfEntries(size_of_data_in_bytes);
@@ -135,7 +136,8 @@ void* NextImmediateCmdAddress(void* cmd, uint32 size_of_data_in_bytes) {
 //   cmd: Address of command.
 //   size_of_cmd_in_bytes: Size of the cmd and data.
 template <typename T>
-void* NextImmediateCmdAddressTotalSize(void* cmd, uint32 total_size_in_bytes) {
+void* NextImmediateCmdAddressTotalSize(void* cmd,
+                                       uint32_t total_size_in_bytes) {
   COMPILE_ASSERT(T::kArgFlags == cmd::kAtLeastN, Cmd_kArgFlags_not_kAtLeastN);
   DCHECK_GE(total_size_in_bytes, sizeof(T));  // NOLINT
   return reinterpret_cast<char*>(cmd) +
@@ -181,18 +183,18 @@ struct Noop {
   typedef Noop ValueType;
   static const CommandId kCmdId = kNoop;
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
-  static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
+  static const uint8_t cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  void SetHeader(uint32 skip_count) {
+  void SetHeader(uint32_t skip_count) {
     DCHECK_GT(skip_count, 0u);
     header.Init(kCmdId, skip_count);
   }
 
-  void Init(uint32 skip_count) {
+  void Init(uint32_t skip_count) {
     SetHeader(skip_count);
   }
 
-  static void* Set(void* cmd, uint32 skip_count) {
+  static void* Set(void* cmd, uint32_t skip_count) {
     static_cast<ValueType*>(cmd)->Init(skip_count);
     return NextImmediateCmdAddress<ValueType>(
         cmd, skip_count * sizeof(CommandBufferEntry));  // NOLINT
@@ -210,23 +212,23 @@ struct SetToken {
   typedef SetToken ValueType;
   static const CommandId kCmdId = kSetToken;
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
-  static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
+  static const uint8_t cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
   void SetHeader() {
     header.SetCmd<ValueType>();
   }
 
-  void Init(uint32 _token) {
+  void Init(uint32_t _token) {
     SetHeader();
     token = _token;
   }
-  static void* Set(void* cmd, uint32 token) {
+  static void* Set(void* cmd, uint32_t token) {
     static_cast<ValueType*>(cmd)->Init(token);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   CommandHeader header;
-  uint32 token;
+  uint32_t token;
 };
 
 COMPILE_ASSERT(sizeof(SetToken) == 8, Sizeof_SetToken_is_not_8);
@@ -251,25 +253,25 @@ struct SetBucketSize {
   typedef SetBucketSize ValueType;
   static const CommandId kCmdId = kSetBucketSize;
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
-  static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
+  static const uint8_t cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
   void SetHeader() {
     header.SetCmd<ValueType>();
   }
 
-  void Init(uint32 _bucket_id, uint32 _size) {
+  void Init(uint32_t _bucket_id, uint32_t _size) {
     SetHeader();
     bucket_id = _bucket_id;
     size = _size;
   }
-  static void* Set(void* cmd, uint32 _bucket_id, uint32 _size) {
+  static void* Set(void* cmd, uint32_t _bucket_id, uint32_t _size) {
     static_cast<ValueType*>(cmd)->Init(_bucket_id, _size);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   CommandHeader header;
-  uint32 bucket_id;
-  uint32 size;
+  uint32_t bucket_id;
+  uint32_t size;
 };
 
 COMPILE_ASSERT(sizeof(SetBucketSize) == 12, Sizeof_SetBucketSize_is_not_8);
@@ -287,17 +289,17 @@ struct SetBucketData {
   typedef SetBucketData ValueType;
   static const CommandId kCmdId = kSetBucketData;
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
-  static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
+  static const uint8_t cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
   void SetHeader() {
     header.SetCmd<ValueType>();
   }
 
-  void Init(uint32 _bucket_id,
-            uint32 _offset,
-            uint32 _size,
-            uint32 _shared_memory_id,
-            uint32 _shared_memory_offset) {
+  void Init(uint32_t _bucket_id,
+            uint32_t _offset,
+            uint32_t _size,
+            uint32_t _shared_memory_id,
+            uint32_t _shared_memory_offset) {
     SetHeader();
     bucket_id = _bucket_id;
     offset = _offset;
@@ -306,11 +308,11 @@ struct SetBucketData {
     shared_memory_offset = _shared_memory_offset;
   }
   static void* Set(void* cmd,
-                   uint32 _bucket_id,
-                   uint32 _offset,
-                   uint32 _size,
-                   uint32 _shared_memory_id,
-                   uint32 _shared_memory_offset) {
+                   uint32_t _bucket_id,
+                   uint32_t _offset,
+                   uint32_t _size,
+                   uint32_t _shared_memory_id,
+                   uint32_t _shared_memory_offset) {
     static_cast<ValueType*>(cmd)->Init(
         _bucket_id,
         _offset,
@@ -321,11 +323,11 @@ struct SetBucketData {
   }
 
   CommandHeader header;
-  uint32 bucket_id;
-  uint32 offset;
-  uint32 size;
-  uint32 shared_memory_id;
-  uint32 shared_memory_offset;
+  uint32_t bucket_id;
+  uint32_t offset;
+  uint32_t size;
+  uint32_t shared_memory_id;
+  uint32_t shared_memory_offset;
 };
 
 COMPILE_ASSERT(sizeof(SetBucketData) == 24, Sizeof_SetBucketData_is_not_24);
@@ -349,24 +351,24 @@ struct SetBucketDataImmediate {
   typedef SetBucketDataImmediate ValueType;
   static const CommandId kCmdId = kSetBucketDataImmediate;
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
-  static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
+  static const uint8_t cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  void SetHeader(uint32 size) {
+  void SetHeader(uint32_t size) {
     header.SetCmdBySize<ValueType>(size);
   }
 
-  void Init(uint32 _bucket_id,
-            uint32 _offset,
-            uint32 _size) {
+  void Init(uint32_t _bucket_id,
+            uint32_t _offset,
+            uint32_t _size) {
     SetHeader(_size);
     bucket_id = _bucket_id;
     offset = _offset;
     size = _size;
   }
   static void* Set(void* cmd,
-                   uint32 _bucket_id,
-                   uint32 _offset,
-                   uint32 _size) {
+                   uint32_t _bucket_id,
+                   uint32_t _offset,
+                   uint32_t _size) {
     static_cast<ValueType*>(cmd)->Init(
         _bucket_id,
         _offset,
@@ -375,9 +377,9 @@ struct SetBucketDataImmediate {
   }
 
   CommandHeader header;
-  uint32 bucket_id;
-  uint32 offset;
-  uint32 size;
+  uint32_t bucket_id;
+  uint32_t offset;
+  uint32_t size;
 };
 
 COMPILE_ASSERT(sizeof(SetBucketDataImmediate) == 16,
@@ -405,20 +407,20 @@ struct GetBucketStart {
   typedef GetBucketStart ValueType;
   static const CommandId kCmdId = kGetBucketStart;
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
-  static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
+  static const uint8_t cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  typedef uint32 Result;
+  typedef uint32_t Result;
 
   void SetHeader() {
     header.SetCmd<ValueType>();
   }
 
-  void Init(uint32 _bucket_id,
-            uint32 _result_memory_id,
-            uint32 _result_memory_offset,
-            uint32 _data_memory_size,
-            uint32 _data_memory_id,
-            uint32 _data_memory_offset) {
+  void Init(uint32_t _bucket_id,
+            uint32_t _result_memory_id,
+            uint32_t _result_memory_offset,
+            uint32_t _data_memory_size,
+            uint32_t _data_memory_id,
+            uint32_t _data_memory_offset) {
     SetHeader();
     bucket_id = _bucket_id;
     result_memory_id = _result_memory_id;
@@ -428,12 +430,12 @@ struct GetBucketStart {
     data_memory_offset = _data_memory_offset;
   }
   static void* Set(void* cmd,
-                   uint32 _bucket_id,
-                   uint32 _result_memory_id,
-                   uint32 _result_memory_offset,
-                   uint32 _data_memory_size,
-                   uint32 _data_memory_id,
-                   uint32 _data_memory_offset) {
+                   uint32_t _bucket_id,
+                   uint32_t _result_memory_id,
+                   uint32_t _result_memory_offset,
+                   uint32_t _data_memory_size,
+                   uint32_t _data_memory_id,
+                   uint32_t _data_memory_offset) {
     static_cast<ValueType*>(cmd)->Init(
         _bucket_id,
         _result_memory_id,
@@ -445,12 +447,12 @@ struct GetBucketStart {
   }
 
   CommandHeader header;
-  uint32 bucket_id;
-  uint32 result_memory_id;
-  uint32 result_memory_offset;
-  uint32 data_memory_size;
-  uint32 data_memory_id;
-  uint32 data_memory_offset;
+  uint32_t bucket_id;
+  uint32_t result_memory_id;
+  uint32_t result_memory_offset;
+  uint32_t data_memory_size;
+  uint32_t data_memory_id;
+  uint32_t data_memory_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetBucketStart) == 28, Sizeof_GetBucketStart_is_not_28);
@@ -475,17 +477,17 @@ struct GetBucketData {
   typedef GetBucketData ValueType;
   static const CommandId kCmdId = kGetBucketData;
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
-  static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
+  static const uint8_t cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
   void SetHeader() {
     header.SetCmd<ValueType>();
   }
 
-  void Init(uint32 _bucket_id,
-            uint32 _offset,
-            uint32 _size,
-            uint32 _shared_memory_id,
-            uint32 _shared_memory_offset) {
+  void Init(uint32_t _bucket_id,
+            uint32_t _offset,
+            uint32_t _size,
+            uint32_t _shared_memory_id,
+            uint32_t _shared_memory_offset) {
     SetHeader();
     bucket_id = _bucket_id;
     offset = _offset;
@@ -494,11 +496,11 @@ struct GetBucketData {
     shared_memory_offset = _shared_memory_offset;
   }
   static void* Set(void* cmd,
-                   uint32 _bucket_id,
-                   uint32 _offset,
-                   uint32 _size,
-                   uint32 _shared_memory_id,
-                   uint32 _shared_memory_offset) {
+                   uint32_t _bucket_id,
+                   uint32_t _offset,
+                   uint32_t _size,
+                   uint32_t _shared_memory_id,
+                   uint32_t _shared_memory_offset) {
     static_cast<ValueType*>(cmd)->Init(
         _bucket_id,
         _offset,
@@ -509,11 +511,11 @@ struct GetBucketData {
   }
 
   CommandHeader header;
-  uint32 bucket_id;
-  uint32 offset;
-  uint32 size;
-  uint32 shared_memory_id;
-  uint32 shared_memory_offset;
+  uint32_t bucket_id;
+  uint32_t offset;
+  uint32_t size;
+  uint32_t shared_memory_id;
+  uint32_t shared_memory_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetBucketData) == 24, Sizeof_GetBucketData_is_not_20);
diff --git a/gpu/command_buffer/common/constants.h b/gpu/command_buffer/common/constants.h
index 75ca374..054708f 100644
--- a/gpu/command_buffer/common/constants.h
+++ b/gpu/command_buffer/common/constants.h
@@ -5,11 +5,12 @@
 #ifndef GPU_COMMAND_BUFFER_COMMON_CONSTANTS_H_
 #define GPU_COMMAND_BUFFER_COMMON_CONSTANTS_H_
 
-#include "gpu/command_buffer/common/types.h"
+#include <stddef.h>
+#include <stdint.h>
 
 namespace gpu {
 
-typedef int32 CommandBufferOffset;
+typedef int32_t CommandBufferOffset;
 const CommandBufferOffset kInvalidCommandBufferOffset = -1;
 
 // This enum must stay in sync with NPDeviceContext3DError.
@@ -46,10 +47,10 @@ namespace error {
 
 // Invalid shared memory Id, returned by RegisterSharedMemory in case of
 // failure.
-const int32 kInvalidSharedMemoryId = -1;
+const int32_t kInvalidSharedMemoryId = -1;
 
 // Common Command Buffer shared memory transfer buffer ID.
-const int32 kCommandBufferSharedMemoryId = 4;
+const int32_t kCommandBufferSharedMemoryId = 4;
 
 // The size to set for the program cache.
 const size_t kDefaultMaxProgramCacheMemoryBytes = 6 * 1024 * 1024;
diff --git a/gpu/command_buffer/common/gles2_cmd_format.h b/gpu/command_buffer/common/gles2_cmd_format.h
index f11b1e9..79baf97 100644
--- a/gpu/command_buffer/common/gles2_cmd_format.h
+++ b/gpu/command_buffer/common/gles2_cmd_format.h
@@ -10,13 +10,14 @@
 
 #include <KHR/khrplatform.h>
 
+#include <stdint.h>
 #include <string.h>
 
 #include "base/atomicops.h"
+#include "base/macros.h"
 #include "gpu/command_buffer/common/bitfield_helpers.h"
 #include "gpu/command_buffer/common/cmd_buffer_common.h"
 #include "gpu/command_buffer/common/gles2_cmd_ids.h"
-#include "gpu/command_buffer/common/types.h"
 
 // GL types are forward declared to avoid including the GL headers. The problem
 // is determining which GL headers to include from code that is common to the
@@ -83,19 +84,19 @@ struct SizedResult {
   // Returns the total size in bytes of the SizedResult for a given number of
   // results including the size field.
   static size_t ComputeSize(size_t num_results) {
-    return sizeof(T) * num_results + sizeof(uint32);  // NOLINT
+    return sizeof(T) * num_results + sizeof(uint32_t);  // NOLINT
   }
 
   // Returns the total size in bytes of the SizedResult for a given size of
   // results.
   static size_t ComputeSizeFromBytes(size_t size_of_result_in_bytes) {
-    return size_of_result_in_bytes + sizeof(uint32);  // NOLINT
+    return size_of_result_in_bytes + sizeof(uint32_t);  // NOLINT
   }
 
   // Returns the maximum number of results for a given buffer size.
-  static uint32 ComputeMaxResults(size_t size_of_buffer) {
-    return (size_of_buffer >= sizeof(uint32)) ?
-        ((size_of_buffer - sizeof(uint32)) / sizeof(T)) : 0;  // NOLINT
+  static uint32_t ComputeMaxResults(size_t size_of_buffer) {
+    return (size_of_buffer >= sizeof(uint32_t)) ?
+        ((size_of_buffer - sizeof(uint32_t)) / sizeof(T)) : 0;  // NOLINT
   }
 
   // Set the size for a given number of results.
@@ -104,7 +105,7 @@ struct SizedResult {
   }
 
   // Get the number of elements in the result
-  int32 GetNumResults() const {
+  int32_t GetNumResults() const {
     return size / sizeof(T);  // NOLINT
   }
 
@@ -113,31 +114,31 @@ struct SizedResult {
     memcpy(dst, &data, size);
   }
 
-  uint32 size;  // in bytes.
-  int32 data;  // this is just here to get an offset.
+  uint32_t size;  // in bytes.
+  int32_t data;  // this is just here to get an offset.
 };
 
-COMPILE_ASSERT(sizeof(SizedResult<int8>) == 8, SizedResult_size_not_8);
-COMPILE_ASSERT(offsetof(SizedResult<int8>, size) == 0,
+COMPILE_ASSERT(sizeof(SizedResult<int8_t>) == 8, SizedResult_size_not_8);
+COMPILE_ASSERT(offsetof(SizedResult<int8_t>, size) == 0,
                OffsetOf_SizedResult_size_not_0);
-COMPILE_ASSERT(offsetof(SizedResult<int8>, data) == 4,
+COMPILE_ASSERT(offsetof(SizedResult<int8_t>, data) == 4,
                OffsetOf_SizedResult_data_not_4);
 
 // The data for one attrib or uniform from GetProgramInfoCHROMIUM.
 struct ProgramInput {
-  uint32 type;             // The type (GL_VEC3, GL_MAT3, GL_SAMPLER_2D, etc.
-  int32 size;              // The size (how big the array is for uniforms)
-  uint32 location_offset;  // offset from ProgramInfoHeader to 'size' locations
-                           // for uniforms, 1 for attribs.
-  uint32 name_offset;      // offset from ProgrmaInfoHeader to start of name.
-  uint32 name_length;      // length of the name.
+  uint32_t type;             // The type (GL_VEC3, GL_MAT3, GL_SAMPLER_2D, etc.
+  int32_t size;              // The size (how big the array is for uniforms)
+  uint32_t location_offset;  // offset from ProgramInfoHeader to 'size'
+                             // locations for uniforms, 1 for attribs.
+  uint32_t name_offset;      // offset from ProgrmaInfoHeader to start of name.
+  uint32_t name_length;      // length of the name.
 };
 
 // The format of the bucket filled out by GetProgramInfoCHROMIUM
 struct ProgramInfoHeader {
-  uint32 link_status;
-  uint32 num_attribs;
-  uint32 num_uniforms;
+  uint32_t link_status;
+  uint32_t num_attribs;
+  uint32_t num_uniforms;
   // ProgramInput inputs[num_attribs + num_uniforms];
 };
 
@@ -149,7 +150,7 @@ struct QuerySync {
   }
 
   base::subtle::Atomic32 process_count;
-  uint64 result;
+  uint64_t result;
 };
 
 struct AsyncUploadSync {
@@ -157,12 +158,12 @@ struct AsyncUploadSync {
     base::subtle::Release_Store(&async_upload_token, 0);
   }
 
-  void SetAsyncUploadToken(uint32 token) {
+  void SetAsyncUploadToken(uint32_t token) {
     DCHECK_NE(token, 0u);
     base::subtle::Release_Store(&async_upload_token, token);
   }
 
-  bool HasAsyncUploadTokenPassed(uint32 token) {
+  bool HasAsyncUploadTokenPassed(uint32_t token) {
     DCHECK_NE(token, 0u);
     uint32_t current_token = base::subtle::Acquire_Load(&async_upload_token);
     return (current_token - token < 0x80000000);
diff --git a/gpu/command_buffer/common/gles2_cmd_format_autogen.h b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
index c63282f..9461628 100644
--- a/gpu/command_buffer/common/gles2_cmd_format_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
@@ -17,8 +17,8 @@ struct ActiveTexture {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -34,7 +34,7 @@ struct ActiveTexture {
   }
 
   gpu::CommandHeader header;
-  uint32 texture;
+  uint32_t texture;
 };
 
 COMPILE_ASSERT(sizeof(ActiveTexture) == 8, Sizeof_ActiveTexture_is_not_8);
@@ -49,8 +49,8 @@ struct AttachShader {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -67,8 +67,8 @@ struct AttachShader {
   }
 
   gpu::CommandHeader header;
-  uint32 program;
-  uint32 shader;
+  uint32_t program;
+  uint32_t shader;
 };
 
 COMPILE_ASSERT(sizeof(AttachShader) == 12, Sizeof_AttachShader_is_not_12);
@@ -85,17 +85,17 @@ struct BindAttribLocation {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLuint _program,
             GLuint _index,
-            uint32 _name_shm_id,
-            uint32 _name_shm_offset,
-            uint32 _data_size) {
+            uint32_t _name_shm_id,
+            uint32_t _name_shm_offset,
+            uint32_t _data_size) {
     SetHeader();
     program = _program;
     index = _index;
@@ -107,20 +107,20 @@ struct BindAttribLocation {
   void* Set(void* cmd,
             GLuint _program,
             GLuint _index,
-            uint32 _name_shm_id,
-            uint32 _name_shm_offset,
-            uint32 _data_size) {
+            uint32_t _name_shm_id,
+            uint32_t _name_shm_offset,
+            uint32_t _data_size) {
     static_cast<ValueType*>(cmd)
         ->Init(_program, _index, _name_shm_id, _name_shm_offset, _data_size);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 program;
-  uint32 index;
-  uint32 name_shm_id;
-  uint32 name_shm_offset;
-  uint32 data_size;
+  uint32_t program;
+  uint32_t index;
+  uint32_t name_shm_id;
+  uint32_t name_shm_offset;
+  uint32_t data_size;
 };
 
 COMPILE_ASSERT(sizeof(BindAttribLocation) == 24,
@@ -144,28 +144,31 @@ struct BindAttribLocationBucket {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLuint _program, GLuint _index, uint32 _name_bucket_id) {
+  void Init(GLuint _program, GLuint _index, uint32_t _name_bucket_id) {
     SetHeader();
     program = _program;
     index = _index;
     name_bucket_id = _name_bucket_id;
   }
 
-  void* Set(void* cmd, GLuint _program, GLuint _index, uint32 _name_bucket_id) {
+  void* Set(void* cmd,
+            GLuint _program,
+            GLuint _index,
+            uint32_t _name_bucket_id) {
     static_cast<ValueType*>(cmd)->Init(_program, _index, _name_bucket_id);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 program;
-  uint32 index;
-  uint32 name_bucket_id;
+  uint32_t program;
+  uint32_t index;
+  uint32_t name_bucket_id;
 };
 
 COMPILE_ASSERT(sizeof(BindAttribLocationBucket) == 16,
@@ -185,8 +188,8 @@ struct BindBuffer {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -203,8 +206,8 @@ struct BindBuffer {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 buffer;
+  uint32_t target;
+  uint32_t buffer;
 };
 
 COMPILE_ASSERT(sizeof(BindBuffer) == 12, Sizeof_BindBuffer_is_not_12);
@@ -221,8 +224,8 @@ struct BindFramebuffer {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(1);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -239,8 +242,8 @@ struct BindFramebuffer {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 framebuffer;
+  uint32_t target;
+  uint32_t framebuffer;
 };
 
 COMPILE_ASSERT(sizeof(BindFramebuffer) == 12, Sizeof_BindFramebuffer_is_not_12);
@@ -257,8 +260,8 @@ struct BindRenderbuffer {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -275,8 +278,8 @@ struct BindRenderbuffer {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 renderbuffer;
+  uint32_t target;
+  uint32_t renderbuffer;
 };
 
 COMPILE_ASSERT(sizeof(BindRenderbuffer) == 12,
@@ -294,8 +297,8 @@ struct BindTexture {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(1);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -312,8 +315,8 @@ struct BindTexture {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 texture;
+  uint32_t target;
+  uint32_t texture;
 };
 
 COMPILE_ASSERT(sizeof(BindTexture) == 12, Sizeof_BindTexture_is_not_12);
@@ -330,8 +333,8 @@ struct BlendColor {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -377,8 +380,8 @@ struct BlendEquation {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -394,7 +397,7 @@ struct BlendEquation {
   }
 
   gpu::CommandHeader header;
-  uint32 mode;
+  uint32_t mode;
 };
 
 COMPILE_ASSERT(sizeof(BlendEquation) == 8, Sizeof_BlendEquation_is_not_8);
@@ -409,8 +412,8 @@ struct BlendEquationSeparate {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -427,8 +430,8 @@ struct BlendEquationSeparate {
   }
 
   gpu::CommandHeader header;
-  uint32 modeRGB;
-  uint32 modeAlpha;
+  uint32_t modeRGB;
+  uint32_t modeAlpha;
 };
 
 COMPILE_ASSERT(sizeof(BlendEquationSeparate) == 12,
@@ -446,8 +449,8 @@ struct BlendFunc {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -464,8 +467,8 @@ struct BlendFunc {
   }
 
   gpu::CommandHeader header;
-  uint32 sfactor;
-  uint32 dfactor;
+  uint32_t sfactor;
+  uint32_t dfactor;
 };
 
 COMPILE_ASSERT(sizeof(BlendFunc) == 12, Sizeof_BlendFunc_is_not_12);
@@ -482,8 +485,8 @@ struct BlendFuncSeparate {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -509,10 +512,10 @@ struct BlendFuncSeparate {
   }
 
   gpu::CommandHeader header;
-  uint32 srcRGB;
-  uint32 dstRGB;
-  uint32 srcAlpha;
-  uint32 dstAlpha;
+  uint32_t srcRGB;
+  uint32_t dstRGB;
+  uint32_t srcAlpha;
+  uint32_t dstAlpha;
 };
 
 COMPILE_ASSERT(sizeof(BlendFuncSeparate) == 20,
@@ -534,16 +537,16 @@ struct BufferData {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLenum _target,
             GLsizeiptr _size,
-            uint32 _data_shm_id,
-            uint32 _data_shm_offset,
+            uint32_t _data_shm_id,
+            uint32_t _data_shm_offset,
             GLenum _usage) {
     SetHeader();
     target = _target;
@@ -556,8 +559,8 @@ struct BufferData {
   void* Set(void* cmd,
             GLenum _target,
             GLsizeiptr _size,
-            uint32 _data_shm_id,
-            uint32 _data_shm_offset,
+            uint32_t _data_shm_id,
+            uint32_t _data_shm_offset,
             GLenum _usage) {
     static_cast<ValueType*>(cmd)
         ->Init(_target, _size, _data_shm_id, _data_shm_offset, _usage);
@@ -565,11 +568,11 @@ struct BufferData {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  int32 size;
-  uint32 data_shm_id;
-  uint32 data_shm_offset;
-  uint32 usage;
+  uint32_t target;
+  int32_t size;
+  uint32_t data_shm_id;
+  uint32_t data_shm_offset;
+  uint32_t usage;
 };
 
 COMPILE_ASSERT(sizeof(BufferData) == 24, Sizeof_BufferData_is_not_24);
@@ -591,8 +594,8 @@ struct BufferSubData {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -600,8 +603,8 @@ struct BufferSubData {
   void Init(GLenum _target,
             GLintptr _offset,
             GLsizeiptr _size,
-            uint32 _data_shm_id,
-            uint32 _data_shm_offset) {
+            uint32_t _data_shm_id,
+            uint32_t _data_shm_offset) {
     SetHeader();
     target = _target;
     offset = _offset;
@@ -614,19 +617,19 @@ struct BufferSubData {
             GLenum _target,
             GLintptr _offset,
             GLsizeiptr _size,
-            uint32 _data_shm_id,
-            uint32 _data_shm_offset) {
+            uint32_t _data_shm_id,
+            uint32_t _data_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_target, _offset, _size, _data_shm_id, _data_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  int32 offset;
-  int32 size;
-  uint32 data_shm_id;
-  uint32 data_shm_offset;
+  uint32_t target;
+  int32_t offset;
+  int32_t size;
+  uint32_t data_shm_id;
+  uint32_t data_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(BufferSubData) == 24, Sizeof_BufferSubData_is_not_24);
@@ -651,13 +654,15 @@ struct CheckFramebufferStatus {
 
   typedef GLenum Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLenum _target, uint32 _result_shm_id, uint32 _result_shm_offset) {
+  void Init(GLenum _target,
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     SetHeader();
     target = _target;
     result_shm_id = _result_shm_id;
@@ -666,17 +671,17 @@ struct CheckFramebufferStatus {
 
   void* Set(void* cmd,
             GLenum _target,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_target, _result_shm_id, _result_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 result_shm_id;
-  uint32 result_shm_offset;
+  uint32_t target;
+  uint32_t result_shm_id;
+  uint32_t result_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(CheckFramebufferStatus) == 16,
@@ -696,8 +701,8 @@ struct Clear {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(1);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -713,7 +718,7 @@ struct Clear {
   }
 
   gpu::CommandHeader header;
-  uint32 mask;
+  uint32_t mask;
 };
 
 COMPILE_ASSERT(sizeof(Clear) == 8, Sizeof_Clear_is_not_8);
@@ -726,8 +731,8 @@ struct ClearColor {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -773,8 +778,8 @@ struct ClearDepthf {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -805,8 +810,8 @@ struct ClearStencil {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -822,7 +827,7 @@ struct ClearStencil {
   }
 
   gpu::CommandHeader header;
-  int32 s;
+  int32_t s;
 };
 
 COMPILE_ASSERT(sizeof(ClearStencil) == 8, Sizeof_ClearStencil_is_not_8);
@@ -836,8 +841,8 @@ struct ColorMask {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -863,10 +868,10 @@ struct ColorMask {
   }
 
   gpu::CommandHeader header;
-  uint32 red;
-  uint32 green;
-  uint32 blue;
-  uint32 alpha;
+  uint32_t red;
+  uint32_t green;
+  uint32_t blue;
+  uint32_t alpha;
 };
 
 COMPILE_ASSERT(sizeof(ColorMask) == 20, Sizeof_ColorMask_is_not_20);
@@ -884,8 +889,8 @@ struct CompileShader {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -901,7 +906,7 @@ struct CompileShader {
   }
 
   gpu::CommandHeader header;
-  uint32 shader;
+  uint32_t shader;
 };
 
 COMPILE_ASSERT(sizeof(CompileShader) == 8, Sizeof_CompileShader_is_not_8);
@@ -916,8 +921,8 @@ struct CompressedTexImage2D {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -929,8 +934,8 @@ struct CompressedTexImage2D {
             GLsizei _height,
             GLint _border,
             GLsizei _imageSize,
-            uint32 _data_shm_id,
-            uint32 _data_shm_offset) {
+            uint32_t _data_shm_id,
+            uint32_t _data_shm_offset) {
     SetHeader();
     target = _target;
     level = _level;
@@ -951,8 +956,8 @@ struct CompressedTexImage2D {
             GLsizei _height,
             GLint _border,
             GLsizei _imageSize,
-            uint32 _data_shm_id,
-            uint32 _data_shm_offset) {
+            uint32_t _data_shm_id,
+            uint32_t _data_shm_offset) {
     static_cast<ValueType*>(cmd)->Init(_target,
                                        _level,
                                        _internalformat,
@@ -966,15 +971,15 @@ struct CompressedTexImage2D {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  int32 level;
-  uint32 internalformat;
-  int32 width;
-  int32 height;
-  int32 border;
-  int32 imageSize;
-  uint32 data_shm_id;
-  uint32 data_shm_offset;
+  uint32_t target;
+  int32_t level;
+  uint32_t internalformat;
+  int32_t width;
+  int32_t height;
+  int32_t border;
+  int32_t imageSize;
+  uint32_t data_shm_id;
+  uint32_t data_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(CompressedTexImage2D) == 40,
@@ -1006,8 +1011,8 @@ struct CompressedTexImage2DBucket {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -1043,13 +1048,13 @@ struct CompressedTexImage2DBucket {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  int32 level;
-  uint32 internalformat;
-  int32 width;
-  int32 height;
-  int32 border;
-  uint32 bucket_id;
+  uint32_t target;
+  int32_t level;
+  uint32_t internalformat;
+  int32_t width;
+  int32_t height;
+  int32_t border;
+  uint32_t bucket_id;
 };
 
 COMPILE_ASSERT(sizeof(CompressedTexImage2DBucket) == 32,
@@ -1077,8 +1082,8 @@ struct CompressedTexSubImage2D {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -1091,8 +1096,8 @@ struct CompressedTexSubImage2D {
             GLsizei _height,
             GLenum _format,
             GLsizei _imageSize,
-            uint32 _data_shm_id,
-            uint32 _data_shm_offset) {
+            uint32_t _data_shm_id,
+            uint32_t _data_shm_offset) {
     SetHeader();
     target = _target;
     level = _level;
@@ -1115,8 +1120,8 @@ struct CompressedTexSubImage2D {
             GLsizei _height,
             GLenum _format,
             GLsizei _imageSize,
-            uint32 _data_shm_id,
-            uint32 _data_shm_offset) {
+            uint32_t _data_shm_id,
+            uint32_t _data_shm_offset) {
     static_cast<ValueType*>(cmd)->Init(_target,
                                        _level,
                                        _xoffset,
@@ -1131,16 +1136,16 @@ struct CompressedTexSubImage2D {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  int32 level;
-  int32 xoffset;
-  int32 yoffset;
-  int32 width;
-  int32 height;
-  uint32 format;
-  int32 imageSize;
-  uint32 data_shm_id;
-  uint32 data_shm_offset;
+  uint32_t target;
+  int32_t level;
+  int32_t xoffset;
+  int32_t yoffset;
+  int32_t width;
+  int32_t height;
+  uint32_t format;
+  int32_t imageSize;
+  uint32_t data_shm_id;
+  uint32_t data_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(CompressedTexSubImage2D) == 44,
@@ -1174,8 +1179,8 @@ struct CompressedTexSubImage2DBucket {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -1220,14 +1225,14 @@ struct CompressedTexSubImage2DBucket {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  int32 level;
-  int32 xoffset;
-  int32 yoffset;
-  int32 width;
-  int32 height;
-  uint32 format;
-  uint32 bucket_id;
+  uint32_t target;
+  int32_t level;
+  int32_t xoffset;
+  int32_t yoffset;
+  int32_t width;
+  int32_t height;
+  uint32_t format;
+  uint32_t bucket_id;
 };
 
 COMPILE_ASSERT(sizeof(CompressedTexSubImage2DBucket) == 36,
@@ -1257,8 +1262,8 @@ struct CopyTexImage2D {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -1297,14 +1302,14 @@ struct CopyTexImage2D {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  int32 level;
-  uint32 internalformat;
-  int32 x;
-  int32 y;
-  int32 width;
-  int32 height;
-  int32 border;
+  uint32_t target;
+  int32_t level;
+  uint32_t internalformat;
+  int32_t x;
+  int32_t y;
+  int32_t width;
+  int32_t height;
+  int32_t border;
 };
 
 COMPILE_ASSERT(sizeof(CopyTexImage2D) == 36, Sizeof_CopyTexImage2D_is_not_36);
@@ -1333,8 +1338,8 @@ struct CopyTexSubImage2D {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -1373,14 +1378,14 @@ struct CopyTexSubImage2D {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  int32 level;
-  int32 xoffset;
-  int32 yoffset;
-  int32 x;
-  int32 y;
-  int32 width;
-  int32 height;
+  uint32_t target;
+  int32_t level;
+  int32_t xoffset;
+  int32_t yoffset;
+  int32_t x;
+  int32_t y;
+  int32_t width;
+  int32_t height;
 };
 
 COMPILE_ASSERT(sizeof(CopyTexSubImage2D) == 36,
@@ -1410,24 +1415,24 @@ struct CreateProgram {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(uint32 _client_id) {
+  void Init(uint32_t _client_id) {
     SetHeader();
     client_id = _client_id;
   }
 
-  void* Set(void* cmd, uint32 _client_id) {
+  void* Set(void* cmd, uint32_t _client_id) {
     static_cast<ValueType*>(cmd)->Init(_client_id);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 client_id;
+  uint32_t client_id;
 };
 
 COMPILE_ASSERT(sizeof(CreateProgram) == 8, Sizeof_CreateProgram_is_not_8);
@@ -1442,26 +1447,26 @@ struct CreateShader {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLenum _type, uint32 _client_id) {
+  void Init(GLenum _type, uint32_t _client_id) {
     SetHeader();
     type = _type;
     client_id = _client_id;
   }
 
-  void* Set(void* cmd, GLenum _type, uint32 _client_id) {
+  void* Set(void* cmd, GLenum _type, uint32_t _client_id) {
     static_cast<ValueType*>(cmd)->Init(_type, _client_id);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 type;
-  uint32 client_id;
+  uint32_t type;
+  uint32_t client_id;
 };
 
 COMPILE_ASSERT(sizeof(CreateShader) == 12, Sizeof_CreateShader_is_not_12);
@@ -1478,8 +1483,8 @@ struct CullFace {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -1495,7 +1500,7 @@ struct CullFace {
   }
 
   gpu::CommandHeader header;
-  uint32 mode;
+  uint32_t mode;
 };
 
 COMPILE_ASSERT(sizeof(CullFace) == 8, Sizeof_CullFace_is_not_8);
@@ -1508,13 +1513,15 @@ struct DeleteBuffers {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLsizei _n, uint32 _buffers_shm_id, uint32 _buffers_shm_offset) {
+  void Init(GLsizei _n,
+            uint32_t _buffers_shm_id,
+            uint32_t _buffers_shm_offset) {
     SetHeader();
     n = _n;
     buffers_shm_id = _buffers_shm_id;
@@ -1523,17 +1530,17 @@ struct DeleteBuffers {
 
   void* Set(void* cmd,
             GLsizei _n,
-            uint32 _buffers_shm_id,
-            uint32 _buffers_shm_offset) {
+            uint32_t _buffers_shm_id,
+            uint32_t _buffers_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_n, _buffers_shm_id, _buffers_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 n;
-  uint32 buffers_shm_id;
-  uint32 buffers_shm_offset;
+  int32_t n;
+  uint32_t buffers_shm_id;
+  uint32_t buffers_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(DeleteBuffers) == 16, Sizeof_DeleteBuffers_is_not_16);
@@ -1551,13 +1558,13 @@ struct DeleteBuffersImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(GLuint) * n);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(GLuint) * n);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(n));  // NOLINT
+  static uint32_t ComputeSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(n));  // NOLINT
   }
 
   void SetHeader(GLsizei n) {
@@ -1572,12 +1579,12 @@ struct DeleteBuffersImmediate {
 
   void* Set(void* cmd, GLsizei _n, const GLuint* _buffers) {
     static_cast<ValueType*>(cmd)->Init(_n, _buffers);
-    const uint32 size = ComputeSize(_n);
+    const uint32_t size = ComputeSize(_n);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 n;
+  int32_t n;
 };
 
 COMPILE_ASSERT(sizeof(DeleteBuffersImmediate) == 8,
@@ -1593,15 +1600,15 @@ struct DeleteFramebuffers {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLsizei _n,
-            uint32 _framebuffers_shm_id,
-            uint32 _framebuffers_shm_offset) {
+            uint32_t _framebuffers_shm_id,
+            uint32_t _framebuffers_shm_offset) {
     SetHeader();
     n = _n;
     framebuffers_shm_id = _framebuffers_shm_id;
@@ -1610,17 +1617,17 @@ struct DeleteFramebuffers {
 
   void* Set(void* cmd,
             GLsizei _n,
-            uint32 _framebuffers_shm_id,
-            uint32 _framebuffers_shm_offset) {
+            uint32_t _framebuffers_shm_id,
+            uint32_t _framebuffers_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_n, _framebuffers_shm_id, _framebuffers_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 n;
-  uint32 framebuffers_shm_id;
-  uint32 framebuffers_shm_offset;
+  int32_t n;
+  uint32_t framebuffers_shm_id;
+  uint32_t framebuffers_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(DeleteFramebuffers) == 16,
@@ -1640,13 +1647,13 @@ struct DeleteFramebuffersImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(GLuint) * n);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(GLuint) * n);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(n));  // NOLINT
+  static uint32_t ComputeSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(n));  // NOLINT
   }
 
   void SetHeader(GLsizei n) {
@@ -1661,12 +1668,12 @@ struct DeleteFramebuffersImmediate {
 
   void* Set(void* cmd, GLsizei _n, const GLuint* _framebuffers) {
     static_cast<ValueType*>(cmd)->Init(_n, _framebuffers);
-    const uint32 size = ComputeSize(_n);
+    const uint32_t size = ComputeSize(_n);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 n;
+  int32_t n;
 };
 
 COMPILE_ASSERT(sizeof(DeleteFramebuffersImmediate) == 8,
@@ -1682,8 +1689,8 @@ struct DeleteProgram {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -1699,7 +1706,7 @@ struct DeleteProgram {
   }
 
   gpu::CommandHeader header;
-  uint32 program;
+  uint32_t program;
 };
 
 COMPILE_ASSERT(sizeof(DeleteProgram) == 8, Sizeof_DeleteProgram_is_not_8);
@@ -1714,15 +1721,15 @@ struct DeleteRenderbuffers {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLsizei _n,
-            uint32 _renderbuffers_shm_id,
-            uint32 _renderbuffers_shm_offset) {
+            uint32_t _renderbuffers_shm_id,
+            uint32_t _renderbuffers_shm_offset) {
     SetHeader();
     n = _n;
     renderbuffers_shm_id = _renderbuffers_shm_id;
@@ -1731,17 +1738,17 @@ struct DeleteRenderbuffers {
 
   void* Set(void* cmd,
             GLsizei _n,
-            uint32 _renderbuffers_shm_id,
-            uint32 _renderbuffers_shm_offset) {
+            uint32_t _renderbuffers_shm_id,
+            uint32_t _renderbuffers_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_n, _renderbuffers_shm_id, _renderbuffers_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 n;
-  uint32 renderbuffers_shm_id;
-  uint32 renderbuffers_shm_offset;
+  int32_t n;
+  uint32_t renderbuffers_shm_id;
+  uint32_t renderbuffers_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(DeleteRenderbuffers) == 16,
@@ -1761,13 +1768,13 @@ struct DeleteRenderbuffersImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(GLuint) * n);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(GLuint) * n);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(n));  // NOLINT
+  static uint32_t ComputeSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(n));  // NOLINT
   }
 
   void SetHeader(GLsizei n) {
@@ -1782,12 +1789,12 @@ struct DeleteRenderbuffersImmediate {
 
   void* Set(void* cmd, GLsizei _n, const GLuint* _renderbuffers) {
     static_cast<ValueType*>(cmd)->Init(_n, _renderbuffers);
-    const uint32 size = ComputeSize(_n);
+    const uint32_t size = ComputeSize(_n);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 n;
+  int32_t n;
 };
 
 COMPILE_ASSERT(sizeof(DeleteRenderbuffersImmediate) == 8,
@@ -1803,8 +1810,8 @@ struct DeleteShader {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -1820,7 +1827,7 @@ struct DeleteShader {
   }
 
   gpu::CommandHeader header;
-  uint32 shader;
+  uint32_t shader;
 };
 
 COMPILE_ASSERT(sizeof(DeleteShader) == 8, Sizeof_DeleteShader_is_not_8);
@@ -1835,13 +1842,15 @@ struct DeleteTextures {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLsizei _n, uint32 _textures_shm_id, uint32 _textures_shm_offset) {
+  void Init(GLsizei _n,
+            uint32_t _textures_shm_id,
+            uint32_t _textures_shm_offset) {
     SetHeader();
     n = _n;
     textures_shm_id = _textures_shm_id;
@@ -1850,17 +1859,17 @@ struct DeleteTextures {
 
   void* Set(void* cmd,
             GLsizei _n,
-            uint32 _textures_shm_id,
-            uint32 _textures_shm_offset) {
+            uint32_t _textures_shm_id,
+            uint32_t _textures_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_n, _textures_shm_id, _textures_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 n;
-  uint32 textures_shm_id;
-  uint32 textures_shm_offset;
+  int32_t n;
+  uint32_t textures_shm_id;
+  uint32_t textures_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(DeleteTextures) == 16, Sizeof_DeleteTextures_is_not_16);
@@ -1879,13 +1888,13 @@ struct DeleteTexturesImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(GLuint) * n);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(GLuint) * n);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(n));  // NOLINT
+  static uint32_t ComputeSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(n));  // NOLINT
   }
 
   void SetHeader(GLsizei n) {
@@ -1900,12 +1909,12 @@ struct DeleteTexturesImmediate {
 
   void* Set(void* cmd, GLsizei _n, const GLuint* _textures) {
     static_cast<ValueType*>(cmd)->Init(_n, _textures);
-    const uint32 size = ComputeSize(_n);
+    const uint32_t size = ComputeSize(_n);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 n;
+  int32_t n;
 };
 
 COMPILE_ASSERT(sizeof(DeleteTexturesImmediate) == 8,
@@ -1921,8 +1930,8 @@ struct DepthFunc {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -1938,7 +1947,7 @@ struct DepthFunc {
   }
 
   gpu::CommandHeader header;
-  uint32 func;
+  uint32_t func;
 };
 
 COMPILE_ASSERT(sizeof(DepthFunc) == 8, Sizeof_DepthFunc_is_not_8);
@@ -1952,8 +1961,8 @@ struct DepthMask {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -1969,7 +1978,7 @@ struct DepthMask {
   }
 
   gpu::CommandHeader header;
-  uint32 flag;
+  uint32_t flag;
 };
 
 COMPILE_ASSERT(sizeof(DepthMask) == 8, Sizeof_DepthMask_is_not_8);
@@ -1983,8 +1992,8 @@ struct DepthRangef {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -2019,8 +2028,8 @@ struct DetachShader {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -2037,8 +2046,8 @@ struct DetachShader {
   }
 
   gpu::CommandHeader header;
-  uint32 program;
-  uint32 shader;
+  uint32_t program;
+  uint32_t shader;
 };
 
 COMPILE_ASSERT(sizeof(DetachShader) == 12, Sizeof_DetachShader_is_not_12);
@@ -2055,8 +2064,8 @@ struct Disable {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -2072,7 +2081,7 @@ struct Disable {
   }
 
   gpu::CommandHeader header;
-  uint32 cap;
+  uint32_t cap;
 };
 
 COMPILE_ASSERT(sizeof(Disable) == 8, Sizeof_Disable_is_not_8);
@@ -2085,8 +2094,8 @@ struct DisableVertexAttribArray {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -2102,7 +2111,7 @@ struct DisableVertexAttribArray {
   }
 
   gpu::CommandHeader header;
-  uint32 index;
+  uint32_t index;
 };
 
 COMPILE_ASSERT(sizeof(DisableVertexAttribArray) == 8,
@@ -2118,8 +2127,8 @@ struct DrawArrays {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(2);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -2137,9 +2146,9 @@ struct DrawArrays {
   }
 
   gpu::CommandHeader header;
-  uint32 mode;
-  int32 first;
-  int32 count;
+  uint32_t mode;
+  int32_t first;
+  int32_t count;
 };
 
 COMPILE_ASSERT(sizeof(DrawArrays) == 16, Sizeof_DrawArrays_is_not_16);
@@ -2157,8 +2166,8 @@ struct DrawElements {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(2);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -2181,10 +2190,10 @@ struct DrawElements {
   }
 
   gpu::CommandHeader header;
-  uint32 mode;
-  int32 count;
-  uint32 type;
-  uint32 index_offset;
+  uint32_t mode;
+  int32_t count;
+  uint32_t type;
+  uint32_t index_offset;
 };
 
 COMPILE_ASSERT(sizeof(DrawElements) == 20, Sizeof_DrawElements_is_not_20);
@@ -2205,8 +2214,8 @@ struct Enable {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -2222,7 +2231,7 @@ struct Enable {
   }
 
   gpu::CommandHeader header;
-  uint32 cap;
+  uint32_t cap;
 };
 
 COMPILE_ASSERT(sizeof(Enable) == 8, Sizeof_Enable_is_not_8);
@@ -2235,8 +2244,8 @@ struct EnableVertexAttribArray {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -2252,7 +2261,7 @@ struct EnableVertexAttribArray {
   }
 
   gpu::CommandHeader header;
-  uint32 index;
+  uint32_t index;
 };
 
 COMPILE_ASSERT(sizeof(EnableVertexAttribArray) == 8,
@@ -2268,8 +2277,8 @@ struct Finish {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -2293,8 +2302,8 @@ struct Flush {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -2318,8 +2327,8 @@ struct FramebufferRenderbuffer {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -2346,10 +2355,10 @@ struct FramebufferRenderbuffer {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 attachment;
-  uint32 renderbuffertarget;
-  uint32 renderbuffer;
+  uint32_t target;
+  uint32_t attachment;
+  uint32_t renderbuffertarget;
+  uint32_t renderbuffer;
 };
 
 COMPILE_ASSERT(sizeof(FramebufferRenderbuffer) == 20,
@@ -2371,8 +2380,8 @@ struct FramebufferTexture2D {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(1);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -2402,11 +2411,11 @@ struct FramebufferTexture2D {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 attachment;
-  uint32 textarget;
-  uint32 texture;
-  int32 level;
+  uint32_t target;
+  uint32_t attachment;
+  uint32_t textarget;
+  uint32_t texture;
+  int32_t level;
 };
 
 COMPILE_ASSERT(sizeof(FramebufferTexture2D) == 24,
@@ -2430,8 +2439,8 @@ struct FrontFace {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -2447,7 +2456,7 @@ struct FrontFace {
   }
 
   gpu::CommandHeader header;
-  uint32 mode;
+  uint32_t mode;
 };
 
 COMPILE_ASSERT(sizeof(FrontFace) == 8, Sizeof_FrontFace_is_not_8);
@@ -2461,13 +2470,15 @@ struct GenBuffers {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLsizei _n, uint32 _buffers_shm_id, uint32 _buffers_shm_offset) {
+  void Init(GLsizei _n,
+            uint32_t _buffers_shm_id,
+            uint32_t _buffers_shm_offset) {
     SetHeader();
     n = _n;
     buffers_shm_id = _buffers_shm_id;
@@ -2476,17 +2487,17 @@ struct GenBuffers {
 
   void* Set(void* cmd,
             GLsizei _n,
-            uint32 _buffers_shm_id,
-            uint32 _buffers_shm_offset) {
+            uint32_t _buffers_shm_id,
+            uint32_t _buffers_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_n, _buffers_shm_id, _buffers_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 n;
-  uint32 buffers_shm_id;
-  uint32 buffers_shm_offset;
+  int32_t n;
+  uint32_t buffers_shm_id;
+  uint32_t buffers_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GenBuffers) == 16, Sizeof_GenBuffers_is_not_16);
@@ -2504,13 +2515,13 @@ struct GenBuffersImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(GLuint) * n);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(GLuint) * n);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(n));  // NOLINT
+  static uint32_t ComputeSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(n));  // NOLINT
   }
 
   void SetHeader(GLsizei n) {
@@ -2525,12 +2536,12 @@ struct GenBuffersImmediate {
 
   void* Set(void* cmd, GLsizei _n, GLuint* _buffers) {
     static_cast<ValueType*>(cmd)->Init(_n, _buffers);
-    const uint32 size = ComputeSize(_n);
+    const uint32_t size = ComputeSize(_n);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 n;
+  int32_t n;
 };
 
 COMPILE_ASSERT(sizeof(GenBuffersImmediate) == 8,
@@ -2546,8 +2557,8 @@ struct GenerateMipmap {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -2563,7 +2574,7 @@ struct GenerateMipmap {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
+  uint32_t target;
 };
 
 COMPILE_ASSERT(sizeof(GenerateMipmap) == 8, Sizeof_GenerateMipmap_is_not_8);
@@ -2578,15 +2589,15 @@ struct GenFramebuffers {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLsizei _n,
-            uint32 _framebuffers_shm_id,
-            uint32 _framebuffers_shm_offset) {
+            uint32_t _framebuffers_shm_id,
+            uint32_t _framebuffers_shm_offset) {
     SetHeader();
     n = _n;
     framebuffers_shm_id = _framebuffers_shm_id;
@@ -2595,17 +2606,17 @@ struct GenFramebuffers {
 
   void* Set(void* cmd,
             GLsizei _n,
-            uint32 _framebuffers_shm_id,
-            uint32 _framebuffers_shm_offset) {
+            uint32_t _framebuffers_shm_id,
+            uint32_t _framebuffers_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_n, _framebuffers_shm_id, _framebuffers_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 n;
-  uint32 framebuffers_shm_id;
-  uint32 framebuffers_shm_offset;
+  int32_t n;
+  uint32_t framebuffers_shm_id;
+  uint32_t framebuffers_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GenFramebuffers) == 16, Sizeof_GenFramebuffers_is_not_16);
@@ -2624,13 +2635,13 @@ struct GenFramebuffersImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(GLuint) * n);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(GLuint) * n);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(n));  // NOLINT
+  static uint32_t ComputeSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(n));  // NOLINT
   }
 
   void SetHeader(GLsizei n) {
@@ -2645,12 +2656,12 @@ struct GenFramebuffersImmediate {
 
   void* Set(void* cmd, GLsizei _n, GLuint* _framebuffers) {
     static_cast<ValueType*>(cmd)->Init(_n, _framebuffers);
-    const uint32 size = ComputeSize(_n);
+    const uint32_t size = ComputeSize(_n);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 n;
+  int32_t n;
 };
 
 COMPILE_ASSERT(sizeof(GenFramebuffersImmediate) == 8,
@@ -2666,15 +2677,15 @@ struct GenRenderbuffers {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLsizei _n,
-            uint32 _renderbuffers_shm_id,
-            uint32 _renderbuffers_shm_offset) {
+            uint32_t _renderbuffers_shm_id,
+            uint32_t _renderbuffers_shm_offset) {
     SetHeader();
     n = _n;
     renderbuffers_shm_id = _renderbuffers_shm_id;
@@ -2683,17 +2694,17 @@ struct GenRenderbuffers {
 
   void* Set(void* cmd,
             GLsizei _n,
-            uint32 _renderbuffers_shm_id,
-            uint32 _renderbuffers_shm_offset) {
+            uint32_t _renderbuffers_shm_id,
+            uint32_t _renderbuffers_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_n, _renderbuffers_shm_id, _renderbuffers_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 n;
-  uint32 renderbuffers_shm_id;
-  uint32 renderbuffers_shm_offset;
+  int32_t n;
+  uint32_t renderbuffers_shm_id;
+  uint32_t renderbuffers_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GenRenderbuffers) == 16,
@@ -2713,13 +2724,13 @@ struct GenRenderbuffersImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(GLuint) * n);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(GLuint) * n);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(n));  // NOLINT
+  static uint32_t ComputeSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(n));  // NOLINT
   }
 
   void SetHeader(GLsizei n) {
@@ -2734,12 +2745,12 @@ struct GenRenderbuffersImmediate {
 
   void* Set(void* cmd, GLsizei _n, GLuint* _renderbuffers) {
     static_cast<ValueType*>(cmd)->Init(_n, _renderbuffers);
-    const uint32 size = ComputeSize(_n);
+    const uint32_t size = ComputeSize(_n);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 n;
+  int32_t n;
 };
 
 COMPILE_ASSERT(sizeof(GenRenderbuffersImmediate) == 8,
@@ -2755,13 +2766,15 @@ struct GenTextures {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLsizei _n, uint32 _textures_shm_id, uint32 _textures_shm_offset) {
+  void Init(GLsizei _n,
+            uint32_t _textures_shm_id,
+            uint32_t _textures_shm_offset) {
     SetHeader();
     n = _n;
     textures_shm_id = _textures_shm_id;
@@ -2770,17 +2783,17 @@ struct GenTextures {
 
   void* Set(void* cmd,
             GLsizei _n,
-            uint32 _textures_shm_id,
-            uint32 _textures_shm_offset) {
+            uint32_t _textures_shm_id,
+            uint32_t _textures_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_n, _textures_shm_id, _textures_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 n;
-  uint32 textures_shm_id;
-  uint32 textures_shm_offset;
+  int32_t n;
+  uint32_t textures_shm_id;
+  uint32_t textures_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GenTextures) == 16, Sizeof_GenTextures_is_not_16);
@@ -2798,13 +2811,13 @@ struct GenTexturesImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(GLuint) * n);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(GLuint) * n);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(n));  // NOLINT
+  static uint32_t ComputeSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(n));  // NOLINT
   }
 
   void SetHeader(GLsizei n) {
@@ -2819,12 +2832,12 @@ struct GenTexturesImmediate {
 
   void* Set(void* cmd, GLsizei _n, GLuint* _textures) {
     static_cast<ValueType*>(cmd)->Init(_n, _textures);
-    const uint32 size = ComputeSize(_n);
+    const uint32_t size = ComputeSize(_n);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 n;
+  int32_t n;
 };
 
 COMPILE_ASSERT(sizeof(GenTexturesImmediate) == 8,
@@ -2841,22 +2854,22 @@ struct GetActiveAttrib {
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
   struct Result {
-    int32 success;
-    int32 size;
-    uint32 type;
+    int32_t success;
+    int32_t size;
+    uint32_t type;
   };
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLuint _program,
             GLuint _index,
-            uint32 _name_bucket_id,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _name_bucket_id,
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     SetHeader();
     program = _program;
     index = _index;
@@ -2868,20 +2881,20 @@ struct GetActiveAttrib {
   void* Set(void* cmd,
             GLuint _program,
             GLuint _index,
-            uint32 _name_bucket_id,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _name_bucket_id,
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     static_cast<ValueType*>(cmd)->Init(
         _program, _index, _name_bucket_id, _result_shm_id, _result_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 program;
-  uint32 index;
-  uint32 name_bucket_id;
-  uint32 result_shm_id;
-  uint32 result_shm_offset;
+  uint32_t program;
+  uint32_t index;
+  uint32_t name_bucket_id;
+  uint32_t result_shm_id;
+  uint32_t result_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetActiveAttrib) == 24, Sizeof_GetActiveAttrib_is_not_24);
@@ -2911,22 +2924,22 @@ struct GetActiveUniform {
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
   struct Result {
-    int32 success;
-    int32 size;
-    uint32 type;
+    int32_t success;
+    int32_t size;
+    uint32_t type;
   };
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLuint _program,
             GLuint _index,
-            uint32 _name_bucket_id,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _name_bucket_id,
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     SetHeader();
     program = _program;
     index = _index;
@@ -2938,20 +2951,20 @@ struct GetActiveUniform {
   void* Set(void* cmd,
             GLuint _program,
             GLuint _index,
-            uint32 _name_bucket_id,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _name_bucket_id,
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     static_cast<ValueType*>(cmd)->Init(
         _program, _index, _name_bucket_id, _result_shm_id, _result_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 program;
-  uint32 index;
-  uint32 name_bucket_id;
-  uint32 result_shm_id;
-  uint32 result_shm_offset;
+  uint32_t program;
+  uint32_t index;
+  uint32_t name_bucket_id;
+  uint32_t result_shm_id;
+  uint32_t result_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetActiveUniform) == 24,
@@ -2983,16 +2996,16 @@ struct GetAttachedShaders {
 
   typedef SizedResult<GLuint> Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLuint _program,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset,
-            uint32 _result_size) {
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset,
+            uint32_t _result_size) {
     SetHeader();
     program = _program;
     result_shm_id = _result_shm_id;
@@ -3002,19 +3015,19 @@ struct GetAttachedShaders {
 
   void* Set(void* cmd,
             GLuint _program,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset,
-            uint32 _result_size) {
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset,
+            uint32_t _result_size) {
     static_cast<ValueType*>(cmd)
         ->Init(_program, _result_shm_id, _result_shm_offset, _result_size);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 program;
-  uint32 result_shm_id;
-  uint32 result_shm_offset;
-  uint32 result_size;
+  uint32_t program;
+  uint32_t result_shm_id;
+  uint32_t result_shm_offset;
+  uint32_t result_size;
 };
 
 COMPILE_ASSERT(sizeof(GetAttachedShaders) == 20,
@@ -3038,13 +3051,15 @@ struct GetBooleanv {
 
   typedef SizedResult<GLboolean> Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLenum _pname, uint32 _params_shm_id, uint32 _params_shm_offset) {
+  void Init(GLenum _pname,
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     SetHeader();
     pname = _pname;
     params_shm_id = _params_shm_id;
@@ -3053,17 +3068,17 @@ struct GetBooleanv {
 
   void* Set(void* cmd,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_pname, _params_shm_id, _params_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 pname;
-  uint32 params_shm_id;
-  uint32 params_shm_offset;
+  uint32_t pname;
+  uint32_t params_shm_id;
+  uint32_t params_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetBooleanv) == 16, Sizeof_GetBooleanv_is_not_16);
@@ -3084,16 +3099,16 @@ struct GetBufferParameteriv {
 
   typedef SizedResult<GLint> Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLenum _target,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     SetHeader();
     target = _target;
     pname = _pname;
@@ -3104,18 +3119,18 @@ struct GetBufferParameteriv {
   void* Set(void* cmd,
             GLenum _target,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_target, _pname, _params_shm_id, _params_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 pname;
-  uint32 params_shm_id;
-  uint32 params_shm_offset;
+  uint32_t target;
+  uint32_t pname;
+  uint32_t params_shm_id;
+  uint32_t params_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetBufferParameteriv) == 20,
@@ -3139,26 +3154,26 @@ struct GetError {
 
   typedef GLenum Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(uint32 _result_shm_id, uint32 _result_shm_offset) {
+  void Init(uint32_t _result_shm_id, uint32_t _result_shm_offset) {
     SetHeader();
     result_shm_id = _result_shm_id;
     result_shm_offset = _result_shm_offset;
   }
 
-  void* Set(void* cmd, uint32 _result_shm_id, uint32 _result_shm_offset) {
+  void* Set(void* cmd, uint32_t _result_shm_id, uint32_t _result_shm_offset) {
     static_cast<ValueType*>(cmd)->Init(_result_shm_id, _result_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 result_shm_id;
-  uint32 result_shm_offset;
+  uint32_t result_shm_id;
+  uint32_t result_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetError) == 12, Sizeof_GetError_is_not_12);
@@ -3176,13 +3191,15 @@ struct GetFloatv {
 
   typedef SizedResult<GLfloat> Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLenum _pname, uint32 _params_shm_id, uint32 _params_shm_offset) {
+  void Init(GLenum _pname,
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     SetHeader();
     pname = _pname;
     params_shm_id = _params_shm_id;
@@ -3191,17 +3208,17 @@ struct GetFloatv {
 
   void* Set(void* cmd,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_pname, _params_shm_id, _params_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 pname;
-  uint32 params_shm_id;
-  uint32 params_shm_offset;
+  uint32_t pname;
+  uint32_t params_shm_id;
+  uint32_t params_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetFloatv) == 16, Sizeof_GetFloatv_is_not_16);
@@ -3221,8 +3238,8 @@ struct GetFramebufferAttachmentParameteriv {
 
   typedef SizedResult<GLint> Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -3230,8 +3247,8 @@ struct GetFramebufferAttachmentParameteriv {
   void Init(GLenum _target,
             GLenum _attachment,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     SetHeader();
     target = _target;
     attachment = _attachment;
@@ -3244,19 +3261,19 @@ struct GetFramebufferAttachmentParameteriv {
             GLenum _target,
             GLenum _attachment,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     static_cast<ValueType*>(cmd)->Init(
         _target, _attachment, _pname, _params_shm_id, _params_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 attachment;
-  uint32 pname;
-  uint32 params_shm_id;
-  uint32 params_shm_offset;
+  uint32_t target;
+  uint32_t attachment;
+  uint32_t pname;
+  uint32_t params_shm_id;
+  uint32_t params_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetFramebufferAttachmentParameteriv) == 24,
@@ -3284,13 +3301,15 @@ struct GetIntegerv {
 
   typedef SizedResult<GLint> Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLenum _pname, uint32 _params_shm_id, uint32 _params_shm_offset) {
+  void Init(GLenum _pname,
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     SetHeader();
     pname = _pname;
     params_shm_id = _params_shm_id;
@@ -3299,17 +3318,17 @@ struct GetIntegerv {
 
   void* Set(void* cmd,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_pname, _params_shm_id, _params_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 pname;
-  uint32 params_shm_id;
-  uint32 params_shm_offset;
+  uint32_t pname;
+  uint32_t params_shm_id;
+  uint32_t params_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetIntegerv) == 16, Sizeof_GetIntegerv_is_not_16);
@@ -3330,16 +3349,16 @@ struct GetProgramiv {
 
   typedef SizedResult<GLint> Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLuint _program,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     SetHeader();
     program = _program;
     pname = _pname;
@@ -3350,18 +3369,18 @@ struct GetProgramiv {
   void* Set(void* cmd,
             GLuint _program,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_program, _pname, _params_shm_id, _params_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 program;
-  uint32 pname;
-  uint32 params_shm_id;
-  uint32 params_shm_offset;
+  uint32_t program;
+  uint32_t pname;
+  uint32_t params_shm_id;
+  uint32_t params_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetProgramiv) == 20, Sizeof_GetProgramiv_is_not_20);
@@ -3382,26 +3401,26 @@ struct GetProgramInfoLog {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLuint _program, uint32 _bucket_id) {
+  void Init(GLuint _program, uint32_t _bucket_id) {
     SetHeader();
     program = _program;
     bucket_id = _bucket_id;
   }
 
-  void* Set(void* cmd, GLuint _program, uint32 _bucket_id) {
+  void* Set(void* cmd, GLuint _program, uint32_t _bucket_id) {
     static_cast<ValueType*>(cmd)->Init(_program, _bucket_id);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 program;
-  uint32 bucket_id;
+  uint32_t program;
+  uint32_t bucket_id;
 };
 
 COMPILE_ASSERT(sizeof(GetProgramInfoLog) == 12,
@@ -3421,16 +3440,16 @@ struct GetRenderbufferParameteriv {
 
   typedef SizedResult<GLint> Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLenum _target,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     SetHeader();
     target = _target;
     pname = _pname;
@@ -3441,18 +3460,18 @@ struct GetRenderbufferParameteriv {
   void* Set(void* cmd,
             GLenum _target,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_target, _pname, _params_shm_id, _params_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 pname;
-  uint32 params_shm_id;
-  uint32 params_shm_offset;
+  uint32_t target;
+  uint32_t pname;
+  uint32_t params_shm_id;
+  uint32_t params_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetRenderbufferParameteriv) == 20,
@@ -3476,16 +3495,16 @@ struct GetShaderiv {
 
   typedef SizedResult<GLint> Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLuint _shader,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     SetHeader();
     shader = _shader;
     pname = _pname;
@@ -3496,18 +3515,18 @@ struct GetShaderiv {
   void* Set(void* cmd,
             GLuint _shader,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_shader, _pname, _params_shm_id, _params_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 shader;
-  uint32 pname;
-  uint32 params_shm_id;
-  uint32 params_shm_offset;
+  uint32_t shader;
+  uint32_t pname;
+  uint32_t params_shm_id;
+  uint32_t params_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetShaderiv) == 20, Sizeof_GetShaderiv_is_not_20);
@@ -3528,26 +3547,26 @@ struct GetShaderInfoLog {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLuint _shader, uint32 _bucket_id) {
+  void Init(GLuint _shader, uint32_t _bucket_id) {
     SetHeader();
     shader = _shader;
     bucket_id = _bucket_id;
   }
 
-  void* Set(void* cmd, GLuint _shader, uint32 _bucket_id) {
+  void* Set(void* cmd, GLuint _shader, uint32_t _bucket_id) {
     static_cast<ValueType*>(cmd)->Init(_shader, _bucket_id);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 shader;
-  uint32 bucket_id;
+  uint32_t shader;
+  uint32_t bucket_id;
 };
 
 COMPILE_ASSERT(sizeof(GetShaderInfoLog) == 12,
@@ -3566,22 +3585,22 @@ struct GetShaderPrecisionFormat {
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
   struct Result {
-    int32 success;
-    int32 min_range;
-    int32 max_range;
-    int32 precision;
+    int32_t success;
+    int32_t min_range;
+    int32_t max_range;
+    int32_t precision;
   };
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLenum _shadertype,
             GLenum _precisiontype,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     SetHeader();
     shadertype = _shadertype;
     precisiontype = _precisiontype;
@@ -3592,18 +3611,18 @@ struct GetShaderPrecisionFormat {
   void* Set(void* cmd,
             GLenum _shadertype,
             GLenum _precisiontype,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_shadertype, _precisiontype, _result_shm_id, _result_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 shadertype;
-  uint32 precisiontype;
-  uint32 result_shm_id;
-  uint32 result_shm_offset;
+  uint32_t shadertype;
+  uint32_t precisiontype;
+  uint32_t result_shm_id;
+  uint32_t result_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetShaderPrecisionFormat) == 20,
@@ -3633,26 +3652,26 @@ struct GetShaderSource {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLuint _shader, uint32 _bucket_id) {
+  void Init(GLuint _shader, uint32_t _bucket_id) {
     SetHeader();
     shader = _shader;
     bucket_id = _bucket_id;
   }
 
-  void* Set(void* cmd, GLuint _shader, uint32 _bucket_id) {
+  void* Set(void* cmd, GLuint _shader, uint32_t _bucket_id) {
     static_cast<ValueType*>(cmd)->Init(_shader, _bucket_id);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 shader;
-  uint32 bucket_id;
+  uint32_t shader;
+  uint32_t bucket_id;
 };
 
 COMPILE_ASSERT(sizeof(GetShaderSource) == 12, Sizeof_GetShaderSource_is_not_12);
@@ -3669,26 +3688,26 @@ struct GetString {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLenum _name, uint32 _bucket_id) {
+  void Init(GLenum _name, uint32_t _bucket_id) {
     SetHeader();
     name = _name;
     bucket_id = _bucket_id;
   }
 
-  void* Set(void* cmd, GLenum _name, uint32 _bucket_id) {
+  void* Set(void* cmd, GLenum _name, uint32_t _bucket_id) {
     static_cast<ValueType*>(cmd)->Init(_name, _bucket_id);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 name;
-  uint32 bucket_id;
+  uint32_t name;
+  uint32_t bucket_id;
 };
 
 COMPILE_ASSERT(sizeof(GetString) == 12, Sizeof_GetString_is_not_12);
@@ -3706,16 +3725,16 @@ struct GetTexParameterfv {
 
   typedef SizedResult<GLfloat> Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLenum _target,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     SetHeader();
     target = _target;
     pname = _pname;
@@ -3726,18 +3745,18 @@ struct GetTexParameterfv {
   void* Set(void* cmd,
             GLenum _target,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_target, _pname, _params_shm_id, _params_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 pname;
-  uint32 params_shm_id;
-  uint32 params_shm_offset;
+  uint32_t target;
+  uint32_t pname;
+  uint32_t params_shm_id;
+  uint32_t params_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetTexParameterfv) == 20,
@@ -3761,16 +3780,16 @@ struct GetTexParameteriv {
 
   typedef SizedResult<GLint> Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLenum _target,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     SetHeader();
     target = _target;
     pname = _pname;
@@ -3781,18 +3800,18 @@ struct GetTexParameteriv {
   void* Set(void* cmd,
             GLenum _target,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_target, _pname, _params_shm_id, _params_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 pname;
-  uint32 params_shm_id;
-  uint32 params_shm_offset;
+  uint32_t target;
+  uint32_t pname;
+  uint32_t params_shm_id;
+  uint32_t params_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetTexParameteriv) == 20,
@@ -3816,16 +3835,16 @@ struct GetUniformfv {
 
   typedef SizedResult<GLfloat> Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLuint _program,
             GLint _location,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     SetHeader();
     program = _program;
     location = _location;
@@ -3836,18 +3855,18 @@ struct GetUniformfv {
   void* Set(void* cmd,
             GLuint _program,
             GLint _location,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_program, _location, _params_shm_id, _params_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 program;
-  int32 location;
-  uint32 params_shm_id;
-  uint32 params_shm_offset;
+  uint32_t program;
+  int32_t location;
+  uint32_t params_shm_id;
+  uint32_t params_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetUniformfv) == 20, Sizeof_GetUniformfv_is_not_20);
@@ -3870,16 +3889,16 @@ struct GetUniformiv {
 
   typedef SizedResult<GLint> Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLuint _program,
             GLint _location,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     SetHeader();
     program = _program;
     location = _location;
@@ -3890,18 +3909,18 @@ struct GetUniformiv {
   void* Set(void* cmd,
             GLuint _program,
             GLint _location,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_program, _location, _params_shm_id, _params_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 program;
-  int32 location;
-  uint32 params_shm_id;
-  uint32 params_shm_offset;
+  uint32_t program;
+  int32_t location;
+  uint32_t params_shm_id;
+  uint32_t params_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetUniformiv) == 20, Sizeof_GetUniformiv_is_not_20);
@@ -3924,16 +3943,16 @@ struct GetVertexAttribfv {
 
   typedef SizedResult<GLfloat> Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLuint _index,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     SetHeader();
     index = _index;
     pname = _pname;
@@ -3944,18 +3963,18 @@ struct GetVertexAttribfv {
   void* Set(void* cmd,
             GLuint _index,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_index, _pname, _params_shm_id, _params_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 index;
-  uint32 pname;
-  uint32 params_shm_id;
-  uint32 params_shm_offset;
+  uint32_t index;
+  uint32_t pname;
+  uint32_t params_shm_id;
+  uint32_t params_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetVertexAttribfv) == 20,
@@ -3979,16 +3998,16 @@ struct GetVertexAttribiv {
 
   typedef SizedResult<GLint> Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLuint _index,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     SetHeader();
     index = _index;
     pname = _pname;
@@ -3999,18 +4018,18 @@ struct GetVertexAttribiv {
   void* Set(void* cmd,
             GLuint _index,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_index, _pname, _params_shm_id, _params_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 index;
-  uint32 pname;
-  uint32 params_shm_id;
-  uint32 params_shm_offset;
+  uint32_t index;
+  uint32_t pname;
+  uint32_t params_shm_id;
+  uint32_t params_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetVertexAttribiv) == 20,
@@ -4034,16 +4053,16 @@ struct GetVertexAttribPointerv {
 
   typedef SizedResult<GLuint> Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLuint _index,
             GLenum _pname,
-            uint32 _pointer_shm_id,
-            uint32 _pointer_shm_offset) {
+            uint32_t _pointer_shm_id,
+            uint32_t _pointer_shm_offset) {
     SetHeader();
     index = _index;
     pname = _pname;
@@ -4054,18 +4073,18 @@ struct GetVertexAttribPointerv {
   void* Set(void* cmd,
             GLuint _index,
             GLenum _pname,
-            uint32 _pointer_shm_id,
-            uint32 _pointer_shm_offset) {
+            uint32_t _pointer_shm_id,
+            uint32_t _pointer_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_index, _pname, _pointer_shm_id, _pointer_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 index;
-  uint32 pname;
-  uint32 pointer_shm_id;
-  uint32 pointer_shm_offset;
+  uint32_t index;
+  uint32_t pname;
+  uint32_t pointer_shm_id;
+  uint32_t pointer_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetVertexAttribPointerv) == 20,
@@ -4087,8 +4106,8 @@ struct Hint {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -4105,8 +4124,8 @@ struct Hint {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 mode;
+  uint32_t target;
+  uint32_t mode;
 };
 
 COMPILE_ASSERT(sizeof(Hint) == 12, Sizeof_Hint_is_not_12);
@@ -4120,15 +4139,17 @@ struct IsBuffer {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  typedef uint32 Result;
+  typedef uint32_t Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLuint _buffer, uint32 _result_shm_id, uint32 _result_shm_offset) {
+  void Init(GLuint _buffer,
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     SetHeader();
     buffer = _buffer;
     result_shm_id = _result_shm_id;
@@ -4137,17 +4158,17 @@ struct IsBuffer {
 
   void* Set(void* cmd,
             GLuint _buffer,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_buffer, _result_shm_id, _result_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 buffer;
-  uint32 result_shm_id;
-  uint32 result_shm_offset;
+  uint32_t buffer;
+  uint32_t result_shm_id;
+  uint32_t result_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(IsBuffer) == 16, Sizeof_IsBuffer_is_not_16);
@@ -4164,15 +4185,15 @@ struct IsEnabled {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  typedef uint32 Result;
+  typedef uint32_t Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLenum _cap, uint32 _result_shm_id, uint32 _result_shm_offset) {
+  void Init(GLenum _cap, uint32_t _result_shm_id, uint32_t _result_shm_offset) {
     SetHeader();
     cap = _cap;
     result_shm_id = _result_shm_id;
@@ -4181,17 +4202,17 @@ struct IsEnabled {
 
   void* Set(void* cmd,
             GLenum _cap,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_cap, _result_shm_id, _result_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 cap;
-  uint32 result_shm_id;
-  uint32 result_shm_offset;
+  uint32_t cap;
+  uint32_t result_shm_id;
+  uint32_t result_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(IsEnabled) == 16, Sizeof_IsEnabled_is_not_16);
@@ -4209,17 +4230,17 @@ struct IsFramebuffer {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  typedef uint32 Result;
+  typedef uint32_t Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLuint _framebuffer,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     SetHeader();
     framebuffer = _framebuffer;
     result_shm_id = _result_shm_id;
@@ -4228,17 +4249,17 @@ struct IsFramebuffer {
 
   void* Set(void* cmd,
             GLuint _framebuffer,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_framebuffer, _result_shm_id, _result_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 framebuffer;
-  uint32 result_shm_id;
-  uint32 result_shm_offset;
+  uint32_t framebuffer;
+  uint32_t result_shm_id;
+  uint32_t result_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(IsFramebuffer) == 16, Sizeof_IsFramebuffer_is_not_16);
@@ -4257,15 +4278,17 @@ struct IsProgram {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  typedef uint32 Result;
+  typedef uint32_t Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLuint _program, uint32 _result_shm_id, uint32 _result_shm_offset) {
+  void Init(GLuint _program,
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     SetHeader();
     program = _program;
     result_shm_id = _result_shm_id;
@@ -4274,17 +4297,17 @@ struct IsProgram {
 
   void* Set(void* cmd,
             GLuint _program,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_program, _result_shm_id, _result_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 program;
-  uint32 result_shm_id;
-  uint32 result_shm_offset;
+  uint32_t program;
+  uint32_t result_shm_id;
+  uint32_t result_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(IsProgram) == 16, Sizeof_IsProgram_is_not_16);
@@ -4303,17 +4326,17 @@ struct IsRenderbuffer {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  typedef uint32 Result;
+  typedef uint32_t Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLuint _renderbuffer,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     SetHeader();
     renderbuffer = _renderbuffer;
     result_shm_id = _result_shm_id;
@@ -4322,17 +4345,17 @@ struct IsRenderbuffer {
 
   void* Set(void* cmd,
             GLuint _renderbuffer,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_renderbuffer, _result_shm_id, _result_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 renderbuffer;
-  uint32 result_shm_id;
-  uint32 result_shm_offset;
+  uint32_t renderbuffer;
+  uint32_t result_shm_id;
+  uint32_t result_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(IsRenderbuffer) == 16, Sizeof_IsRenderbuffer_is_not_16);
@@ -4351,15 +4374,17 @@ struct IsShader {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  typedef uint32 Result;
+  typedef uint32_t Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLuint _shader, uint32 _result_shm_id, uint32 _result_shm_offset) {
+  void Init(GLuint _shader,
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     SetHeader();
     shader = _shader;
     result_shm_id = _result_shm_id;
@@ -4368,17 +4393,17 @@ struct IsShader {
 
   void* Set(void* cmd,
             GLuint _shader,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_shader, _result_shm_id, _result_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 shader;
-  uint32 result_shm_id;
-  uint32 result_shm_offset;
+  uint32_t shader;
+  uint32_t result_shm_id;
+  uint32_t result_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(IsShader) == 16, Sizeof_IsShader_is_not_16);
@@ -4395,15 +4420,17 @@ struct IsTexture {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  typedef uint32 Result;
+  typedef uint32_t Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLuint _texture, uint32 _result_shm_id, uint32 _result_shm_offset) {
+  void Init(GLuint _texture,
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     SetHeader();
     texture = _texture;
     result_shm_id = _result_shm_id;
@@ -4412,17 +4439,17 @@ struct IsTexture {
 
   void* Set(void* cmd,
             GLuint _texture,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_texture, _result_shm_id, _result_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 texture;
-  uint32 result_shm_id;
-  uint32 result_shm_offset;
+  uint32_t texture;
+  uint32_t result_shm_id;
+  uint32_t result_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(IsTexture) == 16, Sizeof_IsTexture_is_not_16);
@@ -4441,8 +4468,8 @@ struct LineWidth {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -4472,8 +4499,8 @@ struct LinkProgram {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -4489,7 +4516,7 @@ struct LinkProgram {
   }
 
   gpu::CommandHeader header;
-  uint32 program;
+  uint32_t program;
 };
 
 COMPILE_ASSERT(sizeof(LinkProgram) == 8, Sizeof_LinkProgram_is_not_8);
@@ -4504,8 +4531,8 @@ struct PixelStorei {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -4522,8 +4549,8 @@ struct PixelStorei {
   }
 
   gpu::CommandHeader header;
-  uint32 pname;
-  int32 param;
+  uint32_t pname;
+  int32_t param;
 };
 
 COMPILE_ASSERT(sizeof(PixelStorei) == 12, Sizeof_PixelStorei_is_not_12);
@@ -4540,8 +4567,8 @@ struct PolygonOffset {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -4579,10 +4606,10 @@ struct ReadPixels {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  typedef uint32 Result;
+  typedef uint32_t Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -4593,10 +4620,10 @@ struct ReadPixels {
             GLsizei _height,
             GLenum _format,
             GLenum _type,
-            uint32 _pixels_shm_id,
-            uint32 _pixels_shm_offset,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset,
+            uint32_t _pixels_shm_id,
+            uint32_t _pixels_shm_offset,
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset,
             GLboolean _async) {
     SetHeader();
     x = _x;
@@ -4619,10 +4646,10 @@ struct ReadPixels {
             GLsizei _height,
             GLenum _format,
             GLenum _type,
-            uint32 _pixels_shm_id,
-            uint32 _pixels_shm_offset,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset,
+            uint32_t _pixels_shm_id,
+            uint32_t _pixels_shm_offset,
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset,
             GLboolean _async) {
     static_cast<ValueType*>(cmd)->Init(_x,
                                        _y,
@@ -4639,17 +4666,17 @@ struct ReadPixels {
   }
 
   gpu::CommandHeader header;
-  int32 x;
-  int32 y;
-  int32 width;
-  int32 height;
-  uint32 format;
-  uint32 type;
-  uint32 pixels_shm_id;
-  uint32 pixels_shm_offset;
-  uint32 result_shm_id;
-  uint32 result_shm_offset;
-  uint32 async;
+  int32_t x;
+  int32_t y;
+  int32_t width;
+  int32_t height;
+  uint32_t format;
+  uint32_t type;
+  uint32_t pixels_shm_id;
+  uint32_t pixels_shm_offset;
+  uint32_t result_shm_id;
+  uint32_t result_shm_offset;
+  uint32_t async;
 };
 
 COMPILE_ASSERT(sizeof(ReadPixels) == 48, Sizeof_ReadPixels_is_not_48);
@@ -4682,8 +4709,8 @@ struct ReleaseShaderCompiler {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -4709,8 +4736,8 @@ struct RenderbufferStorage {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -4737,10 +4764,10 @@ struct RenderbufferStorage {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 internalformat;
-  int32 width;
-  int32 height;
+  uint32_t target;
+  uint32_t internalformat;
+  int32_t width;
+  int32_t height;
 };
 
 COMPILE_ASSERT(sizeof(RenderbufferStorage) == 20,
@@ -4762,8 +4789,8 @@ struct SampleCoverage {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -4781,7 +4808,7 @@ struct SampleCoverage {
 
   gpu::CommandHeader header;
   float value;
-  uint32 invert;
+  uint32_t invert;
 };
 
 COMPILE_ASSERT(sizeof(SampleCoverage) == 12, Sizeof_SampleCoverage_is_not_12);
@@ -4798,8 +4825,8 @@ struct Scissor {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -4818,10 +4845,10 @@ struct Scissor {
   }
 
   gpu::CommandHeader header;
-  int32 x;
-  int32 y;
-  int32 width;
-  int32 height;
+  int32_t x;
+  int32_t y;
+  int32_t width;
+  int32_t height;
 };
 
 COMPILE_ASSERT(sizeof(Scissor) == 20, Sizeof_Scissor_is_not_20);
@@ -4837,18 +4864,18 @@ struct ShaderBinary {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLsizei _n,
-            uint32 _shaders_shm_id,
-            uint32 _shaders_shm_offset,
+            uint32_t _shaders_shm_id,
+            uint32_t _shaders_shm_offset,
             GLenum _binaryformat,
-            uint32 _binary_shm_id,
-            uint32 _binary_shm_offset,
+            uint32_t _binary_shm_id,
+            uint32_t _binary_shm_offset,
             GLsizei _length) {
     SetHeader();
     n = _n;
@@ -4862,11 +4889,11 @@ struct ShaderBinary {
 
   void* Set(void* cmd,
             GLsizei _n,
-            uint32 _shaders_shm_id,
-            uint32 _shaders_shm_offset,
+            uint32_t _shaders_shm_id,
+            uint32_t _shaders_shm_offset,
             GLenum _binaryformat,
-            uint32 _binary_shm_id,
-            uint32 _binary_shm_offset,
+            uint32_t _binary_shm_id,
+            uint32_t _binary_shm_offset,
             GLsizei _length) {
     static_cast<ValueType*>(cmd)->Init(_n,
                                        _shaders_shm_id,
@@ -4879,13 +4906,13 @@ struct ShaderBinary {
   }
 
   gpu::CommandHeader header;
-  int32 n;
-  uint32 shaders_shm_id;
-  uint32 shaders_shm_offset;
-  uint32 binaryformat;
-  uint32 binary_shm_id;
-  uint32 binary_shm_offset;
-  int32 length;
+  int32_t n;
+  uint32_t shaders_shm_id;
+  uint32_t shaders_shm_offset;
+  uint32_t binaryformat;
+  uint32_t binary_shm_id;
+  uint32_t binary_shm_offset;
+  int32_t length;
 };
 
 COMPILE_ASSERT(sizeof(ShaderBinary) == 32, Sizeof_ShaderBinary_is_not_32);
@@ -4911,16 +4938,16 @@ struct ShaderSource {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLuint _shader,
-            uint32 _data_shm_id,
-            uint32 _data_shm_offset,
-            uint32 _data_size) {
+            uint32_t _data_shm_id,
+            uint32_t _data_shm_offset,
+            uint32_t _data_size) {
     SetHeader();
     shader = _shader;
     data_shm_id = _data_shm_id;
@@ -4930,19 +4957,19 @@ struct ShaderSource {
 
   void* Set(void* cmd,
             GLuint _shader,
-            uint32 _data_shm_id,
-            uint32 _data_shm_offset,
-            uint32 _data_size) {
+            uint32_t _data_shm_id,
+            uint32_t _data_shm_offset,
+            uint32_t _data_size) {
     static_cast<ValueType*>(cmd)
         ->Init(_shader, _data_shm_id, _data_shm_offset, _data_size);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 shader;
-  uint32 data_shm_id;
-  uint32 data_shm_offset;
-  uint32 data_size;
+  uint32_t shader;
+  uint32_t data_shm_id;
+  uint32_t data_shm_offset;
+  uint32_t data_size;
 };
 
 COMPILE_ASSERT(sizeof(ShaderSource) == 20, Sizeof_ShaderSource_is_not_20);
@@ -4963,26 +4990,26 @@ struct ShaderSourceBucket {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLuint _shader, uint32 _data_bucket_id) {
+  void Init(GLuint _shader, uint32_t _data_bucket_id) {
     SetHeader();
     shader = _shader;
     data_bucket_id = _data_bucket_id;
   }
 
-  void* Set(void* cmd, GLuint _shader, uint32 _data_bucket_id) {
+  void* Set(void* cmd, GLuint _shader, uint32_t _data_bucket_id) {
     static_cast<ValueType*>(cmd)->Init(_shader, _data_bucket_id);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 shader;
-  uint32 data_bucket_id;
+  uint32_t shader;
+  uint32_t data_bucket_id;
 };
 
 COMPILE_ASSERT(sizeof(ShaderSourceBucket) == 12,
@@ -5000,8 +5027,8 @@ struct StencilFunc {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -5019,9 +5046,9 @@ struct StencilFunc {
   }
 
   gpu::CommandHeader header;
-  uint32 func;
-  int32 ref;
-  uint32 mask;
+  uint32_t func;
+  int32_t ref;
+  uint32_t mask;
 };
 
 COMPILE_ASSERT(sizeof(StencilFunc) == 16, Sizeof_StencilFunc_is_not_16);
@@ -5039,8 +5066,8 @@ struct StencilFuncSeparate {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -5059,10 +5086,10 @@ struct StencilFuncSeparate {
   }
 
   gpu::CommandHeader header;
-  uint32 face;
-  uint32 func;
-  int32 ref;
-  uint32 mask;
+  uint32_t face;
+  uint32_t func;
+  int32_t ref;
+  uint32_t mask;
 };
 
 COMPILE_ASSERT(sizeof(StencilFuncSeparate) == 20,
@@ -5084,8 +5111,8 @@ struct StencilMask {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -5101,7 +5128,7 @@ struct StencilMask {
   }
 
   gpu::CommandHeader header;
-  uint32 mask;
+  uint32_t mask;
 };
 
 COMPILE_ASSERT(sizeof(StencilMask) == 8, Sizeof_StencilMask_is_not_8);
@@ -5116,8 +5143,8 @@ struct StencilMaskSeparate {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -5134,8 +5161,8 @@ struct StencilMaskSeparate {
   }
 
   gpu::CommandHeader header;
-  uint32 face;
-  uint32 mask;
+  uint32_t face;
+  uint32_t mask;
 };
 
 COMPILE_ASSERT(sizeof(StencilMaskSeparate) == 12,
@@ -5153,8 +5180,8 @@ struct StencilOp {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -5172,9 +5199,9 @@ struct StencilOp {
   }
 
   gpu::CommandHeader header;
-  uint32 fail;
-  uint32 zfail;
-  uint32 zpass;
+  uint32_t fail;
+  uint32_t zfail;
+  uint32_t zpass;
 };
 
 COMPILE_ASSERT(sizeof(StencilOp) == 16, Sizeof_StencilOp_is_not_16);
@@ -5191,8 +5218,8 @@ struct StencilOpSeparate {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -5215,10 +5242,10 @@ struct StencilOpSeparate {
   }
 
   gpu::CommandHeader header;
-  uint32 face;
-  uint32 fail;
-  uint32 zfail;
-  uint32 zpass;
+  uint32_t face;
+  uint32_t fail;
+  uint32_t zfail;
+  uint32_t zpass;
 };
 
 COMPILE_ASSERT(sizeof(StencilOpSeparate) == 20,
@@ -5240,8 +5267,8 @@ struct TexImage2D {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -5254,8 +5281,8 @@ struct TexImage2D {
             GLint _border,
             GLenum _format,
             GLenum _type,
-            uint32 _pixels_shm_id,
-            uint32 _pixels_shm_offset) {
+            uint32_t _pixels_shm_id,
+            uint32_t _pixels_shm_offset) {
     SetHeader();
     target = _target;
     level = _level;
@@ -5278,8 +5305,8 @@ struct TexImage2D {
             GLint _border,
             GLenum _format,
             GLenum _type,
-            uint32 _pixels_shm_id,
-            uint32 _pixels_shm_offset) {
+            uint32_t _pixels_shm_id,
+            uint32_t _pixels_shm_offset) {
     static_cast<ValueType*>(cmd)->Init(_target,
                                        _level,
                                        _internalformat,
@@ -5294,16 +5321,16 @@ struct TexImage2D {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  int32 level;
-  int32 internalformat;
-  int32 width;
-  int32 height;
-  int32 border;
-  uint32 format;
-  uint32 type;
-  uint32 pixels_shm_id;
-  uint32 pixels_shm_offset;
+  uint32_t target;
+  int32_t level;
+  int32_t internalformat;
+  int32_t width;
+  int32_t height;
+  int32_t border;
+  uint32_t format;
+  uint32_t type;
+  uint32_t pixels_shm_id;
+  uint32_t pixels_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(TexImage2D) == 44, Sizeof_TexImage2D_is_not_44);
@@ -5336,8 +5363,8 @@ struct TexParameterf {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -5355,8 +5382,8 @@ struct TexParameterf {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 pname;
+  uint32_t target;
+  uint32_t pname;
   float param;
 };
 
@@ -5376,16 +5403,16 @@ struct TexParameterfv {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLenum _target,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     SetHeader();
     target = _target;
     pname = _pname;
@@ -5396,18 +5423,18 @@ struct TexParameterfv {
   void* Set(void* cmd,
             GLenum _target,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_target, _pname, _params_shm_id, _params_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 pname;
-  uint32 params_shm_id;
-  uint32 params_shm_offset;
+  uint32_t target;
+  uint32_t pname;
+  uint32_t params_shm_id;
+  uint32_t params_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(TexParameterfv) == 20, Sizeof_TexParameterfv_is_not_20);
@@ -5428,13 +5455,13 @@ struct TexParameterfvImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize() {
-    return static_cast<uint32>(sizeof(GLfloat) * 1);  // NOLINT
+  static uint32_t ComputeDataSize() {
+    return static_cast<uint32_t>(sizeof(GLfloat) * 1);  // NOLINT
   }
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize());  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize());  // NOLINT
   }
 
   void SetHeader() { header.SetCmdByTotalSize<ValueType>(ComputeSize()); }
@@ -5448,13 +5475,13 @@ struct TexParameterfvImmediate {
 
   void* Set(void* cmd, GLenum _target, GLenum _pname, const GLfloat* _params) {
     static_cast<ValueType*>(cmd)->Init(_target, _pname, _params);
-    const uint32 size = ComputeSize();
+    const uint32_t size = ComputeSize();
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 pname;
+  uint32_t target;
+  uint32_t pname;
 };
 
 COMPILE_ASSERT(sizeof(TexParameterfvImmediate) == 12,
@@ -5472,8 +5499,8 @@ struct TexParameteri {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -5491,9 +5518,9 @@ struct TexParameteri {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 pname;
-  int32 param;
+  uint32_t target;
+  uint32_t pname;
+  int32_t param;
 };
 
 COMPILE_ASSERT(sizeof(TexParameteri) == 16, Sizeof_TexParameteri_is_not_16);
@@ -5512,16 +5539,16 @@ struct TexParameteriv {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLenum _target,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     SetHeader();
     target = _target;
     pname = _pname;
@@ -5532,18 +5559,18 @@ struct TexParameteriv {
   void* Set(void* cmd,
             GLenum _target,
             GLenum _pname,
-            uint32 _params_shm_id,
-            uint32 _params_shm_offset) {
+            uint32_t _params_shm_id,
+            uint32_t _params_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_target, _pname, _params_shm_id, _params_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 pname;
-  uint32 params_shm_id;
-  uint32 params_shm_offset;
+  uint32_t target;
+  uint32_t pname;
+  uint32_t params_shm_id;
+  uint32_t params_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(TexParameteriv) == 20, Sizeof_TexParameteriv_is_not_20);
@@ -5564,13 +5591,13 @@ struct TexParameterivImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize() {
-    return static_cast<uint32>(sizeof(GLint) * 1);  // NOLINT
+  static uint32_t ComputeDataSize() {
+    return static_cast<uint32_t>(sizeof(GLint) * 1);  // NOLINT
   }
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize());  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize());  // NOLINT
   }
 
   void SetHeader() { header.SetCmdByTotalSize<ValueType>(ComputeSize()); }
@@ -5584,13 +5611,13 @@ struct TexParameterivImmediate {
 
   void* Set(void* cmd, GLenum _target, GLenum _pname, const GLint* _params) {
     static_cast<ValueType*>(cmd)->Init(_target, _pname, _params);
-    const uint32 size = ComputeSize();
+    const uint32_t size = ComputeSize();
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 pname;
+  uint32_t target;
+  uint32_t pname;
 };
 
 COMPILE_ASSERT(sizeof(TexParameterivImmediate) == 12,
@@ -5608,8 +5635,8 @@ struct TexSubImage2D {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -5622,8 +5649,8 @@ struct TexSubImage2D {
             GLsizei _height,
             GLenum _format,
             GLenum _type,
-            uint32 _pixels_shm_id,
-            uint32 _pixels_shm_offset,
+            uint32_t _pixels_shm_id,
+            uint32_t _pixels_shm_offset,
             GLboolean _internal) {
     SetHeader();
     target = _target;
@@ -5648,8 +5675,8 @@ struct TexSubImage2D {
             GLsizei _height,
             GLenum _format,
             GLenum _type,
-            uint32 _pixels_shm_id,
-            uint32 _pixels_shm_offset,
+            uint32_t _pixels_shm_id,
+            uint32_t _pixels_shm_offset,
             GLboolean _internal) {
     static_cast<ValueType*>(cmd)->Init(_target,
                                        _level,
@@ -5666,17 +5693,17 @@ struct TexSubImage2D {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  int32 level;
-  int32 xoffset;
-  int32 yoffset;
-  int32 width;
-  int32 height;
-  uint32 format;
-  uint32 type;
-  uint32 pixels_shm_id;
-  uint32 pixels_shm_offset;
-  uint32 internal;
+  uint32_t target;
+  int32_t level;
+  int32_t xoffset;
+  int32_t yoffset;
+  int32_t width;
+  int32_t height;
+  uint32_t format;
+  uint32_t type;
+  uint32_t pixels_shm_id;
+  uint32_t pixels_shm_offset;
+  uint32_t internal;
 };
 
 COMPILE_ASSERT(sizeof(TexSubImage2D) == 48, Sizeof_TexSubImage2D_is_not_48);
@@ -5711,8 +5738,8 @@ struct Uniform1f {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -5729,7 +5756,7 @@ struct Uniform1f {
   }
 
   gpu::CommandHeader header;
-  int32 location;
+  int32_t location;
   float x;
 };
 
@@ -5746,16 +5773,16 @@ struct Uniform1fv {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLint _location,
             GLsizei _count,
-            uint32 _v_shm_id,
-            uint32 _v_shm_offset) {
+            uint32_t _v_shm_id,
+            uint32_t _v_shm_offset) {
     SetHeader();
     location = _location;
     count = _count;
@@ -5766,18 +5793,18 @@ struct Uniform1fv {
   void* Set(void* cmd,
             GLint _location,
             GLsizei _count,
-            uint32 _v_shm_id,
-            uint32 _v_shm_offset) {
+            uint32_t _v_shm_id,
+            uint32_t _v_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_location, _count, _v_shm_id, _v_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
-  uint32 v_shm_id;
-  uint32 v_shm_offset;
+  int32_t location;
+  int32_t count;
+  uint32_t v_shm_id;
+  uint32_t v_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(Uniform1fv) == 20, Sizeof_Uniform1fv_is_not_20);
@@ -5798,13 +5825,13 @@ struct Uniform1fvImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(GLfloat) * 1 * count);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(GLfloat) * 1 * count);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(count));  // NOLINT
+  static uint32_t ComputeSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(count));  // NOLINT
   }
 
   void SetHeader(GLsizei count) {
@@ -5820,13 +5847,13 @@ struct Uniform1fvImmediate {
 
   void* Set(void* cmd, GLint _location, GLsizei _count, const GLfloat* _v) {
     static_cast<ValueType*>(cmd)->Init(_location, _count, _v);
-    const uint32 size = ComputeSize(_count);
+    const uint32_t size = ComputeSize(_count);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
+  int32_t location;
+  int32_t count;
 };
 
 COMPILE_ASSERT(sizeof(Uniform1fvImmediate) == 12,
@@ -5844,8 +5871,8 @@ struct Uniform1i {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -5862,8 +5889,8 @@ struct Uniform1i {
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 x;
+  int32_t location;
+  int32_t x;
 };
 
 COMPILE_ASSERT(sizeof(Uniform1i) == 12, Sizeof_Uniform1i_is_not_12);
@@ -5879,16 +5906,16 @@ struct Uniform1iv {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLint _location,
             GLsizei _count,
-            uint32 _v_shm_id,
-            uint32 _v_shm_offset) {
+            uint32_t _v_shm_id,
+            uint32_t _v_shm_offset) {
     SetHeader();
     location = _location;
     count = _count;
@@ -5899,18 +5926,18 @@ struct Uniform1iv {
   void* Set(void* cmd,
             GLint _location,
             GLsizei _count,
-            uint32 _v_shm_id,
-            uint32 _v_shm_offset) {
+            uint32_t _v_shm_id,
+            uint32_t _v_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_location, _count, _v_shm_id, _v_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
-  uint32 v_shm_id;
-  uint32 v_shm_offset;
+  int32_t location;
+  int32_t count;
+  uint32_t v_shm_id;
+  uint32_t v_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(Uniform1iv) == 20, Sizeof_Uniform1iv_is_not_20);
@@ -5931,13 +5958,13 @@ struct Uniform1ivImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(GLint) * 1 * count);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(GLint) * 1 * count);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(count));  // NOLINT
+  static uint32_t ComputeSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(count));  // NOLINT
   }
 
   void SetHeader(GLsizei count) {
@@ -5953,13 +5980,13 @@ struct Uniform1ivImmediate {
 
   void* Set(void* cmd, GLint _location, GLsizei _count, const GLint* _v) {
     static_cast<ValueType*>(cmd)->Init(_location, _count, _v);
-    const uint32 size = ComputeSize(_count);
+    const uint32_t size = ComputeSize(_count);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
+  int32_t location;
+  int32_t count;
 };
 
 COMPILE_ASSERT(sizeof(Uniform1ivImmediate) == 12,
@@ -5977,8 +6004,8 @@ struct Uniform2f {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -5996,7 +6023,7 @@ struct Uniform2f {
   }
 
   gpu::CommandHeader header;
-  int32 location;
+  int32_t location;
   float x;
   float y;
 };
@@ -6015,16 +6042,16 @@ struct Uniform2fv {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLint _location,
             GLsizei _count,
-            uint32 _v_shm_id,
-            uint32 _v_shm_offset) {
+            uint32_t _v_shm_id,
+            uint32_t _v_shm_offset) {
     SetHeader();
     location = _location;
     count = _count;
@@ -6035,18 +6062,18 @@ struct Uniform2fv {
   void* Set(void* cmd,
             GLint _location,
             GLsizei _count,
-            uint32 _v_shm_id,
-            uint32 _v_shm_offset) {
+            uint32_t _v_shm_id,
+            uint32_t _v_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_location, _count, _v_shm_id, _v_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
-  uint32 v_shm_id;
-  uint32 v_shm_offset;
+  int32_t location;
+  int32_t count;
+  uint32_t v_shm_id;
+  uint32_t v_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(Uniform2fv) == 20, Sizeof_Uniform2fv_is_not_20);
@@ -6067,13 +6094,13 @@ struct Uniform2fvImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(GLfloat) * 2 * count);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(GLfloat) * 2 * count);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(count));  // NOLINT
+  static uint32_t ComputeSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(count));  // NOLINT
   }
 
   void SetHeader(GLsizei count) {
@@ -6089,13 +6116,13 @@ struct Uniform2fvImmediate {
 
   void* Set(void* cmd, GLint _location, GLsizei _count, const GLfloat* _v) {
     static_cast<ValueType*>(cmd)->Init(_location, _count, _v);
-    const uint32 size = ComputeSize(_count);
+    const uint32_t size = ComputeSize(_count);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
+  int32_t location;
+  int32_t count;
 };
 
 COMPILE_ASSERT(sizeof(Uniform2fvImmediate) == 12,
@@ -6113,8 +6140,8 @@ struct Uniform2i {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -6132,9 +6159,9 @@ struct Uniform2i {
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 x;
-  int32 y;
+  int32_t location;
+  int32_t x;
+  int32_t y;
 };
 
 COMPILE_ASSERT(sizeof(Uniform2i) == 16, Sizeof_Uniform2i_is_not_16);
@@ -6151,16 +6178,16 @@ struct Uniform2iv {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLint _location,
             GLsizei _count,
-            uint32 _v_shm_id,
-            uint32 _v_shm_offset) {
+            uint32_t _v_shm_id,
+            uint32_t _v_shm_offset) {
     SetHeader();
     location = _location;
     count = _count;
@@ -6171,18 +6198,18 @@ struct Uniform2iv {
   void* Set(void* cmd,
             GLint _location,
             GLsizei _count,
-            uint32 _v_shm_id,
-            uint32 _v_shm_offset) {
+            uint32_t _v_shm_id,
+            uint32_t _v_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_location, _count, _v_shm_id, _v_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
-  uint32 v_shm_id;
-  uint32 v_shm_offset;
+  int32_t location;
+  int32_t count;
+  uint32_t v_shm_id;
+  uint32_t v_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(Uniform2iv) == 20, Sizeof_Uniform2iv_is_not_20);
@@ -6203,13 +6230,13 @@ struct Uniform2ivImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(GLint) * 2 * count);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(GLint) * 2 * count);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(count));  // NOLINT
+  static uint32_t ComputeSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(count));  // NOLINT
   }
 
   void SetHeader(GLsizei count) {
@@ -6225,13 +6252,13 @@ struct Uniform2ivImmediate {
 
   void* Set(void* cmd, GLint _location, GLsizei _count, const GLint* _v) {
     static_cast<ValueType*>(cmd)->Init(_location, _count, _v);
-    const uint32 size = ComputeSize(_count);
+    const uint32_t size = ComputeSize(_count);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
+  int32_t location;
+  int32_t count;
 };
 
 COMPILE_ASSERT(sizeof(Uniform2ivImmediate) == 12,
@@ -6249,8 +6276,8 @@ struct Uniform3f {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -6269,7 +6296,7 @@ struct Uniform3f {
   }
 
   gpu::CommandHeader header;
-  int32 location;
+  int32_t location;
   float x;
   float y;
   float z;
@@ -6290,16 +6317,16 @@ struct Uniform3fv {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLint _location,
             GLsizei _count,
-            uint32 _v_shm_id,
-            uint32 _v_shm_offset) {
+            uint32_t _v_shm_id,
+            uint32_t _v_shm_offset) {
     SetHeader();
     location = _location;
     count = _count;
@@ -6310,18 +6337,18 @@ struct Uniform3fv {
   void* Set(void* cmd,
             GLint _location,
             GLsizei _count,
-            uint32 _v_shm_id,
-            uint32 _v_shm_offset) {
+            uint32_t _v_shm_id,
+            uint32_t _v_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_location, _count, _v_shm_id, _v_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
-  uint32 v_shm_id;
-  uint32 v_shm_offset;
+  int32_t location;
+  int32_t count;
+  uint32_t v_shm_id;
+  uint32_t v_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(Uniform3fv) == 20, Sizeof_Uniform3fv_is_not_20);
@@ -6342,13 +6369,13 @@ struct Uniform3fvImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(GLfloat) * 3 * count);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(GLfloat) * 3 * count);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(count));  // NOLINT
+  static uint32_t ComputeSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(count));  // NOLINT
   }
 
   void SetHeader(GLsizei count) {
@@ -6364,13 +6391,13 @@ struct Uniform3fvImmediate {
 
   void* Set(void* cmd, GLint _location, GLsizei _count, const GLfloat* _v) {
     static_cast<ValueType*>(cmd)->Init(_location, _count, _v);
-    const uint32 size = ComputeSize(_count);
+    const uint32_t size = ComputeSize(_count);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
+  int32_t location;
+  int32_t count;
 };
 
 COMPILE_ASSERT(sizeof(Uniform3fvImmediate) == 12,
@@ -6388,8 +6415,8 @@ struct Uniform3i {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -6408,10 +6435,10 @@ struct Uniform3i {
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 x;
-  int32 y;
-  int32 z;
+  int32_t location;
+  int32_t x;
+  int32_t y;
+  int32_t z;
 };
 
 COMPILE_ASSERT(sizeof(Uniform3i) == 20, Sizeof_Uniform3i_is_not_20);
@@ -6429,16 +6456,16 @@ struct Uniform3iv {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLint _location,
             GLsizei _count,
-            uint32 _v_shm_id,
-            uint32 _v_shm_offset) {
+            uint32_t _v_shm_id,
+            uint32_t _v_shm_offset) {
     SetHeader();
     location = _location;
     count = _count;
@@ -6449,18 +6476,18 @@ struct Uniform3iv {
   void* Set(void* cmd,
             GLint _location,
             GLsizei _count,
-            uint32 _v_shm_id,
-            uint32 _v_shm_offset) {
+            uint32_t _v_shm_id,
+            uint32_t _v_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_location, _count, _v_shm_id, _v_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
-  uint32 v_shm_id;
-  uint32 v_shm_offset;
+  int32_t location;
+  int32_t count;
+  uint32_t v_shm_id;
+  uint32_t v_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(Uniform3iv) == 20, Sizeof_Uniform3iv_is_not_20);
@@ -6481,13 +6508,13 @@ struct Uniform3ivImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(GLint) * 3 * count);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(GLint) * 3 * count);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(count));  // NOLINT
+  static uint32_t ComputeSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(count));  // NOLINT
   }
 
   void SetHeader(GLsizei count) {
@@ -6503,13 +6530,13 @@ struct Uniform3ivImmediate {
 
   void* Set(void* cmd, GLint _location, GLsizei _count, const GLint* _v) {
     static_cast<ValueType*>(cmd)->Init(_location, _count, _v);
-    const uint32 size = ComputeSize(_count);
+    const uint32_t size = ComputeSize(_count);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
+  int32_t location;
+  int32_t count;
 };
 
 COMPILE_ASSERT(sizeof(Uniform3ivImmediate) == 12,
@@ -6527,8 +6554,8 @@ struct Uniform4f {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -6553,7 +6580,7 @@ struct Uniform4f {
   }
 
   gpu::CommandHeader header;
-  int32 location;
+  int32_t location;
   float x;
   float y;
   float z;
@@ -6576,16 +6603,16 @@ struct Uniform4fv {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLint _location,
             GLsizei _count,
-            uint32 _v_shm_id,
-            uint32 _v_shm_offset) {
+            uint32_t _v_shm_id,
+            uint32_t _v_shm_offset) {
     SetHeader();
     location = _location;
     count = _count;
@@ -6596,18 +6623,18 @@ struct Uniform4fv {
   void* Set(void* cmd,
             GLint _location,
             GLsizei _count,
-            uint32 _v_shm_id,
-            uint32 _v_shm_offset) {
+            uint32_t _v_shm_id,
+            uint32_t _v_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_location, _count, _v_shm_id, _v_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
-  uint32 v_shm_id;
-  uint32 v_shm_offset;
+  int32_t location;
+  int32_t count;
+  uint32_t v_shm_id;
+  uint32_t v_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(Uniform4fv) == 20, Sizeof_Uniform4fv_is_not_20);
@@ -6628,13 +6655,13 @@ struct Uniform4fvImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(GLfloat) * 4 * count);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(GLfloat) * 4 * count);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(count));  // NOLINT
+  static uint32_t ComputeSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(count));  // NOLINT
   }
 
   void SetHeader(GLsizei count) {
@@ -6650,13 +6677,13 @@ struct Uniform4fvImmediate {
 
   void* Set(void* cmd, GLint _location, GLsizei _count, const GLfloat* _v) {
     static_cast<ValueType*>(cmd)->Init(_location, _count, _v);
-    const uint32 size = ComputeSize(_count);
+    const uint32_t size = ComputeSize(_count);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
+  int32_t location;
+  int32_t count;
 };
 
 COMPILE_ASSERT(sizeof(Uniform4fvImmediate) == 12,
@@ -6674,8 +6701,8 @@ struct Uniform4i {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -6700,11 +6727,11 @@ struct Uniform4i {
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 x;
-  int32 y;
-  int32 z;
-  int32 w;
+  int32_t location;
+  int32_t x;
+  int32_t y;
+  int32_t z;
+  int32_t w;
 };
 
 COMPILE_ASSERT(sizeof(Uniform4i) == 24, Sizeof_Uniform4i_is_not_24);
@@ -6723,16 +6750,16 @@ struct Uniform4iv {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLint _location,
             GLsizei _count,
-            uint32 _v_shm_id,
-            uint32 _v_shm_offset) {
+            uint32_t _v_shm_id,
+            uint32_t _v_shm_offset) {
     SetHeader();
     location = _location;
     count = _count;
@@ -6743,18 +6770,18 @@ struct Uniform4iv {
   void* Set(void* cmd,
             GLint _location,
             GLsizei _count,
-            uint32 _v_shm_id,
-            uint32 _v_shm_offset) {
+            uint32_t _v_shm_id,
+            uint32_t _v_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_location, _count, _v_shm_id, _v_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
-  uint32 v_shm_id;
-  uint32 v_shm_offset;
+  int32_t location;
+  int32_t count;
+  uint32_t v_shm_id;
+  uint32_t v_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(Uniform4iv) == 20, Sizeof_Uniform4iv_is_not_20);
@@ -6775,13 +6802,13 @@ struct Uniform4ivImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(GLint) * 4 * count);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(GLint) * 4 * count);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(count));  // NOLINT
+  static uint32_t ComputeSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(count));  // NOLINT
   }
 
   void SetHeader(GLsizei count) {
@@ -6797,13 +6824,13 @@ struct Uniform4ivImmediate {
 
   void* Set(void* cmd, GLint _location, GLsizei _count, const GLint* _v) {
     static_cast<ValueType*>(cmd)->Init(_location, _count, _v);
-    const uint32 size = ComputeSize(_count);
+    const uint32_t size = ComputeSize(_count);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
+  int32_t location;
+  int32_t count;
 };
 
 COMPILE_ASSERT(sizeof(Uniform4ivImmediate) == 12,
@@ -6821,8 +6848,8 @@ struct UniformMatrix2fv {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -6830,8 +6857,8 @@ struct UniformMatrix2fv {
   void Init(GLint _location,
             GLsizei _count,
             GLboolean _transpose,
-            uint32 _value_shm_id,
-            uint32 _value_shm_offset) {
+            uint32_t _value_shm_id,
+            uint32_t _value_shm_offset) {
     SetHeader();
     location = _location;
     count = _count;
@@ -6844,19 +6871,19 @@ struct UniformMatrix2fv {
             GLint _location,
             GLsizei _count,
             GLboolean _transpose,
-            uint32 _value_shm_id,
-            uint32 _value_shm_offset) {
+            uint32_t _value_shm_id,
+            uint32_t _value_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_location, _count, _transpose, _value_shm_id, _value_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
-  uint32 transpose;
-  uint32 value_shm_id;
-  uint32 value_shm_offset;
+  int32_t location;
+  int32_t count;
+  uint32_t transpose;
+  uint32_t value_shm_id;
+  uint32_t value_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(UniformMatrix2fv) == 24,
@@ -6880,13 +6907,13 @@ struct UniformMatrix2fvImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(GLfloat) * 4 * count);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(GLfloat) * 4 * count);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(count));  // NOLINT
+  static uint32_t ComputeSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(count));  // NOLINT
   }
 
   void SetHeader(GLsizei count) {
@@ -6910,14 +6937,14 @@ struct UniformMatrix2fvImmediate {
             GLboolean _transpose,
             const GLfloat* _value) {
     static_cast<ValueType*>(cmd)->Init(_location, _count, _transpose, _value);
-    const uint32 size = ComputeSize(_count);
+    const uint32_t size = ComputeSize(_count);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
-  uint32 transpose;
+  int32_t location;
+  int32_t count;
+  uint32_t transpose;
 };
 
 COMPILE_ASSERT(sizeof(UniformMatrix2fvImmediate) == 16,
@@ -6937,8 +6964,8 @@ struct UniformMatrix3fv {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -6946,8 +6973,8 @@ struct UniformMatrix3fv {
   void Init(GLint _location,
             GLsizei _count,
             GLboolean _transpose,
-            uint32 _value_shm_id,
-            uint32 _value_shm_offset) {
+            uint32_t _value_shm_id,
+            uint32_t _value_shm_offset) {
     SetHeader();
     location = _location;
     count = _count;
@@ -6960,19 +6987,19 @@ struct UniformMatrix3fv {
             GLint _location,
             GLsizei _count,
             GLboolean _transpose,
-            uint32 _value_shm_id,
-            uint32 _value_shm_offset) {
+            uint32_t _value_shm_id,
+            uint32_t _value_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_location, _count, _transpose, _value_shm_id, _value_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
-  uint32 transpose;
-  uint32 value_shm_id;
-  uint32 value_shm_offset;
+  int32_t location;
+  int32_t count;
+  uint32_t transpose;
+  uint32_t value_shm_id;
+  uint32_t value_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(UniformMatrix3fv) == 24,
@@ -6996,13 +7023,13 @@ struct UniformMatrix3fvImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(GLfloat) * 9 * count);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(GLfloat) * 9 * count);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(count));  // NOLINT
+  static uint32_t ComputeSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(count));  // NOLINT
   }
 
   void SetHeader(GLsizei count) {
@@ -7026,14 +7053,14 @@ struct UniformMatrix3fvImmediate {
             GLboolean _transpose,
             const GLfloat* _value) {
     static_cast<ValueType*>(cmd)->Init(_location, _count, _transpose, _value);
-    const uint32 size = ComputeSize(_count);
+    const uint32_t size = ComputeSize(_count);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
-  uint32 transpose;
+  int32_t location;
+  int32_t count;
+  uint32_t transpose;
 };
 
 COMPILE_ASSERT(sizeof(UniformMatrix3fvImmediate) == 16,
@@ -7053,8 +7080,8 @@ struct UniformMatrix4fv {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -7062,8 +7089,8 @@ struct UniformMatrix4fv {
   void Init(GLint _location,
             GLsizei _count,
             GLboolean _transpose,
-            uint32 _value_shm_id,
-            uint32 _value_shm_offset) {
+            uint32_t _value_shm_id,
+            uint32_t _value_shm_offset) {
     SetHeader();
     location = _location;
     count = _count;
@@ -7076,19 +7103,19 @@ struct UniformMatrix4fv {
             GLint _location,
             GLsizei _count,
             GLboolean _transpose,
-            uint32 _value_shm_id,
-            uint32 _value_shm_offset) {
+            uint32_t _value_shm_id,
+            uint32_t _value_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_location, _count, _transpose, _value_shm_id, _value_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
-  uint32 transpose;
-  uint32 value_shm_id;
-  uint32 value_shm_offset;
+  int32_t location;
+  int32_t count;
+  uint32_t transpose;
+  uint32_t value_shm_id;
+  uint32_t value_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(UniformMatrix4fv) == 24,
@@ -7112,13 +7139,13 @@ struct UniformMatrix4fvImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(GLfloat) * 16 * count);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(GLfloat) * 16 * count);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(count));  // NOLINT
+  static uint32_t ComputeSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(count));  // NOLINT
   }
 
   void SetHeader(GLsizei count) {
@@ -7142,14 +7169,14 @@ struct UniformMatrix4fvImmediate {
             GLboolean _transpose,
             const GLfloat* _value) {
     static_cast<ValueType*>(cmd)->Init(_location, _count, _transpose, _value);
-    const uint32 size = ComputeSize(_count);
+    const uint32_t size = ComputeSize(_count);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 location;
-  int32 count;
-  uint32 transpose;
+  int32_t location;
+  int32_t count;
+  uint32_t transpose;
 };
 
 COMPILE_ASSERT(sizeof(UniformMatrix4fvImmediate) == 16,
@@ -7169,8 +7196,8 @@ struct UseProgram {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -7186,7 +7213,7 @@ struct UseProgram {
   }
 
   gpu::CommandHeader header;
-  uint32 program;
+  uint32_t program;
 };
 
 COMPILE_ASSERT(sizeof(UseProgram) == 8, Sizeof_UseProgram_is_not_8);
@@ -7201,8 +7228,8 @@ struct ValidateProgram {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -7218,7 +7245,7 @@ struct ValidateProgram {
   }
 
   gpu::CommandHeader header;
-  uint32 program;
+  uint32_t program;
 };
 
 COMPILE_ASSERT(sizeof(ValidateProgram) == 8, Sizeof_ValidateProgram_is_not_8);
@@ -7233,8 +7260,8 @@ struct VertexAttrib1f {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -7251,7 +7278,7 @@ struct VertexAttrib1f {
   }
 
   gpu::CommandHeader header;
-  uint32 indx;
+  uint32_t indx;
   float x;
 };
 
@@ -7269,13 +7296,15 @@ struct VertexAttrib1fv {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLuint _indx, uint32 _values_shm_id, uint32 _values_shm_offset) {
+  void Init(GLuint _indx,
+            uint32_t _values_shm_id,
+            uint32_t _values_shm_offset) {
     SetHeader();
     indx = _indx;
     values_shm_id = _values_shm_id;
@@ -7284,17 +7313,17 @@ struct VertexAttrib1fv {
 
   void* Set(void* cmd,
             GLuint _indx,
-            uint32 _values_shm_id,
-            uint32 _values_shm_offset) {
+            uint32_t _values_shm_id,
+            uint32_t _values_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_indx, _values_shm_id, _values_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 indx;
-  uint32 values_shm_id;
-  uint32 values_shm_offset;
+  uint32_t indx;
+  uint32_t values_shm_id;
+  uint32_t values_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(VertexAttrib1fv) == 16, Sizeof_VertexAttrib1fv_is_not_16);
@@ -7313,13 +7342,13 @@ struct VertexAttrib1fvImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize() {
-    return static_cast<uint32>(sizeof(GLfloat) * 1);  // NOLINT
+  static uint32_t ComputeDataSize() {
+    return static_cast<uint32_t>(sizeof(GLfloat) * 1);  // NOLINT
   }
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize());  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize());  // NOLINT
   }
 
   void SetHeader() { header.SetCmdByTotalSize<ValueType>(ComputeSize()); }
@@ -7332,12 +7361,12 @@ struct VertexAttrib1fvImmediate {
 
   void* Set(void* cmd, GLuint _indx, const GLfloat* _values) {
     static_cast<ValueType*>(cmd)->Init(_indx, _values);
-    const uint32 size = ComputeSize();
+    const uint32_t size = ComputeSize();
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  uint32 indx;
+  uint32_t indx;
 };
 
 COMPILE_ASSERT(sizeof(VertexAttrib1fvImmediate) == 8,
@@ -7353,8 +7382,8 @@ struct VertexAttrib2f {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -7372,7 +7401,7 @@ struct VertexAttrib2f {
   }
 
   gpu::CommandHeader header;
-  uint32 indx;
+  uint32_t indx;
   float x;
   float y;
 };
@@ -7393,13 +7422,15 @@ struct VertexAttrib2fv {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLuint _indx, uint32 _values_shm_id, uint32 _values_shm_offset) {
+  void Init(GLuint _indx,
+            uint32_t _values_shm_id,
+            uint32_t _values_shm_offset) {
     SetHeader();
     indx = _indx;
     values_shm_id = _values_shm_id;
@@ -7408,17 +7439,17 @@ struct VertexAttrib2fv {
 
   void* Set(void* cmd,
             GLuint _indx,
-            uint32 _values_shm_id,
-            uint32 _values_shm_offset) {
+            uint32_t _values_shm_id,
+            uint32_t _values_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_indx, _values_shm_id, _values_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 indx;
-  uint32 values_shm_id;
-  uint32 values_shm_offset;
+  uint32_t indx;
+  uint32_t values_shm_id;
+  uint32_t values_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(VertexAttrib2fv) == 16, Sizeof_VertexAttrib2fv_is_not_16);
@@ -7437,13 +7468,13 @@ struct VertexAttrib2fvImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize() {
-    return static_cast<uint32>(sizeof(GLfloat) * 2);  // NOLINT
+  static uint32_t ComputeDataSize() {
+    return static_cast<uint32_t>(sizeof(GLfloat) * 2);  // NOLINT
   }
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize());  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize());  // NOLINT
   }
 
   void SetHeader() { header.SetCmdByTotalSize<ValueType>(ComputeSize()); }
@@ -7456,12 +7487,12 @@ struct VertexAttrib2fvImmediate {
 
   void* Set(void* cmd, GLuint _indx, const GLfloat* _values) {
     static_cast<ValueType*>(cmd)->Init(_indx, _values);
-    const uint32 size = ComputeSize();
+    const uint32_t size = ComputeSize();
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  uint32 indx;
+  uint32_t indx;
 };
 
 COMPILE_ASSERT(sizeof(VertexAttrib2fvImmediate) == 8,
@@ -7477,8 +7508,8 @@ struct VertexAttrib3f {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -7497,7 +7528,7 @@ struct VertexAttrib3f {
   }
 
   gpu::CommandHeader header;
-  uint32 indx;
+  uint32_t indx;
   float x;
   float y;
   float z;
@@ -7521,13 +7552,15 @@ struct VertexAttrib3fv {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLuint _indx, uint32 _values_shm_id, uint32 _values_shm_offset) {
+  void Init(GLuint _indx,
+            uint32_t _values_shm_id,
+            uint32_t _values_shm_offset) {
     SetHeader();
     indx = _indx;
     values_shm_id = _values_shm_id;
@@ -7536,17 +7569,17 @@ struct VertexAttrib3fv {
 
   void* Set(void* cmd,
             GLuint _indx,
-            uint32 _values_shm_id,
-            uint32 _values_shm_offset) {
+            uint32_t _values_shm_id,
+            uint32_t _values_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_indx, _values_shm_id, _values_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 indx;
-  uint32 values_shm_id;
-  uint32 values_shm_offset;
+  uint32_t indx;
+  uint32_t values_shm_id;
+  uint32_t values_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(VertexAttrib3fv) == 16, Sizeof_VertexAttrib3fv_is_not_16);
@@ -7565,13 +7598,13 @@ struct VertexAttrib3fvImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize() {
-    return static_cast<uint32>(sizeof(GLfloat) * 3);  // NOLINT
+  static uint32_t ComputeDataSize() {
+    return static_cast<uint32_t>(sizeof(GLfloat) * 3);  // NOLINT
   }
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize());  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize());  // NOLINT
   }
 
   void SetHeader() { header.SetCmdByTotalSize<ValueType>(ComputeSize()); }
@@ -7584,12 +7617,12 @@ struct VertexAttrib3fvImmediate {
 
   void* Set(void* cmd, GLuint _indx, const GLfloat* _values) {
     static_cast<ValueType*>(cmd)->Init(_indx, _values);
-    const uint32 size = ComputeSize();
+    const uint32_t size = ComputeSize();
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  uint32 indx;
+  uint32_t indx;
 };
 
 COMPILE_ASSERT(sizeof(VertexAttrib3fvImmediate) == 8,
@@ -7605,8 +7638,8 @@ struct VertexAttrib4f {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -7631,7 +7664,7 @@ struct VertexAttrib4f {
   }
 
   gpu::CommandHeader header;
-  uint32 indx;
+  uint32_t indx;
   float x;
   float y;
   float z;
@@ -7658,13 +7691,15 @@ struct VertexAttrib4fv {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLuint _indx, uint32 _values_shm_id, uint32 _values_shm_offset) {
+  void Init(GLuint _indx,
+            uint32_t _values_shm_id,
+            uint32_t _values_shm_offset) {
     SetHeader();
     indx = _indx;
     values_shm_id = _values_shm_id;
@@ -7673,17 +7708,17 @@ struct VertexAttrib4fv {
 
   void* Set(void* cmd,
             GLuint _indx,
-            uint32 _values_shm_id,
-            uint32 _values_shm_offset) {
+            uint32_t _values_shm_id,
+            uint32_t _values_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_indx, _values_shm_id, _values_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 indx;
-  uint32 values_shm_id;
-  uint32 values_shm_offset;
+  uint32_t indx;
+  uint32_t values_shm_id;
+  uint32_t values_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(VertexAttrib4fv) == 16, Sizeof_VertexAttrib4fv_is_not_16);
@@ -7702,13 +7737,13 @@ struct VertexAttrib4fvImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize() {
-    return static_cast<uint32>(sizeof(GLfloat) * 4);  // NOLINT
+  static uint32_t ComputeDataSize() {
+    return static_cast<uint32_t>(sizeof(GLfloat) * 4);  // NOLINT
   }
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize());  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize());  // NOLINT
   }
 
   void SetHeader() { header.SetCmdByTotalSize<ValueType>(ComputeSize()); }
@@ -7721,12 +7756,12 @@ struct VertexAttrib4fvImmediate {
 
   void* Set(void* cmd, GLuint _indx, const GLfloat* _values) {
     static_cast<ValueType*>(cmd)->Init(_indx, _values);
-    const uint32 size = ComputeSize();
+    const uint32_t size = ComputeSize();
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  uint32 indx;
+  uint32_t indx;
 };
 
 COMPILE_ASSERT(sizeof(VertexAttrib4fvImmediate) == 8,
@@ -7742,8 +7777,8 @@ struct VertexAttribPointer {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -7776,12 +7811,12 @@ struct VertexAttribPointer {
   }
 
   gpu::CommandHeader header;
-  uint32 indx;
-  int32 size;
-  uint32 type;
-  uint32 normalized;
-  int32 stride;
-  uint32 offset;
+  uint32_t indx;
+  int32_t size;
+  uint32_t type;
+  uint32_t normalized;
+  int32_t stride;
+  uint32_t offset;
 };
 
 COMPILE_ASSERT(sizeof(VertexAttribPointer) == 28,
@@ -7807,8 +7842,8 @@ struct Viewport {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -7827,10 +7862,10 @@ struct Viewport {
   }
 
   gpu::CommandHeader header;
-  int32 x;
-  int32 y;
-  int32 width;
-  int32 height;
+  int32_t x;
+  int32_t y;
+  int32_t width;
+  int32_t height;
 };
 
 COMPILE_ASSERT(sizeof(Viewport) == 20, Sizeof_Viewport_is_not_20);
@@ -7847,8 +7882,8 @@ struct BlitFramebufferCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(1);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -7901,16 +7936,16 @@ struct BlitFramebufferCHROMIUM {
   }
 
   gpu::CommandHeader header;
-  int32 srcX0;
-  int32 srcY0;
-  int32 srcX1;
-  int32 srcY1;
-  int32 dstX0;
-  int32 dstY0;
-  int32 dstX1;
-  int32 dstY1;
-  uint32 mask;
-  uint32 filter;
+  int32_t srcX0;
+  int32_t srcY0;
+  int32_t srcX1;
+  int32_t srcY1;
+  int32_t dstX0;
+  int32_t dstY0;
+  int32_t dstX1;
+  int32_t dstY1;
+  uint32_t mask;
+  uint32_t filter;
 };
 
 COMPILE_ASSERT(sizeof(BlitFramebufferCHROMIUM) == 44,
@@ -7945,8 +7980,8 @@ struct RenderbufferStorageMultisampleCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -7976,11 +8011,11 @@ struct RenderbufferStorageMultisampleCHROMIUM {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  int32 samples;
-  uint32 internalformat;
-  int32 width;
-  int32 height;
+  uint32_t target;
+  int32_t samples;
+  uint32_t internalformat;
+  int32_t width;
+  int32_t height;
 };
 
 COMPILE_ASSERT(sizeof(RenderbufferStorageMultisampleCHROMIUM) == 24,
@@ -8006,8 +8041,8 @@ struct RenderbufferStorageMultisampleEXT {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -8037,11 +8072,11 @@ struct RenderbufferStorageMultisampleEXT {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  int32 samples;
-  uint32 internalformat;
-  int32 width;
-  int32 height;
+  uint32_t target;
+  int32_t samples;
+  uint32_t internalformat;
+  int32_t width;
+  int32_t height;
 };
 
 COMPILE_ASSERT(sizeof(RenderbufferStorageMultisampleEXT) == 24,
@@ -8066,8 +8101,8 @@ struct FramebufferTexture2DMultisampleEXT {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(1);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -8100,12 +8135,12 @@ struct FramebufferTexture2DMultisampleEXT {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 attachment;
-  uint32 textarget;
-  uint32 texture;
-  int32 level;
-  int32 samples;
+  uint32_t target;
+  uint32_t attachment;
+  uint32_t textarget;
+  uint32_t texture;
+  int32_t level;
+  int32_t samples;
 };
 
 COMPILE_ASSERT(sizeof(FramebufferTexture2DMultisampleEXT) == 28,
@@ -8131,8 +8166,8 @@ struct TexStorage2DEXT {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -8162,11 +8197,11 @@ struct TexStorage2DEXT {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  int32 levels;
-  uint32 internalFormat;
-  int32 width;
-  int32 height;
+  uint32_t target;
+  int32_t levels;
+  uint32_t internalFormat;
+  int32_t width;
+  int32_t height;
 };
 
 COMPILE_ASSERT(sizeof(TexStorage2DEXT) == 24, Sizeof_TexStorage2DEXT_is_not_24);
@@ -8189,13 +8224,15 @@ struct GenQueriesEXT {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLsizei _n, uint32 _queries_shm_id, uint32 _queries_shm_offset) {
+  void Init(GLsizei _n,
+            uint32_t _queries_shm_id,
+            uint32_t _queries_shm_offset) {
     SetHeader();
     n = _n;
     queries_shm_id = _queries_shm_id;
@@ -8204,17 +8241,17 @@ struct GenQueriesEXT {
 
   void* Set(void* cmd,
             GLsizei _n,
-            uint32 _queries_shm_id,
-            uint32 _queries_shm_offset) {
+            uint32_t _queries_shm_id,
+            uint32_t _queries_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_n, _queries_shm_id, _queries_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 n;
-  uint32 queries_shm_id;
-  uint32 queries_shm_offset;
+  int32_t n;
+  uint32_t queries_shm_id;
+  uint32_t queries_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GenQueriesEXT) == 16, Sizeof_GenQueriesEXT_is_not_16);
@@ -8232,13 +8269,13 @@ struct GenQueriesEXTImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(GLuint) * n);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(GLuint) * n);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(n));  // NOLINT
+  static uint32_t ComputeSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(n));  // NOLINT
   }
 
   void SetHeader(GLsizei n) {
@@ -8253,12 +8290,12 @@ struct GenQueriesEXTImmediate {
 
   void* Set(void* cmd, GLsizei _n, GLuint* _queries) {
     static_cast<ValueType*>(cmd)->Init(_n, _queries);
-    const uint32 size = ComputeSize(_n);
+    const uint32_t size = ComputeSize(_n);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 n;
+  int32_t n;
 };
 
 COMPILE_ASSERT(sizeof(GenQueriesEXTImmediate) == 8,
@@ -8274,13 +8311,15 @@ struct DeleteQueriesEXT {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLsizei _n, uint32 _queries_shm_id, uint32 _queries_shm_offset) {
+  void Init(GLsizei _n,
+            uint32_t _queries_shm_id,
+            uint32_t _queries_shm_offset) {
     SetHeader();
     n = _n;
     queries_shm_id = _queries_shm_id;
@@ -8289,17 +8328,17 @@ struct DeleteQueriesEXT {
 
   void* Set(void* cmd,
             GLsizei _n,
-            uint32 _queries_shm_id,
-            uint32 _queries_shm_offset) {
+            uint32_t _queries_shm_id,
+            uint32_t _queries_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_n, _queries_shm_id, _queries_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 n;
-  uint32 queries_shm_id;
-  uint32 queries_shm_offset;
+  int32_t n;
+  uint32_t queries_shm_id;
+  uint32_t queries_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(DeleteQueriesEXT) == 16,
@@ -8319,13 +8358,13 @@ struct DeleteQueriesEXTImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(GLuint) * n);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(GLuint) * n);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(n));  // NOLINT
+  static uint32_t ComputeSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(n));  // NOLINT
   }
 
   void SetHeader(GLsizei n) {
@@ -8340,12 +8379,12 @@ struct DeleteQueriesEXTImmediate {
 
   void* Set(void* cmd, GLsizei _n, const GLuint* _queries) {
     static_cast<ValueType*>(cmd)->Init(_n, _queries);
-    const uint32 size = ComputeSize(_n);
+    const uint32_t size = ComputeSize(_n);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 n;
+  int32_t n;
 };
 
 COMPILE_ASSERT(sizeof(DeleteQueriesEXTImmediate) == 8,
@@ -8361,16 +8400,16 @@ struct BeginQueryEXT {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLenum _target,
             GLuint _id,
-            uint32 _sync_data_shm_id,
-            uint32 _sync_data_shm_offset) {
+            uint32_t _sync_data_shm_id,
+            uint32_t _sync_data_shm_offset) {
     SetHeader();
     target = _target;
     id = _id;
@@ -8381,18 +8420,18 @@ struct BeginQueryEXT {
   void* Set(void* cmd,
             GLenum _target,
             GLuint _id,
-            uint32 _sync_data_shm_id,
-            uint32 _sync_data_shm_offset) {
+            uint32_t _sync_data_shm_id,
+            uint32_t _sync_data_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_target, _id, _sync_data_shm_id, _sync_data_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 id;
-  uint32 sync_data_shm_id;
-  uint32 sync_data_shm_offset;
+  uint32_t target;
+  uint32_t id;
+  uint32_t sync_data_shm_id;
+  uint32_t sync_data_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(BeginQueryEXT) == 20, Sizeof_BeginQueryEXT_is_not_20);
@@ -8413,8 +8452,8 @@ struct EndQueryEXT {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -8431,8 +8470,8 @@ struct EndQueryEXT {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 submit_count;
+  uint32_t target;
+  uint32_t submit_count;
 };
 
 COMPILE_ASSERT(sizeof(EndQueryEXT) == 12, Sizeof_EndQueryEXT_is_not_12);
@@ -8449,8 +8488,8 @@ struct InsertEventMarkerEXT {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -8466,7 +8505,7 @@ struct InsertEventMarkerEXT {
   }
 
   gpu::CommandHeader header;
-  uint32 bucket_id;
+  uint32_t bucket_id;
 };
 
 COMPILE_ASSERT(sizeof(InsertEventMarkerEXT) == 8,
@@ -8482,8 +8521,8 @@ struct PushGroupMarkerEXT {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -8499,7 +8538,7 @@ struct PushGroupMarkerEXT {
   }
 
   gpu::CommandHeader header;
-  uint32 bucket_id;
+  uint32_t bucket_id;
 };
 
 COMPILE_ASSERT(sizeof(PushGroupMarkerEXT) == 8,
@@ -8515,8 +8554,8 @@ struct PopGroupMarkerEXT {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -8542,13 +8581,13 @@ struct GenVertexArraysOES {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLsizei _n, uint32 _arrays_shm_id, uint32 _arrays_shm_offset) {
+  void Init(GLsizei _n, uint32_t _arrays_shm_id, uint32_t _arrays_shm_offset) {
     SetHeader();
     n = _n;
     arrays_shm_id = _arrays_shm_id;
@@ -8557,16 +8596,16 @@ struct GenVertexArraysOES {
 
   void* Set(void* cmd,
             GLsizei _n,
-            uint32 _arrays_shm_id,
-            uint32 _arrays_shm_offset) {
+            uint32_t _arrays_shm_id,
+            uint32_t _arrays_shm_offset) {
     static_cast<ValueType*>(cmd)->Init(_n, _arrays_shm_id, _arrays_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 n;
-  uint32 arrays_shm_id;
-  uint32 arrays_shm_offset;
+  int32_t n;
+  uint32_t arrays_shm_id;
+  uint32_t arrays_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GenVertexArraysOES) == 16,
@@ -8586,13 +8625,13 @@ struct GenVertexArraysOESImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(GLuint) * n);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(GLuint) * n);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(n));  // NOLINT
+  static uint32_t ComputeSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(n));  // NOLINT
   }
 
   void SetHeader(GLsizei n) {
@@ -8607,12 +8646,12 @@ struct GenVertexArraysOESImmediate {
 
   void* Set(void* cmd, GLsizei _n, GLuint* _arrays) {
     static_cast<ValueType*>(cmd)->Init(_n, _arrays);
-    const uint32 size = ComputeSize(_n);
+    const uint32_t size = ComputeSize(_n);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 n;
+  int32_t n;
 };
 
 COMPILE_ASSERT(sizeof(GenVertexArraysOESImmediate) == 8,
@@ -8628,13 +8667,13 @@ struct DeleteVertexArraysOES {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLsizei _n, uint32 _arrays_shm_id, uint32 _arrays_shm_offset) {
+  void Init(GLsizei _n, uint32_t _arrays_shm_id, uint32_t _arrays_shm_offset) {
     SetHeader();
     n = _n;
     arrays_shm_id = _arrays_shm_id;
@@ -8643,16 +8682,16 @@ struct DeleteVertexArraysOES {
 
   void* Set(void* cmd,
             GLsizei _n,
-            uint32 _arrays_shm_id,
-            uint32 _arrays_shm_offset) {
+            uint32_t _arrays_shm_id,
+            uint32_t _arrays_shm_offset) {
     static_cast<ValueType*>(cmd)->Init(_n, _arrays_shm_id, _arrays_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 n;
-  uint32 arrays_shm_id;
-  uint32 arrays_shm_offset;
+  int32_t n;
+  uint32_t arrays_shm_id;
+  uint32_t arrays_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(DeleteVertexArraysOES) == 16,
@@ -8672,13 +8711,13 @@ struct DeleteVertexArraysOESImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(GLuint) * n);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(GLuint) * n);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei n) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(n));  // NOLINT
+  static uint32_t ComputeSize(GLsizei n) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(n));  // NOLINT
   }
 
   void SetHeader(GLsizei n) {
@@ -8693,12 +8732,12 @@ struct DeleteVertexArraysOESImmediate {
 
   void* Set(void* cmd, GLsizei _n, const GLuint* _arrays) {
     static_cast<ValueType*>(cmd)->Init(_n, _arrays);
-    const uint32 size = ComputeSize(_n);
+    const uint32_t size = ComputeSize(_n);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 n;
+  int32_t n;
 };
 
 COMPILE_ASSERT(sizeof(DeleteVertexArraysOESImmediate) == 8,
@@ -8714,15 +8753,17 @@ struct IsVertexArrayOES {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  typedef uint32 Result;
+  typedef uint32_t Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLuint _array, uint32 _result_shm_id, uint32 _result_shm_offset) {
+  void Init(GLuint _array,
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     SetHeader();
     array = _array;
     result_shm_id = _result_shm_id;
@@ -8731,17 +8772,17 @@ struct IsVertexArrayOES {
 
   void* Set(void* cmd,
             GLuint _array,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_array, _result_shm_id, _result_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 array;
-  uint32 result_shm_id;
-  uint32 result_shm_offset;
+  uint32_t array;
+  uint32_t result_shm_id;
+  uint32_t result_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(IsVertexArrayOES) == 16,
@@ -8761,8 +8802,8 @@ struct BindVertexArrayOES {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -8778,7 +8819,7 @@ struct BindVertexArrayOES {
   }
 
   gpu::CommandHeader header;
-  uint32 array;
+  uint32_t array;
 };
 
 COMPILE_ASSERT(sizeof(BindVertexArrayOES) == 8,
@@ -8794,8 +8835,8 @@ struct SwapBuffers {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(1);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -8822,8 +8863,8 @@ struct GetMaxValueInBufferCHROMIUM {
 
   typedef GLuint Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -8832,8 +8873,8 @@ struct GetMaxValueInBufferCHROMIUM {
             GLsizei _count,
             GLenum _type,
             GLuint _offset,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     SetHeader();
     buffer_id = _buffer_id;
     count = _count;
@@ -8848,20 +8889,20 @@ struct GetMaxValueInBufferCHROMIUM {
             GLsizei _count,
             GLenum _type,
             GLuint _offset,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     static_cast<ValueType*>(cmd)->Init(
         _buffer_id, _count, _type, _offset, _result_shm_id, _result_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 buffer_id;
-  int32 count;
-  uint32 type;
-  uint32 offset;
-  uint32 result_shm_id;
-  uint32 result_shm_offset;
+  uint32_t buffer_id;
+  int32_t count;
+  uint32_t type;
+  uint32_t offset;
+  uint32_t result_shm_id;
+  uint32_t result_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GetMaxValueInBufferCHROMIUM) == 28,
@@ -8887,8 +8928,8 @@ struct GenSharedIdsCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -8896,8 +8937,8 @@ struct GenSharedIdsCHROMIUM {
   void Init(GLuint _namespace_id,
             GLuint _id_offset,
             GLsizei _n,
-            uint32 _ids_shm_id,
-            uint32 _ids_shm_offset) {
+            uint32_t _ids_shm_id,
+            uint32_t _ids_shm_offset) {
     SetHeader();
     namespace_id = _namespace_id;
     id_offset = _id_offset;
@@ -8910,19 +8951,19 @@ struct GenSharedIdsCHROMIUM {
             GLuint _namespace_id,
             GLuint _id_offset,
             GLsizei _n,
-            uint32 _ids_shm_id,
-            uint32 _ids_shm_offset) {
+            uint32_t _ids_shm_id,
+            uint32_t _ids_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_namespace_id, _id_offset, _n, _ids_shm_id, _ids_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 namespace_id;
-  uint32 id_offset;
-  int32 n;
-  uint32 ids_shm_id;
-  uint32 ids_shm_offset;
+  uint32_t namespace_id;
+  uint32_t id_offset;
+  int32_t n;
+  uint32_t ids_shm_id;
+  uint32_t ids_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(GenSharedIdsCHROMIUM) == 24,
@@ -8946,16 +8987,16 @@ struct DeleteSharedIdsCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLuint _namespace_id,
             GLsizei _n,
-            uint32 _ids_shm_id,
-            uint32 _ids_shm_offset) {
+            uint32_t _ids_shm_id,
+            uint32_t _ids_shm_offset) {
     SetHeader();
     namespace_id = _namespace_id;
     n = _n;
@@ -8966,18 +9007,18 @@ struct DeleteSharedIdsCHROMIUM {
   void* Set(void* cmd,
             GLuint _namespace_id,
             GLsizei _n,
-            uint32 _ids_shm_id,
-            uint32 _ids_shm_offset) {
+            uint32_t _ids_shm_id,
+            uint32_t _ids_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_namespace_id, _n, _ids_shm_id, _ids_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 namespace_id;
-  int32 n;
-  uint32 ids_shm_id;
-  uint32 ids_shm_offset;
+  uint32_t namespace_id;
+  int32_t n;
+  uint32_t ids_shm_id;
+  uint32_t ids_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(DeleteSharedIdsCHROMIUM) == 20,
@@ -8999,16 +9040,16 @@ struct RegisterSharedIdsCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLuint _namespace_id,
             GLsizei _n,
-            uint32 _ids_shm_id,
-            uint32 _ids_shm_offset) {
+            uint32_t _ids_shm_id,
+            uint32_t _ids_shm_offset) {
     SetHeader();
     namespace_id = _namespace_id;
     n = _n;
@@ -9019,18 +9060,18 @@ struct RegisterSharedIdsCHROMIUM {
   void* Set(void* cmd,
             GLuint _namespace_id,
             GLsizei _n,
-            uint32 _ids_shm_id,
-            uint32 _ids_shm_offset) {
+            uint32_t _ids_shm_id,
+            uint32_t _ids_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_namespace_id, _n, _ids_shm_id, _ids_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 namespace_id;
-  int32 n;
-  uint32 ids_shm_id;
-  uint32 ids_shm_offset;
+  uint32_t namespace_id;
+  int32_t n;
+  uint32_t ids_shm_id;
+  uint32_t ids_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(RegisterSharedIdsCHROMIUM) == 20,
@@ -9054,15 +9095,15 @@ struct EnableFeatureCHROMIUM {
 
   typedef GLint Result;
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLuint _bucket_id,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     SetHeader();
     bucket_id = _bucket_id;
     result_shm_id = _result_shm_id;
@@ -9071,17 +9112,17 @@ struct EnableFeatureCHROMIUM {
 
   void* Set(void* cmd,
             GLuint _bucket_id,
-            uint32 _result_shm_id,
-            uint32 _result_shm_offset) {
+            uint32_t _result_shm_id,
+            uint32_t _result_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_bucket_id, _result_shm_id, _result_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 bucket_id;
-  uint32 result_shm_id;
-  uint32 result_shm_offset;
+  uint32_t bucket_id;
+  uint32_t result_shm_id;
+  uint32_t result_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(EnableFeatureCHROMIUM) == 16,
@@ -9101,8 +9142,8 @@ struct ResizeCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -9120,8 +9161,8 @@ struct ResizeCHROMIUM {
   }
 
   gpu::CommandHeader header;
-  uint32 width;
-  uint32 height;
+  uint32_t width;
+  uint32_t height;
   float scale_factor;
 };
 
@@ -9141,24 +9182,24 @@ struct GetRequestableExtensionsCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(uint32 _bucket_id) {
+  void Init(uint32_t _bucket_id) {
     SetHeader();
     bucket_id = _bucket_id;
   }
 
-  void* Set(void* cmd, uint32 _bucket_id) {
+  void* Set(void* cmd, uint32_t _bucket_id) {
     static_cast<ValueType*>(cmd)->Init(_bucket_id);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 bucket_id;
+  uint32_t bucket_id;
 };
 
 COMPILE_ASSERT(sizeof(GetRequestableExtensionsCHROMIUM) == 8,
@@ -9174,24 +9215,24 @@ struct RequestExtensionCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(uint32 _bucket_id) {
+  void Init(uint32_t _bucket_id) {
     SetHeader();
     bucket_id = _bucket_id;
   }
 
-  void* Set(void* cmd, uint32 _bucket_id) {
+  void* Set(void* cmd, uint32_t _bucket_id) {
     static_cast<ValueType*>(cmd)->Init(_bucket_id);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 bucket_id;
+  uint32_t bucket_id;
 };
 
 COMPILE_ASSERT(sizeof(RequestExtensionCHROMIUM) == 8,
@@ -9207,17 +9248,17 @@ struct GetMultipleIntegervCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(uint32 _pnames_shm_id,
-            uint32 _pnames_shm_offset,
+  void Init(uint32_t _pnames_shm_id,
+            uint32_t _pnames_shm_offset,
             GLuint _count,
-            uint32 _results_shm_id,
-            uint32 _results_shm_offset,
+            uint32_t _results_shm_id,
+            uint32_t _results_shm_offset,
             GLsizeiptr _size) {
     SetHeader();
     pnames_shm_id = _pnames_shm_id;
@@ -9229,11 +9270,11 @@ struct GetMultipleIntegervCHROMIUM {
   }
 
   void* Set(void* cmd,
-            uint32 _pnames_shm_id,
-            uint32 _pnames_shm_offset,
+            uint32_t _pnames_shm_id,
+            uint32_t _pnames_shm_offset,
             GLuint _count,
-            uint32 _results_shm_id,
-            uint32 _results_shm_offset,
+            uint32_t _results_shm_id,
+            uint32_t _results_shm_offset,
             GLsizeiptr _size) {
     static_cast<ValueType*>(cmd)->Init(_pnames_shm_id,
                                        _pnames_shm_offset,
@@ -9245,12 +9286,12 @@ struct GetMultipleIntegervCHROMIUM {
   }
 
   gpu::CommandHeader header;
-  uint32 pnames_shm_id;
-  uint32 pnames_shm_offset;
-  uint32 count;
-  uint32 results_shm_id;
-  uint32 results_shm_offset;
-  int32 size;
+  uint32_t pnames_shm_id;
+  uint32_t pnames_shm_offset;
+  uint32_t count;
+  uint32_t results_shm_id;
+  uint32_t results_shm_offset;
+  int32_t size;
 };
 
 COMPILE_ASSERT(sizeof(GetMultipleIntegervCHROMIUM) == 28,
@@ -9277,31 +9318,31 @@ struct GetProgramInfoCHROMIUM {
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
   struct Result {
-    uint32 link_status;
-    uint32 num_attribs;
-    uint32 num_uniforms;
+    uint32_t link_status;
+    uint32_t num_attribs;
+    uint32_t num_uniforms;
   };
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLuint _program, uint32 _bucket_id) {
+  void Init(GLuint _program, uint32_t _bucket_id) {
     SetHeader();
     program = _program;
     bucket_id = _bucket_id;
   }
 
-  void* Set(void* cmd, GLuint _program, uint32 _bucket_id) {
+  void* Set(void* cmd, GLuint _program, uint32_t _bucket_id) {
     static_cast<ValueType*>(cmd)->Init(_program, _bucket_id);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 program;
-  uint32 bucket_id;
+  uint32_t program;
+  uint32_t bucket_id;
 };
 
 COMPILE_ASSERT(sizeof(GetProgramInfoCHROMIUM) == 12,
@@ -9325,26 +9366,26 @@ struct GetTranslatedShaderSourceANGLE {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLuint _shader, uint32 _bucket_id) {
+  void Init(GLuint _shader, uint32_t _bucket_id) {
     SetHeader();
     shader = _shader;
     bucket_id = _bucket_id;
   }
 
-  void* Set(void* cmd, GLuint _shader, uint32 _bucket_id) {
+  void* Set(void* cmd, GLuint _shader, uint32_t _bucket_id) {
     static_cast<ValueType*>(cmd)->Init(_shader, _bucket_id);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 shader;
-  uint32 bucket_id;
+  uint32_t shader;
+  uint32_t bucket_id;
 };
 
 COMPILE_ASSERT(sizeof(GetTranslatedShaderSourceANGLE) == 12,
@@ -9362,8 +9403,8 @@ struct PostSubBufferCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -9382,10 +9423,10 @@ struct PostSubBufferCHROMIUM {
   }
 
   gpu::CommandHeader header;
-  int32 x;
-  int32 y;
-  int32 width;
-  int32 height;
+  int32_t x;
+  int32_t y;
+  int32_t width;
+  int32_t height;
 };
 
 COMPILE_ASSERT(sizeof(PostSubBufferCHROMIUM) == 20,
@@ -9407,8 +9448,8 @@ struct TexImageIOSurface2DCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -9438,11 +9479,11 @@ struct TexImageIOSurface2DCHROMIUM {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  int32 width;
-  int32 height;
-  uint32 ioSurfaceId;
-  uint32 plane;
+  uint32_t target;
+  int32_t width;
+  int32_t height;
+  uint32_t ioSurfaceId;
+  uint32_t plane;
 };
 
 COMPILE_ASSERT(sizeof(TexImageIOSurface2DCHROMIUM) == 24,
@@ -9466,8 +9507,8 @@ struct CopyTextureCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -9500,12 +9541,12 @@ struct CopyTextureCHROMIUM {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 source_id;
-  uint32 dest_id;
-  int32 level;
-  int32 internalformat;
-  uint32 dest_type;
+  uint32_t target;
+  uint32_t source_id;
+  uint32_t dest_id;
+  int32_t level;
+  int32_t internalformat;
+  uint32_t dest_type;
 };
 
 COMPILE_ASSERT(sizeof(CopyTextureCHROMIUM) == 28,
@@ -9531,8 +9572,8 @@ struct DrawArraysInstancedANGLE {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -9555,10 +9596,10 @@ struct DrawArraysInstancedANGLE {
   }
 
   gpu::CommandHeader header;
-  uint32 mode;
-  int32 first;
-  int32 count;
-  int32 primcount;
+  uint32_t mode;
+  int32_t first;
+  int32_t count;
+  int32_t primcount;
 };
 
 COMPILE_ASSERT(sizeof(DrawArraysInstancedANGLE) == 20,
@@ -9580,8 +9621,8 @@ struct DrawElementsInstancedANGLE {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -9611,11 +9652,11 @@ struct DrawElementsInstancedANGLE {
   }
 
   gpu::CommandHeader header;
-  uint32 mode;
-  int32 count;
-  uint32 type;
-  uint32 index_offset;
-  int32 primcount;
+  uint32_t mode;
+  int32_t count;
+  uint32_t type;
+  uint32_t index_offset;
+  int32_t primcount;
 };
 
 COMPILE_ASSERT(sizeof(DrawElementsInstancedANGLE) == 24,
@@ -9639,8 +9680,8 @@ struct VertexAttribDivisorANGLE {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -9657,8 +9698,8 @@ struct VertexAttribDivisorANGLE {
   }
 
   gpu::CommandHeader header;
-  uint32 index;
-  uint32 divisor;
+  uint32_t index;
+  uint32_t divisor;
 };
 
 COMPILE_ASSERT(sizeof(VertexAttribDivisorANGLE) == 12,
@@ -9676,15 +9717,15 @@ struct ProduceTextureCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(1);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLenum _target,
-            uint32 _mailbox_shm_id,
-            uint32 _mailbox_shm_offset) {
+            uint32_t _mailbox_shm_id,
+            uint32_t _mailbox_shm_offset) {
     SetHeader();
     target = _target;
     mailbox_shm_id = _mailbox_shm_id;
@@ -9693,17 +9734,17 @@ struct ProduceTextureCHROMIUM {
 
   void* Set(void* cmd,
             GLenum _target,
-            uint32 _mailbox_shm_id,
-            uint32 _mailbox_shm_offset) {
+            uint32_t _mailbox_shm_id,
+            uint32_t _mailbox_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_target, _mailbox_shm_id, _mailbox_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 mailbox_shm_id;
-  uint32 mailbox_shm_offset;
+  uint32_t target;
+  uint32_t mailbox_shm_id;
+  uint32_t mailbox_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(ProduceTextureCHROMIUM) == 16,
@@ -9723,13 +9764,13 @@ struct ProduceTextureCHROMIUMImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(1);
 
-  static uint32 ComputeDataSize() {
-    return static_cast<uint32>(sizeof(GLbyte) * 64);  // NOLINT
+  static uint32_t ComputeDataSize() {
+    return static_cast<uint32_t>(sizeof(GLbyte) * 64);  // NOLINT
   }
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize());  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize());  // NOLINT
   }
 
   void SetHeader() { header.SetCmdByTotalSize<ValueType>(ComputeSize()); }
@@ -9742,12 +9783,12 @@ struct ProduceTextureCHROMIUMImmediate {
 
   void* Set(void* cmd, GLenum _target, const GLbyte* _mailbox) {
     static_cast<ValueType*>(cmd)->Init(_target, _mailbox);
-    const uint32 size = ComputeSize();
+    const uint32_t size = ComputeSize();
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  uint32 target;
+  uint32_t target;
 };
 
 COMPILE_ASSERT(sizeof(ProduceTextureCHROMIUMImmediate) == 8,
@@ -9763,15 +9804,15 @@ struct ConsumeTextureCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(1);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLenum _target,
-            uint32 _mailbox_shm_id,
-            uint32 _mailbox_shm_offset) {
+            uint32_t _mailbox_shm_id,
+            uint32_t _mailbox_shm_offset) {
     SetHeader();
     target = _target;
     mailbox_shm_id = _mailbox_shm_id;
@@ -9780,17 +9821,17 @@ struct ConsumeTextureCHROMIUM {
 
   void* Set(void* cmd,
             GLenum _target,
-            uint32 _mailbox_shm_id,
-            uint32 _mailbox_shm_offset) {
+            uint32_t _mailbox_shm_id,
+            uint32_t _mailbox_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_target, _mailbox_shm_id, _mailbox_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  uint32 mailbox_shm_id;
-  uint32 mailbox_shm_offset;
+  uint32_t target;
+  uint32_t mailbox_shm_id;
+  uint32_t mailbox_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(ConsumeTextureCHROMIUM) == 16,
@@ -9810,13 +9851,13 @@ struct ConsumeTextureCHROMIUMImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(1);
 
-  static uint32 ComputeDataSize() {
-    return static_cast<uint32>(sizeof(GLbyte) * 64);  // NOLINT
+  static uint32_t ComputeDataSize() {
+    return static_cast<uint32_t>(sizeof(GLbyte) * 64);  // NOLINT
   }
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize());  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize());  // NOLINT
   }
 
   void SetHeader() { header.SetCmdByTotalSize<ValueType>(ComputeSize()); }
@@ -9829,12 +9870,12 @@ struct ConsumeTextureCHROMIUMImmediate {
 
   void* Set(void* cmd, GLenum _target, const GLbyte* _mailbox) {
     static_cast<ValueType*>(cmd)->Init(_target, _mailbox);
-    const uint32 size = ComputeSize();
+    const uint32_t size = ComputeSize();
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  uint32 target;
+  uint32_t target;
 };
 
 COMPILE_ASSERT(sizeof(ConsumeTextureCHROMIUMImmediate) == 8,
@@ -9850,17 +9891,17 @@ struct BindUniformLocationCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLuint _program,
             GLint _location,
-            uint32 _name_shm_id,
-            uint32 _name_shm_offset,
-            uint32 _data_size) {
+            uint32_t _name_shm_id,
+            uint32_t _name_shm_offset,
+            uint32_t _data_size) {
     SetHeader();
     program = _program;
     location = _location;
@@ -9872,20 +9913,20 @@ struct BindUniformLocationCHROMIUM {
   void* Set(void* cmd,
             GLuint _program,
             GLint _location,
-            uint32 _name_shm_id,
-            uint32 _name_shm_offset,
-            uint32 _data_size) {
+            uint32_t _name_shm_id,
+            uint32_t _name_shm_offset,
+            uint32_t _data_size) {
     static_cast<ValueType*>(cmd)
         ->Init(_program, _location, _name_shm_id, _name_shm_offset, _data_size);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 program;
-  int32 location;
-  uint32 name_shm_id;
-  uint32 name_shm_offset;
-  uint32 data_size;
+  uint32_t program;
+  int32_t location;
+  uint32_t name_shm_id;
+  uint32_t name_shm_offset;
+  uint32_t data_size;
 };
 
 COMPILE_ASSERT(sizeof(BindUniformLocationCHROMIUM) == 24,
@@ -9909,13 +9950,13 @@ struct BindUniformLocationCHROMIUMBucket {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLuint _program, GLint _location, uint32 _name_bucket_id) {
+  void Init(GLuint _program, GLint _location, uint32_t _name_bucket_id) {
     SetHeader();
     program = _program;
     location = _location;
@@ -9925,15 +9966,15 @@ struct BindUniformLocationCHROMIUMBucket {
   void* Set(void* cmd,
             GLuint _program,
             GLint _location,
-            uint32 _name_bucket_id) {
+            uint32_t _name_bucket_id) {
     static_cast<ValueType*>(cmd)->Init(_program, _location, _name_bucket_id);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 program;
-  int32 location;
-  uint32 name_bucket_id;
+  uint32_t program;
+  int32_t location;
+  uint32_t name_bucket_id;
 };
 
 COMPILE_ASSERT(sizeof(BindUniformLocationCHROMIUMBucket) == 16,
@@ -9954,8 +9995,8 @@ struct BindTexImage2DCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -9972,8 +10013,8 @@ struct BindTexImage2DCHROMIUM {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  int32 imageId;
+  uint32_t target;
+  int32_t imageId;
 };
 
 COMPILE_ASSERT(sizeof(BindTexImage2DCHROMIUM) == 12,
@@ -9991,8 +10032,8 @@ struct ReleaseTexImage2DCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -10009,8 +10050,8 @@ struct ReleaseTexImage2DCHROMIUM {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  int32 imageId;
+  uint32_t target;
+  int32_t imageId;
 };
 
 COMPILE_ASSERT(sizeof(ReleaseTexImage2DCHROMIUM) == 12,
@@ -10028,8 +10069,8 @@ struct TraceBeginCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -10045,7 +10086,7 @@ struct TraceBeginCHROMIUM {
   }
 
   gpu::CommandHeader header;
-  uint32 bucket_id;
+  uint32_t bucket_id;
 };
 
 COMPILE_ASSERT(sizeof(TraceBeginCHROMIUM) == 8,
@@ -10061,8 +10102,8 @@ struct TraceEndCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -10087,8 +10128,8 @@ struct AsyncTexSubImage2DCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -10101,11 +10142,11 @@ struct AsyncTexSubImage2DCHROMIUM {
             GLsizei _height,
             GLenum _format,
             GLenum _type,
-            uint32 _data_shm_id,
-            uint32 _data_shm_offset,
-            uint32 _async_upload_token,
-            uint32 _sync_data_shm_id,
-            uint32 _sync_data_shm_offset) {
+            uint32_t _data_shm_id,
+            uint32_t _data_shm_offset,
+            uint32_t _async_upload_token,
+            uint32_t _sync_data_shm_id,
+            uint32_t _sync_data_shm_offset) {
     SetHeader();
     target = _target;
     level = _level;
@@ -10131,11 +10172,11 @@ struct AsyncTexSubImage2DCHROMIUM {
             GLsizei _height,
             GLenum _format,
             GLenum _type,
-            uint32 _data_shm_id,
-            uint32 _data_shm_offset,
-            uint32 _async_upload_token,
-            uint32 _sync_data_shm_id,
-            uint32 _sync_data_shm_offset) {
+            uint32_t _data_shm_id,
+            uint32_t _data_shm_offset,
+            uint32_t _async_upload_token,
+            uint32_t _sync_data_shm_id,
+            uint32_t _sync_data_shm_offset) {
     static_cast<ValueType*>(cmd)->Init(_target,
                                        _level,
                                        _xoffset,
@@ -10153,19 +10194,19 @@ struct AsyncTexSubImage2DCHROMIUM {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  int32 level;
-  int32 xoffset;
-  int32 yoffset;
-  int32 width;
-  int32 height;
-  uint32 format;
-  uint32 type;
-  uint32 data_shm_id;
-  uint32 data_shm_offset;
-  uint32 async_upload_token;
-  uint32 sync_data_shm_id;
-  uint32 sync_data_shm_offset;
+  uint32_t target;
+  int32_t level;
+  int32_t xoffset;
+  int32_t yoffset;
+  int32_t width;
+  int32_t height;
+  uint32_t format;
+  uint32_t type;
+  uint32_t data_shm_id;
+  uint32_t data_shm_offset;
+  uint32_t async_upload_token;
+  uint32_t sync_data_shm_id;
+  uint32_t sync_data_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(AsyncTexSubImage2DCHROMIUM) == 56,
@@ -10205,8 +10246,8 @@ struct AsyncTexImage2DCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -10219,11 +10260,11 @@ struct AsyncTexImage2DCHROMIUM {
             GLint _border,
             GLenum _format,
             GLenum _type,
-            uint32 _pixels_shm_id,
-            uint32 _pixels_shm_offset,
-            uint32 _async_upload_token,
-            uint32 _sync_data_shm_id,
-            uint32 _sync_data_shm_offset) {
+            uint32_t _pixels_shm_id,
+            uint32_t _pixels_shm_offset,
+            uint32_t _async_upload_token,
+            uint32_t _sync_data_shm_id,
+            uint32_t _sync_data_shm_offset) {
     SetHeader();
     target = _target;
     level = _level;
@@ -10249,11 +10290,11 @@ struct AsyncTexImage2DCHROMIUM {
             GLint _border,
             GLenum _format,
             GLenum _type,
-            uint32 _pixels_shm_id,
-            uint32 _pixels_shm_offset,
-            uint32 _async_upload_token,
-            uint32 _sync_data_shm_id,
-            uint32 _sync_data_shm_offset) {
+            uint32_t _pixels_shm_id,
+            uint32_t _pixels_shm_offset,
+            uint32_t _async_upload_token,
+            uint32_t _sync_data_shm_id,
+            uint32_t _sync_data_shm_offset) {
     static_cast<ValueType*>(cmd)->Init(_target,
                                        _level,
                                        _internalformat,
@@ -10271,19 +10312,19 @@ struct AsyncTexImage2DCHROMIUM {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  int32 level;
-  int32 internalformat;
-  int32 width;
-  int32 height;
-  int32 border;
-  uint32 format;
-  uint32 type;
-  uint32 pixels_shm_id;
-  uint32 pixels_shm_offset;
-  uint32 async_upload_token;
-  uint32 sync_data_shm_id;
-  uint32 sync_data_shm_offset;
+  uint32_t target;
+  int32_t level;
+  int32_t internalformat;
+  int32_t width;
+  int32_t height;
+  int32_t border;
+  uint32_t format;
+  uint32_t type;
+  uint32_t pixels_shm_id;
+  uint32_t pixels_shm_offset;
+  uint32_t async_upload_token;
+  uint32_t sync_data_shm_id;
+  uint32_t sync_data_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(AsyncTexImage2DCHROMIUM) == 56,
@@ -10323,8 +10364,8 @@ struct WaitAsyncTexImage2DCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -10340,7 +10381,7 @@ struct WaitAsyncTexImage2DCHROMIUM {
   }
 
   gpu::CommandHeader header;
-  uint32 target;
+  uint32_t target;
 };
 
 COMPILE_ASSERT(sizeof(WaitAsyncTexImage2DCHROMIUM) == 8,
@@ -10356,8 +10397,8 @@ struct WaitAllAsyncTexImage2DCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -10383,16 +10424,16 @@ struct DiscardFramebufferEXT {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
   void Init(GLenum _target,
             GLsizei _count,
-            uint32 _attachments_shm_id,
-            uint32 _attachments_shm_offset) {
+            uint32_t _attachments_shm_id,
+            uint32_t _attachments_shm_offset) {
     SetHeader();
     target = _target;
     count = _count;
@@ -10403,18 +10444,18 @@ struct DiscardFramebufferEXT {
   void* Set(void* cmd,
             GLenum _target,
             GLsizei _count,
-            uint32 _attachments_shm_id,
-            uint32 _attachments_shm_offset) {
+            uint32_t _attachments_shm_id,
+            uint32_t _attachments_shm_offset) {
     static_cast<ValueType*>(cmd)
         ->Init(_target, _count, _attachments_shm_id, _attachments_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  int32 count;
-  uint32 attachments_shm_id;
-  uint32 attachments_shm_offset;
+  uint32_t target;
+  int32_t count;
+  uint32_t attachments_shm_id;
+  uint32_t attachments_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(DiscardFramebufferEXT) == 20,
@@ -10436,13 +10477,13 @@ struct DiscardFramebufferEXTImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(GLenum) * 1 * count);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(GLenum) * 1 * count);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(count));  // NOLINT
+  static uint32_t ComputeSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(count));  // NOLINT
   }
 
   void SetHeader(GLsizei count) {
@@ -10461,13 +10502,13 @@ struct DiscardFramebufferEXTImmediate {
             GLsizei _count,
             const GLenum* _attachments) {
     static_cast<ValueType*>(cmd)->Init(_target, _count, _attachments);
-    const uint32 size = ComputeSize(_count);
+    const uint32_t size = ComputeSize(_count);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  uint32 target;
-  int32 count;
+  uint32_t target;
+  int32_t count;
 };
 
 COMPILE_ASSERT(sizeof(DiscardFramebufferEXTImmediate) == 12,
@@ -10485,8 +10526,8 @@ struct LoseContextCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -10503,8 +10544,8 @@ struct LoseContextCHROMIUM {
   }
 
   gpu::CommandHeader header;
-  uint32 current;
-  uint32 other;
+  uint32_t current;
+  uint32_t other;
 };
 
 COMPILE_ASSERT(sizeof(LoseContextCHROMIUM) == 12,
@@ -10522,8 +10563,8 @@ struct WaitSyncPointCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(1);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -10539,7 +10580,7 @@ struct WaitSyncPointCHROMIUM {
   }
 
   gpu::CommandHeader header;
-  uint32 sync_point;
+  uint32_t sync_point;
 };
 
 COMPILE_ASSERT(sizeof(WaitSyncPointCHROMIUM) == 8,
@@ -10555,13 +10596,13 @@ struct DrawBuffersEXT {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
 
-  void Init(GLsizei _count, uint32 _bufs_shm_id, uint32 _bufs_shm_offset) {
+  void Init(GLsizei _count, uint32_t _bufs_shm_id, uint32_t _bufs_shm_offset) {
     SetHeader();
     count = _count;
     bufs_shm_id = _bufs_shm_id;
@@ -10570,16 +10611,16 @@ struct DrawBuffersEXT {
 
   void* Set(void* cmd,
             GLsizei _count,
-            uint32 _bufs_shm_id,
-            uint32 _bufs_shm_offset) {
+            uint32_t _bufs_shm_id,
+            uint32_t _bufs_shm_offset) {
     static_cast<ValueType*>(cmd)->Init(_count, _bufs_shm_id, _bufs_shm_offset);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
-  int32 count;
-  uint32 bufs_shm_id;
-  uint32 bufs_shm_offset;
+  int32_t count;
+  uint32_t bufs_shm_id;
+  uint32_t bufs_shm_offset;
 };
 
 COMPILE_ASSERT(sizeof(DrawBuffersEXT) == 16, Sizeof_DrawBuffersEXT_is_not_16);
@@ -10598,13 +10639,13 @@ struct DrawBuffersEXTImmediate {
   static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeDataSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(GLenum) * 1 * count);  // NOLINT
+  static uint32_t ComputeDataSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(GLenum) * 1 * count);  // NOLINT
   }
 
-  static uint32 ComputeSize(GLsizei count) {
-    return static_cast<uint32>(sizeof(ValueType) +
-                               ComputeDataSize(count));  // NOLINT
+  static uint32_t ComputeSize(GLsizei count) {
+    return static_cast<uint32_t>(sizeof(ValueType) +
+                                 ComputeDataSize(count));  // NOLINT
   }
 
   void SetHeader(GLsizei count) {
@@ -10619,12 +10660,12 @@ struct DrawBuffersEXTImmediate {
 
   void* Set(void* cmd, GLsizei _count, const GLenum* _bufs) {
     static_cast<ValueType*>(cmd)->Init(_count, _bufs);
-    const uint32 size = ComputeSize(_count);
+    const uint32_t size = ComputeSize(_count);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size);
   }
 
   gpu::CommandHeader header;
-  int32 count;
+  int32_t count;
 };
 
 COMPILE_ASSERT(sizeof(DrawBuffersEXTImmediate) == 8,
@@ -10640,8 +10681,8 @@ struct DiscardBackbufferCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -10667,8 +10708,8 @@ struct ScheduleOverlayPlaneCHROMIUM {
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
   static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
+  static uint32_t ComputeSize() {
+    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() { header.SetCmd<ValueType>(); }
@@ -10725,13 +10766,13 @@ struct ScheduleOverlayPlaneCHROMIUM {
   }
 
   gpu::CommandHeader header;
-  int32 plane_z_order;
-  uint32 plane_transform;
-  uint32 overlay_texture_id;
-  int32 bounds_x;
-  int32 bounds_y;
-  int32 bounds_width;
-  int32 bounds_height;
+  int32_t plane_z_order;
+  uint32_t plane_transform;
+  uint32_t overlay_texture_id;
+  int32_t bounds_x;
+  int32_t bounds_y;
+  int32_t bounds_width;
+  int32_t bounds_height;
   float uv_x;
   float uv_y;
   float uv_width;
diff --git a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
index 9b6836d..115137d 100644
--- a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
@@ -17,7 +17,7 @@
 TEST_F(GLES2FormatTest, ActiveTexture) {
   cmds::ActiveTexture& cmd = *GetBufferAs<cmds::ActiveTexture>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::ActiveTexture::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::ActiveTexture::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.texture);
@@ -28,7 +28,7 @@ TEST_F(GLES2FormatTest, AttachShader) {
   cmds::AttachShader& cmd = *GetBufferAs<cmds::AttachShader>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<GLuint>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::AttachShader::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::AttachShader::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
@@ -41,17 +41,17 @@ TEST_F(GLES2FormatTest, BindAttribLocation) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
                            static_cast<GLuint>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14),
-                           static_cast<uint32>(15));
-  EXPECT_EQ(static_cast<uint32>(cmds::BindAttribLocation::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14),
+                           static_cast<uint32_t>(15));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::BindAttribLocation::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
   EXPECT_EQ(static_cast<GLuint>(12), cmd.index);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.name_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.name_shm_offset);
-  EXPECT_EQ(static_cast<uint32>(15), cmd.data_size);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.name_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.name_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(15), cmd.data_size);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -61,13 +61,13 @@ TEST_F(GLES2FormatTest, BindAttribLocationBucket) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
                            static_cast<GLuint>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::BindAttribLocationBucket::kCmdId),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::BindAttribLocationBucket::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
   EXPECT_EQ(static_cast<GLuint>(12), cmd.index);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.name_bucket_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.name_bucket_id);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -75,7 +75,8 @@ TEST_F(GLES2FormatTest, BindBuffer) {
   cmds::BindBuffer& cmd = *GetBufferAs<cmds::BindBuffer>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLuint>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::BindBuffer::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::BindBuffer::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
   EXPECT_EQ(static_cast<GLuint>(12), cmd.buffer);
@@ -86,7 +87,7 @@ TEST_F(GLES2FormatTest, BindFramebuffer) {
   cmds::BindFramebuffer& cmd = *GetBufferAs<cmds::BindFramebuffer>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLuint>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::BindFramebuffer::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::BindFramebuffer::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -98,7 +99,7 @@ TEST_F(GLES2FormatTest, BindRenderbuffer) {
   cmds::BindRenderbuffer& cmd = *GetBufferAs<cmds::BindRenderbuffer>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLuint>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::BindRenderbuffer::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::BindRenderbuffer::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -110,7 +111,8 @@ TEST_F(GLES2FormatTest, BindTexture) {
   cmds::BindTexture& cmd = *GetBufferAs<cmds::BindTexture>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLuint>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::BindTexture::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::BindTexture::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
   EXPECT_EQ(static_cast<GLuint>(12), cmd.texture);
@@ -124,7 +126,8 @@ TEST_F(GLES2FormatTest, BlendColor) {
                            static_cast<GLclampf>(12),
                            static_cast<GLclampf>(13),
                            static_cast<GLclampf>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::BlendColor::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::BlendColor::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLclampf>(11), cmd.red);
   EXPECT_EQ(static_cast<GLclampf>(12), cmd.green);
@@ -136,7 +139,7 @@ TEST_F(GLES2FormatTest, BlendColor) {
 TEST_F(GLES2FormatTest, BlendEquation) {
   cmds::BlendEquation& cmd = *GetBufferAs<cmds::BlendEquation>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::BlendEquation::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::BlendEquation::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.mode);
@@ -148,7 +151,7 @@ TEST_F(GLES2FormatTest, BlendEquationSeparate) {
       *GetBufferAs<cmds::BlendEquationSeparate>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLenum>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::BlendEquationSeparate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::BlendEquationSeparate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.modeRGB);
@@ -160,7 +163,7 @@ TEST_F(GLES2FormatTest, BlendFunc) {
   cmds::BlendFunc& cmd = *GetBufferAs<cmds::BlendFunc>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLenum>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::BlendFunc::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::BlendFunc::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.sfactor);
   EXPECT_EQ(static_cast<GLenum>(12), cmd.dfactor);
@@ -174,7 +177,7 @@ TEST_F(GLES2FormatTest, BlendFuncSeparate) {
                            static_cast<GLenum>(12),
                            static_cast<GLenum>(13),
                            static_cast<GLenum>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::BlendFuncSeparate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::BlendFuncSeparate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.srcRGB);
@@ -189,15 +192,16 @@ TEST_F(GLES2FormatTest, BufferData) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLenum>(11),
                            static_cast<GLsizeiptr>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14),
                            static_cast<GLenum>(15));
-  EXPECT_EQ(static_cast<uint32>(cmds::BufferData::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::BufferData::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
   EXPECT_EQ(static_cast<GLsizeiptr>(12), cmd.size);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.data_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.data_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.data_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.data_shm_offset);
   EXPECT_EQ(static_cast<GLenum>(15), cmd.usage);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
@@ -208,16 +212,16 @@ TEST_F(GLES2FormatTest, BufferSubData) {
                            static_cast<GLenum>(11),
                            static_cast<GLintptr>(12),
                            static_cast<GLsizeiptr>(13),
-                           static_cast<uint32>(14),
-                           static_cast<uint32>(15));
-  EXPECT_EQ(static_cast<uint32>(cmds::BufferSubData::kCmdId),
+                           static_cast<uint32_t>(14),
+                           static_cast<uint32_t>(15));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::BufferSubData::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
   EXPECT_EQ(static_cast<GLintptr>(12), cmd.offset);
   EXPECT_EQ(static_cast<GLsizeiptr>(13), cmd.size);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.data_shm_id);
-  EXPECT_EQ(static_cast<uint32>(15), cmd.data_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.data_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(15), cmd.data_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -226,21 +230,21 @@ TEST_F(GLES2FormatTest, CheckFramebufferStatus) {
       *GetBufferAs<cmds::CheckFramebufferStatus>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLenum>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::CheckFramebufferStatus::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::CheckFramebufferStatus::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.result_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.result_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.result_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.result_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
 TEST_F(GLES2FormatTest, Clear) {
   cmds::Clear& cmd = *GetBufferAs<cmds::Clear>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLbitfield>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::Clear::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Clear::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLbitfield>(11), cmd.mask);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
@@ -253,7 +257,8 @@ TEST_F(GLES2FormatTest, ClearColor) {
                            static_cast<GLclampf>(12),
                            static_cast<GLclampf>(13),
                            static_cast<GLclampf>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::ClearColor::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::ClearColor::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLclampf>(11), cmd.red);
   EXPECT_EQ(static_cast<GLclampf>(12), cmd.green);
@@ -265,7 +270,8 @@ TEST_F(GLES2FormatTest, ClearColor) {
 TEST_F(GLES2FormatTest, ClearDepthf) {
   cmds::ClearDepthf& cmd = *GetBufferAs<cmds::ClearDepthf>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLclampf>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::ClearDepthf::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::ClearDepthf::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLclampf>(11), cmd.depth);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
@@ -274,7 +280,7 @@ TEST_F(GLES2FormatTest, ClearDepthf) {
 TEST_F(GLES2FormatTest, ClearStencil) {
   cmds::ClearStencil& cmd = *GetBufferAs<cmds::ClearStencil>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLint>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::ClearStencil::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::ClearStencil::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.s);
@@ -288,7 +294,7 @@ TEST_F(GLES2FormatTest, ColorMask) {
                            static_cast<GLboolean>(12),
                            static_cast<GLboolean>(13),
                            static_cast<GLboolean>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::ColorMask::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::ColorMask::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLboolean>(11), cmd.red);
   EXPECT_EQ(static_cast<GLboolean>(12), cmd.green);
@@ -300,7 +306,7 @@ TEST_F(GLES2FormatTest, ColorMask) {
 TEST_F(GLES2FormatTest, CompileShader) {
   cmds::CompileShader& cmd = *GetBufferAs<cmds::CompileShader>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::CompileShader::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::CompileShader::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.shader);
@@ -317,9 +323,9 @@ TEST_F(GLES2FormatTest, CompressedTexImage2D) {
                            static_cast<GLsizei>(15),
                            static_cast<GLint>(16),
                            static_cast<GLsizei>(17),
-                           static_cast<uint32>(18),
-                           static_cast<uint32>(19));
-  EXPECT_EQ(static_cast<uint32>(cmds::CompressedTexImage2D::kCmdId),
+                           static_cast<uint32_t>(18),
+                           static_cast<uint32_t>(19));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::CompressedTexImage2D::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -329,8 +335,8 @@ TEST_F(GLES2FormatTest, CompressedTexImage2D) {
   EXPECT_EQ(static_cast<GLsizei>(15), cmd.height);
   EXPECT_EQ(static_cast<GLint>(16), cmd.border);
   EXPECT_EQ(static_cast<GLsizei>(17), cmd.imageSize);
-  EXPECT_EQ(static_cast<uint32>(18), cmd.data_shm_id);
-  EXPECT_EQ(static_cast<uint32>(19), cmd.data_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(18), cmd.data_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(19), cmd.data_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -345,7 +351,7 @@ TEST_F(GLES2FormatTest, CompressedTexImage2DBucket) {
                            static_cast<GLsizei>(15),
                            static_cast<GLint>(16),
                            static_cast<GLuint>(17));
-  EXPECT_EQ(static_cast<uint32>(cmds::CompressedTexImage2DBucket::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::CompressedTexImage2DBucket::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -370,9 +376,9 @@ TEST_F(GLES2FormatTest, CompressedTexSubImage2D) {
                            static_cast<GLsizei>(16),
                            static_cast<GLenum>(17),
                            static_cast<GLsizei>(18),
-                           static_cast<uint32>(19),
-                           static_cast<uint32>(20));
-  EXPECT_EQ(static_cast<uint32>(cmds::CompressedTexSubImage2D::kCmdId),
+                           static_cast<uint32_t>(19),
+                           static_cast<uint32_t>(20));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::CompressedTexSubImage2D::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -383,8 +389,8 @@ TEST_F(GLES2FormatTest, CompressedTexSubImage2D) {
   EXPECT_EQ(static_cast<GLsizei>(16), cmd.height);
   EXPECT_EQ(static_cast<GLenum>(17), cmd.format);
   EXPECT_EQ(static_cast<GLsizei>(18), cmd.imageSize);
-  EXPECT_EQ(static_cast<uint32>(19), cmd.data_shm_id);
-  EXPECT_EQ(static_cast<uint32>(20), cmd.data_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(19), cmd.data_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(20), cmd.data_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -400,7 +406,7 @@ TEST_F(GLES2FormatTest, CompressedTexSubImage2DBucket) {
                            static_cast<GLsizei>(16),
                            static_cast<GLenum>(17),
                            static_cast<GLuint>(18));
-  EXPECT_EQ(static_cast<uint32>(cmds::CompressedTexSubImage2DBucket::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::CompressedTexSubImage2DBucket::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -425,7 +431,7 @@ TEST_F(GLES2FormatTest, CopyTexImage2D) {
                            static_cast<GLsizei>(16),
                            static_cast<GLsizei>(17),
                            static_cast<GLint>(18));
-  EXPECT_EQ(static_cast<uint32>(cmds::CopyTexImage2D::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::CopyTexImage2D::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -450,7 +456,7 @@ TEST_F(GLES2FormatTest, CopyTexSubImage2D) {
                            static_cast<GLint>(16),
                            static_cast<GLsizei>(17),
                            static_cast<GLsizei>(18));
-  EXPECT_EQ(static_cast<uint32>(cmds::CopyTexSubImage2D::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::CopyTexSubImage2D::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -466,30 +472,30 @@ TEST_F(GLES2FormatTest, CopyTexSubImage2D) {
 
 TEST_F(GLES2FormatTest, CreateProgram) {
   cmds::CreateProgram& cmd = *GetBufferAs<cmds::CreateProgram>();
-  void* next_cmd = cmd.Set(&cmd, static_cast<uint32>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::CreateProgram::kCmdId),
+  void* next_cmd = cmd.Set(&cmd, static_cast<uint32_t>(11));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::CreateProgram::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
-  EXPECT_EQ(static_cast<uint32>(11), cmd.client_id);
+  EXPECT_EQ(static_cast<uint32_t>(11), cmd.client_id);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
 TEST_F(GLES2FormatTest, CreateShader) {
   cmds::CreateShader& cmd = *GetBufferAs<cmds::CreateShader>();
   void* next_cmd =
-      cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<uint32>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::CreateShader::kCmdId),
+      cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<uint32_t>(12));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::CreateShader::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.type);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.client_id);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.client_id);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
 TEST_F(GLES2FormatTest, CullFace) {
   cmds::CullFace& cmd = *GetBufferAs<cmds::CullFace>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::CullFace::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::CullFace::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.mode);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
@@ -499,14 +505,14 @@ TEST_F(GLES2FormatTest, DeleteBuffers) {
   cmds::DeleteBuffers& cmd = *GetBufferAs<cmds::DeleteBuffers>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLsizei>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::DeleteBuffers::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteBuffers::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLsizei>(11), cmd.n);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.buffers_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.buffers_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.buffers_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.buffers_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -517,7 +523,7 @@ TEST_F(GLES2FormatTest, DeleteBuffersImmediate) {
   cmds::DeleteBuffersImmediate& cmd =
       *GetBufferAs<cmds::DeleteBuffersImmediate>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLsizei>(arraysize(ids)), ids);
-  EXPECT_EQ(static_cast<uint32>(cmds::DeleteBuffersImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteBuffersImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(cmd.n * 4u),
             cmd.header.size * 4u);
@@ -532,14 +538,14 @@ TEST_F(GLES2FormatTest, DeleteFramebuffers) {
   cmds::DeleteFramebuffers& cmd = *GetBufferAs<cmds::DeleteFramebuffers>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLsizei>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::DeleteFramebuffers::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteFramebuffers::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLsizei>(11), cmd.n);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.framebuffers_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.framebuffers_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.framebuffers_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.framebuffers_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -550,7 +556,7 @@ TEST_F(GLES2FormatTest, DeleteFramebuffersImmediate) {
   cmds::DeleteFramebuffersImmediate& cmd =
       *GetBufferAs<cmds::DeleteFramebuffersImmediate>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLsizei>(arraysize(ids)), ids);
-  EXPECT_EQ(static_cast<uint32>(cmds::DeleteFramebuffersImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteFramebuffersImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(cmd.n * 4u),
             cmd.header.size * 4u);
@@ -564,7 +570,7 @@ TEST_F(GLES2FormatTest, DeleteFramebuffersImmediate) {
 TEST_F(GLES2FormatTest, DeleteProgram) {
   cmds::DeleteProgram& cmd = *GetBufferAs<cmds::DeleteProgram>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::DeleteProgram::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteProgram::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
@@ -575,14 +581,14 @@ TEST_F(GLES2FormatTest, DeleteRenderbuffers) {
   cmds::DeleteRenderbuffers& cmd = *GetBufferAs<cmds::DeleteRenderbuffers>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLsizei>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::DeleteRenderbuffers::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteRenderbuffers::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLsizei>(11), cmd.n);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.renderbuffers_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.renderbuffers_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.renderbuffers_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.renderbuffers_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -593,7 +599,7 @@ TEST_F(GLES2FormatTest, DeleteRenderbuffersImmediate) {
   cmds::DeleteRenderbuffersImmediate& cmd =
       *GetBufferAs<cmds::DeleteRenderbuffersImmediate>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLsizei>(arraysize(ids)), ids);
-  EXPECT_EQ(static_cast<uint32>(cmds::DeleteRenderbuffersImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteRenderbuffersImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(cmd.n * 4u),
             cmd.header.size * 4u);
@@ -607,7 +613,7 @@ TEST_F(GLES2FormatTest, DeleteRenderbuffersImmediate) {
 TEST_F(GLES2FormatTest, DeleteShader) {
   cmds::DeleteShader& cmd = *GetBufferAs<cmds::DeleteShader>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::DeleteShader::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteShader::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.shader);
@@ -618,14 +624,14 @@ TEST_F(GLES2FormatTest, DeleteTextures) {
   cmds::DeleteTextures& cmd = *GetBufferAs<cmds::DeleteTextures>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLsizei>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::DeleteTextures::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteTextures::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLsizei>(11), cmd.n);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.textures_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.textures_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.textures_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.textures_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -636,7 +642,7 @@ TEST_F(GLES2FormatTest, DeleteTexturesImmediate) {
   cmds::DeleteTexturesImmediate& cmd =
       *GetBufferAs<cmds::DeleteTexturesImmediate>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLsizei>(arraysize(ids)), ids);
-  EXPECT_EQ(static_cast<uint32>(cmds::DeleteTexturesImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteTexturesImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(cmd.n * 4u),
             cmd.header.size * 4u);
@@ -650,7 +656,7 @@ TEST_F(GLES2FormatTest, DeleteTexturesImmediate) {
 TEST_F(GLES2FormatTest, DepthFunc) {
   cmds::DepthFunc& cmd = *GetBufferAs<cmds::DepthFunc>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::DepthFunc::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DepthFunc::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.func);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
@@ -659,7 +665,7 @@ TEST_F(GLES2FormatTest, DepthFunc) {
 TEST_F(GLES2FormatTest, DepthMask) {
   cmds::DepthMask& cmd = *GetBufferAs<cmds::DepthMask>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLboolean>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::DepthMask::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DepthMask::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLboolean>(11), cmd.flag);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
@@ -669,7 +675,8 @@ TEST_F(GLES2FormatTest, DepthRangef) {
   cmds::DepthRangef& cmd = *GetBufferAs<cmds::DepthRangef>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLclampf>(11), static_cast<GLclampf>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::DepthRangef::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DepthRangef::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLclampf>(11), cmd.zNear);
   EXPECT_EQ(static_cast<GLclampf>(12), cmd.zFar);
@@ -680,7 +687,7 @@ TEST_F(GLES2FormatTest, DetachShader) {
   cmds::DetachShader& cmd = *GetBufferAs<cmds::DetachShader>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<GLuint>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::DetachShader::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DetachShader::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
@@ -691,7 +698,7 @@ TEST_F(GLES2FormatTest, DetachShader) {
 TEST_F(GLES2FormatTest, Disable) {
   cmds::Disable& cmd = *GetBufferAs<cmds::Disable>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::Disable::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Disable::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.cap);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
@@ -701,7 +708,7 @@ TEST_F(GLES2FormatTest, DisableVertexAttribArray) {
   cmds::DisableVertexAttribArray& cmd =
       *GetBufferAs<cmds::DisableVertexAttribArray>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::DisableVertexAttribArray::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DisableVertexAttribArray::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.index);
@@ -714,7 +721,8 @@ TEST_F(GLES2FormatTest, DrawArrays) {
                            static_cast<GLenum>(11),
                            static_cast<GLint>(12),
                            static_cast<GLsizei>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::DrawArrays::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DrawArrays::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.mode);
   EXPECT_EQ(static_cast<GLint>(12), cmd.first);
@@ -729,7 +737,7 @@ TEST_F(GLES2FormatTest, DrawElements) {
                            static_cast<GLsizei>(12),
                            static_cast<GLenum>(13),
                            static_cast<GLuint>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::DrawElements::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DrawElements::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.mode);
@@ -742,7 +750,7 @@ TEST_F(GLES2FormatTest, DrawElements) {
 TEST_F(GLES2FormatTest, Enable) {
   cmds::Enable& cmd = *GetBufferAs<cmds::Enable>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::Enable::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Enable::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.cap);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
@@ -752,7 +760,7 @@ TEST_F(GLES2FormatTest, EnableVertexAttribArray) {
   cmds::EnableVertexAttribArray& cmd =
       *GetBufferAs<cmds::EnableVertexAttribArray>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::EnableVertexAttribArray::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::EnableVertexAttribArray::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.index);
@@ -762,7 +770,7 @@ TEST_F(GLES2FormatTest, EnableVertexAttribArray) {
 TEST_F(GLES2FormatTest, Finish) {
   cmds::Finish& cmd = *GetBufferAs<cmds::Finish>();
   void* next_cmd = cmd.Set(&cmd);
-  EXPECT_EQ(static_cast<uint32>(cmds::Finish::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Finish::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
@@ -770,7 +778,7 @@ TEST_F(GLES2FormatTest, Finish) {
 TEST_F(GLES2FormatTest, Flush) {
   cmds::Flush& cmd = *GetBufferAs<cmds::Flush>();
   void* next_cmd = cmd.Set(&cmd);
-  EXPECT_EQ(static_cast<uint32>(cmds::Flush::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Flush::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
@@ -783,7 +791,7 @@ TEST_F(GLES2FormatTest, FramebufferRenderbuffer) {
                            static_cast<GLenum>(12),
                            static_cast<GLenum>(13),
                            static_cast<GLuint>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::FramebufferRenderbuffer::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::FramebufferRenderbuffer::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -801,7 +809,7 @@ TEST_F(GLES2FormatTest, FramebufferTexture2D) {
                            static_cast<GLenum>(13),
                            static_cast<GLuint>(14),
                            static_cast<GLint>(15));
-  EXPECT_EQ(static_cast<uint32>(cmds::FramebufferTexture2D::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::FramebufferTexture2D::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -815,7 +823,7 @@ TEST_F(GLES2FormatTest, FramebufferTexture2D) {
 TEST_F(GLES2FormatTest, FrontFace) {
   cmds::FrontFace& cmd = *GetBufferAs<cmds::FrontFace>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::FrontFace::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::FrontFace::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.mode);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
@@ -825,13 +833,14 @@ TEST_F(GLES2FormatTest, GenBuffers) {
   cmds::GenBuffers& cmd = *GetBufferAs<cmds::GenBuffers>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLsizei>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::GenBuffers::kCmdId), cmd.header.command);
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GenBuffers::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLsizei>(11), cmd.n);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.buffers_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.buffers_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.buffers_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.buffers_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -841,7 +850,7 @@ TEST_F(GLES2FormatTest, GenBuffersImmediate) {
   };
   cmds::GenBuffersImmediate& cmd = *GetBufferAs<cmds::GenBuffersImmediate>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLsizei>(arraysize(ids)), ids);
-  EXPECT_EQ(static_cast<uint32>(cmds::GenBuffersImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GenBuffersImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(cmd.n * 4u),
             cmd.header.size * 4u);
@@ -855,7 +864,7 @@ TEST_F(GLES2FormatTest, GenBuffersImmediate) {
 TEST_F(GLES2FormatTest, GenerateMipmap) {
   cmds::GenerateMipmap& cmd = *GetBufferAs<cmds::GenerateMipmap>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::GenerateMipmap::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GenerateMipmap::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -866,14 +875,14 @@ TEST_F(GLES2FormatTest, GenFramebuffers) {
   cmds::GenFramebuffers& cmd = *GetBufferAs<cmds::GenFramebuffers>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLsizei>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::GenFramebuffers::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GenFramebuffers::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLsizei>(11), cmd.n);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.framebuffers_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.framebuffers_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.framebuffers_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.framebuffers_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -884,7 +893,7 @@ TEST_F(GLES2FormatTest, GenFramebuffersImmediate) {
   cmds::GenFramebuffersImmediate& cmd =
       *GetBufferAs<cmds::GenFramebuffersImmediate>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLsizei>(arraysize(ids)), ids);
-  EXPECT_EQ(static_cast<uint32>(cmds::GenFramebuffersImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GenFramebuffersImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(cmd.n * 4u),
             cmd.header.size * 4u);
@@ -899,14 +908,14 @@ TEST_F(GLES2FormatTest, GenRenderbuffers) {
   cmds::GenRenderbuffers& cmd = *GetBufferAs<cmds::GenRenderbuffers>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLsizei>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::GenRenderbuffers::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GenRenderbuffers::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLsizei>(11), cmd.n);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.renderbuffers_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.renderbuffers_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.renderbuffers_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.renderbuffers_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -917,7 +926,7 @@ TEST_F(GLES2FormatTest, GenRenderbuffersImmediate) {
   cmds::GenRenderbuffersImmediate& cmd =
       *GetBufferAs<cmds::GenRenderbuffersImmediate>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLsizei>(arraysize(ids)), ids);
-  EXPECT_EQ(static_cast<uint32>(cmds::GenRenderbuffersImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GenRenderbuffersImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(cmd.n * 4u),
             cmd.header.size * 4u);
@@ -932,13 +941,14 @@ TEST_F(GLES2FormatTest, GenTextures) {
   cmds::GenTextures& cmd = *GetBufferAs<cmds::GenTextures>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLsizei>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::GenTextures::kCmdId), cmd.header.command);
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GenTextures::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLsizei>(11), cmd.n);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.textures_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.textures_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.textures_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.textures_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -948,7 +958,7 @@ TEST_F(GLES2FormatTest, GenTexturesImmediate) {
   };
   cmds::GenTexturesImmediate& cmd = *GetBufferAs<cmds::GenTexturesImmediate>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLsizei>(arraysize(ids)), ids);
-  EXPECT_EQ(static_cast<uint32>(cmds::GenTexturesImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GenTexturesImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(cmd.n * 4u),
             cmd.header.size * 4u);
@@ -964,17 +974,17 @@ TEST_F(GLES2FormatTest, GetActiveAttrib) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
                            static_cast<GLuint>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14),
-                           static_cast<uint32>(15));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetActiveAttrib::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14),
+                           static_cast<uint32_t>(15));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetActiveAttrib::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
   EXPECT_EQ(static_cast<GLuint>(12), cmd.index);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.name_bucket_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.result_shm_id);
-  EXPECT_EQ(static_cast<uint32>(15), cmd.result_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.name_bucket_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.result_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(15), cmd.result_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -983,17 +993,17 @@ TEST_F(GLES2FormatTest, GetActiveUniform) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
                            static_cast<GLuint>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14),
-                           static_cast<uint32>(15));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetActiveUniform::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14),
+                           static_cast<uint32_t>(15));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetActiveUniform::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
   EXPECT_EQ(static_cast<GLuint>(12), cmd.index);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.name_bucket_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.result_shm_id);
-  EXPECT_EQ(static_cast<uint32>(15), cmd.result_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.name_bucket_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.result_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(15), cmd.result_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1001,16 +1011,16 @@ TEST_F(GLES2FormatTest, GetAttachedShaders) {
   cmds::GetAttachedShaders& cmd = *GetBufferAs<cmds::GetAttachedShaders>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetAttachedShaders::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetAttachedShaders::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.result_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.result_shm_offset);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.result_size);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.result_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.result_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.result_size);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1020,13 +1030,14 @@ TEST_F(GLES2FormatTest, GetBooleanv) {
   cmds::GetBooleanv& cmd = *GetBufferAs<cmds::GetBooleanv>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLenum>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetBooleanv::kCmdId), cmd.header.command);
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetBooleanv::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.pname);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.params_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.params_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.params_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.params_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1035,26 +1046,26 @@ TEST_F(GLES2FormatTest, GetBufferParameteriv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLenum>(11),
                            static_cast<GLenum>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetBufferParameteriv::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetBufferParameteriv::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
   EXPECT_EQ(static_cast<GLenum>(12), cmd.pname);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.params_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.params_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.params_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.params_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
 TEST_F(GLES2FormatTest, GetError) {
   cmds::GetError& cmd = *GetBufferAs<cmds::GetError>();
   void* next_cmd =
-      cmd.Set(&cmd, static_cast<uint32>(11), static_cast<uint32>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetError::kCmdId), cmd.header.command);
+      cmd.Set(&cmd, static_cast<uint32_t>(11), static_cast<uint32_t>(12));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetError::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
-  EXPECT_EQ(static_cast<uint32>(11), cmd.result_shm_id);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.result_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(11), cmd.result_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.result_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1062,13 +1073,13 @@ TEST_F(GLES2FormatTest, GetFloatv) {
   cmds::GetFloatv& cmd = *GetBufferAs<cmds::GetFloatv>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLenum>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetFloatv::kCmdId), cmd.header.command);
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetFloatv::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.pname);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.params_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.params_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.params_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.params_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1079,17 +1090,17 @@ TEST_F(GLES2FormatTest, GetFramebufferAttachmentParameteriv) {
                            static_cast<GLenum>(11),
                            static_cast<GLenum>(12),
                            static_cast<GLenum>(13),
-                           static_cast<uint32>(14),
-                           static_cast<uint32>(15));
+                           static_cast<uint32_t>(14),
+                           static_cast<uint32_t>(15));
   EXPECT_EQ(
-      static_cast<uint32>(cmds::GetFramebufferAttachmentParameteriv::kCmdId),
+      static_cast<uint32_t>(cmds::GetFramebufferAttachmentParameteriv::kCmdId),
       cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
   EXPECT_EQ(static_cast<GLenum>(12), cmd.attachment);
   EXPECT_EQ(static_cast<GLenum>(13), cmd.pname);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.params_shm_id);
-  EXPECT_EQ(static_cast<uint32>(15), cmd.params_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.params_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(15), cmd.params_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1097,13 +1108,14 @@ TEST_F(GLES2FormatTest, GetIntegerv) {
   cmds::GetIntegerv& cmd = *GetBufferAs<cmds::GetIntegerv>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLenum>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetIntegerv::kCmdId), cmd.header.command);
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetIntegerv::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.pname);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.params_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.params_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.params_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.params_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1112,27 +1124,27 @@ TEST_F(GLES2FormatTest, GetProgramiv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
                            static_cast<GLenum>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetProgramiv::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetProgramiv::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
   EXPECT_EQ(static_cast<GLenum>(12), cmd.pname);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.params_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.params_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.params_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.params_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
 TEST_F(GLES2FormatTest, GetProgramInfoLog) {
   cmds::GetProgramInfoLog& cmd = *GetBufferAs<cmds::GetProgramInfoLog>();
   void* next_cmd =
-      cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetProgramInfoLog::kCmdId),
+      cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32_t>(12));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetProgramInfoLog::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.bucket_id);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.bucket_id);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1142,15 +1154,15 @@ TEST_F(GLES2FormatTest, GetRenderbufferParameteriv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLenum>(11),
                            static_cast<GLenum>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetRenderbufferParameteriv::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetRenderbufferParameteriv::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
   EXPECT_EQ(static_cast<GLenum>(12), cmd.pname);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.params_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.params_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.params_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.params_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1159,26 +1171,27 @@ TEST_F(GLES2FormatTest, GetShaderiv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
                            static_cast<GLenum>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetShaderiv::kCmdId), cmd.header.command);
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetShaderiv::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.shader);
   EXPECT_EQ(static_cast<GLenum>(12), cmd.pname);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.params_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.params_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.params_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.params_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
 TEST_F(GLES2FormatTest, GetShaderInfoLog) {
   cmds::GetShaderInfoLog& cmd = *GetBufferAs<cmds::GetShaderInfoLog>();
   void* next_cmd =
-      cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetShaderInfoLog::kCmdId),
+      cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32_t>(12));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetShaderInfoLog::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.shader);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.bucket_id);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.bucket_id);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1188,38 +1201,38 @@ TEST_F(GLES2FormatTest, GetShaderPrecisionFormat) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLenum>(11),
                            static_cast<GLenum>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetShaderPrecisionFormat::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetShaderPrecisionFormat::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.shadertype);
   EXPECT_EQ(static_cast<GLenum>(12), cmd.precisiontype);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.result_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.result_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.result_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.result_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
 TEST_F(GLES2FormatTest, GetShaderSource) {
   cmds::GetShaderSource& cmd = *GetBufferAs<cmds::GetShaderSource>();
   void* next_cmd =
-      cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetShaderSource::kCmdId),
+      cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32_t>(12));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetShaderSource::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.shader);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.bucket_id);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.bucket_id);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
 TEST_F(GLES2FormatTest, GetString) {
   cmds::GetString& cmd = *GetBufferAs<cmds::GetString>();
   void* next_cmd =
-      cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<uint32>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetString::kCmdId), cmd.header.command);
+      cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<uint32_t>(12));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetString::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.name);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.bucket_id);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.bucket_id);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1228,15 +1241,15 @@ TEST_F(GLES2FormatTest, GetTexParameterfv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLenum>(11),
                            static_cast<GLenum>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetTexParameterfv::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetTexParameterfv::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
   EXPECT_EQ(static_cast<GLenum>(12), cmd.pname);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.params_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.params_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.params_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.params_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1245,15 +1258,15 @@ TEST_F(GLES2FormatTest, GetTexParameteriv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLenum>(11),
                            static_cast<GLenum>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetTexParameteriv::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetTexParameteriv::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
   EXPECT_EQ(static_cast<GLenum>(12), cmd.pname);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.params_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.params_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.params_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.params_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1262,15 +1275,15 @@ TEST_F(GLES2FormatTest, GetUniformfv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
                            static_cast<GLint>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetUniformfv::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetUniformfv::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
   EXPECT_EQ(static_cast<GLint>(12), cmd.location);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.params_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.params_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.params_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.params_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1279,15 +1292,15 @@ TEST_F(GLES2FormatTest, GetUniformiv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
                            static_cast<GLint>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetUniformiv::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetUniformiv::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
   EXPECT_EQ(static_cast<GLint>(12), cmd.location);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.params_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.params_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.params_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.params_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1298,15 +1311,15 @@ TEST_F(GLES2FormatTest, GetVertexAttribfv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
                            static_cast<GLenum>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetVertexAttribfv::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetVertexAttribfv::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.index);
   EXPECT_EQ(static_cast<GLenum>(12), cmd.pname);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.params_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.params_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.params_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.params_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1315,15 +1328,15 @@ TEST_F(GLES2FormatTest, GetVertexAttribiv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
                            static_cast<GLenum>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetVertexAttribiv::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetVertexAttribiv::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.index);
   EXPECT_EQ(static_cast<GLenum>(12), cmd.pname);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.params_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.params_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.params_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.params_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1333,15 +1346,15 @@ TEST_F(GLES2FormatTest, GetVertexAttribPointerv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
                            static_cast<GLenum>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetVertexAttribPointerv::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetVertexAttribPointerv::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.index);
   EXPECT_EQ(static_cast<GLenum>(12), cmd.pname);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.pointer_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.pointer_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.pointer_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.pointer_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1349,7 +1362,7 @@ TEST_F(GLES2FormatTest, Hint) {
   cmds::Hint& cmd = *GetBufferAs<cmds::Hint>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLenum>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::Hint::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Hint::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
   EXPECT_EQ(static_cast<GLenum>(12), cmd.mode);
@@ -1360,13 +1373,13 @@ TEST_F(GLES2FormatTest, IsBuffer) {
   cmds::IsBuffer& cmd = *GetBufferAs<cmds::IsBuffer>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::IsBuffer::kCmdId), cmd.header.command);
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::IsBuffer::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.buffer);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.result_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.result_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.result_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.result_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1374,13 +1387,13 @@ TEST_F(GLES2FormatTest, IsEnabled) {
   cmds::IsEnabled& cmd = *GetBufferAs<cmds::IsEnabled>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLenum>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::IsEnabled::kCmdId), cmd.header.command);
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::IsEnabled::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.cap);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.result_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.result_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.result_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.result_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1388,14 +1401,14 @@ TEST_F(GLES2FormatTest, IsFramebuffer) {
   cmds::IsFramebuffer& cmd = *GetBufferAs<cmds::IsFramebuffer>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::IsFramebuffer::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::IsFramebuffer::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.framebuffer);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.result_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.result_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.result_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.result_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1403,13 +1416,13 @@ TEST_F(GLES2FormatTest, IsProgram) {
   cmds::IsProgram& cmd = *GetBufferAs<cmds::IsProgram>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::IsProgram::kCmdId), cmd.header.command);
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::IsProgram::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.result_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.result_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.result_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.result_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1417,14 +1430,14 @@ TEST_F(GLES2FormatTest, IsRenderbuffer) {
   cmds::IsRenderbuffer& cmd = *GetBufferAs<cmds::IsRenderbuffer>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::IsRenderbuffer::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::IsRenderbuffer::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.renderbuffer);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.result_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.result_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.result_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.result_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1432,13 +1445,13 @@ TEST_F(GLES2FormatTest, IsShader) {
   cmds::IsShader& cmd = *GetBufferAs<cmds::IsShader>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::IsShader::kCmdId), cmd.header.command);
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::IsShader::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.shader);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.result_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.result_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.result_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.result_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1446,20 +1459,20 @@ TEST_F(GLES2FormatTest, IsTexture) {
   cmds::IsTexture& cmd = *GetBufferAs<cmds::IsTexture>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::IsTexture::kCmdId), cmd.header.command);
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::IsTexture::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.texture);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.result_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.result_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.result_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.result_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
 TEST_F(GLES2FormatTest, LineWidth) {
   cmds::LineWidth& cmd = *GetBufferAs<cmds::LineWidth>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLfloat>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::LineWidth::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::LineWidth::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLfloat>(11), cmd.width);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
@@ -1468,7 +1481,8 @@ TEST_F(GLES2FormatTest, LineWidth) {
 TEST_F(GLES2FormatTest, LinkProgram) {
   cmds::LinkProgram& cmd = *GetBufferAs<cmds::LinkProgram>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::LinkProgram::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::LinkProgram::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
@@ -1478,7 +1492,8 @@ TEST_F(GLES2FormatTest, PixelStorei) {
   cmds::PixelStorei& cmd = *GetBufferAs<cmds::PixelStorei>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLint>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::PixelStorei::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::PixelStorei::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.pname);
   EXPECT_EQ(static_cast<GLint>(12), cmd.param);
@@ -1489,7 +1504,7 @@ TEST_F(GLES2FormatTest, PolygonOffset) {
   cmds::PolygonOffset& cmd = *GetBufferAs<cmds::PolygonOffset>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLfloat>(11), static_cast<GLfloat>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::PolygonOffset::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::PolygonOffset::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLfloat>(11), cmd.factor);
@@ -1506,12 +1521,13 @@ TEST_F(GLES2FormatTest, ReadPixels) {
                            static_cast<GLsizei>(14),
                            static_cast<GLenum>(15),
                            static_cast<GLenum>(16),
-                           static_cast<uint32>(17),
-                           static_cast<uint32>(18),
-                           static_cast<uint32>(19),
-                           static_cast<uint32>(20),
+                           static_cast<uint32_t>(17),
+                           static_cast<uint32_t>(18),
+                           static_cast<uint32_t>(19),
+                           static_cast<uint32_t>(20),
                            static_cast<GLboolean>(21));
-  EXPECT_EQ(static_cast<uint32>(cmds::ReadPixels::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::ReadPixels::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.x);
   EXPECT_EQ(static_cast<GLint>(12), cmd.y);
@@ -1519,10 +1535,10 @@ TEST_F(GLES2FormatTest, ReadPixels) {
   EXPECT_EQ(static_cast<GLsizei>(14), cmd.height);
   EXPECT_EQ(static_cast<GLenum>(15), cmd.format);
   EXPECT_EQ(static_cast<GLenum>(16), cmd.type);
-  EXPECT_EQ(static_cast<uint32>(17), cmd.pixels_shm_id);
-  EXPECT_EQ(static_cast<uint32>(18), cmd.pixels_shm_offset);
-  EXPECT_EQ(static_cast<uint32>(19), cmd.result_shm_id);
-  EXPECT_EQ(static_cast<uint32>(20), cmd.result_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(17), cmd.pixels_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(18), cmd.pixels_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(19), cmd.result_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(20), cmd.result_shm_offset);
   EXPECT_EQ(static_cast<GLboolean>(21), cmd.async);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
@@ -1531,7 +1547,7 @@ TEST_F(GLES2FormatTest, ReleaseShaderCompiler) {
   cmds::ReleaseShaderCompiler& cmd =
       *GetBufferAs<cmds::ReleaseShaderCompiler>();
   void* next_cmd = cmd.Set(&cmd);
-  EXPECT_EQ(static_cast<uint32>(cmds::ReleaseShaderCompiler::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::ReleaseShaderCompiler::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
@@ -1544,7 +1560,7 @@ TEST_F(GLES2FormatTest, RenderbufferStorage) {
                            static_cast<GLenum>(12),
                            static_cast<GLsizei>(13),
                            static_cast<GLsizei>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::RenderbufferStorage::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::RenderbufferStorage::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -1558,7 +1574,7 @@ TEST_F(GLES2FormatTest, SampleCoverage) {
   cmds::SampleCoverage& cmd = *GetBufferAs<cmds::SampleCoverage>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLclampf>(11), static_cast<GLboolean>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::SampleCoverage::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::SampleCoverage::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLclampf>(11), cmd.value);
@@ -1573,7 +1589,7 @@ TEST_F(GLES2FormatTest, Scissor) {
                            static_cast<GLint>(12),
                            static_cast<GLsizei>(13),
                            static_cast<GLsizei>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::Scissor::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Scissor::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.x);
   EXPECT_EQ(static_cast<GLint>(12), cmd.y);
@@ -1586,21 +1602,21 @@ TEST_F(GLES2FormatTest, ShaderBinary) {
   cmds::ShaderBinary& cmd = *GetBufferAs<cmds::ShaderBinary>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLsizei>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13),
                            static_cast<GLenum>(14),
-                           static_cast<uint32>(15),
-                           static_cast<uint32>(16),
+                           static_cast<uint32_t>(15),
+                           static_cast<uint32_t>(16),
                            static_cast<GLsizei>(17));
-  EXPECT_EQ(static_cast<uint32>(cmds::ShaderBinary::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::ShaderBinary::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLsizei>(11), cmd.n);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.shaders_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.shaders_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.shaders_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.shaders_shm_offset);
   EXPECT_EQ(static_cast<GLenum>(14), cmd.binaryformat);
-  EXPECT_EQ(static_cast<uint32>(15), cmd.binary_shm_id);
-  EXPECT_EQ(static_cast<uint32>(16), cmd.binary_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(15), cmd.binary_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(16), cmd.binary_shm_offset);
   EXPECT_EQ(static_cast<GLsizei>(17), cmd.length);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
@@ -1609,28 +1625,28 @@ TEST_F(GLES2FormatTest, ShaderSource) {
   cmds::ShaderSource& cmd = *GetBufferAs<cmds::ShaderSource>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::ShaderSource::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::ShaderSource::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.shader);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.data_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.data_shm_offset);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.data_size);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.data_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.data_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.data_size);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
 TEST_F(GLES2FormatTest, ShaderSourceBucket) {
   cmds::ShaderSourceBucket& cmd = *GetBufferAs<cmds::ShaderSourceBucket>();
   void* next_cmd =
-      cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::ShaderSourceBucket::kCmdId),
+      cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32_t>(12));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::ShaderSourceBucket::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.shader);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.data_bucket_id);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.data_bucket_id);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1640,7 +1656,8 @@ TEST_F(GLES2FormatTest, StencilFunc) {
                            static_cast<GLenum>(11),
                            static_cast<GLint>(12),
                            static_cast<GLuint>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::StencilFunc::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::StencilFunc::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.func);
   EXPECT_EQ(static_cast<GLint>(12), cmd.ref);
@@ -1655,7 +1672,7 @@ TEST_F(GLES2FormatTest, StencilFuncSeparate) {
                            static_cast<GLenum>(12),
                            static_cast<GLint>(13),
                            static_cast<GLuint>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::StencilFuncSeparate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::StencilFuncSeparate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.face);
@@ -1668,7 +1685,8 @@ TEST_F(GLES2FormatTest, StencilFuncSeparate) {
 TEST_F(GLES2FormatTest, StencilMask) {
   cmds::StencilMask& cmd = *GetBufferAs<cmds::StencilMask>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::StencilMask::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::StencilMask::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.mask);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
@@ -1678,7 +1696,7 @@ TEST_F(GLES2FormatTest, StencilMaskSeparate) {
   cmds::StencilMaskSeparate& cmd = *GetBufferAs<cmds::StencilMaskSeparate>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLuint>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::StencilMaskSeparate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::StencilMaskSeparate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.face);
@@ -1692,7 +1710,7 @@ TEST_F(GLES2FormatTest, StencilOp) {
                            static_cast<GLenum>(11),
                            static_cast<GLenum>(12),
                            static_cast<GLenum>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::StencilOp::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::StencilOp::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.fail);
   EXPECT_EQ(static_cast<GLenum>(12), cmd.zfail);
@@ -1707,7 +1725,7 @@ TEST_F(GLES2FormatTest, StencilOpSeparate) {
                            static_cast<GLenum>(12),
                            static_cast<GLenum>(13),
                            static_cast<GLenum>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::StencilOpSeparate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::StencilOpSeparate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.face);
@@ -1728,9 +1746,10 @@ TEST_F(GLES2FormatTest, TexImage2D) {
                            static_cast<GLint>(16),
                            static_cast<GLenum>(17),
                            static_cast<GLenum>(18),
-                           static_cast<uint32>(19),
-                           static_cast<uint32>(20));
-  EXPECT_EQ(static_cast<uint32>(cmds::TexImage2D::kCmdId), cmd.header.command);
+                           static_cast<uint32_t>(19),
+                           static_cast<uint32_t>(20));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::TexImage2D::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
   EXPECT_EQ(static_cast<GLint>(12), cmd.level);
@@ -1740,8 +1759,8 @@ TEST_F(GLES2FormatTest, TexImage2D) {
   EXPECT_EQ(static_cast<GLint>(16), cmd.border);
   EXPECT_EQ(static_cast<GLenum>(17), cmd.format);
   EXPECT_EQ(static_cast<GLenum>(18), cmd.type);
-  EXPECT_EQ(static_cast<uint32>(19), cmd.pixels_shm_id);
-  EXPECT_EQ(static_cast<uint32>(20), cmd.pixels_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(19), cmd.pixels_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(20), cmd.pixels_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1751,7 +1770,7 @@ TEST_F(GLES2FormatTest, TexParameterf) {
                            static_cast<GLenum>(11),
                            static_cast<GLenum>(12),
                            static_cast<GLfloat>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::TexParameterf::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::TexParameterf::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -1765,15 +1784,15 @@ TEST_F(GLES2FormatTest, TexParameterfv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLenum>(11),
                            static_cast<GLenum>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::TexParameterfv::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::TexParameterfv::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
   EXPECT_EQ(static_cast<GLenum>(12), cmd.pname);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.params_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.params_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.params_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.params_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1786,7 +1805,7 @@ TEST_F(GLES2FormatTest, TexParameterfvImmediate) {
       *GetBufferAs<cmds::TexParameterfvImmediate>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLenum>(12), data);
-  EXPECT_EQ(static_cast<uint32>(cmds::TexParameterfvImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::TexParameterfvImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)),
             cmd.header.size * 4u);
@@ -1803,7 +1822,7 @@ TEST_F(GLES2FormatTest, TexParameteri) {
                            static_cast<GLenum>(11),
                            static_cast<GLenum>(12),
                            static_cast<GLint>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::TexParameteri::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::TexParameteri::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -1817,15 +1836,15 @@ TEST_F(GLES2FormatTest, TexParameteriv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLenum>(11),
                            static_cast<GLenum>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::TexParameteriv::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::TexParameteriv::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
   EXPECT_EQ(static_cast<GLenum>(12), cmd.pname);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.params_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.params_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.params_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.params_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1838,7 +1857,7 @@ TEST_F(GLES2FormatTest, TexParameterivImmediate) {
       *GetBufferAs<cmds::TexParameterivImmediate>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLenum>(12), data);
-  EXPECT_EQ(static_cast<uint32>(cmds::TexParameterivImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::TexParameterivImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)),
             cmd.header.size * 4u);
@@ -1860,10 +1879,10 @@ TEST_F(GLES2FormatTest, TexSubImage2D) {
                            static_cast<GLsizei>(16),
                            static_cast<GLenum>(17),
                            static_cast<GLenum>(18),
-                           static_cast<uint32>(19),
-                           static_cast<uint32>(20),
+                           static_cast<uint32_t>(19),
+                           static_cast<uint32_t>(20),
                            static_cast<GLboolean>(21));
-  EXPECT_EQ(static_cast<uint32>(cmds::TexSubImage2D::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::TexSubImage2D::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -1874,8 +1893,8 @@ TEST_F(GLES2FormatTest, TexSubImage2D) {
   EXPECT_EQ(static_cast<GLsizei>(16), cmd.height);
   EXPECT_EQ(static_cast<GLenum>(17), cmd.format);
   EXPECT_EQ(static_cast<GLenum>(18), cmd.type);
-  EXPECT_EQ(static_cast<uint32>(19), cmd.pixels_shm_id);
-  EXPECT_EQ(static_cast<uint32>(20), cmd.pixels_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(19), cmd.pixels_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(20), cmd.pixels_shm_offset);
   EXPECT_EQ(static_cast<GLboolean>(21), cmd.internal);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
@@ -1884,7 +1903,7 @@ TEST_F(GLES2FormatTest, Uniform1f) {
   cmds::Uniform1f& cmd = *GetBufferAs<cmds::Uniform1f>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLint>(11), static_cast<GLfloat>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform1f::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform1f::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.location);
   EXPECT_EQ(static_cast<GLfloat>(12), cmd.x);
@@ -1896,14 +1915,15 @@ TEST_F(GLES2FormatTest, Uniform1fv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLint>(11),
                            static_cast<GLsizei>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform1fv::kCmdId), cmd.header.command);
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform1fv::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.location);
   EXPECT_EQ(static_cast<GLsizei>(12), cmd.count);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.v_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.v_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.v_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.v_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1919,7 +1939,7 @@ TEST_F(GLES2FormatTest, Uniform1fvImmediate) {
       sizeof(cmd) + kNumElements * sizeof(GLfloat) * 1;
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLint>(1), static_cast<GLsizei>(2), data);
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform1fvImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform1fvImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(kExpectedCmdSize, cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(1), cmd.location);
@@ -1933,7 +1953,7 @@ TEST_F(GLES2FormatTest, Uniform1i) {
   cmds::Uniform1i& cmd = *GetBufferAs<cmds::Uniform1i>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLint>(11), static_cast<GLint>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform1i::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform1i::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.location);
   EXPECT_EQ(static_cast<GLint>(12), cmd.x);
@@ -1945,14 +1965,15 @@ TEST_F(GLES2FormatTest, Uniform1iv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLint>(11),
                            static_cast<GLsizei>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform1iv::kCmdId), cmd.header.command);
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform1iv::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.location);
   EXPECT_EQ(static_cast<GLsizei>(12), cmd.count);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.v_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.v_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.v_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.v_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -1968,7 +1989,7 @@ TEST_F(GLES2FormatTest, Uniform1ivImmediate) {
       sizeof(cmd) + kNumElements * sizeof(GLint) * 1;
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLint>(1), static_cast<GLsizei>(2), data);
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform1ivImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform1ivImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(kExpectedCmdSize, cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(1), cmd.location);
@@ -1984,7 +2005,7 @@ TEST_F(GLES2FormatTest, Uniform2f) {
                            static_cast<GLint>(11),
                            static_cast<GLfloat>(12),
                            static_cast<GLfloat>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform2f::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform2f::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.location);
   EXPECT_EQ(static_cast<GLfloat>(12), cmd.x);
@@ -1997,14 +2018,15 @@ TEST_F(GLES2FormatTest, Uniform2fv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLint>(11),
                            static_cast<GLsizei>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform2fv::kCmdId), cmd.header.command);
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform2fv::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.location);
   EXPECT_EQ(static_cast<GLsizei>(12), cmd.count);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.v_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.v_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.v_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.v_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -2022,7 +2044,7 @@ TEST_F(GLES2FormatTest, Uniform2fvImmediate) {
       sizeof(cmd) + kNumElements * sizeof(GLfloat) * 2;
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLint>(1), static_cast<GLsizei>(2), data);
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform2fvImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform2fvImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(kExpectedCmdSize, cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(1), cmd.location);
@@ -2038,7 +2060,7 @@ TEST_F(GLES2FormatTest, Uniform2i) {
                            static_cast<GLint>(11),
                            static_cast<GLint>(12),
                            static_cast<GLint>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform2i::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform2i::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.location);
   EXPECT_EQ(static_cast<GLint>(12), cmd.x);
@@ -2051,14 +2073,15 @@ TEST_F(GLES2FormatTest, Uniform2iv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLint>(11),
                            static_cast<GLsizei>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform2iv::kCmdId), cmd.header.command);
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform2iv::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.location);
   EXPECT_EQ(static_cast<GLsizei>(12), cmd.count);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.v_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.v_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.v_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.v_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -2076,7 +2099,7 @@ TEST_F(GLES2FormatTest, Uniform2ivImmediate) {
       sizeof(cmd) + kNumElements * sizeof(GLint) * 2;
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLint>(1), static_cast<GLsizei>(2), data);
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform2ivImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform2ivImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(kExpectedCmdSize, cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(1), cmd.location);
@@ -2093,7 +2116,7 @@ TEST_F(GLES2FormatTest, Uniform3f) {
                            static_cast<GLfloat>(12),
                            static_cast<GLfloat>(13),
                            static_cast<GLfloat>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform3f::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform3f::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.location);
   EXPECT_EQ(static_cast<GLfloat>(12), cmd.x);
@@ -2107,14 +2130,15 @@ TEST_F(GLES2FormatTest, Uniform3fv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLint>(11),
                            static_cast<GLsizei>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform3fv::kCmdId), cmd.header.command);
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform3fv::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.location);
   EXPECT_EQ(static_cast<GLsizei>(12), cmd.count);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.v_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.v_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.v_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.v_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -2134,7 +2158,7 @@ TEST_F(GLES2FormatTest, Uniform3fvImmediate) {
       sizeof(cmd) + kNumElements * sizeof(GLfloat) * 3;
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLint>(1), static_cast<GLsizei>(2), data);
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform3fvImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform3fvImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(kExpectedCmdSize, cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(1), cmd.location);
@@ -2151,7 +2175,7 @@ TEST_F(GLES2FormatTest, Uniform3i) {
                            static_cast<GLint>(12),
                            static_cast<GLint>(13),
                            static_cast<GLint>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform3i::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform3i::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.location);
   EXPECT_EQ(static_cast<GLint>(12), cmd.x);
@@ -2165,14 +2189,15 @@ TEST_F(GLES2FormatTest, Uniform3iv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLint>(11),
                            static_cast<GLsizei>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform3iv::kCmdId), cmd.header.command);
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform3iv::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.location);
   EXPECT_EQ(static_cast<GLsizei>(12), cmd.count);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.v_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.v_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.v_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.v_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -2192,7 +2217,7 @@ TEST_F(GLES2FormatTest, Uniform3ivImmediate) {
       sizeof(cmd) + kNumElements * sizeof(GLint) * 3;
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLint>(1), static_cast<GLsizei>(2), data);
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform3ivImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform3ivImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(kExpectedCmdSize, cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(1), cmd.location);
@@ -2210,7 +2235,7 @@ TEST_F(GLES2FormatTest, Uniform4f) {
                            static_cast<GLfloat>(13),
                            static_cast<GLfloat>(14),
                            static_cast<GLfloat>(15));
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform4f::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform4f::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.location);
   EXPECT_EQ(static_cast<GLfloat>(12), cmd.x);
@@ -2225,14 +2250,15 @@ TEST_F(GLES2FormatTest, Uniform4fv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLint>(11),
                            static_cast<GLsizei>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform4fv::kCmdId), cmd.header.command);
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform4fv::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.location);
   EXPECT_EQ(static_cast<GLsizei>(12), cmd.count);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.v_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.v_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.v_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.v_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -2254,7 +2280,7 @@ TEST_F(GLES2FormatTest, Uniform4fvImmediate) {
       sizeof(cmd) + kNumElements * sizeof(GLfloat) * 4;
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLint>(1), static_cast<GLsizei>(2), data);
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform4fvImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform4fvImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(kExpectedCmdSize, cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(1), cmd.location);
@@ -2272,7 +2298,7 @@ TEST_F(GLES2FormatTest, Uniform4i) {
                            static_cast<GLint>(13),
                            static_cast<GLint>(14),
                            static_cast<GLint>(15));
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform4i::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform4i::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.location);
   EXPECT_EQ(static_cast<GLint>(12), cmd.x);
@@ -2287,14 +2313,15 @@ TEST_F(GLES2FormatTest, Uniform4iv) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLint>(11),
                            static_cast<GLsizei>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform4iv::kCmdId), cmd.header.command);
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform4iv::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.location);
   EXPECT_EQ(static_cast<GLsizei>(12), cmd.count);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.v_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.v_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.v_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.v_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -2316,7 +2343,7 @@ TEST_F(GLES2FormatTest, Uniform4ivImmediate) {
       sizeof(cmd) + kNumElements * sizeof(GLint) * 4;
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLint>(1), static_cast<GLsizei>(2), data);
-  EXPECT_EQ(static_cast<uint32>(cmds::Uniform4ivImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform4ivImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(kExpectedCmdSize, cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(1), cmd.location);
@@ -2332,16 +2359,16 @@ TEST_F(GLES2FormatTest, UniformMatrix2fv) {
                            static_cast<GLint>(11),
                            static_cast<GLsizei>(12),
                            static_cast<GLboolean>(13),
-                           static_cast<uint32>(14),
-                           static_cast<uint32>(15));
-  EXPECT_EQ(static_cast<uint32>(cmds::UniformMatrix2fv::kCmdId),
+                           static_cast<uint32_t>(14),
+                           static_cast<uint32_t>(15));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::UniformMatrix2fv::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.location);
   EXPECT_EQ(static_cast<GLsizei>(12), cmd.count);
   EXPECT_EQ(static_cast<GLboolean>(13), cmd.transpose);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.value_shm_id);
-  EXPECT_EQ(static_cast<uint32>(15), cmd.value_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.value_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(15), cmd.value_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -2367,7 +2394,7 @@ TEST_F(GLES2FormatTest, UniformMatrix2fvImmediate) {
                            static_cast<GLsizei>(2),
                            static_cast<GLboolean>(3),
                            data);
-  EXPECT_EQ(static_cast<uint32>(cmds::UniformMatrix2fvImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::UniformMatrix2fvImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(kExpectedCmdSize, cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(1), cmd.location);
@@ -2384,16 +2411,16 @@ TEST_F(GLES2FormatTest, UniformMatrix3fv) {
                            static_cast<GLint>(11),
                            static_cast<GLsizei>(12),
                            static_cast<GLboolean>(13),
-                           static_cast<uint32>(14),
-                           static_cast<uint32>(15));
-  EXPECT_EQ(static_cast<uint32>(cmds::UniformMatrix3fv::kCmdId),
+                           static_cast<uint32_t>(14),
+                           static_cast<uint32_t>(15));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::UniformMatrix3fv::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.location);
   EXPECT_EQ(static_cast<GLsizei>(12), cmd.count);
   EXPECT_EQ(static_cast<GLboolean>(13), cmd.transpose);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.value_shm_id);
-  EXPECT_EQ(static_cast<uint32>(15), cmd.value_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.value_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(15), cmd.value_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -2429,7 +2456,7 @@ TEST_F(GLES2FormatTest, UniformMatrix3fvImmediate) {
                            static_cast<GLsizei>(2),
                            static_cast<GLboolean>(3),
                            data);
-  EXPECT_EQ(static_cast<uint32>(cmds::UniformMatrix3fvImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::UniformMatrix3fvImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(kExpectedCmdSize, cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(1), cmd.location);
@@ -2446,16 +2473,16 @@ TEST_F(GLES2FormatTest, UniformMatrix4fv) {
                            static_cast<GLint>(11),
                            static_cast<GLsizei>(12),
                            static_cast<GLboolean>(13),
-                           static_cast<uint32>(14),
-                           static_cast<uint32>(15));
-  EXPECT_EQ(static_cast<uint32>(cmds::UniformMatrix4fv::kCmdId),
+                           static_cast<uint32_t>(14),
+                           static_cast<uint32_t>(15));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::UniformMatrix4fv::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.location);
   EXPECT_EQ(static_cast<GLsizei>(12), cmd.count);
   EXPECT_EQ(static_cast<GLboolean>(13), cmd.transpose);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.value_shm_id);
-  EXPECT_EQ(static_cast<uint32>(15), cmd.value_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.value_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(15), cmd.value_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -2505,7 +2532,7 @@ TEST_F(GLES2FormatTest, UniformMatrix4fvImmediate) {
                            static_cast<GLsizei>(2),
                            static_cast<GLboolean>(3),
                            data);
-  EXPECT_EQ(static_cast<uint32>(cmds::UniformMatrix4fvImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::UniformMatrix4fvImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(kExpectedCmdSize, cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(1), cmd.location);
@@ -2519,7 +2546,8 @@ TEST_F(GLES2FormatTest, UniformMatrix4fvImmediate) {
 TEST_F(GLES2FormatTest, UseProgram) {
   cmds::UseProgram& cmd = *GetBufferAs<cmds::UseProgram>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::UseProgram::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::UseProgram::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
@@ -2528,7 +2556,7 @@ TEST_F(GLES2FormatTest, UseProgram) {
 TEST_F(GLES2FormatTest, ValidateProgram) {
   cmds::ValidateProgram& cmd = *GetBufferAs<cmds::ValidateProgram>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::ValidateProgram::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::ValidateProgram::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
@@ -2539,7 +2567,7 @@ TEST_F(GLES2FormatTest, VertexAttrib1f) {
   cmds::VertexAttrib1f& cmd = *GetBufferAs<cmds::VertexAttrib1f>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<GLfloat>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::VertexAttrib1f::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttrib1f::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.indx);
@@ -2551,14 +2579,14 @@ TEST_F(GLES2FormatTest, VertexAttrib1fv) {
   cmds::VertexAttrib1fv& cmd = *GetBufferAs<cmds::VertexAttrib1fv>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::VertexAttrib1fv::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttrib1fv::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.indx);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.values_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.values_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.values_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.values_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -2570,7 +2598,7 @@ TEST_F(GLES2FormatTest, VertexAttrib1fvImmediate) {
   cmds::VertexAttrib1fvImmediate& cmd =
       *GetBufferAs<cmds::VertexAttrib1fvImmediate>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11), data);
-  EXPECT_EQ(static_cast<uint32>(cmds::VertexAttrib1fvImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttrib1fvImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)),
             cmd.header.size * 4u);
@@ -2586,7 +2614,7 @@ TEST_F(GLES2FormatTest, VertexAttrib2f) {
                            static_cast<GLuint>(11),
                            static_cast<GLfloat>(12),
                            static_cast<GLfloat>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::VertexAttrib2f::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttrib2f::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.indx);
@@ -2599,14 +2627,14 @@ TEST_F(GLES2FormatTest, VertexAttrib2fv) {
   cmds::VertexAttrib2fv& cmd = *GetBufferAs<cmds::VertexAttrib2fv>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::VertexAttrib2fv::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttrib2fv::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.indx);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.values_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.values_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.values_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.values_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -2619,7 +2647,7 @@ TEST_F(GLES2FormatTest, VertexAttrib2fvImmediate) {
   cmds::VertexAttrib2fvImmediate& cmd =
       *GetBufferAs<cmds::VertexAttrib2fvImmediate>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11), data);
-  EXPECT_EQ(static_cast<uint32>(cmds::VertexAttrib2fvImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttrib2fvImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)),
             cmd.header.size * 4u);
@@ -2636,7 +2664,7 @@ TEST_F(GLES2FormatTest, VertexAttrib3f) {
                            static_cast<GLfloat>(12),
                            static_cast<GLfloat>(13),
                            static_cast<GLfloat>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::VertexAttrib3f::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttrib3f::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.indx);
@@ -2650,14 +2678,14 @@ TEST_F(GLES2FormatTest, VertexAttrib3fv) {
   cmds::VertexAttrib3fv& cmd = *GetBufferAs<cmds::VertexAttrib3fv>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::VertexAttrib3fv::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttrib3fv::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.indx);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.values_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.values_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.values_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.values_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -2671,7 +2699,7 @@ TEST_F(GLES2FormatTest, VertexAttrib3fvImmediate) {
   cmds::VertexAttrib3fvImmediate& cmd =
       *GetBufferAs<cmds::VertexAttrib3fvImmediate>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11), data);
-  EXPECT_EQ(static_cast<uint32>(cmds::VertexAttrib3fvImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttrib3fvImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)),
             cmd.header.size * 4u);
@@ -2689,7 +2717,7 @@ TEST_F(GLES2FormatTest, VertexAttrib4f) {
                            static_cast<GLfloat>(13),
                            static_cast<GLfloat>(14),
                            static_cast<GLfloat>(15));
-  EXPECT_EQ(static_cast<uint32>(cmds::VertexAttrib4f::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttrib4f::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.indx);
@@ -2704,14 +2732,14 @@ TEST_F(GLES2FormatTest, VertexAttrib4fv) {
   cmds::VertexAttrib4fv& cmd = *GetBufferAs<cmds::VertexAttrib4fv>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::VertexAttrib4fv::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttrib4fv::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.indx);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.values_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.values_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.values_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.values_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -2726,7 +2754,7 @@ TEST_F(GLES2FormatTest, VertexAttrib4fvImmediate) {
   cmds::VertexAttrib4fvImmediate& cmd =
       *GetBufferAs<cmds::VertexAttrib4fvImmediate>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11), data);
-  EXPECT_EQ(static_cast<uint32>(cmds::VertexAttrib4fvImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttrib4fvImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)),
             cmd.header.size * 4u);
@@ -2745,7 +2773,7 @@ TEST_F(GLES2FormatTest, VertexAttribPointer) {
                            static_cast<GLboolean>(14),
                            static_cast<GLsizei>(15),
                            static_cast<GLuint>(16));
-  EXPECT_EQ(static_cast<uint32>(cmds::VertexAttribPointer::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttribPointer::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.indx);
@@ -2764,7 +2792,7 @@ TEST_F(GLES2FormatTest, Viewport) {
                            static_cast<GLint>(12),
                            static_cast<GLsizei>(13),
                            static_cast<GLsizei>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::Viewport::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::Viewport::kCmdId), cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.x);
   EXPECT_EQ(static_cast<GLint>(12), cmd.y);
@@ -2787,7 +2815,7 @@ TEST_F(GLES2FormatTest, BlitFramebufferCHROMIUM) {
                            static_cast<GLint>(18),
                            static_cast<GLbitfield>(19),
                            static_cast<GLenum>(20));
-  EXPECT_EQ(static_cast<uint32>(cmds::BlitFramebufferCHROMIUM::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::BlitFramebufferCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.srcX0);
@@ -2812,9 +2840,9 @@ TEST_F(GLES2FormatTest, RenderbufferStorageMultisampleCHROMIUM) {
                            static_cast<GLenum>(13),
                            static_cast<GLsizei>(14),
                            static_cast<GLsizei>(15));
-  EXPECT_EQ(
-      static_cast<uint32>(cmds::RenderbufferStorageMultisampleCHROMIUM::kCmdId),
-      cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(
+                cmds::RenderbufferStorageMultisampleCHROMIUM::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
   EXPECT_EQ(static_cast<GLsizei>(12), cmd.samples);
@@ -2834,7 +2862,7 @@ TEST_F(GLES2FormatTest, RenderbufferStorageMultisampleEXT) {
                            static_cast<GLsizei>(14),
                            static_cast<GLsizei>(15));
   EXPECT_EQ(
-      static_cast<uint32>(cmds::RenderbufferStorageMultisampleEXT::kCmdId),
+      static_cast<uint32_t>(cmds::RenderbufferStorageMultisampleEXT::kCmdId),
       cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -2856,7 +2884,7 @@ TEST_F(GLES2FormatTest, FramebufferTexture2DMultisampleEXT) {
                            static_cast<GLint>(15),
                            static_cast<GLsizei>(16));
   EXPECT_EQ(
-      static_cast<uint32>(cmds::FramebufferTexture2DMultisampleEXT::kCmdId),
+      static_cast<uint32_t>(cmds::FramebufferTexture2DMultisampleEXT::kCmdId),
       cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -2876,7 +2904,7 @@ TEST_F(GLES2FormatTest, TexStorage2DEXT) {
                            static_cast<GLenum>(13),
                            static_cast<GLsizei>(14),
                            static_cast<GLsizei>(15));
-  EXPECT_EQ(static_cast<uint32>(cmds::TexStorage2DEXT::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::TexStorage2DEXT::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -2891,14 +2919,14 @@ TEST_F(GLES2FormatTest, GenQueriesEXT) {
   cmds::GenQueriesEXT& cmd = *GetBufferAs<cmds::GenQueriesEXT>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLsizei>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::GenQueriesEXT::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GenQueriesEXT::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLsizei>(11), cmd.n);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.queries_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.queries_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.queries_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.queries_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -2909,7 +2937,7 @@ TEST_F(GLES2FormatTest, GenQueriesEXTImmediate) {
   cmds::GenQueriesEXTImmediate& cmd =
       *GetBufferAs<cmds::GenQueriesEXTImmediate>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLsizei>(arraysize(ids)), ids);
-  EXPECT_EQ(static_cast<uint32>(cmds::GenQueriesEXTImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GenQueriesEXTImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(cmd.n * 4u),
             cmd.header.size * 4u);
@@ -2924,14 +2952,14 @@ TEST_F(GLES2FormatTest, DeleteQueriesEXT) {
   cmds::DeleteQueriesEXT& cmd = *GetBufferAs<cmds::DeleteQueriesEXT>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLsizei>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::DeleteQueriesEXT::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteQueriesEXT::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLsizei>(11), cmd.n);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.queries_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.queries_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.queries_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.queries_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -2942,7 +2970,7 @@ TEST_F(GLES2FormatTest, DeleteQueriesEXTImmediate) {
   cmds::DeleteQueriesEXTImmediate& cmd =
       *GetBufferAs<cmds::DeleteQueriesEXTImmediate>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLsizei>(arraysize(ids)), ids);
-  EXPECT_EQ(static_cast<uint32>(cmds::DeleteQueriesEXTImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteQueriesEXTImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(cmd.n * 4u),
             cmd.header.size * 4u);
@@ -2958,15 +2986,15 @@ TEST_F(GLES2FormatTest, BeginQueryEXT) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLenum>(11),
                            static_cast<GLuint>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::BeginQueryEXT::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::BeginQueryEXT::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
   EXPECT_EQ(static_cast<GLuint>(12), cmd.id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.sync_data_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.sync_data_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.sync_data_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.sync_data_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -2974,7 +3002,8 @@ TEST_F(GLES2FormatTest, EndQueryEXT) {
   cmds::EndQueryEXT& cmd = *GetBufferAs<cmds::EndQueryEXT>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLuint>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::EndQueryEXT::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::EndQueryEXT::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
   EXPECT_EQ(static_cast<GLuint>(12), cmd.submit_count);
@@ -2984,7 +3013,7 @@ TEST_F(GLES2FormatTest, EndQueryEXT) {
 TEST_F(GLES2FormatTest, InsertEventMarkerEXT) {
   cmds::InsertEventMarkerEXT& cmd = *GetBufferAs<cmds::InsertEventMarkerEXT>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::InsertEventMarkerEXT::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::InsertEventMarkerEXT::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.bucket_id);
@@ -2994,7 +3023,7 @@ TEST_F(GLES2FormatTest, InsertEventMarkerEXT) {
 TEST_F(GLES2FormatTest, PushGroupMarkerEXT) {
   cmds::PushGroupMarkerEXT& cmd = *GetBufferAs<cmds::PushGroupMarkerEXT>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::PushGroupMarkerEXT::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::PushGroupMarkerEXT::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.bucket_id);
@@ -3004,7 +3033,7 @@ TEST_F(GLES2FormatTest, PushGroupMarkerEXT) {
 TEST_F(GLES2FormatTest, PopGroupMarkerEXT) {
   cmds::PopGroupMarkerEXT& cmd = *GetBufferAs<cmds::PopGroupMarkerEXT>();
   void* next_cmd = cmd.Set(&cmd);
-  EXPECT_EQ(static_cast<uint32>(cmds::PopGroupMarkerEXT::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::PopGroupMarkerEXT::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
@@ -3014,14 +3043,14 @@ TEST_F(GLES2FormatTest, GenVertexArraysOES) {
   cmds::GenVertexArraysOES& cmd = *GetBufferAs<cmds::GenVertexArraysOES>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLsizei>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::GenVertexArraysOES::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GenVertexArraysOES::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLsizei>(11), cmd.n);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.arrays_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.arrays_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.arrays_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.arrays_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -3032,7 +3061,7 @@ TEST_F(GLES2FormatTest, GenVertexArraysOESImmediate) {
   cmds::GenVertexArraysOESImmediate& cmd =
       *GetBufferAs<cmds::GenVertexArraysOESImmediate>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLsizei>(arraysize(ids)), ids);
-  EXPECT_EQ(static_cast<uint32>(cmds::GenVertexArraysOESImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GenVertexArraysOESImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(cmd.n * 4u),
             cmd.header.size * 4u);
@@ -3048,14 +3077,14 @@ TEST_F(GLES2FormatTest, DeleteVertexArraysOES) {
       *GetBufferAs<cmds::DeleteVertexArraysOES>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLsizei>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::DeleteVertexArraysOES::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteVertexArraysOES::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLsizei>(11), cmd.n);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.arrays_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.arrays_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.arrays_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.arrays_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -3066,7 +3095,7 @@ TEST_F(GLES2FormatTest, DeleteVertexArraysOESImmediate) {
   cmds::DeleteVertexArraysOESImmediate& cmd =
       *GetBufferAs<cmds::DeleteVertexArraysOESImmediate>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLsizei>(arraysize(ids)), ids);
-  EXPECT_EQ(static_cast<uint32>(cmds::DeleteVertexArraysOESImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteVertexArraysOESImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(cmd.n * 4u),
             cmd.header.size * 4u);
@@ -3081,21 +3110,21 @@ TEST_F(GLES2FormatTest, IsVertexArrayOES) {
   cmds::IsVertexArrayOES& cmd = *GetBufferAs<cmds::IsVertexArrayOES>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::IsVertexArrayOES::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::IsVertexArrayOES::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.array);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.result_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.result_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.result_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.result_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
 TEST_F(GLES2FormatTest, BindVertexArrayOES) {
   cmds::BindVertexArrayOES& cmd = *GetBufferAs<cmds::BindVertexArrayOES>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::BindVertexArrayOES::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::BindVertexArrayOES::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.array);
@@ -3105,7 +3134,8 @@ TEST_F(GLES2FormatTest, BindVertexArrayOES) {
 TEST_F(GLES2FormatTest, SwapBuffers) {
   cmds::SwapBuffers& cmd = *GetBufferAs<cmds::SwapBuffers>();
   void* next_cmd = cmd.Set(&cmd);
-  EXPECT_EQ(static_cast<uint32>(cmds::SwapBuffers::kCmdId), cmd.header.command);
+  EXPECT_EQ(static_cast<uint32_t>(cmds::SwapBuffers::kCmdId),
+            cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
@@ -3118,17 +3148,17 @@ TEST_F(GLES2FormatTest, GetMaxValueInBufferCHROMIUM) {
                            static_cast<GLsizei>(12),
                            static_cast<GLenum>(13),
                            static_cast<GLuint>(14),
-                           static_cast<uint32>(15),
-                           static_cast<uint32>(16));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetMaxValueInBufferCHROMIUM::kCmdId),
+                           static_cast<uint32_t>(15),
+                           static_cast<uint32_t>(16));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetMaxValueInBufferCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.buffer_id);
   EXPECT_EQ(static_cast<GLsizei>(12), cmd.count);
   EXPECT_EQ(static_cast<GLenum>(13), cmd.type);
   EXPECT_EQ(static_cast<GLuint>(14), cmd.offset);
-  EXPECT_EQ(static_cast<uint32>(15), cmd.result_shm_id);
-  EXPECT_EQ(static_cast<uint32>(16), cmd.result_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(15), cmd.result_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(16), cmd.result_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -3138,16 +3168,16 @@ TEST_F(GLES2FormatTest, GenSharedIdsCHROMIUM) {
                            static_cast<GLuint>(11),
                            static_cast<GLuint>(12),
                            static_cast<GLsizei>(13),
-                           static_cast<uint32>(14),
-                           static_cast<uint32>(15));
-  EXPECT_EQ(static_cast<uint32>(cmds::GenSharedIdsCHROMIUM::kCmdId),
+                           static_cast<uint32_t>(14),
+                           static_cast<uint32_t>(15));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GenSharedIdsCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.namespace_id);
   EXPECT_EQ(static_cast<GLuint>(12), cmd.id_offset);
   EXPECT_EQ(static_cast<GLsizei>(13), cmd.n);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.ids_shm_id);
-  EXPECT_EQ(static_cast<uint32>(15), cmd.ids_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.ids_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(15), cmd.ids_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -3157,15 +3187,15 @@ TEST_F(GLES2FormatTest, DeleteSharedIdsCHROMIUM) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
                            static_cast<GLsizei>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::DeleteSharedIdsCHROMIUM::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteSharedIdsCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.namespace_id);
   EXPECT_EQ(static_cast<GLsizei>(12), cmd.n);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.ids_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.ids_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.ids_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.ids_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -3175,15 +3205,15 @@ TEST_F(GLES2FormatTest, RegisterSharedIdsCHROMIUM) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
                            static_cast<GLsizei>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::RegisterSharedIdsCHROMIUM::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::RegisterSharedIdsCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.namespace_id);
   EXPECT_EQ(static_cast<GLsizei>(12), cmd.n);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.ids_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.ids_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.ids_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.ids_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -3192,14 +3222,14 @@ TEST_F(GLES2FormatTest, EnableFeatureCHROMIUM) {
       *GetBufferAs<cmds::EnableFeatureCHROMIUM>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::EnableFeatureCHROMIUM::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::EnableFeatureCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.bucket_id);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.result_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.result_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.result_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.result_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -3209,7 +3239,7 @@ TEST_F(GLES2FormatTest, ResizeCHROMIUM) {
                            static_cast<GLuint>(11),
                            static_cast<GLuint>(12),
                            static_cast<GLfloat>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::ResizeCHROMIUM::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::ResizeCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.width);
@@ -3221,22 +3251,23 @@ TEST_F(GLES2FormatTest, ResizeCHROMIUM) {
 TEST_F(GLES2FormatTest, GetRequestableExtensionsCHROMIUM) {
   cmds::GetRequestableExtensionsCHROMIUM& cmd =
       *GetBufferAs<cmds::GetRequestableExtensionsCHROMIUM>();
-  void* next_cmd = cmd.Set(&cmd, static_cast<uint32>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetRequestableExtensionsCHROMIUM::kCmdId),
-            cmd.header.command);
+  void* next_cmd = cmd.Set(&cmd, static_cast<uint32_t>(11));
+  EXPECT_EQ(
+      static_cast<uint32_t>(cmds::GetRequestableExtensionsCHROMIUM::kCmdId),
+      cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
-  EXPECT_EQ(static_cast<uint32>(11), cmd.bucket_id);
+  EXPECT_EQ(static_cast<uint32_t>(11), cmd.bucket_id);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
 TEST_F(GLES2FormatTest, RequestExtensionCHROMIUM) {
   cmds::RequestExtensionCHROMIUM& cmd =
       *GetBufferAs<cmds::RequestExtensionCHROMIUM>();
-  void* next_cmd = cmd.Set(&cmd, static_cast<uint32>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::RequestExtensionCHROMIUM::kCmdId),
+  void* next_cmd = cmd.Set(&cmd, static_cast<uint32_t>(11));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::RequestExtensionCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
-  EXPECT_EQ(static_cast<uint32>(11), cmd.bucket_id);
+  EXPECT_EQ(static_cast<uint32_t>(11), cmd.bucket_id);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -3244,20 +3275,20 @@ TEST_F(GLES2FormatTest, GetMultipleIntegervCHROMIUM) {
   cmds::GetMultipleIntegervCHROMIUM& cmd =
       *GetBufferAs<cmds::GetMultipleIntegervCHROMIUM>();
   void* next_cmd = cmd.Set(&cmd,
-                           static_cast<uint32>(11),
-                           static_cast<uint32>(12),
+                           static_cast<uint32_t>(11),
+                           static_cast<uint32_t>(12),
                            static_cast<GLuint>(13),
-                           static_cast<uint32>(14),
-                           static_cast<uint32>(15),
+                           static_cast<uint32_t>(14),
+                           static_cast<uint32_t>(15),
                            static_cast<GLsizeiptr>(16));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetMultipleIntegervCHROMIUM::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetMultipleIntegervCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
-  EXPECT_EQ(static_cast<uint32>(11), cmd.pnames_shm_id);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.pnames_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(11), cmd.pnames_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.pnames_shm_offset);
   EXPECT_EQ(static_cast<GLuint>(13), cmd.count);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.results_shm_id);
-  EXPECT_EQ(static_cast<uint32>(15), cmd.results_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.results_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(15), cmd.results_shm_offset);
   EXPECT_EQ(static_cast<GLsizeiptr>(16), cmd.size);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
@@ -3266,12 +3297,12 @@ TEST_F(GLES2FormatTest, GetProgramInfoCHROMIUM) {
   cmds::GetProgramInfoCHROMIUM& cmd =
       *GetBufferAs<cmds::GetProgramInfoCHROMIUM>();
   void* next_cmd =
-      cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetProgramInfoCHROMIUM::kCmdId),
+      cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32_t>(12));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetProgramInfoCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.bucket_id);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.bucket_id);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -3279,12 +3310,12 @@ TEST_F(GLES2FormatTest, GetTranslatedShaderSourceANGLE) {
   cmds::GetTranslatedShaderSourceANGLE& cmd =
       *GetBufferAs<cmds::GetTranslatedShaderSourceANGLE>();
   void* next_cmd =
-      cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::GetTranslatedShaderSourceANGLE::kCmdId),
+      cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32_t>(12));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::GetTranslatedShaderSourceANGLE::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.shader);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.bucket_id);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.bucket_id);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -3296,7 +3327,7 @@ TEST_F(GLES2FormatTest, PostSubBufferCHROMIUM) {
                            static_cast<GLint>(12),
                            static_cast<GLint>(13),
                            static_cast<GLint>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::PostSubBufferCHROMIUM::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::PostSubBufferCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.x);
@@ -3315,7 +3346,7 @@ TEST_F(GLES2FormatTest, TexImageIOSurface2DCHROMIUM) {
                            static_cast<GLsizei>(13),
                            static_cast<GLuint>(14),
                            static_cast<GLuint>(15));
-  EXPECT_EQ(static_cast<uint32>(cmds::TexImageIOSurface2DCHROMIUM::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::TexImageIOSurface2DCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -3335,7 +3366,7 @@ TEST_F(GLES2FormatTest, CopyTextureCHROMIUM) {
                            static_cast<GLint>(14),
                            static_cast<GLint>(15),
                            static_cast<GLenum>(16));
-  EXPECT_EQ(static_cast<uint32>(cmds::CopyTextureCHROMIUM::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::CopyTextureCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -3355,7 +3386,7 @@ TEST_F(GLES2FormatTest, DrawArraysInstancedANGLE) {
                            static_cast<GLint>(12),
                            static_cast<GLsizei>(13),
                            static_cast<GLsizei>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::DrawArraysInstancedANGLE::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DrawArraysInstancedANGLE::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.mode);
@@ -3374,7 +3405,7 @@ TEST_F(GLES2FormatTest, DrawElementsInstancedANGLE) {
                            static_cast<GLenum>(13),
                            static_cast<GLuint>(14),
                            static_cast<GLsizei>(15));
-  EXPECT_EQ(static_cast<uint32>(cmds::DrawElementsInstancedANGLE::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DrawElementsInstancedANGLE::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.mode);
@@ -3390,7 +3421,7 @@ TEST_F(GLES2FormatTest, VertexAttribDivisorANGLE) {
       *GetBufferAs<cmds::VertexAttribDivisorANGLE>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<GLuint>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::VertexAttribDivisorANGLE::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttribDivisorANGLE::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.index);
@@ -3404,14 +3435,14 @@ TEST_F(GLES2FormatTest, ProduceTextureCHROMIUM) {
       *GetBufferAs<cmds::ProduceTextureCHROMIUM>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLenum>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::ProduceTextureCHROMIUM::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::ProduceTextureCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.mailbox_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.mailbox_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.mailbox_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.mailbox_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -3486,8 +3517,9 @@ TEST_F(GLES2FormatTest, ProduceTextureCHROMIUMImmediate) {
   cmds::ProduceTextureCHROMIUMImmediate& cmd =
       *GetBufferAs<cmds::ProduceTextureCHROMIUMImmediate>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11), data);
-  EXPECT_EQ(static_cast<uint32>(cmds::ProduceTextureCHROMIUMImmediate::kCmdId),
-            cmd.header.command);
+  EXPECT_EQ(
+      static_cast<uint32_t>(cmds::ProduceTextureCHROMIUMImmediate::kCmdId),
+      cmd.header.command);
   EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)),
             cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -3501,14 +3533,14 @@ TEST_F(GLES2FormatTest, ConsumeTextureCHROMIUM) {
       *GetBufferAs<cmds::ConsumeTextureCHROMIUM>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLenum>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::ConsumeTextureCHROMIUM::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::ConsumeTextureCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.mailbox_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.mailbox_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.mailbox_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.mailbox_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -3583,8 +3615,9 @@ TEST_F(GLES2FormatTest, ConsumeTextureCHROMIUMImmediate) {
   cmds::ConsumeTextureCHROMIUMImmediate& cmd =
       *GetBufferAs<cmds::ConsumeTextureCHROMIUMImmediate>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11), data);
-  EXPECT_EQ(static_cast<uint32>(cmds::ConsumeTextureCHROMIUMImmediate::kCmdId),
-            cmd.header.command);
+  EXPECT_EQ(
+      static_cast<uint32_t>(cmds::ConsumeTextureCHROMIUMImmediate::kCmdId),
+      cmd.header.command);
   EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)),
             cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -3599,17 +3632,17 @@ TEST_F(GLES2FormatTest, BindUniformLocationCHROMIUM) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
                            static_cast<GLint>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14),
-                           static_cast<uint32>(15));
-  EXPECT_EQ(static_cast<uint32>(cmds::BindUniformLocationCHROMIUM::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14),
+                           static_cast<uint32_t>(15));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::BindUniformLocationCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
   EXPECT_EQ(static_cast<GLint>(12), cmd.location);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.name_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.name_shm_offset);
-  EXPECT_EQ(static_cast<uint32>(15), cmd.data_size);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.name_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.name_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(15), cmd.data_size);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -3619,14 +3652,14 @@ TEST_F(GLES2FormatTest, BindUniformLocationCHROMIUMBucket) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLuint>(11),
                            static_cast<GLint>(12),
-                           static_cast<uint32>(13));
+                           static_cast<uint32_t>(13));
   EXPECT_EQ(
-      static_cast<uint32>(cmds::BindUniformLocationCHROMIUMBucket::kCmdId),
+      static_cast<uint32_t>(cmds::BindUniformLocationCHROMIUMBucket::kCmdId),
       cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
   EXPECT_EQ(static_cast<GLint>(12), cmd.location);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.name_bucket_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.name_bucket_id);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -3635,7 +3668,7 @@ TEST_F(GLES2FormatTest, BindTexImage2DCHROMIUM) {
       *GetBufferAs<cmds::BindTexImage2DCHROMIUM>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLint>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::BindTexImage2DCHROMIUM::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::BindTexImage2DCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -3648,7 +3681,7 @@ TEST_F(GLES2FormatTest, ReleaseTexImage2DCHROMIUM) {
       *GetBufferAs<cmds::ReleaseTexImage2DCHROMIUM>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLint>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::ReleaseTexImage2DCHROMIUM::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::ReleaseTexImage2DCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -3659,7 +3692,7 @@ TEST_F(GLES2FormatTest, ReleaseTexImage2DCHROMIUM) {
 TEST_F(GLES2FormatTest, TraceBeginCHROMIUM) {
   cmds::TraceBeginCHROMIUM& cmd = *GetBufferAs<cmds::TraceBeginCHROMIUM>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::TraceBeginCHROMIUM::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::TraceBeginCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.bucket_id);
@@ -3669,7 +3702,7 @@ TEST_F(GLES2FormatTest, TraceBeginCHROMIUM) {
 TEST_F(GLES2FormatTest, TraceEndCHROMIUM) {
   cmds::TraceEndCHROMIUM& cmd = *GetBufferAs<cmds::TraceEndCHROMIUM>();
   void* next_cmd = cmd.Set(&cmd);
-  EXPECT_EQ(static_cast<uint32>(cmds::TraceEndCHROMIUM::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::TraceEndCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
@@ -3687,12 +3720,12 @@ TEST_F(GLES2FormatTest, AsyncTexSubImage2DCHROMIUM) {
                            static_cast<GLsizei>(16),
                            static_cast<GLenum>(17),
                            static_cast<GLenum>(18),
-                           static_cast<uint32>(19),
-                           static_cast<uint32>(20),
-                           static_cast<uint32>(21),
-                           static_cast<uint32>(22),
-                           static_cast<uint32>(23));
-  EXPECT_EQ(static_cast<uint32>(cmds::AsyncTexSubImage2DCHROMIUM::kCmdId),
+                           static_cast<uint32_t>(19),
+                           static_cast<uint32_t>(20),
+                           static_cast<uint32_t>(21),
+                           static_cast<uint32_t>(22),
+                           static_cast<uint32_t>(23));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::AsyncTexSubImage2DCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -3703,11 +3736,11 @@ TEST_F(GLES2FormatTest, AsyncTexSubImage2DCHROMIUM) {
   EXPECT_EQ(static_cast<GLsizei>(16), cmd.height);
   EXPECT_EQ(static_cast<GLenum>(17), cmd.format);
   EXPECT_EQ(static_cast<GLenum>(18), cmd.type);
-  EXPECT_EQ(static_cast<uint32>(19), cmd.data_shm_id);
-  EXPECT_EQ(static_cast<uint32>(20), cmd.data_shm_offset);
-  EXPECT_EQ(static_cast<uint32>(21), cmd.async_upload_token);
-  EXPECT_EQ(static_cast<uint32>(22), cmd.sync_data_shm_id);
-  EXPECT_EQ(static_cast<uint32>(23), cmd.sync_data_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(19), cmd.data_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(20), cmd.data_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(21), cmd.async_upload_token);
+  EXPECT_EQ(static_cast<uint32_t>(22), cmd.sync_data_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(23), cmd.sync_data_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -3723,12 +3756,12 @@ TEST_F(GLES2FormatTest, AsyncTexImage2DCHROMIUM) {
                            static_cast<GLint>(16),
                            static_cast<GLenum>(17),
                            static_cast<GLenum>(18),
-                           static_cast<uint32>(19),
-                           static_cast<uint32>(20),
-                           static_cast<uint32>(21),
-                           static_cast<uint32>(22),
-                           static_cast<uint32>(23));
-  EXPECT_EQ(static_cast<uint32>(cmds::AsyncTexImage2DCHROMIUM::kCmdId),
+                           static_cast<uint32_t>(19),
+                           static_cast<uint32_t>(20),
+                           static_cast<uint32_t>(21),
+                           static_cast<uint32_t>(22),
+                           static_cast<uint32_t>(23));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::AsyncTexImage2DCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -3739,11 +3772,11 @@ TEST_F(GLES2FormatTest, AsyncTexImage2DCHROMIUM) {
   EXPECT_EQ(static_cast<GLint>(16), cmd.border);
   EXPECT_EQ(static_cast<GLenum>(17), cmd.format);
   EXPECT_EQ(static_cast<GLenum>(18), cmd.type);
-  EXPECT_EQ(static_cast<uint32>(19), cmd.pixels_shm_id);
-  EXPECT_EQ(static_cast<uint32>(20), cmd.pixels_shm_offset);
-  EXPECT_EQ(static_cast<uint32>(21), cmd.async_upload_token);
-  EXPECT_EQ(static_cast<uint32>(22), cmd.sync_data_shm_id);
-  EXPECT_EQ(static_cast<uint32>(23), cmd.sync_data_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(19), cmd.pixels_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(20), cmd.pixels_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(21), cmd.async_upload_token);
+  EXPECT_EQ(static_cast<uint32_t>(22), cmd.sync_data_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(23), cmd.sync_data_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -3751,7 +3784,7 @@ TEST_F(GLES2FormatTest, WaitAsyncTexImage2DCHROMIUM) {
   cmds::WaitAsyncTexImage2DCHROMIUM& cmd =
       *GetBufferAs<cmds::WaitAsyncTexImage2DCHROMIUM>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::WaitAsyncTexImage2DCHROMIUM::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::WaitAsyncTexImage2DCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
@@ -3762,7 +3795,7 @@ TEST_F(GLES2FormatTest, WaitAllAsyncTexImage2DCHROMIUM) {
   cmds::WaitAllAsyncTexImage2DCHROMIUM& cmd =
       *GetBufferAs<cmds::WaitAllAsyncTexImage2DCHROMIUM>();
   void* next_cmd = cmd.Set(&cmd);
-  EXPECT_EQ(static_cast<uint32>(cmds::WaitAllAsyncTexImage2DCHROMIUM::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::WaitAllAsyncTexImage2DCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
@@ -3774,15 +3807,15 @@ TEST_F(GLES2FormatTest, DiscardFramebufferEXT) {
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLenum>(11),
                            static_cast<GLsizei>(12),
-                           static_cast<uint32>(13),
-                           static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(cmds::DiscardFramebufferEXT::kCmdId),
+                           static_cast<uint32_t>(13),
+                           static_cast<uint32_t>(14));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DiscardFramebufferEXT::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
   EXPECT_EQ(static_cast<GLsizei>(12), cmd.count);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.attachments_shm_id);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.attachments_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.attachments_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(14), cmd.attachments_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -3799,7 +3832,7 @@ TEST_F(GLES2FormatTest, DiscardFramebufferEXTImmediate) {
       sizeof(cmd) + kNumElements * sizeof(GLenum) * 1;
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLenum>(1), static_cast<GLsizei>(2), data);
-  EXPECT_EQ(static_cast<uint32>(cmds::DiscardFramebufferEXTImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DiscardFramebufferEXTImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(kExpectedCmdSize, cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(1), cmd.target);
@@ -3813,7 +3846,7 @@ TEST_F(GLES2FormatTest, LoseContextCHROMIUM) {
   cmds::LoseContextCHROMIUM& cmd = *GetBufferAs<cmds::LoseContextCHROMIUM>();
   void* next_cmd =
       cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLenum>(12));
-  EXPECT_EQ(static_cast<uint32>(cmds::LoseContextCHROMIUM::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::LoseContextCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLenum>(11), cmd.current);
@@ -3826,7 +3859,7 @@ TEST_F(GLES2FormatTest, WaitSyncPointCHROMIUM) {
   cmds::WaitSyncPointCHROMIUM& cmd =
       *GetBufferAs<cmds::WaitSyncPointCHROMIUM>();
   void* next_cmd = cmd.Set(&cmd, static_cast<GLuint>(11));
-  EXPECT_EQ(static_cast<uint32>(cmds::WaitSyncPointCHROMIUM::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::WaitSyncPointCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLuint>(11), cmd.sync_point);
@@ -3837,14 +3870,14 @@ TEST_F(GLES2FormatTest, DrawBuffersEXT) {
   cmds::DrawBuffersEXT& cmd = *GetBufferAs<cmds::DrawBuffersEXT>();
   void* next_cmd = cmd.Set(&cmd,
                            static_cast<GLsizei>(11),
-                           static_cast<uint32>(12),
-                           static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(cmds::DrawBuffersEXT::kCmdId),
+                           static_cast<uint32_t>(12),
+                           static_cast<uint32_t>(13));
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DrawBuffersEXT::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLsizei>(11), cmd.count);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.bufs_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.bufs_shm_offset);
+  EXPECT_EQ(static_cast<uint32_t>(12), cmd.bufs_shm_id);
+  EXPECT_EQ(static_cast<uint32_t>(13), cmd.bufs_shm_offset);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
@@ -3859,7 +3892,7 @@ TEST_F(GLES2FormatTest, DrawBuffersEXTImmediate) {
   const size_t kExpectedCmdSize =
       sizeof(cmd) + kNumElements * sizeof(GLenum) * 1;
   void* next_cmd = cmd.Set(&cmd, static_cast<GLsizei>(1), data);
-  EXPECT_EQ(static_cast<uint32>(cmds::DrawBuffersEXTImmediate::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DrawBuffersEXTImmediate::kCmdId),
             cmd.header.command);
   EXPECT_EQ(kExpectedCmdSize, cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLsizei>(1), cmd.count);
@@ -3872,7 +3905,7 @@ TEST_F(GLES2FormatTest, DiscardBackbufferCHROMIUM) {
   cmds::DiscardBackbufferCHROMIUM& cmd =
       *GetBufferAs<cmds::DiscardBackbufferCHROMIUM>();
   void* next_cmd = cmd.Set(&cmd);
-  EXPECT_EQ(static_cast<uint32>(cmds::DiscardBackbufferCHROMIUM::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::DiscardBackbufferCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
@@ -3893,7 +3926,7 @@ TEST_F(GLES2FormatTest, ScheduleOverlayPlaneCHROMIUM) {
                            static_cast<GLfloat>(19),
                            static_cast<GLfloat>(20),
                            static_cast<GLfloat>(21));
-  EXPECT_EQ(static_cast<uint32>(cmds::ScheduleOverlayPlaneCHROMIUM::kCmdId),
+  EXPECT_EQ(static_cast<uint32_t>(cmds::ScheduleOverlayPlaneCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<GLint>(11), cmd.plane_z_order);
diff --git a/gpu/command_buffer/common/gles2_cmd_utils.h b/gpu/command_buffer/common/gles2_cmd_utils.h
index 52d93a3..f6432a7 100644
--- a/gpu/command_buffer/common/gles2_cmd_utils.h
+++ b/gpu/command_buffer/common/gles2_cmd_utils.h
@@ -8,12 +8,13 @@
 #ifndef GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_UTILS_H_
 #define GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_UTILS_H_
 
+#include <stdint.h>
+
 #include <limits>
 #include <string>
 #include <vector>
 
 #include "gpu/command_buffer/common/gles2_utils_export.h"
-#include "gpu/command_buffer/common/types.h"
 
 namespace gpu {
 namespace gles2 {
@@ -23,12 +24,12 @@ namespace gles2 {
 
 // Multiplies 2 32 bit unsigned numbers checking for overflow.
 // If there was no overflow returns true.
-inline bool SafeMultiplyUint32(uint32 a, uint32 b, uint32* dst) {
+inline bool SafeMultiplyUint32(uint32_t a, uint32_t b, uint32_t* dst) {
   if (b == 0) {
     *dst = 0;
     return true;
   }
-  uint32 v = a * b;
+  uint32_t v = a * b;
   if (v / b != a) {
     *dst = 0;
     return false;
@@ -38,7 +39,7 @@ inline bool SafeMultiplyUint32(uint32 a, uint32 b, uint32* dst) {
 }
 
 // Does an add checking for overflow.  If there was no overflow returns true.
-inline bool SafeAddUint32(uint32 a, uint32 b, uint32* dst) {
+inline bool SafeAddUint32(uint32_t a, uint32_t b, uint32_t* dst) {
   if (a + b < a) {
     *dst = 0;
     return false;
@@ -48,10 +49,10 @@ inline bool SafeAddUint32(uint32 a, uint32 b, uint32* dst) {
 }
 
 // Does an add checking for overflow.  If there was no overflow returns true.
-inline bool SafeAddInt32(int32 a, int32 b, int32* dst) {
-  int64 sum64 = static_cast<int64>(a) + b;
-  int32 sum32 = static_cast<int32>(sum64);
-  bool safe = sum64 == static_cast<int64>(sum32);
+inline bool SafeAddInt32(int32_t a, int32_t b, int32_t* dst) {
+  int64_t sum64 = static_cast<int64_t>(a) + b;
+  int32_t sum32 = static_cast<int32_t>(sum64);
+  bool safe = sum64 == static_cast<int64_t>(sum32);
   *dst = safe ? sum32 : 0;
   return safe;
 }
@@ -59,7 +60,7 @@ inline bool SafeAddInt32(int32 a, int32 b, int32* dst) {
 // Return false if |value| is more than a 32 bit integer can represent.
 template<typename T>
 inline bool FitInt32NonNegative(T value) {
-  const int32 max = std::numeric_limits<int32>::max();
+  const int32_t max = std::numeric_limits<int32_t>::max();
   return (std::numeric_limits<T>::max() <= max ||
           value <= static_cast<T>(max));
 }
@@ -83,7 +84,7 @@ class GLES2_UTILS_EXPORT GLES2Util {
   };
 
   struct EnumToString {
-    uint32 value;
+    uint32_t value;
     const char* name;
   };
 
@@ -113,12 +114,12 @@ class GLES2_UTILS_EXPORT GLES2Util {
   int GLGetNumValuesReturned(int id) const;
 
   // Computes the size of a single group of elements from a format and type pair
-  static uint32 ComputeImageGroupSize(int format, int type);
+  static uint32_t ComputeImageGroupSize(int format, int type);
 
   // Computes the size of an image row including alignment padding
   static bool ComputeImagePaddedRowSize(
       int width, int format, int type, int unpack_alignment,
-      uint32* padded_row_size);
+      uint32_t* padded_row_size);
 
   // Computes the size of image data for TexImage2D and TexSubImage2D.
   // Optionally the unpadded and padded row sizes can be returned. If height < 2
@@ -126,40 +127,40 @@ class GLES2_UTILS_EXPORT GLES2Util {
   // padding is not necessary.
   static bool ComputeImageDataSizes(
       int width, int height, int format, int type, int unpack_alignment,
-      uint32* size, uint32* unpadded_row_size, uint32* padded_row_size);
+      uint32_t* size, uint32_t* unpadded_row_size, uint32_t* padded_row_size);
 
   static size_t RenderbufferBytesPerPixel(int format);
 
-  static uint32 GetGLDataTypeSizeForUniforms(int type);
+  static uint32_t GetGLDataTypeSizeForUniforms(int type);
 
-  static size_t GetGLTypeSizeForTexturesAndBuffers(uint32 type);
+  static size_t GetGLTypeSizeForTexturesAndBuffers(uint32_t type);
 
-  static uint32 GLErrorToErrorBit(uint32 gl_error);
+  static uint32_t GLErrorToErrorBit(uint32_t gl_error);
 
-  static uint32 GLErrorBitToGLError(uint32 error_bit);
+  static uint32_t GLErrorBitToGLError(uint32_t error_bit);
 
-  static uint32 IndexToGLFaceTarget(int index);
+  static uint32_t IndexToGLFaceTarget(int index);
 
-  static uint32 GetPreferredGLReadPixelsFormat(uint32 internal_format);
+  static uint32_t GetPreferredGLReadPixelsFormat(uint32_t internal_format);
 
-  static uint32 GetPreferredGLReadPixelsType(
-      uint32 internal_format, uint32 texture_type);
+  static uint32_t GetPreferredGLReadPixelsType(
+      uint32_t internal_format, uint32_t texture_type);
 
   // Returns a bitmask for the channels the given format supports.
   // See ChannelBits.
-  static uint32 GetChannelsForFormat(int format);
+  static uint32_t GetChannelsForFormat(int format);
 
   // Returns a bitmask for the channels the given attachment type needs.
-  static uint32 GetChannelsNeededForAttachmentType(
-      int type, uint32 max_color_attachments);
+  static uint32_t GetChannelsNeededForAttachmentType(
+      int type, uint32_t max_color_attachments);
 
-  static bool IsNPOT(uint32 value) {
+  static bool IsNPOT(uint32_t value) {
     return value > 0 && (value & (value - 1)) != 0;
   }
 
-  static std::string GetStringEnum(uint32 value);
-  static std::string GetStringBool(uint32 value);
-  static std::string GetStringError(uint32 value);
+  static std::string GetStringEnum(uint32_t value);
+  static std::string GetStringBool(uint32_t value);
+  static std::string GetStringError(uint32_t value);
 
   // Parses a uniform name.
   //   array_pos: the position of the last '[' character in name.
@@ -178,7 +179,7 @@ class GLES2_UTILS_EXPORT GLES2Util {
 
  private:
   static std::string GetQualifiedEnumString(
-      const EnumToString* table, size_t count, uint32 value);
+      const EnumToString* table, size_t count, uint32_t value);
 
   static const EnumToString* const enum_to_string_table_;
   static const size_t enum_to_string_table_len_;
@@ -191,18 +192,18 @@ class GLES2_UTILS_EXPORT ContextCreationAttribHelper {
  public:
   ContextCreationAttribHelper();
 
-  void Serialize(std::vector<int32>* attribs);
-  bool Parse(const std::vector<int32>& attribs);
+  void Serialize(std::vector<int32_t>* attribs);
+  bool Parse(const std::vector<int32_t>& attribs);
 
   // -1 if invalid or unspecified.
-  int32 alpha_size_;
-  int32 blue_size_;
-  int32 green_size_;
-  int32 red_size_;
-  int32 depth_size_;
-  int32 stencil_size_;
-  int32 samples_;
-  int32 sample_buffers_;
+  int32_t alpha_size_;
+  int32_t blue_size_;
+  int32_t green_size_;
+  int32_t red_size_;
+  int32_t depth_size_;
+  int32_t stencil_size_;
+  int32_t samples_;
+  int32_t sample_buffers_;
   bool buffer_preserved_;
   bool share_resources_;
   bool bind_generates_resource_;
diff --git a/gpu/command_buffer/common/gles2_cmd_utils_autogen.h b/gpu/command_buffer/common/gles2_cmd_utils_autogen.h
index 4798a6f..d4f5776 100644
--- a/gpu/command_buffer/common/gles2_cmd_utils_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_utils_autogen.h
@@ -11,60 +11,60 @@
 #ifndef GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_UTILS_AUTOGEN_H_
 #define GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_UTILS_AUTOGEN_H_
 
-static std::string GetStringAttachment(uint32 value);
-static std::string GetStringBackbufferAttachment(uint32 value);
-static std::string GetStringBlitFilter(uint32 value);
-static std::string GetStringBufferParameter(uint32 value);
-static std::string GetStringBufferTarget(uint32 value);
-static std::string GetStringBufferUsage(uint32 value);
-static std::string GetStringCapability(uint32 value);
-static std::string GetStringCmpFunction(uint32 value);
-static std::string GetStringCompressedTextureFormat(uint32 value);
-static std::string GetStringDrawMode(uint32 value);
-static std::string GetStringDstBlendFactor(uint32 value);
-static std::string GetStringEquation(uint32 value);
-static std::string GetStringFaceMode(uint32 value);
-static std::string GetStringFaceType(uint32 value);
-static std::string GetStringFrameBufferParameter(uint32 value);
-static std::string GetStringFrameBufferTarget(uint32 value);
-static std::string GetStringGLState(uint32 value);
-static std::string GetStringGetMaxIndexType(uint32 value);
-static std::string GetStringGetTexParamTarget(uint32 value);
-static std::string GetStringHintMode(uint32 value);
-static std::string GetStringHintTarget(uint32 value);
-static std::string GetStringIndexType(uint32 value);
-static std::string GetStringPixelStore(uint32 value);
-static std::string GetStringPixelType(uint32 value);
-static std::string GetStringProgramParameter(uint32 value);
-static std::string GetStringQueryObjectParameter(uint32 value);
-static std::string GetStringQueryParameter(uint32 value);
-static std::string GetStringQueryTarget(uint32 value);
-static std::string GetStringReadPixelFormat(uint32 value);
-static std::string GetStringReadPixelType(uint32 value);
-static std::string GetStringRenderBufferFormat(uint32 value);
-static std::string GetStringRenderBufferParameter(uint32 value);
-static std::string GetStringRenderBufferTarget(uint32 value);
-static std::string GetStringResetStatus(uint32 value);
-static std::string GetStringShaderBinaryFormat(uint32 value);
-static std::string GetStringShaderParameter(uint32 value);
-static std::string GetStringShaderPrecision(uint32 value);
-static std::string GetStringShaderType(uint32 value);
-static std::string GetStringSrcBlendFactor(uint32 value);
-static std::string GetStringStencilOp(uint32 value);
-static std::string GetStringStringType(uint32 value);
-static std::string GetStringTextureBindTarget(uint32 value);
-static std::string GetStringTextureFormat(uint32 value);
-static std::string GetStringTextureInternalFormat(uint32 value);
-static std::string GetStringTextureInternalFormatStorage(uint32 value);
-static std::string GetStringTextureMagFilterMode(uint32 value);
-static std::string GetStringTextureMinFilterMode(uint32 value);
-static std::string GetStringTextureParameter(uint32 value);
-static std::string GetStringTexturePool(uint32 value);
-static std::string GetStringTextureTarget(uint32 value);
-static std::string GetStringTextureUsage(uint32 value);
-static std::string GetStringTextureWrapMode(uint32 value);
-static std::string GetStringVertexAttribType(uint32 value);
-static std::string GetStringVertexAttribute(uint32 value);
-static std::string GetStringVertexPointer(uint32 value);
+static std::string GetStringAttachment(uint32_t value);
+static std::string GetStringBackbufferAttachment(uint32_t value);
+static std::string GetStringBlitFilter(uint32_t value);
+static std::string GetStringBufferParameter(uint32_t value);
+static std::string GetStringBufferTarget(uint32_t value);
+static std::string GetStringBufferUsage(uint32_t value);
+static std::string GetStringCapability(uint32_t value);
+static std::string GetStringCmpFunction(uint32_t value);
+static std::string GetStringCompressedTextureFormat(uint32_t value);
+static std::string GetStringDrawMode(uint32_t value);
+static std::string GetStringDstBlendFactor(uint32_t value);
+static std::string GetStringEquation(uint32_t value);
+static std::string GetStringFaceMode(uint32_t value);
+static std::string GetStringFaceType(uint32_t value);
+static std::string GetStringFrameBufferParameter(uint32_t value);
+static std::string GetStringFrameBufferTarget(uint32_t value);
+static std::string GetStringGLState(uint32_t value);
+static std::string GetStringGetMaxIndexType(uint32_t value);
+static std::string GetStringGetTexParamTarget(uint32_t value);
+static std::string GetStringHintMode(uint32_t value);
+static std::string GetStringHintTarget(uint32_t value);
+static std::string GetStringIndexType(uint32_t value);
+static std::string GetStringPixelStore(uint32_t value);
+static std::string GetStringPixelType(uint32_t value);
+static std::string GetStringProgramParameter(uint32_t value);
+static std::string GetStringQueryObjectParameter(uint32_t value);
+static std::string GetStringQueryParameter(uint32_t value);
+static std::string GetStringQueryTarget(uint32_t value);
+static std::string GetStringReadPixelFormat(uint32_t value);
+static std::string GetStringReadPixelType(uint32_t value);
+static std::string GetStringRenderBufferFormat(uint32_t value);
+static std::string GetStringRenderBufferParameter(uint32_t value);
+static std::string GetStringRenderBufferTarget(uint32_t value);
+static std::string GetStringResetStatus(uint32_t value);
+static std::string GetStringShaderBinaryFormat(uint32_t value);
+static std::string GetStringShaderParameter(uint32_t value);
+static std::string GetStringShaderPrecision(uint32_t value);
+static std::string GetStringShaderType(uint32_t value);
+static std::string GetStringSrcBlendFactor(uint32_t value);
+static std::string GetStringStencilOp(uint32_t value);
+static std::string GetStringStringType(uint32_t value);
+static std::string GetStringTextureBindTarget(uint32_t value);
+static std::string GetStringTextureFormat(uint32_t value);
+static std::string GetStringTextureInternalFormat(uint32_t value);
+static std::string GetStringTextureInternalFormatStorage(uint32_t value);
+static std::string GetStringTextureMagFilterMode(uint32_t value);
+static std::string GetStringTextureMinFilterMode(uint32_t value);
+static std::string GetStringTextureParameter(uint32_t value);
+static std::string GetStringTexturePool(uint32_t value);
+static std::string GetStringTextureTarget(uint32_t value);
+static std::string GetStringTextureUsage(uint32_t value);
+static std::string GetStringTextureWrapMode(uint32_t value);
+static std::string GetStringVertexAttribType(uint32_t value);
+static std::string GetStringVertexAttribute(uint32_t value);
+static std::string GetStringVertexPointer(uint32_t value);
 
 #endif  // GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_UTILS_AUTOGEN_H_
diff --git a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
index 5283c24..3285287 100644
--- a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
@@ -13,2338 +13,3116 @@
 
 static const GLES2Util::EnumToString enum_to_string_table[] = {
     {
-     0x78EC, "GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM",
+     0x78EC,
+     "GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM",
     },
     {
-     0x8825, "GL_DRAW_BUFFER0_EXT",
+     0x8825,
+     "GL_DRAW_BUFFER0_EXT",
     },
     {
-     0x0BC1, "GL_ALPHA_TEST_FUNC_QCOM",
+     0x0BC1,
+     "GL_ALPHA_TEST_FUNC_QCOM",
     },
     {
-     0x884C, "GL_TEXTURE_COMPARE_MODE_EXT",
+     0x884C,
+     "GL_TEXTURE_COMPARE_MODE_EXT",
     },
     {
-     0x0BC2, "GL_ALPHA_TEST_REF_QCOM",
+     0x0BC2,
+     "GL_ALPHA_TEST_REF_QCOM",
     },
     {
-     0x884D, "GL_TEXTURE_COMPARE_FUNC_EXT",
+     0x884D,
+     "GL_TEXTURE_COMPARE_FUNC_EXT",
     },
     {
-     0x884E, "GL_COMPARE_REF_TO_TEXTURE_EXT",
+     0x884E,
+     "GL_COMPARE_REF_TO_TEXTURE_EXT",
     },
     {
-     0x93A1, "GL_BGRA8_EXT",
+     0x93A1,
+     "GL_BGRA8_EXT",
     },
     {
-     0, "GL_FALSE",
+     0,
+     "GL_FALSE",
     },
     {
-     0x00400000, "GL_STENCIL_BUFFER_BIT6_QCOM",
+     0x00400000,
+     "GL_STENCIL_BUFFER_BIT6_QCOM",
     },
     {
-     0x9138, "GL_COMPRESSED_RGBA_PVRTC_4BPPV2_IMG",
+     0x9138,
+     "GL_COMPRESSED_RGBA_PVRTC_4BPPV2_IMG",
     },
     {
-     0x8FC4, "GL_SHADER_BINARY_VIV",
+     0x8FC4,
+     "GL_SHADER_BINARY_VIV",
     },
     {
-     0x9130, "GL_SGX_PROGRAM_BINARY_IMG",
+     0x9130,
+     "GL_SGX_PROGRAM_BINARY_IMG",
     },
     {
-     0x9133, "GL_RENDERBUFFER_SAMPLES_IMG",
+     0x9133,
+     "GL_RENDERBUFFER_SAMPLES_IMG",
     },
     {
-     0x82E0, "GL_BUFFER_KHR",
+     0x82E0,
+     "GL_BUFFER_KHR",
     },
     {
-     0x9135, "GL_MAX_SAMPLES_IMG",
+     0x9135,
+     "GL_MAX_SAMPLES_IMG",
     },
     {
-     0x9134, "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG",
+     0x9134,
+     "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG",
     },
     {
-     0x9137, "GL_COMPRESSED_RGBA_PVRTC_2BPPV2_IMG",
+     0x9137,
+     "GL_COMPRESSED_RGBA_PVRTC_2BPPV2_IMG",
     },
     {
-     0x9136, "GL_TEXTURE_SAMPLES_IMG",
+     0x9136,
+     "GL_TEXTURE_SAMPLES_IMG",
     },
     {
-     0x00000020, "GL_COLOR_BUFFER_BIT5_QCOM",
+     0x00000020,
+     "GL_COLOR_BUFFER_BIT5_QCOM",
     },
     {
-     0x0008, "GL_MAP_INVALIDATE_BUFFER_BIT_EXT",
+     0x0008,
+     "GL_MAP_INVALIDATE_BUFFER_BIT_EXT",
     },
     {
-     0x0BC0, "GL_ALPHA_TEST_QCOM",
+     0x0BC0,
+     "GL_ALPHA_TEST_QCOM",
     },
     {
-     0x0006, "GL_TRIANGLE_FAN",
+     0x0006,
+     "GL_TRIANGLE_FAN",
     },
     {
-     0x0004, "GL_TRIANGLES",
+     0x0004,
+     "GL_TRIANGLES",
     },
     {
-     0x0005, "GL_TRIANGLE_STRIP",
+     0x0005,
+     "GL_TRIANGLE_STRIP",
     },
     {
-     0x0002, "GL_LINE_LOOP",
+     0x0002,
+     "GL_LINE_LOOP",
     },
     {
-     0x0003, "GL_LINE_STRIP",
+     0x0003,
+     "GL_LINE_STRIP",
     },
     {
-     0x0000, "GL_POINTS",
+     0x0000,
+     "GL_POINTS",
     },
     {
-     0x0001, "GL_LINES",
+     0x0001,
+     "GL_LINES",
     },
     {
-     0x78F0, "GL_IMAGE_ROWBYTES_CHROMIUM",
+     0x78F0,
+     "GL_IMAGE_ROWBYTES_CHROMIUM",
     },
     {
-     0x88B8, "GL_READ_ONLY",
+     0x88B8,
+     "GL_READ_ONLY",
     },
     {
-     0x88B9, "GL_WRITE_ONLY_OES",
+     0x88B9,
+     "GL_WRITE_ONLY_OES",
     },
     {
-     0x8211, "GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT",
+     0x8211,
+     "GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT",
     },
     {
-     0x8210, "GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT",
+     0x8210,
+     "GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT",
     },
     {
-     0x8741, "GL_PROGRAM_BINARY_LENGTH_OES",
+     0x8741,
+     "GL_PROGRAM_BINARY_LENGTH_OES",
     },
     {
-     0x8740, "GL_Z400_BINARY_AMD",
+     0x8740,
+     "GL_Z400_BINARY_AMD",
     },
     {
-     0x8192, "GL_GENERATE_MIPMAP_HINT",
+     0x8192,
+     "GL_GENERATE_MIPMAP_HINT",
     },
     {
-     0x8A54, "GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT",
+     0x8A54,
+     "GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT",
     },
     {
-     0x8A55, "GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT",
+     0x8A55,
+     "GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT",
     },
     {
-     0x8A56, "GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT",
+     0x8A56,
+     "GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT",
     },
     {
-     0x8A57, "GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT",
+     0x8A57,
+     "GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT",
     },
     {
-     0x8A51, "GL_RGB_RAW_422_APPLE",
+     0x8A51,
+     "GL_RGB_RAW_422_APPLE",
     },
     {
-     0x87F9, "GL_3DC_X_AMD",
+     0x87F9,
+     "GL_3DC_X_AMD",
     },
     {
-     0x8A53, "GL_SYNC_OBJECT_APPLE",
+     0x8A53,
+     "GL_SYNC_OBJECT_APPLE",
     },
     {
-     0x8DF8, "GL_SHADER_BINARY_FORMATS",
+     0x8DF8,
+     "GL_SHADER_BINARY_FORMATS",
     },
     {
-     0x8DF9, "GL_NUM_SHADER_BINARY_FORMATS",
+     0x8DF9,
+     "GL_NUM_SHADER_BINARY_FORMATS",
     },
     {
-     0x826D, "GL_DEBUG_GROUP_STACK_DEPTH_KHR",
+     0x826D,
+     "GL_DEBUG_GROUP_STACK_DEPTH_KHR",
     },
     {
-     0x826B, "GL_DEBUG_SEVERITY_NOTIFICATION_KHR",
+     0x826B,
+     "GL_DEBUG_SEVERITY_NOTIFICATION_KHR",
     },
     {
-     0x826C, "GL_MAX_DEBUG_GROUP_STACK_DEPTH_KHR",
+     0x826C,
+     "GL_MAX_DEBUG_GROUP_STACK_DEPTH_KHR",
     },
     {
-     0x8B59, "GL_BOOL_VEC4",
+     0x8B59,
+     "GL_BOOL_VEC4",
     },
     {
-     0x826A, "GL_DEBUG_TYPE_POP_GROUP_KHR",
+     0x826A,
+     "GL_DEBUG_TYPE_POP_GROUP_KHR",
     },
     {
-     0x8B57, "GL_BOOL_VEC2",
+     0x8B57,
+     "GL_BOOL_VEC2",
     },
     {
-     0x8DF1, "GL_MEDIUM_FLOAT",
+     0x8DF1,
+     "GL_MEDIUM_FLOAT",
     },
     {
-     0x8B55, "GL_INT_VEC4",
+     0x8B55,
+     "GL_INT_VEC4",
     },
     {
-     0x8B54, "GL_INT_VEC3",
+     0x8B54,
+     "GL_INT_VEC3",
     },
     {
-     0x8DF4, "GL_MEDIUM_INT",
+     0x8DF4,
+     "GL_MEDIUM_INT",
     },
     {
-     0x8DF5, "GL_HIGH_INT",
+     0x8DF5,
+     "GL_HIGH_INT",
     },
     {
-     0x8B51, "GL_FLOAT_VEC3",
+     0x8B51,
+     "GL_FLOAT_VEC3",
     },
     {
-     0x8B50, "GL_FLOAT_VEC2",
+     0x8B50,
+     "GL_FLOAT_VEC2",
     },
     {
-     0x806F, "GL_TEXTURE_3D_OES",
+     0x806F,
+     "GL_TEXTURE_3D_OES",
     },
     {
-     0x92E0, "GL_DEBUG_OUTPUT_KHR",
+     0x92E0,
+     "GL_DEBUG_OUTPUT_KHR",
     },
     {
-     0x806A, "GL_TEXTURE_BINDING_3D_OES",
+     0x806A,
+     "GL_TEXTURE_BINDING_3D_OES",
     },
     {
-     0x8CE3, "GL_COLOR_ATTACHMENT3_EXT",
+     0x8CE3,
+     "GL_COLOR_ATTACHMENT3_EXT",
     },
     {
-     0x1904, "GL_GREEN_NV",
+     0x1904,
+     "GL_GREEN_NV",
     },
     {
-     0x928D, "GL_DST_OUT_NV",
+     0x928D,
+     "GL_DST_OUT_NV",
     },
     {
-     0x8069, "GL_TEXTURE_BINDING_2D",
+     0x8069,
+     "GL_TEXTURE_BINDING_2D",
     },
     {
-     0x8261, "GL_NO_RESET_NOTIFICATION_EXT",
+     0x8261,
+     "GL_NO_RESET_NOTIFICATION_EXT",
     },
     {
-     0x8DFA, "GL_SHADER_COMPILER",
+     0x8DFA,
+     "GL_SHADER_COMPILER",
     },
     {
-     0x8DFB, "GL_MAX_VERTEX_UNIFORM_VECTORS",
+     0x8DFB,
+     "GL_MAX_VERTEX_UNIFORM_VECTORS",
     },
     {
-     0x8DFC, "GL_MAX_VARYING_VECTORS",
+     0x8DFC,
+     "GL_MAX_VARYING_VECTORS",
     },
     {
-     0x8B5C, "GL_FLOAT_MAT4",
+     0x8B5C,
+     "GL_FLOAT_MAT4",
     },
     {
-     0x8B5B, "GL_FLOAT_MAT3",
+     0x8B5B,
+     "GL_FLOAT_MAT3",
     },
     {
-     0x8268, "GL_DEBUG_TYPE_MARKER_KHR",
+     0x8268,
+     "GL_DEBUG_TYPE_MARKER_KHR",
     },
     {
-     0x8269, "GL_DEBUG_TYPE_PUSH_GROUP_KHR",
+     0x8269,
+     "GL_DEBUG_TYPE_PUSH_GROUP_KHR",
     },
     {
-     0x1905, "GL_BLUE_NV",
+     0x1905,
+     "GL_BLUE_NV",
     },
     {
-     0x87FF, "GL_PROGRAM_BINARY_FORMATS_OES",
+     0x87FF,
+     "GL_PROGRAM_BINARY_FORMATS_OES",
     },
     {
-     0x87FE, "GL_NUM_PROGRAM_BINARY_FORMATS_OES",
+     0x87FE,
+     "GL_NUM_PROGRAM_BINARY_FORMATS_OES",
     },
     {
-     0x2600, "GL_NEAREST",
+     0x2600,
+     "GL_NEAREST",
     },
     {
-     0x2601, "GL_LINEAR",
+     0x2601,
+     "GL_LINEAR",
     },
     {
-     0x8C03, "GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG",
+     0x8C03,
+     "GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG",
     },
     {
-     0x9242, "GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM",
+     0x9242,
+     "GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM",
     },
     {
-     0x88BA, "GL_READ_WRITE",
+     0x88BA,
+     "GL_READ_WRITE",
     },
     {
-     0x88BB, "GL_BUFFER_ACCESS_OES",
+     0x88BB,
+     "GL_BUFFER_ACCESS_OES",
     },
     {
-     0x88BC, "GL_BUFFER_MAPPED_OES",
+     0x88BC,
+     "GL_BUFFER_MAPPED_OES",
     },
     {
-     0x88BD, "GL_BUFFER_MAP_POINTER_OES",
+     0x88BD,
+     "GL_BUFFER_MAP_POINTER_OES",
     },
     {
-     0x88BF, "GL_TIME_ELAPSED_EXT",
+     0x88BF,
+     "GL_TIME_ELAPSED_EXT",
     },
     {
-     0x0C10, "GL_SCISSOR_BOX",
+     0x0C10,
+     "GL_SCISSOR_BOX",
     },
     {
-     0x0C11, "GL_SCISSOR_TEST",
+     0x0C11,
+     "GL_SCISSOR_TEST",
     },
     {
-     0x80000000, "GL_MULTISAMPLE_BUFFER_BIT7_QCOM",
+     0x80000000,
+     "GL_MULTISAMPLE_BUFFER_BIT7_QCOM",
     },
     {
-     0x8A48, "GL_TEXTURE_SRGB_DECODE_EXT",
+     0x8A48,
+     "GL_TEXTURE_SRGB_DECODE_EXT",
     },
     {
-     0x300E, "GL_CONTEXT_LOST",
+     0x300E,
+     "GL_CONTEXT_LOST",
     },
     {
-     0x02000000, "GL_MULTISAMPLE_BUFFER_BIT1_QCOM",
+     0x02000000,
+     "GL_MULTISAMPLE_BUFFER_BIT1_QCOM",
     },
     {
-     0x8C2F, "GL_ANY_SAMPLES_PASSED_EXT",
+     0x8C2F,
+     "GL_ANY_SAMPLES_PASSED_EXT",
     },
     {
-     0x8BD2, "GL_TEXTURE_WIDTH_QCOM",
+     0x8BD2,
+     "GL_TEXTURE_WIDTH_QCOM",
     },
     {
-     0x8BD3, "GL_TEXTURE_HEIGHT_QCOM",
+     0x8BD3,
+     "GL_TEXTURE_HEIGHT_QCOM",
     },
     {
-     0x8BD4, "GL_TEXTURE_DEPTH_QCOM",
+     0x8BD4,
+     "GL_TEXTURE_DEPTH_QCOM",
     },
     {
-     0x8BD5, "GL_TEXTURE_INTERNAL_FORMAT_QCOM",
+     0x8BD5,
+     "GL_TEXTURE_INTERNAL_FORMAT_QCOM",
     },
     {
-     0x8BD6, "GL_TEXTURE_FORMAT_QCOM",
+     0x8BD6,
+     "GL_TEXTURE_FORMAT_QCOM",
     },
     {
-     0x8BD7, "GL_TEXTURE_TYPE_QCOM",
+     0x8BD7,
+     "GL_TEXTURE_TYPE_QCOM",
     },
     {
-     0x8B8D, "GL_CURRENT_PROGRAM",
+     0x8B8D,
+     "GL_CURRENT_PROGRAM",
     },
     {
-     0x8BD9, "GL_TEXTURE_NUM_LEVELS_QCOM",
+     0x8BD9,
+     "GL_TEXTURE_NUM_LEVELS_QCOM",
     },
     {
-     0x00200000, "GL_STENCIL_BUFFER_BIT5_QCOM",
+     0x00200000,
+     "GL_STENCIL_BUFFER_BIT5_QCOM",
     },
     {
-     0x8B8A, "GL_ACTIVE_ATTRIBUTE_MAX_LENGTH",
+     0x8B8A,
+     "GL_ACTIVE_ATTRIBUTE_MAX_LENGTH",
     },
     {
-     0x8B8B, "GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES",
+     0x8B8B,
+     "GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES",
     },
     {
-     0x8B8C, "GL_SHADING_LANGUAGE_VERSION",
+     0x8B8C,
+     "GL_SHADING_LANGUAGE_VERSION",
     },
     {
-     0x8BDA, "GL_TEXTURE_TARGET_QCOM",
+     0x8BDA,
+     "GL_TEXTURE_TARGET_QCOM",
     },
     {
-     0x8BDB, "GL_TEXTURE_OBJECT_VALID_QCOM",
+     0x8BDB,
+     "GL_TEXTURE_OBJECT_VALID_QCOM",
     },
     {
-     0x8BDC, "GL_STATE_RESTORE",
+     0x8BDC,
+     "GL_STATE_RESTORE",
     },
     {
-     0x8B88, "GL_SHADER_SOURCE_LENGTH",
+     0x8B88,
+     "GL_SHADER_SOURCE_LENGTH",
     },
     {
-     0x8B89, "GL_ACTIVE_ATTRIBUTES",
+     0x8B89,
+     "GL_ACTIVE_ATTRIBUTES",
     },
     {
-     0x93C9, "GL_COMPRESSED_RGBA_ASTC_6x6x6_OES",
+     0x93C9,
+     "GL_COMPRESSED_RGBA_ASTC_6x6x6_OES",
     },
     {
-     0x93C8, "GL_COMPRESSED_RGBA_ASTC_6x6x5_OES",
+     0x93C8,
+     "GL_COMPRESSED_RGBA_ASTC_6x6x5_OES",
     },
     {
-     0x8B84, "GL_INFO_LOG_LENGTH",
+     0x8B84,
+     "GL_INFO_LOG_LENGTH",
     },
     {
-     0x8B85, "GL_ATTACHED_SHADERS",
+     0x8B85,
+     "GL_ATTACHED_SHADERS",
     },
     {
-     0x8B86, "GL_ACTIVE_UNIFORMS",
+     0x8B86,
+     "GL_ACTIVE_UNIFORMS",
     },
     {
-     0x8B87, "GL_ACTIVE_UNIFORM_MAX_LENGTH",
+     0x8B87,
+     "GL_ACTIVE_UNIFORM_MAX_LENGTH",
     },
     {
-     0x8B80, "GL_DELETE_STATUS",
+     0x8B80,
+     "GL_DELETE_STATUS",
     },
     {
-     0x8B81, "GL_COMPILE_STATUS",
+     0x8B81,
+     "GL_COMPILE_STATUS",
     },
     {
-     0x8B82, "GL_LINK_STATUS",
+     0x8B82,
+     "GL_LINK_STATUS",
     },
     {
-     0x8B83, "GL_VALIDATE_STATUS",
+     0x8B83,
+     "GL_VALIDATE_STATUS",
     },
     {
-     0x8D48, "GL_STENCIL_INDEX8",
+     0x8D48,
+     "GL_STENCIL_INDEX8",
     },
     {
-     0x8D46, "GL_STENCIL_INDEX1_OES",
+     0x8D46,
+     "GL_STENCIL_INDEX1_OES",
     },
     {
-     0x8D47, "GL_STENCIL_INDEX4_OES",
+     0x8D47,
+     "GL_STENCIL_INDEX4_OES",
     },
     {
-     0x8D44, "GL_RENDERBUFFER_INTERNAL_FORMAT",
+     0x8D44,
+     "GL_RENDERBUFFER_INTERNAL_FORMAT",
     },
     {
-     0x00000100, "GL_DEPTH_BUFFER_BIT",
+     0x00000100,
+     "GL_DEPTH_BUFFER_BIT",
     },
     {
-     0x8D42, "GL_RENDERBUFFER_WIDTH",
+     0x8D42,
+     "GL_RENDERBUFFER_WIDTH",
     },
     {
-     0x8D43, "GL_RENDERBUFFER_HEIGHT",
+     0x8D43,
+     "GL_RENDERBUFFER_HEIGHT",
     },
     {
-     0x8D40, "GL_FRAMEBUFFER",
+     0x8D40,
+     "GL_FRAMEBUFFER",
     },
     {
-     0x8D41, "GL_RENDERBUFFER",
+     0x8D41,
+     "GL_RENDERBUFFER",
     },
     {
-     0x0BD0, "GL_DITHER",
+     0x0BD0,
+     "GL_DITHER",
     },
     {
-     0x93D3, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR",
+     0x93D3,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR",
     },
     {
-     0x1801, "GL_DEPTH_EXT",
+     0x1801,
+     "GL_DEPTH_EXT",
     },
     {
-     0x1800, "GL_COLOR_EXT",
+     0x1800,
+     "GL_COLOR_EXT",
     },
     {
-     0x1802, "GL_STENCIL_EXT",
+     0x1802,
+     "GL_STENCIL_EXT",
     },
     {
-     0x0B21, "GL_LINE_WIDTH",
+     0x0B21,
+     "GL_LINE_WIDTH",
     },
     {
-     0x81A5, "GL_DEPTH_COMPONENT16",
+     0x81A5,
+     "GL_DEPTH_COMPONENT16",
     },
     {
-     0x81A6, "GL_DEPTH_COMPONENT24_OES",
+     0x81A6,
+     "GL_DEPTH_COMPONENT24_OES",
     },
     {
-     0x81A7, "GL_DEPTH_COMPONENT32_OES",
+     0x81A7,
+     "GL_DEPTH_COMPONENT32_OES",
     },
     {
-     0x88FE, "GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE",
+     0x88FE,
+     "GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE",
     },
     {
-     0x8B6A, "GL_FLOAT_MAT4x3_NV",
+     0x8B6A,
+     "GL_FLOAT_MAT4x3_NV",
     },
     {
-     0x93D0, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR",
+     0x93D0,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR",
     },
     {
-     0x9143, "GL_MAX_DEBUG_MESSAGE_LENGTH_KHR",
+     0x9143,
+     "GL_MAX_DEBUG_MESSAGE_LENGTH_KHR",
     },
     {
-     0x9144, "GL_MAX_DEBUG_LOGGED_MESSAGES_KHR",
+     0x9144,
+     "GL_MAX_DEBUG_LOGGED_MESSAGES_KHR",
     },
     {
-     0x9145, "GL_DEBUG_LOGGED_MESSAGES_KHR",
+     0x9145,
+     "GL_DEBUG_LOGGED_MESSAGES_KHR",
     },
     {
-     0x9146, "GL_DEBUG_SEVERITY_HIGH_KHR",
+     0x9146,
+     "GL_DEBUG_SEVERITY_HIGH_KHR",
     },
     {
-     0x9147, "GL_DEBUG_SEVERITY_MEDIUM_KHR",
+     0x9147,
+     "GL_DEBUG_SEVERITY_MEDIUM_KHR",
     },
     {
-     0x9148, "GL_DEBUG_SEVERITY_LOW_KHR",
+     0x9148,
+     "GL_DEBUG_SEVERITY_LOW_KHR",
     },
     {
-     0x9260, "GL_GCCSO_SHADER_BINARY_FJ",
+     0x9260,
+     "GL_GCCSO_SHADER_BINARY_FJ",
     },
     {
-     0x8F60, "GL_MALI_SHADER_BINARY_ARM",
+     0x8F60,
+     "GL_MALI_SHADER_BINARY_ARM",
     },
     {
-     0x8F61, "GL_MALI_PROGRAM_BINARY_ARM",
+     0x8F61,
+     "GL_MALI_PROGRAM_BINARY_ARM",
     },
     {
-     0x87EE, "GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD",
+     0x87EE,
+     "GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD",
     },
     {
-     0x822B, "GL_RG8_EXT",
+     0x822B,
+     "GL_RG8_EXT",
     },
     {
-     0x822F, "GL_RG16F_EXT",
+     0x822F,
+     "GL_RG16F_EXT",
     },
     {
-     0x822D, "GL_R16F_EXT",
+     0x822D,
+     "GL_R16F_EXT",
     },
     {
-     0x822E, "GL_R32F_EXT",
+     0x822E,
+     "GL_R32F_EXT",
     },
     {
-     1, "GL_ES_VERSION_2_0",
+     1,
+     "GL_ES_VERSION_2_0",
     },
     {
-     0x84F9, "GL_DEPTH_STENCIL_OES",
+     0x84F9,
+     "GL_DEPTH_STENCIL_OES",
     },
     {
-     0x8368, "GL_UNSIGNED_INT_2_10_10_10_REV_EXT",
+     0x8368,
+     "GL_UNSIGNED_INT_2_10_10_10_REV_EXT",
     },
     {
-     0x8819, "GL_LUMINANCE_ALPHA32F_EXT",
+     0x8819,
+     "GL_LUMINANCE_ALPHA32F_EXT",
     },
     {
-     0x8818, "GL_LUMINANCE32F_EXT",
+     0x8818,
+     "GL_LUMINANCE32F_EXT",
     },
     {
-     0x8363, "GL_UNSIGNED_SHORT_5_6_5",
+     0x8363,
+     "GL_UNSIGNED_SHORT_5_6_5",
     },
     {
-     0x8814, "GL_RGBA32F_EXT",
+     0x8814,
+     "GL_RGBA32F_EXT",
     },
     {
-     0x84F2, "GL_ALL_COMPLETED_NV",
+     0x84F2,
+     "GL_ALL_COMPLETED_NV",
     },
     {
-     0x8816, "GL_ALPHA32F_EXT",
+     0x8816,
+     "GL_ALPHA32F_EXT",
     },
     {
-     0x84F4, "GL_FENCE_CONDITION_NV",
+     0x84F4,
+     "GL_FENCE_CONDITION_NV",
     },
     {
-     0x8366, "GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT",
+     0x8366,
+     "GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT",
     },
     {
-     0x8365, "GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT",
+     0x8365,
+     "GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT",
     },
     {
-     0x84F7, "GL_COMMANDS_COMPLETED_CHROMIUM",
+     0x84F7,
+     "GL_COMMANDS_COMPLETED_CHROMIUM",
     },
     {
-     0x881E, "GL_LUMINANCE16F_EXT",
+     0x881E,
+     "GL_LUMINANCE16F_EXT",
     },
     {
-     0x84FA, "GL_UNSIGNED_INT_24_8_OES",
+     0x84FA,
+     "GL_UNSIGNED_INT_24_8_OES",
     },
     {
-     0x881F, "GL_LUMINANCE_ALPHA16F_EXT",
+     0x881F,
+     "GL_LUMINANCE_ALPHA16F_EXT",
     },
     {
-     0x881A, "GL_RGBA16F_EXT",
+     0x881A,
+     "GL_RGBA16F_EXT",
     },
     {
-     0x84FE, "GL_TEXTURE_MAX_ANISOTROPY_EXT",
+     0x84FE,
+     "GL_TEXTURE_MAX_ANISOTROPY_EXT",
     },
     {
-     0x0901, "GL_CCW",
+     0x0901,
+     "GL_CCW",
     },
     {
-     0x0900, "GL_CW",
+     0x0900,
+     "GL_CW",
     },
     {
-     0x8229, "GL_R8_EXT",
+     0x8229,
+     "GL_R8_EXT",
     },
     {
-     0x9283, "GL_DISJOINT_NV",
+     0x9283,
+     "GL_DISJOINT_NV",
     },
     {
-     0x8227, "GL_RG_EXT",
+     0x8227,
+     "GL_RG_EXT",
     },
     {
-     0x8B66, "GL_FLOAT_MAT2x4_NV",
+     0x8B66,
+     "GL_FLOAT_MAT2x4_NV",
     },
     {
-     0x8B67, "GL_FLOAT_MAT3x2_NV",
+     0x8B67,
+     "GL_FLOAT_MAT3x2_NV",
     },
     {
-     0x8B65, "GL_FLOAT_MAT2x3_NV",
+     0x8B65,
+     "GL_FLOAT_MAT2x3_NV",
     },
     {
-     0x8B62, "GL_SAMPLER_2D_SHADOW_EXT",
+     0x8B62,
+     "GL_SAMPLER_2D_SHADOW_EXT",
     },
     {
-     0x8B63, "GL_SAMPLER_2D_RECT_ARB",
+     0x8B63,
+     "GL_SAMPLER_2D_RECT_ARB",
     },
     {
-     0x8B60, "GL_SAMPLER_CUBE",
+     0x8B60,
+     "GL_SAMPLER_CUBE",
     },
     {
-     0x00001000, "GL_DEPTH_BUFFER_BIT4_QCOM",
+     0x00001000,
+     "GL_DEPTH_BUFFER_BIT4_QCOM",
     },
     {
-     0x8B68, "GL_FLOAT_MAT3x4_NV",
+     0x8B68,
+     "GL_FLOAT_MAT3x4_NV",
     },
     {
-     0x83F0, "GL_COMPRESSED_RGB_S3TC_DXT1_EXT",
+     0x83F0,
+     "GL_COMPRESSED_RGB_S3TC_DXT1_EXT",
     },
     {
-     0x00000080, "GL_COLOR_BUFFER_BIT7_QCOM",
+     0x00000080,
+     "GL_COLOR_BUFFER_BIT7_QCOM",
     },
     {
-     0x88F0, "GL_DEPTH24_STENCIL8_OES",
+     0x88F0,
+     "GL_DEPTH24_STENCIL8_OES",
     },
     {
-     0x80A0, "GL_SAMPLE_COVERAGE",
+     0x80A0,
+     "GL_SAMPLE_COVERAGE",
     },
     {
-     0x928F, "GL_DST_ATOP_NV",
+     0x928F,
+     "GL_DST_ATOP_NV",
     },
     {
-     0x80A9, "GL_SAMPLES",
+     0x80A9,
+     "GL_SAMPLES",
     },
     {
-     0x80A8, "GL_SAMPLE_BUFFERS",
+     0x80A8,
+     "GL_SAMPLE_BUFFERS",
     },
     {
-     0x0D55, "GL_ALPHA_BITS",
+     0x0D55,
+     "GL_ALPHA_BITS",
     },
     {
-     0x0D54, "GL_BLUE_BITS",
+     0x0D54,
+     "GL_BLUE_BITS",
     },
     {
-     0x0D57, "GL_STENCIL_BITS",
+     0x0D57,
+     "GL_STENCIL_BITS",
     },
     {
-     0x0D56, "GL_DEPTH_BITS",
+     0x0D56,
+     "GL_DEPTH_BITS",
     },
     {
-     0x8CD5, "GL_FRAMEBUFFER_COMPLETE",
+     0x8CD5,
+     "GL_FRAMEBUFFER_COMPLETE",
     },
     {
-     0x0D50, "GL_SUBPIXEL_BITS",
+     0x0D50,
+     "GL_SUBPIXEL_BITS",
     },
     {
-     0x0D53, "GL_GREEN_BITS",
+     0x0D53,
+     "GL_GREEN_BITS",
     },
     {
-     0x0D52, "GL_RED_BITS",
+     0x0D52,
+     "GL_RED_BITS",
     },
     {
-     0x8037, "GL_POLYGON_OFFSET_FILL",
+     0x8037,
+     "GL_POLYGON_OFFSET_FILL",
     },
     {
-     0x928C, "GL_SRC_OUT_NV",
+     0x928C,
+     "GL_SRC_OUT_NV",
     },
     {
-     0x8034, "GL_UNSIGNED_SHORT_5_5_5_1",
+     0x8034,
+     "GL_UNSIGNED_SHORT_5_5_5_1",
     },
     {
-     0x8033, "GL_UNSIGNED_SHORT_4_4_4_4",
+     0x8033,
+     "GL_UNSIGNED_SHORT_4_4_4_4",
     },
     {
-     0x928B, "GL_DST_IN_NV",
+     0x928B,
+     "GL_DST_IN_NV",
     },
     {
-     0x0305, "GL_ONE_MINUS_DST_ALPHA",
+     0x0305,
+     "GL_ONE_MINUS_DST_ALPHA",
     },
     {
-     0x0304, "GL_DST_ALPHA",
+     0x0304,
+     "GL_DST_ALPHA",
     },
     {
-     0x0307, "GL_ONE_MINUS_DST_COLOR",
+     0x0307,
+     "GL_ONE_MINUS_DST_COLOR",
     },
     {
-     0x0306, "GL_DST_COLOR",
+     0x0306,
+     "GL_DST_COLOR",
     },
     {
-     0x0301, "GL_ONE_MINUS_SRC_COLOR",
+     0x0301,
+     "GL_ONE_MINUS_SRC_COLOR",
     },
     {
-     0x0300, "GL_SRC_COLOR",
+     0x0300,
+     "GL_SRC_COLOR",
     },
     {
-     0x0303, "GL_ONE_MINUS_SRC_ALPHA",
+     0x0303,
+     "GL_ONE_MINUS_SRC_ALPHA",
     },
     {
-     0x0302, "GL_SRC_ALPHA",
+     0x0302,
+     "GL_SRC_ALPHA",
     },
     {
-     0x0308, "GL_SRC_ALPHA_SATURATE",
+     0x0308,
+     "GL_SRC_ALPHA_SATURATE",
     },
     {
-     0x2A00, "GL_POLYGON_OFFSET_UNITS",
+     0x2A00,
+     "GL_POLYGON_OFFSET_UNITS",
     },
     {
-     0xFFFFFFFF, "GL_ALL_SHADER_BITS_EXT",
+     0xFFFFFFFF,
+     "GL_ALL_SHADER_BITS_EXT",
     },
     {
-     0x00800000, "GL_STENCIL_BUFFER_BIT7_QCOM",
+     0x00800000,
+     "GL_STENCIL_BUFFER_BIT7_QCOM",
     },
     {
-     0x8C4D, "GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_NV",
+     0x8C4D,
+     "GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_NV",
     },
     {
-     0x00020000, "GL_STENCIL_BUFFER_BIT1_QCOM",
+     0x00020000,
+     "GL_STENCIL_BUFFER_BIT1_QCOM",
     },
     {
-     0x8D00, "GL_DEPTH_ATTACHMENT",
+     0x8D00,
+     "GL_DEPTH_ATTACHMENT",
     },
     {
-     0x8FA0, "GL_PERFMON_GLOBAL_MODE_QCOM",
+     0x8FA0,
+     "GL_PERFMON_GLOBAL_MODE_QCOM",
     },
     {
-     0x8815, "GL_RGB32F_EXT",
+     0x8815,
+     "GL_RGB32F_EXT",
     },
     {
-     0x813D, "GL_TEXTURE_MAX_LEVEL_APPLE",
+     0x813D,
+     "GL_TEXTURE_MAX_LEVEL_APPLE",
     },
     {
-     0x8DFD, "GL_MAX_FRAGMENT_UNIFORM_VECTORS",
+     0x8DFD,
+     "GL_MAX_FRAGMENT_UNIFORM_VECTORS",
     },
     {
-     0x8CDD, "GL_FRAMEBUFFER_UNSUPPORTED",
+     0x8CDD,
+     "GL_FRAMEBUFFER_UNSUPPORTED",
     },
     {
-     0x8CDF, "GL_MAX_COLOR_ATTACHMENTS_EXT",
+     0x8CDF,
+     "GL_MAX_COLOR_ATTACHMENTS_EXT",
     },
     {
-     0x90F3, "GL_CONTEXT_ROBUST_ACCESS_EXT",
+     0x90F3,
+     "GL_CONTEXT_ROBUST_ACCESS_EXT",
     },
     {
-     0x90F2, "GL_MAX_MULTIVIEW_BUFFERS_EXT",
+     0x90F2,
+     "GL_MAX_MULTIVIEW_BUFFERS_EXT",
     },
     {
-     0x90F1, "GL_MULTIVIEW_EXT",
+     0x90F1,
+     "GL_MULTIVIEW_EXT",
     },
     {
-     0x90F0, "GL_COLOR_ATTACHMENT_EXT",
+     0x90F0,
+     "GL_COLOR_ATTACHMENT_EXT",
     },
     {
-     0x803C, "GL_ALPHA8_OES",
+     0x803C,
+     "GL_ALPHA8_OES",
     },
     {
-     0x84F5, "GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM",
+     0x84F5,
+     "GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM",
     },
     {
-     0x882A, "GL_DRAW_BUFFER5_EXT",
+     0x882A,
+     "GL_DRAW_BUFFER5_EXT",
     },
     {
-     0x80AA, "GL_SAMPLE_COVERAGE_VALUE",
+     0x80AA,
+     "GL_SAMPLE_COVERAGE_VALUE",
     },
     {
-     0x84F6, "GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM",
+     0x84F6,
+     "GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM",
     },
     {
-     0x80AB, "GL_SAMPLE_COVERAGE_INVERT",
+     0x80AB,
+     "GL_SAMPLE_COVERAGE_INVERT",
     },
     {
-     0x8C41, "GL_SRGB8_NV",
+     0x8C41,
+     "GL_SRGB8_NV",
     },
     {
-     0x8C40, "GL_SRGB_EXT",
+     0x8C40,
+     "GL_SRGB_EXT",
     },
     {
-     0x882B, "GL_DRAW_BUFFER6_EXT",
+     0x882B,
+     "GL_DRAW_BUFFER6_EXT",
     },
     {
-     0x8C17, "GL_UNSIGNED_NORMALIZED_EXT",
+     0x8C17,
+     "GL_UNSIGNED_NORMALIZED_EXT",
     },
     {
-     0x8A4A, "GL_SKIP_DECODE_EXT",
+     0x8A4A,
+     "GL_SKIP_DECODE_EXT",
     },
     {
-     0x8A4F, "GL_PROGRAM_PIPELINE_OBJECT_EXT",
+     0x8A4F,
+     "GL_PROGRAM_PIPELINE_OBJECT_EXT",
     },
     {
-     0x882C, "GL_DRAW_BUFFER7_EXT",
+     0x882C,
+     "GL_DRAW_BUFFER7_EXT",
     },
     {
-     0x0010, "GL_MAP_FLUSH_EXPLICIT_BIT_EXT",
+     0x0010,
+     "GL_MAP_FLUSH_EXPLICIT_BIT_EXT",
     },
     {
-     0x882D, "GL_DRAW_BUFFER8_EXT",
+     0x882D,
+     "GL_DRAW_BUFFER8_EXT",
     },
     {
-     0x8F37, "GL_COPY_WRITE_BUFFER_NV",
+     0x8F37,
+     "GL_COPY_WRITE_BUFFER_NV",
     },
     {
-     0x8F36, "GL_COPY_READ_BUFFER_NV",
+     0x8F36,
+     "GL_COPY_READ_BUFFER_NV",
     },
     {
-     0x84FF, "GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT",
+     0x84FF,
+     "GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT",
     },
     {
-     0x6000, "GL_TEXTURE_POOL_CHROMIUM",
+     0x6000,
+     "GL_TEXTURE_POOL_CHROMIUM",
     },
     {
-     0x0B74, "GL_DEPTH_FUNC",
+     0x0B74,
+     "GL_DEPTH_FUNC",
     },
     {
-     0x8A49, "GL_DECODE_EXT",
+     0x8A49,
+     "GL_DECODE_EXT",
     },
     {
-     0x881B, "GL_RGB16F_EXT",
+     0x881B,
+     "GL_RGB16F_EXT",
     },
     {
-     0x0B71, "GL_DEPTH_TEST",
+     0x0B71,
+     "GL_DEPTH_TEST",
     },
     {
-     0x0B70, "GL_DEPTH_RANGE",
+     0x0B70,
+     "GL_DEPTH_RANGE",
     },
     {
-     0x0B73, "GL_DEPTH_CLEAR_VALUE",
+     0x0B73,
+     "GL_DEPTH_CLEAR_VALUE",
     },
     {
-     0x0B72, "GL_DEPTH_WRITEMASK",
+     0x0B72,
+     "GL_DEPTH_WRITEMASK",
     },
     {
-     0x85BA, "GL_UNSIGNED_SHORT_8_8_APPLE",
+     0x85BA,
+     "GL_UNSIGNED_SHORT_8_8_APPLE",
     },
     {
-     0x882E, "GL_DRAW_BUFFER9_EXT",
+     0x882E,
+     "GL_DRAW_BUFFER9_EXT",
     },
     {
-     0x6001, "GL_TEXTURE_POOL_MANAGED_CHROMIUM",
+     0x6001,
+     "GL_TEXTURE_POOL_MANAGED_CHROMIUM",
     },
     {
-     0x8073, "GL_MAX_3D_TEXTURE_SIZE_OES",
+     0x8073,
+     "GL_MAX_3D_TEXTURE_SIZE_OES",
     },
     {
-     0x8072, "GL_TEXTURE_WRAP_R_OES",
+     0x8072,
+     "GL_TEXTURE_WRAP_R_OES",
     },
     {
-     0x9289, "GL_DST_OVER_NV",
+     0x9289,
+     "GL_DST_OVER_NV",
     },
     {
-     0x882F, "GL_DRAW_BUFFER10_EXT",
+     0x882F,
+     "GL_DRAW_BUFFER10_EXT",
     },
     {
-     0x8074, "GL_VERTEX_ARRAY_KHR",
+     0x8074,
+     "GL_VERTEX_ARRAY_KHR",
     },
     {
-     0x80E1, "GL_BGRA_EXT",
+     0x80E1,
+     "GL_BGRA_EXT",
     },
     {
-     0x8ED7, "GL_COVERAGE_AUTOMATIC_NV",
+     0x8ED7,
+     "GL_COVERAGE_AUTOMATIC_NV",
     },
     {
-     0x8ED6, "GL_COVERAGE_EDGE_FRAGMENTS_NV",
+     0x8ED6,
+     "GL_COVERAGE_EDGE_FRAGMENTS_NV",
     },
     {
-     0x8ED5, "GL_COVERAGE_ALL_FRAGMENTS_NV",
+     0x8ED5,
+     "GL_COVERAGE_ALL_FRAGMENTS_NV",
     },
     {
-     0x8ED4, "GL_COVERAGE_SAMPLES_NV",
+     0x8ED4,
+     "GL_COVERAGE_SAMPLES_NV",
     },
     {
-     0x8ED3, "GL_COVERAGE_BUFFERS_NV",
+     0x8ED3,
+     "GL_COVERAGE_BUFFERS_NV",
     },
     {
-     0x8ED2, "GL_COVERAGE_ATTACHMENT_NV",
+     0x8ED2,
+     "GL_COVERAGE_ATTACHMENT_NV",
     },
     {
-     0x8ED1, "GL_COVERAGE_COMPONENT4_NV",
+     0x8ED1,
+     "GL_COVERAGE_COMPONENT4_NV",
     },
     {
-     0x8ED0, "GL_COVERAGE_COMPONENT_NV",
+     0x8ED0,
+     "GL_COVERAGE_COMPONENT_NV",
     },
     {
-     0x9288, "GL_SRC_OVER_NV",
+     0x9288,
+     "GL_SRC_OVER_NV",
     },
     {
-     0x800B, "GL_FUNC_REVERSE_SUBTRACT",
+     0x800B,
+     "GL_FUNC_REVERSE_SUBTRACT",
     },
     {
-     0x00000400, "GL_STENCIL_BUFFER_BIT",
+     0x00000400,
+     "GL_STENCIL_BUFFER_BIT",
     },
     {
-     0x800A, "GL_FUNC_SUBTRACT",
+     0x800A,
+     "GL_FUNC_SUBTRACT",
     },
     {
-     0x8E2C, "GL_DEPTH_COMPONENT16_NONLINEAR_NV",
+     0x8E2C,
+     "GL_DEPTH_COMPONENT16_NONLINEAR_NV",
     },
     {
-     0x889F, "GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING",
+     0x889F,
+     "GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING",
     },
     {
-     0x8219, "GL_FRAMEBUFFER_UNDEFINED_OES",
+     0x8219,
+     "GL_FRAMEBUFFER_UNDEFINED_OES",
     },
     {
-     0x8E22, "GL_TRANSFORM_FEEDBACK",
+     0x8E22,
+     "GL_TRANSFORM_FEEDBACK",
     },
     {
-     0x8E28, "GL_TIMESTAMP_EXT",
+     0x8E28,
+     "GL_TIMESTAMP_EXT",
     },
     {
-     0x8006, "GL_FUNC_ADD",
+     0x8006,
+     "GL_FUNC_ADD",
     },
     {
-     0x8007, "GL_MIN_EXT",
+     0x8007,
+     "GL_MIN_EXT",
     },
     {
-     0x8004, "GL_ONE_MINUS_CONSTANT_ALPHA",
+     0x8004,
+     "GL_ONE_MINUS_CONSTANT_ALPHA",
     },
     {
-     0x8005, "GL_BLEND_COLOR",
+     0x8005,
+     "GL_BLEND_COLOR",
     },
     {
-     0x8002, "GL_ONE_MINUS_CONSTANT_COLOR",
+     0x8002,
+     "GL_ONE_MINUS_CONSTANT_COLOR",
     },
     {
-     0x8003, "GL_CONSTANT_ALPHA",
+     0x8003,
+     "GL_CONSTANT_ALPHA",
     },
     {
-     0x8001, "GL_CONSTANT_COLOR",
+     0x8001,
+     "GL_CONSTANT_COLOR",
     },
     {
-     0x0204, "GL_GREATER",
+     0x0204,
+     "GL_GREATER",
     },
     {
-     0x0205, "GL_NOTEQUAL",
+     0x0205,
+     "GL_NOTEQUAL",
     },
     {
-     0x0206, "GL_GEQUAL",
+     0x0206,
+     "GL_GEQUAL",
     },
     {
-     0x0207, "GL_ALWAYS",
+     0x0207,
+     "GL_ALWAYS",
     },
     {
-     0x0200, "GL_NEVER",
+     0x0200,
+     "GL_NEVER",
     },
     {
-     0x0201, "GL_LESS",
+     0x0201,
+     "GL_LESS",
     },
     {
-     0x0202, "GL_EQUAL",
+     0x0202,
+     "GL_EQUAL",
     },
     {
-     0x0203, "GL_LEQUAL",
+     0x0203,
+     "GL_LEQUAL",
     },
     {
-     0x2901, "GL_REPEAT",
+     0x2901,
+     "GL_REPEAT",
     },
     {
-     0x92A0, "GL_EXCLUSION_NV",
+     0x92A0,
+     "GL_EXCLUSION_NV",
     },
     {
-     0x93D8, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR",
+     0x93D8,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR",
     },
     {
-     0x93D9, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR",
+     0x93D9,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR",
     },
     {
-     0x8FB2, "GL_GPU_OPTIMIZED_QCOM",
+     0x8FB2,
+     "GL_GPU_OPTIMIZED_QCOM",
     },
     {
-     0x190A, "GL_LUMINANCE_ALPHA",
+     0x190A,
+     "GL_LUMINANCE_ALPHA",
     },
     {
-     0x8FB0, "GL_BINNING_CONTROL_HINT_QCOM",
+     0x8FB0,
+     "GL_BINNING_CONTROL_HINT_QCOM",
     },
     {
-     0x92A1, "GL_CONTRAST_NV",
+     0x92A1,
+     "GL_CONTRAST_NV",
     },
     {
-     0x1E00, "GL_KEEP",
+     0x1E00,
+     "GL_KEEP",
     },
     {
-     0x1E01, "GL_REPLACE",
+     0x1E01,
+     "GL_REPLACE",
     },
     {
-     0x1E02, "GL_INCR",
+     0x1E02,
+     "GL_INCR",
     },
     {
-     0x1E03, "GL_DECR",
+     0x1E03,
+     "GL_DECR",
     },
     {
-     0x93D6, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR",
+     0x93D6,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR",
     },
     {
-     0x93D7, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR",
+     0x93D7,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR",
     },
     {
-     0x93D4, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR",
+     0x93D4,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR",
     },
     {
-     0x93D5, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR",
+     0x93D5,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR",
     },
     {
-     0x0BE2, "GL_BLEND",
+     0x0BE2,
+     "GL_BLEND",
     },
     {
-     0x84CB, "GL_TEXTURE11",
+     0x84CB,
+     "GL_TEXTURE11",
     },
     {
-     0x8D55, "GL_RENDERBUFFER_STENCIL_SIZE",
+     0x8D55,
+     "GL_RENDERBUFFER_STENCIL_SIZE",
     },
     {
-     0x8D54, "GL_RENDERBUFFER_DEPTH_SIZE",
+     0x8D54,
+     "GL_RENDERBUFFER_DEPTH_SIZE",
     },
     {
-     0x8D57, "GL_MAX_SAMPLES_ANGLE",
+     0x8D57,
+     "GL_MAX_SAMPLES_ANGLE",
     },
     {
-     0x8D56, "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE",
+     0x8D56,
+     "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE",
     },
     {
-     0x8D51, "GL_RENDERBUFFER_GREEN_SIZE",
+     0x8D51,
+     "GL_RENDERBUFFER_GREEN_SIZE",
     },
     {
-     0x8D50, "GL_RENDERBUFFER_RED_SIZE",
+     0x8D50,
+     "GL_RENDERBUFFER_RED_SIZE",
     },
     {
-     0x8D53, "GL_RENDERBUFFER_ALPHA_SIZE",
+     0x8D53,
+     "GL_RENDERBUFFER_ALPHA_SIZE",
     },
     {
-     0x8D52, "GL_RENDERBUFFER_BLUE_SIZE",
+     0x8D52,
+     "GL_RENDERBUFFER_BLUE_SIZE",
     },
     {
-     0x92A6, "GL_VIVIDLIGHT_NV",
+     0x92A6,
+     "GL_VIVIDLIGHT_NV",
     },
     {
-     0x00080000, "GL_STENCIL_BUFFER_BIT3_QCOM",
+     0x00080000,
+     "GL_STENCIL_BUFFER_BIT3_QCOM",
     },
     {
-     0x92A7, "GL_LINEARLIGHT_NV",
+     0x92A7,
+     "GL_LINEARLIGHT_NV",
     },
     {
-     0x886A, "GL_VERTEX_ATTRIB_ARRAY_NORMALIZED",
+     0x886A,
+     "GL_VERTEX_ATTRIB_ARRAY_NORMALIZED",
     },
     {
-     0x0C01, "GL_DRAW_BUFFER_EXT",
+     0x0C01,
+     "GL_DRAW_BUFFER_EXT",
     },
     {
-     0x93C7, "GL_COMPRESSED_RGBA_ASTC_6x5x5_OES",
+     0x93C7,
+     "GL_COMPRESSED_RGBA_ASTC_6x5x5_OES",
     },
     {
-     0x8B5F, "GL_SAMPLER_3D_OES",
+     0x8B5F,
+     "GL_SAMPLER_3D_OES",
     },
     {
-     0x8B95, "GL_PALETTE8_RGB8_OES",
+     0x8B95,
+     "GL_PALETTE8_RGB8_OES",
     },
     {
-     0x9250, "GL_SHADER_BINARY_DMP",
+     0x9250,
+     "GL_SHADER_BINARY_DMP",
     },
     {
-     0x10000000, "GL_MULTISAMPLE_BUFFER_BIT4_QCOM",
+     0x10000000,
+     "GL_MULTISAMPLE_BUFFER_BIT4_QCOM",
     },
     {
-     0x8C92, "GL_ATC_RGB_AMD",
+     0x8C92,
+     "GL_ATC_RGB_AMD",
     },
     {
-     0x9154, "GL_VERTEX_ARRAY_OBJECT_EXT",
+     0x9154,
+     "GL_VERTEX_ARRAY_OBJECT_EXT",
     },
     {
-     0x9153, "GL_QUERY_OBJECT_EXT",
+     0x9153,
+     "GL_QUERY_OBJECT_EXT",
     },
     {
-     0x8864, "GL_QUERY_COUNTER_BITS_EXT",
+     0x8864,
+     "GL_QUERY_COUNTER_BITS_EXT",
     },
     {
-     0x9151, "GL_BUFFER_OBJECT_EXT",
+     0x9151,
+     "GL_BUFFER_OBJECT_EXT",
     },
     {
-     0x8C93, "GL_ATC_RGBA_EXPLICIT_ALPHA_AMD",
+     0x8C93,
+     "GL_ATC_RGBA_EXPLICIT_ALPHA_AMD",
     },
     {
-     0x00000002, "GL_CONTEXT_FLAG_DEBUG_BIT_KHR",
+     0x00000002,
+     "GL_CONTEXT_FLAG_DEBUG_BIT_KHR",
     },
     {
-     0x00000001, "GL_SYNC_FLUSH_COMMANDS_BIT_APPLE",
+     0x00000001,
+     "GL_SYNC_FLUSH_COMMANDS_BIT_APPLE",
     },
     {
-     0x9248, "GL_OVERLAY_TRANSFORM_ROTATE_90_CHROMIUM",
+     0x9248,
+     "GL_OVERLAY_TRANSFORM_ROTATE_90_CHROMIUM",
     },
     {
-     0x00000004, "GL_COLOR_BUFFER_BIT2_QCOM",
+     0x00000004,
+     "GL_COLOR_BUFFER_BIT2_QCOM",
     },
     {
-     0x1702, "GL_TEXTURE",
+     0x1702,
+     "GL_TEXTURE",
     },
     {
-     0x00000008, "GL_COLOR_BUFFER_BIT3_QCOM",
+     0x00000008,
+     "GL_COLOR_BUFFER_BIT3_QCOM",
     },
     {
-     0x8B58, "GL_BOOL_VEC3",
+     0x8B58,
+     "GL_BOOL_VEC3",
     },
     {
-     0x8828, "GL_DRAW_BUFFER3_EXT",
+     0x8828,
+     "GL_DRAW_BUFFER3_EXT",
     },
     {
-     0x8DF0, "GL_LOW_FLOAT",
+     0x8DF0,
+     "GL_LOW_FLOAT",
     },
     {
-     0x1906, "GL_ALPHA",
+     0x1906,
+     "GL_ALPHA",
     },
     {
-     0x1907, "GL_RGB",
+     0x1907,
+     "GL_RGB",
     },
     {
-     0x8FBB, "GL_GPU_DISJOINT_EXT",
+     0x8FBB,
+     "GL_GPU_DISJOINT_EXT",
     },
     {
-     0x1902, "GL_DEPTH_COMPONENT",
+     0x1902,
+     "GL_DEPTH_COMPONENT",
     },
     {
-     0x8B56, "GL_BOOL",
+     0x8B56,
+     "GL_BOOL",
     },
     {
-     0x93DB, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR",
+     0x93DB,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR",
     },
     {
-     0x8B9B, "GL_IMPLEMENTATION_COLOR_READ_FORMAT",
+     0x8B9B,
+     "GL_IMPLEMENTATION_COLOR_READ_FORMAT",
     },
     {
-     0x8B9A, "GL_IMPLEMENTATION_COLOR_READ_TYPE",
+     0x8B9A,
+     "GL_IMPLEMENTATION_COLOR_READ_TYPE",
     },
     {
-     0x93DA, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR",
+     0x93DA,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR",
     },
     {
-     0x1908, "GL_RGBA",
+     0x1908,
+     "GL_RGBA",
     },
     {
-     0x8DF2, "GL_HIGH_FLOAT",
+     0x8DF2,
+     "GL_HIGH_FLOAT",
     },
     {
-     0x93DD, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR",
+     0x93DD,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR",
     },
     {
-     0x8827, "GL_DRAW_BUFFER2_EXT",
+     0x8827,
+     "GL_DRAW_BUFFER2_EXT",
     },
     {
-     0x9243, "GL_UNPACK_COLORSPACE_CONVERSION_CHROMIUM",
+     0x9243,
+     "GL_UNPACK_COLORSPACE_CONVERSION_CHROMIUM",
     },
     {
-     0x8DF3, "GL_LOW_INT",
+     0x8DF3,
+     "GL_LOW_INT",
     },
     {
-     0x82E8, "GL_MAX_LABEL_LENGTH_KHR",
+     0x82E8,
+     "GL_MAX_LABEL_LENGTH_KHR",
     },
     {
-     0x82E6, "GL_SAMPLER_KHR",
+     0x82E6,
+     "GL_SAMPLER_KHR",
     },
     {
-     0x0C02, "GL_READ_BUFFER_EXT",
+     0x0C02,
+     "GL_READ_BUFFER_EXT",
     },
     {
-     0x82E3, "GL_QUERY_KHR",
+     0x82E3,
+     "GL_QUERY_KHR",
     },
     {
-     0x82E2, "GL_PROGRAM_KHR",
+     0x82E2,
+     "GL_PROGRAM_KHR",
     },
     {
-     0x82E1, "GL_SHADER_KHR",
+     0x82E1,
+     "GL_SHADER_KHR",
     },
     {
-     0x8B52, "GL_FLOAT_VEC4",
+     0x8B52,
+     "GL_FLOAT_VEC4",
     },
     {
-     0x9240, "GL_UNPACK_FLIP_Y_CHROMIUM",
+     0x9240,
+     "GL_UNPACK_FLIP_Y_CHROMIUM",
     },
     {
-     0x8DF6, "GL_UNSIGNED_INT_10_10_10_2_OES",
+     0x8DF6,
+     "GL_UNSIGNED_INT_10_10_10_2_OES",
     },
     {
-     0x8230, "GL_RG32F_EXT",
+     0x8230,
+     "GL_RG32F_EXT",
     },
     {
-     0x8DF7, "GL_INT_10_10_10_2_OES",
+     0x8DF7,
+     "GL_INT_10_10_10_2_OES",
     },
     {
-     0x9246, "GL_OVERLAY_TRANSFORM_FLIP_HORIZONTAL_CHROMIUM",
+     0x9246,
+     "GL_OVERLAY_TRANSFORM_FLIP_HORIZONTAL_CHROMIUM",
     },
     {
-     0x8B69, "GL_FLOAT_MAT4x2_NV",
+     0x8B69,
+     "GL_FLOAT_MAT4x2_NV",
     },
     {
-     0x812D, "GL_CLAMP_TO_BORDER_NV",
+     0x812D,
+     "GL_CLAMP_TO_BORDER_NV",
     },
     {
-     0x812F, "GL_CLAMP_TO_EDGE",
+     0x812F,
+     "GL_CLAMP_TO_EDGE",
     },
     {
-     0x86A3, "GL_COMPRESSED_TEXTURE_FORMATS",
+     0x86A3,
+     "GL_COMPRESSED_TEXTURE_FORMATS",
     },
     {
-     0x9244, "GL_BIND_GENERATES_RESOURCE_CHROMIUM",
+     0x9244,
+     "GL_BIND_GENERATES_RESOURCE_CHROMIUM",
     },
     {
-     0x86A2, "GL_NUM_COMPRESSED_TEXTURE_FORMATS",
+     0x86A2,
+     "GL_NUM_COMPRESSED_TEXTURE_FORMATS",
     },
     {
-     0x0CF3, "GL_UNPACK_SKIP_ROWS_EXT",
+     0x0CF3,
+     "GL_UNPACK_SKIP_ROWS_EXT",
     },
     {
-     0x0CF2, "GL_UNPACK_ROW_LENGTH_EXT",
+     0x0CF2,
+     "GL_UNPACK_ROW_LENGTH_EXT",
     },
     {
-     0x140C, "GL_FIXED",
+     0x140C,
+     "GL_FIXED",
     },
     {
-     0x8008, "GL_MAX_EXT",
+     0x8008,
+     "GL_MAX_EXT",
     },
     {
-     0x0CF5, "GL_UNPACK_ALIGNMENT",
+     0x0CF5,
+     "GL_UNPACK_ALIGNMENT",
     },
     {
-     0x0CF4, "GL_UNPACK_SKIP_PIXELS_EXT",
+     0x0CF4,
+     "GL_UNPACK_SKIP_PIXELS_EXT",
     },
     {
-     0x8009, "GL_BLEND_EQUATION",
+     0x8009,
+     "GL_BLEND_EQUATION",
     },
     {
-     0x1401, "GL_UNSIGNED_BYTE",
+     0x1401,
+     "GL_UNSIGNED_BYTE",
     },
     {
-     0x1400, "GL_BYTE",
+     0x1400,
+     "GL_BYTE",
     },
     {
-     0x1403, "GL_UNSIGNED_SHORT",
+     0x1403,
+     "GL_UNSIGNED_SHORT",
     },
     {
-     0x1402, "GL_SHORT",
+     0x1402,
+     "GL_SHORT",
     },
     {
-     0x1405, "GL_UNSIGNED_INT",
+     0x1405,
+     "GL_UNSIGNED_INT",
     },
     {
-     0x1404, "GL_INT",
+     0x1404,
+     "GL_INT",
     },
     {
-     0x1406, "GL_FLOAT",
+     0x1406,
+     "GL_FLOAT",
     },
     {
-     0x8043, "GL_LUMINANCE4_ALPHA4_OES",
+     0x8043,
+     "GL_LUMINANCE4_ALPHA4_OES",
     },
     {
-     0x8040, "GL_LUMINANCE8_OES",
+     0x8040,
+     "GL_LUMINANCE8_OES",
     },
     {
-     0x8045, "GL_LUMINANCE8_ALPHA8_OES",
+     0x8045,
+     "GL_LUMINANCE8_ALPHA8_OES",
     },
     {
-     0x8CD1, "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME",
+     0x8CD1,
+     "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME",
     },
     {
-     0x00040000, "GL_STENCIL_BUFFER_BIT2_QCOM",
+     0x00040000,
+     "GL_STENCIL_BUFFER_BIT2_QCOM",
     },
     {
-     0x8CD0, "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE",
+     0x8CD0,
+     "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE",
     },
     {
-     0x8CE4, "GL_COLOR_ATTACHMENT4_EXT",
+     0x8CE4,
+     "GL_COLOR_ATTACHMENT4_EXT",
     },
     {
-     0x8CD3, "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE",
+     0x8CD3,
+     "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE",
     },
     {
-     0x929E, "GL_DIFFERENCE_NV",
+     0x929E,
+     "GL_DIFFERENCE_NV",
     },
     {
-     0x0B90, "GL_STENCIL_TEST",
+     0x0B90,
+     "GL_STENCIL_TEST",
     },
     {
-     0x8CD2, "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL",
+     0x8CD2,
+     "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL",
     },
     {
-     0x881C, "GL_ALPHA16F_EXT",
+     0x881C,
+     "GL_ALPHA16F_EXT",
     },
     {
-     0x928E, "GL_SRC_ATOP_NV",
+     0x928E,
+     "GL_SRC_ATOP_NV",
     },
     {
-     0x8CD4, "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES",
+     0x8CD4,
+     "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES",
     },
     {
-     0x9298, "GL_LIGHTEN_NV",
+     0x9298,
+     "GL_LIGHTEN_NV",
     },
     {
-     0x8CD7, "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT",
+     0x8CD7,
+     "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT",
     },
     {
-     0x9112, "GL_OBJECT_TYPE_APPLE",
+     0x9112,
+     "GL_OBJECT_TYPE_APPLE",
     },
     {
-     0x8038, "GL_POLYGON_OFFSET_FACTOR",
+     0x8038,
+     "GL_POLYGON_OFFSET_FACTOR",
     },
     {
-     0x851A, "GL_TEXTURE_CUBE_MAP_NEGATIVE_Z",
+     0x851A,
+     "GL_TEXTURE_CUBE_MAP_NEGATIVE_Z",
     },
     {
-     0x851C, "GL_MAX_CUBE_MAP_TEXTURE_SIZE",
+     0x851C,
+     "GL_MAX_CUBE_MAP_TEXTURE_SIZE",
     },
     {
-     0x8CD9, "GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS",
+     0x8CD9,
+     "GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS",
     },
     {
-     0x84CC, "GL_TEXTURE12",
+     0x84CC,
+     "GL_TEXTURE12",
     },
     {
-     0x0BA2, "GL_VIEWPORT",
+     0x0BA2,
+     "GL_VIEWPORT",
     },
     {
-     0x84CA, "GL_TEXTURE10",
+     0x84CA,
+     "GL_TEXTURE10",
     },
     {
-     0x84CF, "GL_TEXTURE15",
+     0x84CF,
+     "GL_TEXTURE15",
     },
     {
-     0x84CE, "GL_TEXTURE14",
+     0x84CE,
+     "GL_TEXTURE14",
     },
     {
-     0x84CD, "GL_TEXTURE13",
+     0x84CD,
+     "GL_TEXTURE13",
     },
     {
-     0x9115, "GL_SYNC_FLAGS_APPLE",
+     0x9115,
+     "GL_SYNC_FLAGS_APPLE",
     },
     {
-     0x9286, "GL_SRC_NV",
+     0x9286,
+     "GL_SRC_NV",
     },
     {
-     0x83F3, "GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE",
+     0x83F3,
+     "GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE",
     },
     {
-     0x83F2, "GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE",
+     0x83F2,
+     "GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE",
     },
     {
-     0x83F1, "GL_COMPRESSED_RGBA_S3TC_DXT1_EXT",
+     0x83F1,
+     "GL_COMPRESSED_RGBA_S3TC_DXT1_EXT",
     },
     {
-     0x9114, "GL_SYNC_STATUS_APPLE",
+     0x9114,
+     "GL_SYNC_STATUS_APPLE",
     },
     {
-     0x8C0A, "GL_SGX_BINARY_IMG",
+     0x8C0A,
+     "GL_SGX_BINARY_IMG",
     },
     {
-     0x9285, "GL_BLEND_ADVANCED_COHERENT_NV",
+     0x9285,
+     "GL_BLEND_ADVANCED_COHERENT_NV",
     },
     {
-     0x911C, "GL_CONDITION_SATISFIED_APPLE",
+     0x911C,
+     "GL_CONDITION_SATISFIED_APPLE",
     },
     {
-     0x911B, "GL_TIMEOUT_EXPIRED_APPLE",
+     0x911B,
+     "GL_TIMEOUT_EXPIRED_APPLE",
     },
     {
-     0x911A, "GL_ALREADY_SIGNALED_APPLE",
+     0x911A,
+     "GL_ALREADY_SIGNALED_APPLE",
     },
     {
-     0x9284, "GL_CONJOINT_NV",
+     0x9284,
+     "GL_CONJOINT_NV",
     },
     {
-     0x911D, "GL_WAIT_FAILED_APPLE",
+     0x911D,
+     "GL_WAIT_FAILED_APPLE",
     },
     {
-     0x929A, "GL_COLORBURN_NV",
+     0x929A,
+     "GL_COLORBURN_NV",
     },
     {
-     0x929B, "GL_HARDLIGHT_NV",
+     0x929B,
+     "GL_HARDLIGHT_NV",
     },
     {
-     0x929C, "GL_SOFTLIGHT_NV",
+     0x929C,
+     "GL_SOFTLIGHT_NV",
     },
     {
-     0x846D, "GL_ALIASED_POINT_SIZE_RANGE",
+     0x846D,
+     "GL_ALIASED_POINT_SIZE_RANGE",
     },
     {
-     0x846E, "GL_ALIASED_LINE_WIDTH_RANGE",
+     0x846E,
+     "GL_ALIASED_LINE_WIDTH_RANGE",
     },
     {
-     0x929F, "GL_MINUS_NV",
+     0x929F,
+     "GL_MINUS_NV",
     },
     {
-     0x9282, "GL_UNCORRELATED_NV",
+     0x9282,
+     "GL_UNCORRELATED_NV",
     },
     {
-     0x9113, "GL_SYNC_CONDITION_APPLE",
+     0x9113,
+     "GL_SYNC_CONDITION_APPLE",
     },
     {
-     0x93A4, "GL_PACK_REVERSE_ROW_ORDER_ANGLE",
+     0x93A4,
+     "GL_PACK_REVERSE_ROW_ORDER_ANGLE",
     },
     {
-     0x9111, "GL_MAX_SERVER_WAIT_TIMEOUT_APPLE",
+     0x9111,
+     "GL_MAX_SERVER_WAIT_TIMEOUT_APPLE",
     },
     {
-     0x93A6, "GL_PROGRAM_BINARY_ANGLE",
+     0x93A6,
+     "GL_PROGRAM_BINARY_ANGLE",
     },
     {
-     0x9117, "GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE",
+     0x9117,
+     "GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE",
     },
     {
-     0x93A0, "GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE",
+     0x93A0,
+     "GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE",
     },
     {
-     0x93A3, "GL_FRAMEBUFFER_ATTACHMENT_ANGLE",
+     0x93A3,
+     "GL_FRAMEBUFFER_ATTACHMENT_ANGLE",
     },
     {
-     0x93A2, "GL_TEXTURE_USAGE_ANGLE",
+     0x93A2,
+     "GL_TEXTURE_USAGE_ANGLE",
     },
     {
-     0x8802, "GL_STENCIL_BACK_PASS_DEPTH_FAIL",
+     0x8802,
+     "GL_STENCIL_BACK_PASS_DEPTH_FAIL",
     },
     {
-     0x9119, "GL_SIGNALED_APPLE",
+     0x9119,
+     "GL_SIGNALED_APPLE",
     },
     {
-     0x9118, "GL_UNSIGNALED_APPLE",
+     0x9118,
+     "GL_UNSIGNALED_APPLE",
     },
     {
-     0x9294, "GL_MULTIPLY_NV",
+     0x9294,
+     "GL_MULTIPLY_NV",
     },
     {
-     0x9295, "GL_SCREEN_NV",
+     0x9295,
+     "GL_SCREEN_NV",
     },
     {
-     0x9296, "GL_OVERLAY_NV",
+     0x9296,
+     "GL_OVERLAY_NV",
     },
     {
-     0x9297, "GL_DARKEN_NV",
+     0x9297,
+     "GL_DARKEN_NV",
     },
     {
-     0x0020, "GL_MAP_UNSYNCHRONIZED_BIT_EXT",
+     0x0020,
+     "GL_MAP_UNSYNCHRONIZED_BIT_EXT",
     },
     {
-     0x8C01, "GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG",
+     0x8C01,
+     "GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG",
     },
     {
-     0x8C00, "GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG",
+     0x8C00,
+     "GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG",
     },
     {
-     0x8A52, "GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT",
+     0x8A52,
+     "GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT",
     },
     {
-     0x8C02, "GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG",
+     0x8C02,
+     "GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG",
     },
     {
-     0x84C9, "GL_TEXTURE9",
+     0x84C9,
+     "GL_TEXTURE9",
     },
     {
-     0x84C8, "GL_TEXTURE8",
+     0x84C8,
+     "GL_TEXTURE8",
     },
     {
-     0x8869, "GL_MAX_VERTEX_ATTRIBS",
+     0x8869,
+     "GL_MAX_VERTEX_ATTRIBS",
     },
     {
-     0x84C3, "GL_TEXTURE3",
+     0x84C3,
+     "GL_TEXTURE3",
     },
     {
-     0x84C2, "GL_TEXTURE2",
+     0x84C2,
+     "GL_TEXTURE2",
     },
     {
-     0x84C1, "GL_TEXTURE1",
+     0x84C1,
+     "GL_TEXTURE1",
     },
     {
-     0x84C0, "GL_TEXTURE0",
+     0x84C0,
+     "GL_TEXTURE0",
     },
     {
-     0x84C7, "GL_TEXTURE7",
+     0x84C7,
+     "GL_TEXTURE7",
     },
     {
-     0x84C6, "GL_TEXTURE6",
+     0x84C6,
+     "GL_TEXTURE6",
     },
     {
-     0x84C5, "GL_TEXTURE5",
+     0x84C5,
+     "GL_TEXTURE5",
     },
     {
-     0x8803, "GL_STENCIL_BACK_PASS_DEPTH_PASS",
+     0x8803,
+     "GL_STENCIL_BACK_PASS_DEPTH_PASS",
     },
     {
-     0x928A, "GL_SRC_IN_NV",
+     0x928A,
+     "GL_SRC_IN_NV",
     },
     {
-     0x8518, "GL_TEXTURE_CUBE_MAP_NEGATIVE_Y",
+     0x8518,
+     "GL_TEXTURE_CUBE_MAP_NEGATIVE_Y",
     },
     {
-     0x8519, "GL_TEXTURE_CUBE_MAP_POSITIVE_Z",
+     0x8519,
+     "GL_TEXTURE_CUBE_MAP_POSITIVE_Z",
     },
     {
-     0x8514, "GL_TEXTURE_BINDING_CUBE_MAP",
+     0x8514,
+     "GL_TEXTURE_BINDING_CUBE_MAP",
     },
     {
-     0x8515, "GL_TEXTURE_CUBE_MAP_POSITIVE_X",
+     0x8515,
+     "GL_TEXTURE_CUBE_MAP_POSITIVE_X",
     },
     {
-     0x8516, "GL_TEXTURE_CUBE_MAP_NEGATIVE_X",
+     0x8516,
+     "GL_TEXTURE_CUBE_MAP_NEGATIVE_X",
     },
     {
-     0x8517, "GL_TEXTURE_CUBE_MAP_POSITIVE_Y",
+     0x8517,
+     "GL_TEXTURE_CUBE_MAP_POSITIVE_Y",
     },
     {
-     0x8513, "GL_TEXTURE_CUBE_MAP",
+     0x8513,
+     "GL_TEXTURE_CUBE_MAP",
     },
     {
-     0x8626, "GL_CURRENT_VERTEX_ATTRIB",
+     0x8626,
+     "GL_CURRENT_VERTEX_ATTRIB",
     },
     {
-     0x92B1, "GL_PLUS_CLAMPED_NV",
+     0x92B1,
+     "GL_PLUS_CLAMPED_NV",
     },
     {
-     0x92B0, "GL_HSL_LUMINOSITY_NV",
+     0x92B0,
+     "GL_HSL_LUMINOSITY_NV",
     },
     {
-     0x92B3, "GL_MINUS_CLAMPED_NV",
+     0x92B3,
+     "GL_MINUS_CLAMPED_NV",
     },
     {
-     0x92B2, "GL_PLUS_CLAMPED_ALPHA_NV",
+     0x92B2,
+     "GL_PLUS_CLAMPED_ALPHA_NV",
     },
     {
-     0x8765, "GL_BUFFER_USAGE",
+     0x8765,
+     "GL_BUFFER_USAGE",
     },
     {
-     0x8764, "GL_BUFFER_SIZE",
+     0x8764,
+     "GL_BUFFER_SIZE",
     },
     {
-     0x8B99, "GL_PALETTE8_RGB5_A1_OES",
+     0x8B99,
+     "GL_PALETTE8_RGB5_A1_OES",
     },
     {
-     0x0503, "GL_STACK_OVERFLOW_KHR",
+     0x0503,
+     "GL_STACK_OVERFLOW_KHR",
     },
     {
-     0x0502, "GL_INVALID_OPERATION",
+     0x0502,
+     "GL_INVALID_OPERATION",
     },
     {
-     0x0501, "GL_INVALID_VALUE",
+     0x0501,
+     "GL_INVALID_VALUE",
     },
     {
-     0x0500, "GL_INVALID_ENUM",
+     0x0500,
+     "GL_INVALID_ENUM",
     },
     {
-     64, "GL_MAILBOX_SIZE_CHROMIUM",
+     64,
+     "GL_MAILBOX_SIZE_CHROMIUM",
     },
     {
-     0x0506, "GL_INVALID_FRAMEBUFFER_OPERATION",
+     0x0506,
+     "GL_INVALID_FRAMEBUFFER_OPERATION",
     },
     {
-     0x0505, "GL_OUT_OF_MEMORY",
+     0x0505,
+     "GL_OUT_OF_MEMORY",
     },
     {
-     0x0504, "GL_STACK_UNDERFLOW_KHR",
+     0x0504,
+     "GL_STACK_UNDERFLOW_KHR",
     },
     {
-     0x0B44, "GL_CULL_FACE",
+     0x0B44,
+     "GL_CULL_FACE",
     },
     {
-     0x8B5E, "GL_SAMPLER_2D",
+     0x8B5E,
+     "GL_SAMPLER_2D",
     },
     {
-     0x0B46, "GL_FRONT_FACE",
+     0x0B46,
+     "GL_FRONT_FACE",
     },
     {
-     0x8FB3, "GL_RENDER_DIRECT_TO_FRAMEBUFFER_QCOM",
+     0x8FB3,
+     "GL_RENDER_DIRECT_TO_FRAMEBUFFER_QCOM",
     },
     {
-     0x824A, "GL_DEBUG_SOURCE_APPLICATION_KHR",
+     0x824A,
+     "GL_DEBUG_SOURCE_APPLICATION_KHR",
     },
     {
-     0x824B, "GL_DEBUG_SOURCE_OTHER_KHR",
+     0x824B,
+     "GL_DEBUG_SOURCE_OTHER_KHR",
     },
     {
-     0x824C, "GL_DEBUG_TYPE_ERROR_KHR",
+     0x824C,
+     "GL_DEBUG_TYPE_ERROR_KHR",
     },
     {
-     0x824D, "GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_KHR",
+     0x824D,
+     "GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_KHR",
     },
     {
-     0x824E, "GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_KHR",
+     0x824E,
+     "GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_KHR",
     },
     {
-     0x824F, "GL_DEBUG_TYPE_PORTABILITY_KHR",
+     0x824F,
+     "GL_DEBUG_TYPE_PORTABILITY_KHR",
     },
     {
-     0x8B31, "GL_VERTEX_SHADER",
+     0x8B31,
+     "GL_VERTEX_SHADER",
     },
     {
-     0x8B30, "GL_FRAGMENT_SHADER",
+     0x8B30,
+     "GL_FRAGMENT_SHADER",
     },
     {
-     0x8FB1, "GL_CPU_OPTIMIZED_QCOM",
+     0x8FB1,
+     "GL_CPU_OPTIMIZED_QCOM",
     },
     {
-     0x93D2, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR",
+     0x93D2,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR",
     },
     {
-     0x8B5A, "GL_FLOAT_MAT2",
+     0x8B5A,
+     "GL_FLOAT_MAT2",
     },
     {
-     0x84D8, "GL_TEXTURE24",
+     0x84D8,
+     "GL_TEXTURE24",
     },
     {
-     0x84D9, "GL_TEXTURE25",
+     0x84D9,
+     "GL_TEXTURE25",
     },
     {
-     0x84D6, "GL_TEXTURE22",
+     0x84D6,
+     "GL_TEXTURE22",
     },
     {
-     0x84D7, "GL_TEXTURE23",
+     0x84D7,
+     "GL_TEXTURE23",
     },
     {
-     0x84D4, "GL_TEXTURE20",
+     0x84D4,
+     "GL_TEXTURE20",
     },
     {
-     0x0D05, "GL_PACK_ALIGNMENT",
+     0x0D05,
+     "GL_PACK_ALIGNMENT",
     },
     {
-     0x84D2, "GL_TEXTURE18",
+     0x84D2,
+     "GL_TEXTURE18",
     },
     {
-     0x84D3, "GL_TEXTURE19",
+     0x84D3,
+     "GL_TEXTURE19",
     },
     {
-     0x84D0, "GL_TEXTURE16",
+     0x84D0,
+     "GL_TEXTURE16",
     },
     {
-     0x84D1, "GL_TEXTURE17",
+     0x84D1,
+     "GL_TEXTURE17",
     },
     {
-     0x93D1, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR",
+     0x93D1,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR",
     },
     {
-     0x84DF, "GL_TEXTURE31",
+     0x84DF,
+     "GL_TEXTURE31",
     },
     {
-     0x8B97, "GL_PALETTE8_R5_G6_B5_OES",
+     0x8B97,
+     "GL_PALETTE8_R5_G6_B5_OES",
     },
     {
-     0x84DD, "GL_TEXTURE29",
+     0x84DD,
+     "GL_TEXTURE29",
     },
     {
-     0x84DE, "GL_TEXTURE30",
+     0x84DE,
+     "GL_TEXTURE30",
     },
     {
-     0x84DB, "GL_TEXTURE27",
+     0x84DB,
+     "GL_TEXTURE27",
     },
     {
-     0x84DC, "GL_TEXTURE28",
+     0x84DC,
+     "GL_TEXTURE28",
     },
     {
-     0x6002, "GL_TEXTURE_POOL_UNMANAGED_CHROMIUM",
+     0x6002,
+     "GL_TEXTURE_POOL_UNMANAGED_CHROMIUM",
     },
     {
-     0x84DA, "GL_TEXTURE26",
+     0x84DA,
+     "GL_TEXTURE26",
     },
     {
-     0x8242, "GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR",
+     0x8242,
+     "GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR",
     },
     {
-     0x8243, "GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_KHR",
+     0x8243,
+     "GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_KHR",
     },
     {
-     0x8244, "GL_DEBUG_CALLBACK_FUNCTION_KHR",
+     0x8244,
+     "GL_DEBUG_CALLBACK_FUNCTION_KHR",
     },
     {
-     0x8245, "GL_DEBUG_CALLBACK_USER_PARAM_KHR",
+     0x8245,
+     "GL_DEBUG_CALLBACK_USER_PARAM_KHR",
     },
     {
-     0x8246, "GL_DEBUG_SOURCE_API_KHR",
+     0x8246,
+     "GL_DEBUG_SOURCE_API_KHR",
     },
     {
-     0x8247, "GL_DEBUG_SOURCE_WINDOW_SYSTEM_KHR",
+     0x8247,
+     "GL_DEBUG_SOURCE_WINDOW_SYSTEM_KHR",
     },
     {
-     0x8248, "GL_DEBUG_SOURCE_SHADER_COMPILER_KHR",
+     0x8248,
+     "GL_DEBUG_SOURCE_SHADER_COMPILER_KHR",
     },
     {
-     0x8249, "GL_DEBUG_SOURCE_THIRD_PARTY_KHR",
+     0x8249,
+     "GL_DEBUG_SOURCE_THIRD_PARTY_KHR",
     },
     {
-     0x8B94, "GL_PALETTE4_RGB5_A1_OES",
+     0x8B94,
+     "GL_PALETTE4_RGB5_A1_OES",
     },
     {
-     0x00000040, "GL_COLOR_BUFFER_BIT6_QCOM",
+     0x00000040,
+     "GL_COLOR_BUFFER_BIT6_QCOM",
     },
     {
-     0x8645, "GL_VERTEX_ATTRIB_ARRAY_POINTER",
+     0x8645,
+     "GL_VERTEX_ATTRIB_ARRAY_POINTER",
     },
     {
-     0x8865, "GL_CURRENT_QUERY_EXT",
+     0x8865,
+     "GL_CURRENT_QUERY_EXT",
     },
     {
-     0x8866, "GL_QUERY_RESULT_EXT",
+     0x8866,
+     "GL_QUERY_RESULT_EXT",
     },
     {
-     0x8867, "GL_QUERY_RESULT_AVAILABLE_EXT",
+     0x8867,
+     "GL_QUERY_RESULT_AVAILABLE_EXT",
     },
     {
-     0x08000000, "GL_MULTISAMPLE_BUFFER_BIT3_QCOM",
+     0x08000000,
+     "GL_MULTISAMPLE_BUFFER_BIT3_QCOM",
     },
     {
-     0x87FA, "GL_3DC_XY_AMD",
+     0x87FA,
+     "GL_3DC_XY_AMD",
     },
     {
-     0x84C4, "GL_TEXTURE4",
+     0x84C4,
+     "GL_TEXTURE4",
     },
     {
-     0x85B5, "GL_VERTEX_ARRAY_BINDING_OES",
+     0x85B5,
+     "GL_VERTEX_ARRAY_BINDING_OES",
     },
     {
-     0x8D6A, "GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT",
+     0x8D6A,
+     "GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT",
     },
     {
-     0x8D6C, "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT",
+     0x8D6C,
+     "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT",
     },
     {
-     0x8252, "GL_LOSE_CONTEXT_ON_RESET_EXT",
+     0x8252,
+     "GL_LOSE_CONTEXT_ON_RESET_EXT",
     },
     {
-     0x8C4C, "GL_COMPRESSED_SRGB_S3TC_DXT1_NV",
+     0x8C4C,
+     "GL_COMPRESSED_SRGB_S3TC_DXT1_NV",
     },
     {
-     0x8C4E, "GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_NV",
+     0x8C4E,
+     "GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_NV",
     },
     {
-     0x1102, "GL_NICEST",
+     0x1102,
+     "GL_NICEST",
     },
     {
-     0x8C4F, "GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_NV",
+     0x8C4F,
+     "GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_NV",
     },
     {
-     0x93E9, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6_OES",
+     0x93E9,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6_OES",
     },
     {
-     0x93E8, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x5_OES",
+     0x93E8,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x5_OES",
     },
     {
-     0x8C43, "GL_SRGB8_ALPHA8_EXT",
+     0x8C43,
+     "GL_SRGB8_ALPHA8_EXT",
     },
     {
-     0x8C42, "GL_SRGB_ALPHA_EXT",
+     0x8C42,
+     "GL_SRGB_ALPHA_EXT",
     },
     {
-     0x8C45, "GL_SLUMINANCE8_ALPHA8_NV",
+     0x8C45,
+     "GL_SLUMINANCE8_ALPHA8_NV",
     },
     {
-     0x8C44, "GL_SLUMINANCE_ALPHA_NV",
+     0x8C44,
+     "GL_SLUMINANCE_ALPHA_NV",
     },
     {
-     0x8C47, "GL_SLUMINANCE8_NV",
+     0x8C47,
+     "GL_SLUMINANCE8_NV",
     },
     {
-     0x8C46, "GL_SLUMINANCE_NV",
+     0x8C46,
+     "GL_SLUMINANCE_NV",
     },
     {
-     0x93E1, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x3x3_OES",
+     0x93E1,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x3x3_OES",
     },
     {
-     0x93E0, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_3x3x3_OES",
+     0x93E0,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_3x3x3_OES",
     },
     {
-     0x93E3, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x4_OES",
+     0x93E3,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x4_OES",
     },
     {
-     0x93E2, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x3_OES",
+     0x93E2,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x3_OES",
     },
     {
-     0x93E5, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x4_OES",
+     0x93E5,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x4_OES",
     },
     {
-     0x93E4, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4x4_OES",
+     0x93E4,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4x4_OES",
     },
     {
-     0x93E7, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5x5_OES",
+     0x93E7,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5x5_OES",
     },
     {
-     0x93E6, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x5_OES",
+     0x93E6,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x5_OES",
     },
     {
-     0x8D68, "GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES",
+     0x8D68,
+     "GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES",
     },
     {
-     0x85BB, "GL_UNSIGNED_SHORT_8_8_REV_APPLE",
+     0x85BB,
+     "GL_UNSIGNED_SHORT_8_8_REV_APPLE",
     },
     {
-     0x8D61, "GL_HALF_FLOAT_OES",
+     0x8D61,
+     "GL_HALF_FLOAT_OES",
     },
     {
-     0x8D62, "GL_RGB565",
+     0x8D62,
+     "GL_RGB565",
     },
     {
-     0x8D64, "GL_ETC1_RGB8_OES",
+     0x8D64,
+     "GL_ETC1_RGB8_OES",
     },
     {
-     0x8D65, "GL_TEXTURE_EXTERNAL_OES",
+     0x8D65,
+     "GL_TEXTURE_EXTERNAL_OES",
     },
     {
-     0x8D66, "GL_SAMPLER_EXTERNAL_OES",
+     0x8D66,
+     "GL_SAMPLER_EXTERNAL_OES",
     },
     {
-     0x8D67, "GL_TEXTURE_BINDING_EXTERNAL_OES",
+     0x8D67,
+     "GL_TEXTURE_BINDING_EXTERNAL_OES",
     },
     {
-     0x04000000, "GL_MULTISAMPLE_BUFFER_BIT2_QCOM",
+     0x04000000,
+     "GL_MULTISAMPLE_BUFFER_BIT2_QCOM",
     },
     {
-     0x8CEE, "GL_COLOR_ATTACHMENT14_EXT",
+     0x8CEE,
+     "GL_COLOR_ATTACHMENT14_EXT",
     },
     {
-     0x2800, "GL_TEXTURE_MAG_FILTER",
+     0x2800,
+     "GL_TEXTURE_MAG_FILTER",
     },
     {
-     0x2801, "GL_TEXTURE_MIN_FILTER",
+     0x2801,
+     "GL_TEXTURE_MIN_FILTER",
     },
     {
-     0x2802, "GL_TEXTURE_WRAP_S",
+     0x2802,
+     "GL_TEXTURE_WRAP_S",
     },
     {
-     0x2803, "GL_TEXTURE_WRAP_T",
+     0x2803,
+     "GL_TEXTURE_WRAP_T",
     },
     {
-     0x2703, "GL_LINEAR_MIPMAP_LINEAR",
+     0x2703,
+     "GL_LINEAR_MIPMAP_LINEAR",
     },
     {
-     0x8B98, "GL_PALETTE8_RGBA4_OES",
+     0x8B98,
+     "GL_PALETTE8_RGBA4_OES",
     },
     {
-     0x84F3, "GL_FENCE_STATUS_NV",
+     0x84F3,
+     "GL_FENCE_STATUS_NV",
     },
     {
-     0x2702, "GL_NEAREST_MIPMAP_LINEAR",
+     0x2702,
+     "GL_NEAREST_MIPMAP_LINEAR",
     },
     {
-     0x1F03, "GL_EXTENSIONS",
+     0x1F03,
+     "GL_EXTENSIONS",
     },
     {
-     0x1F02, "GL_VERSION",
+     0x1F02,
+     "GL_VERSION",
     },
     {
-     0x1F01, "GL_RENDERER",
+     0x1F01,
+     "GL_RENDERER",
     },
     {
-     0x1F00, "GL_VENDOR",
+     0x1F00,
+     "GL_VENDOR",
     },
     {
-     0x9247, "GL_OVERLAY_TRANSFORM_FLIP_VERTICAL_CHROMIUM",
+     0x9247,
+     "GL_OVERLAY_TRANSFORM_FLIP_VERTICAL_CHROMIUM",
     },
     {
-     0x2701, "GL_LINEAR_MIPMAP_NEAREST",
+     0x2701,
+     "GL_LINEAR_MIPMAP_NEAREST",
     },
     {
-     0x9245, "GL_OVERLAY_TRANSFORM_NONE_CHROMIUM",
+     0x9245,
+     "GL_OVERLAY_TRANSFORM_NONE_CHROMIUM",
     },
     {
-     0x92B4, "GL_INVERT_OVG_NV",
+     0x92B4,
+     "GL_INVERT_OVG_NV",
     },
     {
-     0x9249, "GL_OVERLAY_TRANSFORM_ROTATE_180_CHROMIUM",
+     0x9249,
+     "GL_OVERLAY_TRANSFORM_ROTATE_180_CHROMIUM",
     },
     {
-     0x0B94, "GL_STENCIL_FAIL",
+     0x0B94,
+     "GL_STENCIL_FAIL",
     },
     {
-     0x8B4C, "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS",
+     0x8B4C,
+     "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS",
     },
     {
-     0x8B4D, "GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS",
+     0x8B4D,
+     "GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS",
     },
     {
-     0x8B4F, "GL_SHADER_TYPE",
+     0x8B4F,
+     "GL_SHADER_TYPE",
     },
     {
-     0x00004000, "GL_COLOR_BUFFER_BIT",
+     0x00004000,
+     "GL_COLOR_BUFFER_BIT",
     },
     {
-     0x00000010, "GL_COLOR_BUFFER_BIT4_QCOM",
+     0x00000010,
+     "GL_COLOR_BUFFER_BIT4_QCOM",
     },
     {
-     0x8834, "GL_DRAW_BUFFER15_EXT",
+     0x8834,
+     "GL_DRAW_BUFFER15_EXT",
     },
     {
-     0x8833, "GL_DRAW_BUFFER14_EXT",
+     0x8833,
+     "GL_DRAW_BUFFER14_EXT",
     },
     {
-     0x8832, "GL_DRAW_BUFFER13_EXT",
+     0x8832,
+     "GL_DRAW_BUFFER13_EXT",
     },
     {
-     0x8831, "GL_DRAW_BUFFER12_EXT",
+     0x8831,
+     "GL_DRAW_BUFFER12_EXT",
     },
     {
-     0x8830, "GL_DRAW_BUFFER11_EXT",
+     0x8830,
+     "GL_DRAW_BUFFER11_EXT",
     },
     {
-     0x8DC5, "GL_SAMPLER_CUBE_SHADOW_NV",
+     0x8DC5,
+     "GL_SAMPLER_CUBE_SHADOW_NV",
     },
     {
-     0x93B8, "GL_COMPRESSED_RGBA_ASTC_10x5_KHR",
+     0x93B8,
+     "GL_COMPRESSED_RGBA_ASTC_10x5_KHR",
     },
     {
-     0x9241, "GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM",
+     0x9241,
+     "GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM",
     },
     {
-     0x00010000, "GL_STENCIL_BUFFER_BIT0_QCOM",
+     0x00010000,
+     "GL_STENCIL_BUFFER_BIT0_QCOM",
     },
     {
-     0x0B93, "GL_STENCIL_VALUE_MASK",
+     0x0B93,
+     "GL_STENCIL_VALUE_MASK",
     },
     {
-     0x0B92, "GL_STENCIL_FUNC",
+     0x0B92,
+     "GL_STENCIL_FUNC",
     },
     {
-     0x0B91, "GL_STENCIL_CLEAR_VALUE",
+     0x0B91,
+     "GL_STENCIL_CLEAR_VALUE",
     },
     {
-     0x883D, "GL_BLEND_EQUATION_ALPHA",
+     0x883D,
+     "GL_BLEND_EQUATION_ALPHA",
     },
     {
-     0x0B97, "GL_STENCIL_REF",
+     0x0B97,
+     "GL_STENCIL_REF",
     },
     {
-     0x0B96, "GL_STENCIL_PASS_DEPTH_PASS",
+     0x0B96,
+     "GL_STENCIL_PASS_DEPTH_PASS",
     },
     {
-     0x0B95, "GL_STENCIL_PASS_DEPTH_FAIL",
+     0x0B95,
+     "GL_STENCIL_PASS_DEPTH_FAIL",
     },
     {
-     0x2700, "GL_NEAREST_MIPMAP_NEAREST",
+     0x2700,
+     "GL_NEAREST_MIPMAP_NEAREST",
     },
     {
-     0x0B98, "GL_STENCIL_WRITEMASK",
+     0x0B98,
+     "GL_STENCIL_WRITEMASK",
     },
     {
-     0x8B40, "GL_PROGRAM_OBJECT_EXT",
+     0x8B40,
+     "GL_PROGRAM_OBJECT_EXT",
     },
     {
-     0x1004, "GL_TEXTURE_BORDER_COLOR_NV",
+     0x1004,
+     "GL_TEXTURE_BORDER_COLOR_NV",
     },
     {
-     0x8B48, "GL_SHADER_OBJECT_EXT",
+     0x8B48,
+     "GL_SHADER_OBJECT_EXT",
     },
     {
-     0x912F, "GL_TEXTURE_IMMUTABLE_FORMAT_EXT",
+     0x912F,
+     "GL_TEXTURE_IMMUTABLE_FORMAT_EXT",
     },
     {
-     0x924A, "GL_OVERLAY_TRANSFORM_ROTATE_270_CHROMIUM",
+     0x924A,
+     "GL_OVERLAY_TRANSFORM_ROTATE_270_CHROMIUM",
     },
     {
-     0x20000000, "GL_MULTISAMPLE_BUFFER_BIT5_QCOM",
+     0x20000000,
+     "GL_MULTISAMPLE_BUFFER_BIT5_QCOM",
     },
     {
-     0x0DE1, "GL_TEXTURE_2D",
+     0x0DE1,
+     "GL_TEXTURE_2D",
     },
     {
-     0x80C9, "GL_BLEND_SRC_RGB",
+     0x80C9,
+     "GL_BLEND_SRC_RGB",
     },
     {
-     0x80C8, "GL_BLEND_DST_RGB",
+     0x80C8,
+     "GL_BLEND_DST_RGB",
     },
     {
-     0x8059, "GL_RGB10_A2_EXT",
+     0x8059,
+     "GL_RGB10_A2_EXT",
     },
     {
-     0x8058, "GL_RGBA8_OES",
+     0x8058,
+     "GL_RGBA8_OES",
     },
     {
-     0x8B93, "GL_PALETTE4_RGBA4_OES",
+     0x8B93,
+     "GL_PALETTE4_RGBA4_OES",
     },
     {
-     0x00002000, "GL_DEPTH_BUFFER_BIT5_QCOM",
+     0x00002000,
+     "GL_DEPTH_BUFFER_BIT5_QCOM",
     },
     {
-     0x8051, "GL_RGB8_OES",
+     0x8051,
+     "GL_RGB8_OES",
     },
     {
-     0x8052, "GL_RGB10_EXT",
+     0x8052,
+     "GL_RGB10_EXT",
     },
     {
-     0x8CAB, "GL_RENDERBUFFER_SAMPLES_ANGLE",
+     0x8CAB,
+     "GL_RENDERBUFFER_SAMPLES_ANGLE",
     },
     {
-     0x8057, "GL_RGB5_A1",
+     0x8057,
+     "GL_RGB5_A1",
     },
     {
-     0x8056, "GL_RGBA4",
+     0x8056,
+     "GL_RGBA4",
     },
     {
-     0x150A, "GL_INVERT",
+     0x150A,
+     "GL_INVERT",
     },
     {
-     0x01000000, "GL_MULTISAMPLE_BUFFER_BIT0_QCOM",
+     0x01000000,
+     "GL_MULTISAMPLE_BUFFER_BIT0_QCOM",
     },
     {
-     0x78ED, "GL_PIXEL_PACK_TRANSFER_BUFFER_CHROMIUM",
+     0x78ED,
+     "GL_PIXEL_PACK_TRANSFER_BUFFER_CHROMIUM",
     },
     {
-     0x78EE, "GL_PIXEL_PACK_TRANSFER_BUFFER_BINDING_CHROMIUM",
+     0x78EE,
+     "GL_PIXEL_PACK_TRANSFER_BUFFER_BINDING_CHROMIUM",
     },
     {
-     0x78EF, "GL_PIXEL_UNPACK_TRANSFER_BUFFER_BINDING_CHROMIUM",
+     0x78EF,
+     "GL_PIXEL_UNPACK_TRANSFER_BUFFER_BINDING_CHROMIUM",
     },
     {
-     0x0B45, "GL_CULL_FACE_MODE",
+     0x0B45,
+     "GL_CULL_FACE_MODE",
     },
     {
-     0x8B92, "GL_PALETTE4_R5_G6_B5_OES",
+     0x8B92,
+     "GL_PALETTE4_R5_G6_B5_OES",
     },
     {
-     0x00100000, "GL_STENCIL_BUFFER_BIT4_QCOM",
+     0x00100000,
+     "GL_STENCIL_BUFFER_BIT4_QCOM",
     },
     {
-     0x9299, "GL_COLORDODGE_NV",
+     0x9299,
+     "GL_COLORDODGE_NV",
     },
     {
-     0x8D20, "GL_STENCIL_ATTACHMENT",
+     0x8D20,
+     "GL_STENCIL_ATTACHMENT",
     },
     {
-     0x8B91, "GL_PALETTE4_RGBA8_OES",
+     0x8B91,
+     "GL_PALETTE4_RGBA8_OES",
     },
     {
-     0x00000200, "GL_DEPTH_BUFFER_BIT1_QCOM",
+     0x00000200,
+     "GL_DEPTH_BUFFER_BIT1_QCOM",
     },
     {
-     0x00008000, "GL_COVERAGE_BUFFER_BIT_NV",
+     0x00008000,
+     "GL_COVERAGE_BUFFER_BIT_NV",
     },
     {
-     0x1506, "GL_XOR_NV",
+     0x1506,
+     "GL_XOR_NV",
     },
     {
-     0x8CA8, "GL_READ_FRAMEBUFFER_ANGLE",
+     0x8CA8,
+     "GL_READ_FRAMEBUFFER_ANGLE",
     },
     {
-     0x8CA9, "GL_DRAW_FRAMEBUFFER_ANGLE",
+     0x8CA9,
+     "GL_DRAW_FRAMEBUFFER_ANGLE",
     },
     {
-     0x8CA6, "GL_FRAMEBUFFER_BINDING",
+     0x8CA6,
+     "GL_FRAMEBUFFER_BINDING",
     },
     {
-     0x8CA7, "GL_RENDERBUFFER_BINDING",
+     0x8CA7,
+     "GL_RENDERBUFFER_BINDING",
     },
     {
-     0x8CA4, "GL_STENCIL_BACK_VALUE_MASK",
+     0x8CA4,
+     "GL_STENCIL_BACK_VALUE_MASK",
     },
     {
-     0x8CA5, "GL_STENCIL_BACK_WRITEMASK",
+     0x8CA5,
+     "GL_STENCIL_BACK_WRITEMASK",
     },
     {
-     0x8B90, "GL_PALETTE4_RGB8_OES",
+     0x8B90,
+     "GL_PALETTE4_RGB8_OES",
     },
     {
-     0x8CA3, "GL_STENCIL_BACK_REF",
+     0x8CA3,
+     "GL_STENCIL_BACK_REF",
     },
     {
-     0x80CB, "GL_BLEND_SRC_ALPHA",
+     0x80CB,
+     "GL_BLEND_SRC_ALPHA",
     },
     {
-     0x80CA, "GL_BLEND_DST_ALPHA",
+     0x80CA,
+     "GL_BLEND_DST_ALPHA",
     },
     {
-     0x8CE7, "GL_COLOR_ATTACHMENT7_EXT",
+     0x8CE7,
+     "GL_COLOR_ATTACHMENT7_EXT",
     },
     {
-     0x93B0, "GL_COMPRESSED_RGBA_ASTC_4x4_KHR",
+     0x93B0,
+     "GL_COMPRESSED_RGBA_ASTC_4x4_KHR",
     },
     {
-     0x93B1, "GL_COMPRESSED_RGBA_ASTC_5x4_KHR",
+     0x93B1,
+     "GL_COMPRESSED_RGBA_ASTC_5x4_KHR",
     },
     {
-     0x93B2, "GL_COMPRESSED_RGBA_ASTC_5x5_KHR",
+     0x93B2,
+     "GL_COMPRESSED_RGBA_ASTC_5x5_KHR",
     },
     {
-     0x93B3, "GL_COMPRESSED_RGBA_ASTC_6x5_KHR",
+     0x93B3,
+     "GL_COMPRESSED_RGBA_ASTC_6x5_KHR",
     },
     {
-     0x93B4, "GL_COMPRESSED_RGBA_ASTC_6x6_KHR",
+     0x93B4,
+     "GL_COMPRESSED_RGBA_ASTC_6x6_KHR",
     },
     {
-     0x93B5, "GL_COMPRESSED_RGBA_ASTC_8x5_KHR",
+     0x93B5,
+     "GL_COMPRESSED_RGBA_ASTC_8x5_KHR",
     },
     {
-     0x93B6, "GL_COMPRESSED_RGBA_ASTC_8x6_KHR",
+     0x93B6,
+     "GL_COMPRESSED_RGBA_ASTC_8x6_KHR",
     },
     {
-     0x93B7, "GL_COMPRESSED_RGBA_ASTC_8x8_KHR",
+     0x93B7,
+     "GL_COMPRESSED_RGBA_ASTC_8x8_KHR",
     },
     {
-     0x8CD6, "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT",
+     0x8CD6,
+     "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT",
     },
     {
-     0x93B9, "GL_COMPRESSED_RGBA_ASTC_10x6_KHR",
+     0x93B9,
+     "GL_COMPRESSED_RGBA_ASTC_10x6_KHR",
     },
     {
-     0x8253, "GL_GUILTY_CONTEXT_RESET_EXT",
+     0x8253,
+     "GL_GUILTY_CONTEXT_RESET_EXT",
     },
     {
-     0x8CE5, "GL_COLOR_ATTACHMENT5_EXT",
+     0x8CE5,
+     "GL_COLOR_ATTACHMENT5_EXT",
     },
     {
-     0x8CE9, "GL_COLOR_ATTACHMENT9_EXT",
+     0x8CE9,
+     "GL_COLOR_ATTACHMENT9_EXT",
     },
     {
-     0x8B96, "GL_PALETTE8_RGBA8_OES",
+     0x8B96,
+     "GL_PALETTE8_RGBA8_OES",
     },
     {
-     0x8872, "GL_MAX_TEXTURE_IMAGE_UNITS",
+     0x8872,
+     "GL_MAX_TEXTURE_IMAGE_UNITS",
     },
     {
-     0x8508, "GL_DECR_WRAP",
+     0x8508,
+     "GL_DECR_WRAP",
     },
     {
-     0x92AD, "GL_HSL_HUE_NV",
+     0x92AD,
+     "GL_HSL_HUE_NV",
     },
     {
-     0x92AE, "GL_HSL_SATURATION_NV",
+     0x92AE,
+     "GL_HSL_SATURATION_NV",
     },
     {
-     0x92AF, "GL_HSL_COLOR_NV",
+     0x92AF,
+     "GL_HSL_COLOR_NV",
     },
     {
-     0x8DC4, "GL_SAMPLER_2D_ARRAY_SHADOW_NV",
+     0x8DC4,
+     "GL_SAMPLER_2D_ARRAY_SHADOW_NV",
     },
     {
-     0x8507, "GL_INCR_WRAP",
+     0x8507,
+     "GL_INCR_WRAP",
     },
     {
-     0x8895, "GL_ELEMENT_ARRAY_BUFFER_BINDING",
+     0x8895,
+     "GL_ELEMENT_ARRAY_BUFFER_BINDING",
     },
     {
-     0x8894, "GL_ARRAY_BUFFER_BINDING",
+     0x8894,
+     "GL_ARRAY_BUFFER_BINDING",
     },
     {
-     0x92A3, "GL_INVERT_RGB_NV",
+     0x92A3,
+     "GL_INVERT_RGB_NV",
     },
     {
-     0x92A4, "GL_LINEARDODGE_NV",
+     0x92A4,
+     "GL_LINEARDODGE_NV",
     },
     {
-     0x92A5, "GL_LINEARBURN_NV",
+     0x92A5,
+     "GL_LINEARBURN_NV",
     },
     {
-     0x8893, "GL_ELEMENT_ARRAY_BUFFER",
+     0x8893,
+     "GL_ELEMENT_ARRAY_BUFFER",
     },
     {
-     0x8892, "GL_ARRAY_BUFFER",
+     0x8892,
+     "GL_ARRAY_BUFFER",
     },
     {
-     0x92A8, "GL_PINLIGHT_NV",
+     0x92A8,
+     "GL_PINLIGHT_NV",
     },
     {
-     0x92A9, "GL_HARDMIX_NV",
+     0x92A9,
+     "GL_HARDMIX_NV",
     },
     {
-     0x8BD8, "GL_TEXTURE_IMAGE_VALID_QCOM",
+     0x8BD8,
+     "GL_TEXTURE_IMAGE_VALID_QCOM",
     },
     {
-     0x84D5, "GL_TEXTURE21",
+     0x84D5,
+     "GL_TEXTURE21",
     },
     {
-     0x9287, "GL_DST_NV",
+     0x9287,
+     "GL_DST_NV",
     },
     {
-     0x93BA, "GL_COMPRESSED_RGBA_ASTC_10x8_KHR",
+     0x93BA,
+     "GL_COMPRESSED_RGBA_ASTC_10x8_KHR",
     },
     {
-     0x93BB, "GL_COMPRESSED_RGBA_ASTC_10x10_KHR",
+     0x93BB,
+     "GL_COMPRESSED_RGBA_ASTC_10x10_KHR",
     },
     {
-     0x93BC, "GL_COMPRESSED_RGBA_ASTC_12x10_KHR",
+     0x93BC,
+     "GL_COMPRESSED_RGBA_ASTC_12x10_KHR",
     },
     {
-     0x93BD, "GL_COMPRESSED_RGBA_ASTC_12x12_KHR",
+     0x93BD,
+     "GL_COMPRESSED_RGBA_ASTC_12x12_KHR",
     },
     {
-     0x84E8, "GL_MAX_RENDERBUFFER_SIZE",
+     0x84E8,
+     "GL_MAX_RENDERBUFFER_SIZE",
     },
     {
-     0x9281, "GL_BLEND_OVERLAP_NV",
+     0x9281,
+     "GL_BLEND_OVERLAP_NV",
     },
     {
-     0x9280, "GL_BLEND_PREMULTIPLIED_SRC_NV",
+     0x9280,
+     "GL_BLEND_PREMULTIPLIED_SRC_NV",
     },
     {
-     0x8370, "GL_MIRRORED_REPEAT",
+     0x8370,
+     "GL_MIRRORED_REPEAT",
     },
     {
-     0x84E0, "GL_ACTIVE_TEXTURE",
+     0x84E0,
+     "GL_ACTIVE_TEXTURE",
     },
     {
-     0x8800, "GL_STENCIL_BACK_FUNC",
+     0x8800,
+     "GL_STENCIL_BACK_FUNC",
     },
     {
-     0x8801, "GL_STENCIL_BACK_FAIL",
+     0x8801,
+     "GL_STENCIL_BACK_FAIL",
     },
     {
-     0x0D33, "GL_MAX_TEXTURE_SIZE",
+     0x0D33,
+     "GL_MAX_TEXTURE_SIZE",
     },
     {
-     0x8624, "GL_VERTEX_ATTRIB_ARRAY_STRIDE",
+     0x8624,
+     "GL_VERTEX_ATTRIB_ARRAY_STRIDE",
     },
     {
-     0x8625, "GL_VERTEX_ATTRIB_ARRAY_TYPE",
+     0x8625,
+     "GL_VERTEX_ATTRIB_ARRAY_TYPE",
     },
     {
-     0x8622, "GL_VERTEX_ATTRIB_ARRAY_ENABLED",
+     0x8622,
+     "GL_VERTEX_ATTRIB_ARRAY_ENABLED",
     },
     {
-     0x8623, "GL_VERTEX_ATTRIB_ARRAY_SIZE",
+     0x8623,
+     "GL_VERTEX_ATTRIB_ARRAY_SIZE",
     },
     {
-     0x8DB9, "GL_FRAMEBUFFER_SRGB_EXT",
+     0x8DB9,
+     "GL_FRAMEBUFFER_SRGB_EXT",
     },
     {
-     0x8259, "GL_ACTIVE_PROGRAM_EXT",
+     0x8259,
+     "GL_ACTIVE_PROGRAM_EXT",
     },
     {
-     0x8258, "GL_PROGRAM_SEPARABLE_EXT",
+     0x8258,
+     "GL_PROGRAM_SEPARABLE_EXT",
     },
     {
-     0x8256, "GL_RESET_NOTIFICATION_STRATEGY_EXT",
+     0x8256,
+     "GL_RESET_NOTIFICATION_STRATEGY_EXT",
     },
     {
-     0x8255, "GL_UNKNOWN_CONTEXT_RESET_EXT",
+     0x8255,
+     "GL_UNKNOWN_CONTEXT_RESET_EXT",
     },
     {
-     0x8254, "GL_INNOCENT_CONTEXT_RESET_EXT",
+     0x8254,
+     "GL_INNOCENT_CONTEXT_RESET_EXT",
     },
     {
-     0x1100, "GL_DONT_CARE",
+     0x1100,
+     "GL_DONT_CARE",
     },
     {
-     0x1101, "GL_FASTEST",
+     0x1101,
+     "GL_FASTEST",
     },
     {
-     0x8251, "GL_DEBUG_TYPE_OTHER_KHR",
+     0x8251,
+     "GL_DEBUG_TYPE_OTHER_KHR",
     },
     {
-     0x8250, "GL_DEBUG_TYPE_PERFORMANCE_KHR",
+     0x8250,
+     "GL_DEBUG_TYPE_PERFORMANCE_KHR",
     },
     {
-     0x8CEB, "GL_COLOR_ATTACHMENT11_EXT",
+     0x8CEB,
+     "GL_COLOR_ATTACHMENT11_EXT",
     },
     {
-     0x8CEC, "GL_COLOR_ATTACHMENT12_EXT",
+     0x8CEC,
+     "GL_COLOR_ATTACHMENT12_EXT",
     },
     {
-     0x0408, "GL_FRONT_AND_BACK",
+     0x0408,
+     "GL_FRONT_AND_BACK",
     },
     {
-     0x8CEA, "GL_COLOR_ATTACHMENT10_EXT",
+     0x8CEA,
+     "GL_COLOR_ATTACHMENT10_EXT",
     },
     {
-     0x8CEF, "GL_COLOR_ATTACHMENT15_EXT",
+     0x8CEF,
+     "GL_COLOR_ATTACHMENT15_EXT",
     },
     {
-     0x8CED, "GL_COLOR_ATTACHMENT13_EXT",
+     0x8CED,
+     "GL_COLOR_ATTACHMENT13_EXT",
     },
     {
-     0x8829, "GL_DRAW_BUFFER4_EXT",
+     0x8829,
+     "GL_DRAW_BUFFER4_EXT",
     },
     {
-     0x0404, "GL_FRONT",
+     0x0404,
+     "GL_FRONT",
     },
     {
-     0x0405, "GL_BACK",
+     0x0405,
+     "GL_BACK",
     },
     {
-     0x88E1, "GL_STREAM_READ",
+     0x88E1,
+     "GL_STREAM_READ",
     },
     {
-     0x88E0, "GL_STREAM_DRAW",
+     0x88E0,
+     "GL_STREAM_DRAW",
     },
     {
-     0x88E4, "GL_STATIC_DRAW",
+     0x88E4,
+     "GL_STATIC_DRAW",
     },
     {
-     0x93C6, "GL_COMPRESSED_RGBA_ASTC_5x5x5_OES",
+     0x93C6,
+     "GL_COMPRESSED_RGBA_ASTC_5x5x5_OES",
     },
     {
-     0x88E8, "GL_DYNAMIC_DRAW",
+     0x88E8,
+     "GL_DYNAMIC_DRAW",
     },
     {
-     0x9291, "GL_PLUS_NV",
+     0x9291,
+     "GL_PLUS_NV",
     },
     {
-     0x8CAA, "GL_READ_FRAMEBUFFER_BINDING_ANGLE",
+     0x8CAA,
+     "GL_READ_FRAMEBUFFER_BINDING_ANGLE",
     },
     {
-     0x93C5, "GL_COMPRESSED_RGBA_ASTC_5x5x4_OES",
+     0x93C5,
+     "GL_COMPRESSED_RGBA_ASTC_5x5x4_OES",
     },
     {
-     0x40000000, "GL_MULTISAMPLE_BUFFER_BIT6_QCOM",
+     0x40000000,
+     "GL_MULTISAMPLE_BUFFER_BIT6_QCOM",
     },
     {
-     0x9116, "GL_SYNC_FENCE_APPLE",
+     0x9116,
+     "GL_SYNC_FENCE_APPLE",
     },
     {
-     0x93C4, "GL_COMPRESSED_RGBA_ASTC_5x4x4_OES",
+     0x93C4,
+     "GL_COMPRESSED_RGBA_ASTC_5x4x4_OES",
     },
     {
-     0x88EE, "GL_ETC1_SRGB8_NV",
+     0x88EE,
+     "GL_ETC1_SRGB8_NV",
     },
     {
-     0x93C3, "GL_COMPRESSED_RGBA_ASTC_4x4x4_OES",
+     0x93C3,
+     "GL_COMPRESSED_RGBA_ASTC_4x4x4_OES",
     },
     {
-     0x00000800, "GL_DEPTH_BUFFER_BIT3_QCOM",
+     0x00000800,
+     "GL_DEPTH_BUFFER_BIT3_QCOM",
     },
     {
-     0x1903, "GL_RED_EXT",
+     0x1903,
+     "GL_RED_EXT",
     },
     {
-     0x93C2, "GL_COMPRESSED_RGBA_ASTC_4x4x3_OES",
+     0x93C2,
+     "GL_COMPRESSED_RGBA_ASTC_4x4x3_OES",
     },
     {
-     0x8CE2, "GL_COLOR_ATTACHMENT2_EXT",
+     0x8CE2,
+     "GL_COLOR_ATTACHMENT2_EXT",
     },
     {
-     0x8BC1, "GL_COUNTER_RANGE_AMD",
+     0x8BC1,
+     "GL_COUNTER_RANGE_AMD",
     },
     {
-     0x8CE0, "GL_COLOR_ATTACHMENT0",
+     0x8CE0,
+     "GL_COLOR_ATTACHMENT0",
     },
     {
-     0x8CE1, "GL_COLOR_ATTACHMENT1_EXT",
+     0x8CE1,
+     "GL_COLOR_ATTACHMENT1_EXT",
     },
     {
-     0x8CE6, "GL_COLOR_ATTACHMENT6_EXT",
+     0x8CE6,
+     "GL_COLOR_ATTACHMENT6_EXT",
     },
     {
-     0x93C1, "GL_COMPRESSED_RGBA_ASTC_4x3x3_OES",
+     0x93C1,
+     "GL_COMPRESSED_RGBA_ASTC_4x3x3_OES",
     },
     {
-     0x8A1F, "GL_RGB_422_APPLE",
+     0x8A1F,
+     "GL_RGB_422_APPLE",
     },
     {
-     0x93DC, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR",
+     0x93DC,
+     "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR",
     },
     {
-     0x9292, "GL_PLUS_DARKER_NV",
+     0x9292,
+     "GL_PLUS_DARKER_NV",
     },
     {
-     0x8CE8, "GL_COLOR_ATTACHMENT8_EXT",
+     0x8CE8,
+     "GL_COLOR_ATTACHMENT8_EXT",
     },
     {
-     0x93C0, "GL_COMPRESSED_RGBA_ASTC_3x3x3_OES",
+     0x93C0,
+     "GL_COMPRESSED_RGBA_ASTC_3x3x3_OES",
     },
     {
-     0x0C23, "GL_COLOR_WRITEMASK",
+     0x0C23,
+     "GL_COLOR_WRITEMASK",
     },
     {
-     0x0C22, "GL_COLOR_CLEAR_VALUE",
+     0x0C22,
+     "GL_COLOR_CLEAR_VALUE",
     },
     {
-     0x8823, "GL_WRITEONLY_RENDERING_QCOM",
+     0x8823,
+     "GL_WRITEONLY_RENDERING_QCOM",
     },
     {
-     0x8824, "GL_MAX_DRAW_BUFFERS_EXT",
+     0x8824,
+     "GL_MAX_DRAW_BUFFERS_EXT",
     },
     {
-     0x825A, "GL_PROGRAM_PIPELINE_BINDING_EXT",
+     0x825A,
+     "GL_PROGRAM_PIPELINE_BINDING_EXT",
     },
     {
-     0x1909, "GL_LUMINANCE",
+     0x1909,
+     "GL_LUMINANCE",
     },
     {
-     0x0D3A, "GL_MAX_VIEWPORT_DIMS",
+     0x0D3A,
+     "GL_MAX_VIEWPORT_DIMS",
     },
     {
-     0x8B53, "GL_INT_VEC2",
+     0x8B53,
+     "GL_INT_VEC2",
     },
     {
-     0x8826, "GL_DRAW_BUFFER1_EXT",
+     0x8826,
+     "GL_DRAW_BUFFER1_EXT",
     },
     {
-     0x809E, "GL_SAMPLE_ALPHA_TO_COVERAGE",
+     0x809E,
+     "GL_SAMPLE_ALPHA_TO_COVERAGE",
     },
     {
-     0x8BC0, "GL_COUNTER_TYPE_AMD",
+     0x8BC0,
+     "GL_COUNTER_TYPE_AMD",
     },
     {
-     0x8BC3, "GL_PERCENTAGE_AMD",
+     0x8BC3,
+     "GL_PERCENTAGE_AMD",
     },
     {
-     0x8BC2, "GL_UNSIGNED_INT64_AMD",
+     0x8BC2,
+     "GL_UNSIGNED_INT64_AMD",
     },
     {
-     0x8BC5, "GL_PERFMON_RESULT_SIZE_AMD",
+     0x8BC5,
+     "GL_PERFMON_RESULT_SIZE_AMD",
     },
     {
-     0x8BC4, "GL_PERFMON_RESULT_AVAILABLE_AMD",
+     0x8BC4,
+     "GL_PERFMON_RESULT_AVAILABLE_AMD",
     },
     {
-     0x8BC6, "GL_PERFMON_RESULT_AMD",
+     0x8BC6,
+     "GL_PERFMON_RESULT_AMD",
     },
 };
 
@@ -2353,7 +3131,7 @@ const GLES2Util::EnumToString* const GLES2Util::enum_to_string_table_ =
 const size_t GLES2Util::enum_to_string_table_len_ =
     sizeof(enum_to_string_table) / sizeof(enum_to_string_table[0]);
 
-std::string GLES2Util::GetStringAttachment(uint32 value) {
+std::string GLES2Util::GetStringAttachment(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_COLOR_ATTACHMENT0, "GL_COLOR_ATTACHMENT0"},
       {GL_DEPTH_ATTACHMENT, "GL_DEPTH_ATTACHMENT"},
@@ -2363,7 +3141,7 @@ std::string GLES2Util::GetStringAttachment(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringBackbufferAttachment(uint32 value) {
+std::string GLES2Util::GetStringBackbufferAttachment(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_COLOR_EXT, "GL_COLOR_EXT"},
       {GL_DEPTH_EXT, "GL_DEPTH_EXT"},
@@ -2373,7 +3151,7 @@ std::string GLES2Util::GetStringBackbufferAttachment(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringBlitFilter(uint32 value) {
+std::string GLES2Util::GetStringBlitFilter(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_NEAREST, "GL_NEAREST"}, {GL_LINEAR, "GL_LINEAR"},
   };
@@ -2381,7 +3159,7 @@ std::string GLES2Util::GetStringBlitFilter(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringBufferParameter(uint32 value) {
+std::string GLES2Util::GetStringBufferParameter(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_BUFFER_SIZE, "GL_BUFFER_SIZE"}, {GL_BUFFER_USAGE, "GL_BUFFER_USAGE"},
   };
@@ -2389,7 +3167,7 @@ std::string GLES2Util::GetStringBufferParameter(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringBufferTarget(uint32 value) {
+std::string GLES2Util::GetStringBufferTarget(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_ARRAY_BUFFER, "GL_ARRAY_BUFFER"},
       {GL_ELEMENT_ARRAY_BUFFER, "GL_ELEMENT_ARRAY_BUFFER"},
@@ -2398,7 +3176,7 @@ std::string GLES2Util::GetStringBufferTarget(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringBufferUsage(uint32 value) {
+std::string GLES2Util::GetStringBufferUsage(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_STREAM_DRAW, "GL_STREAM_DRAW"},
       {GL_STATIC_DRAW, "GL_STATIC_DRAW"},
@@ -2408,7 +3186,7 @@ std::string GLES2Util::GetStringBufferUsage(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringCapability(uint32 value) {
+std::string GLES2Util::GetStringCapability(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_BLEND, "GL_BLEND"},
       {GL_CULL_FACE, "GL_CULL_FACE"},
@@ -2424,7 +3202,7 @@ std::string GLES2Util::GetStringCapability(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringCmpFunction(uint32 value) {
+std::string GLES2Util::GetStringCmpFunction(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_NEVER, "GL_NEVER"},
       {GL_LESS, "GL_LESS"},
@@ -2439,11 +3217,11 @@ std::string GLES2Util::GetStringCmpFunction(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringCompressedTextureFormat(uint32 value) {
+std::string GLES2Util::GetStringCompressedTextureFormat(uint32_t value) {
   return GLES2Util::GetQualifiedEnumString(NULL, 0, value);
 }
 
-std::string GLES2Util::GetStringDrawMode(uint32 value) {
+std::string GLES2Util::GetStringDrawMode(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_POINTS, "GL_POINTS"},
       {GL_LINE_STRIP, "GL_LINE_STRIP"},
@@ -2457,7 +3235,7 @@ std::string GLES2Util::GetStringDrawMode(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringDstBlendFactor(uint32 value) {
+std::string GLES2Util::GetStringDstBlendFactor(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_ZERO, "GL_ZERO"},
       {GL_ONE, "GL_ONE"},
@@ -2478,7 +3256,7 @@ std::string GLES2Util::GetStringDstBlendFactor(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringEquation(uint32 value) {
+std::string GLES2Util::GetStringEquation(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_FUNC_ADD, "GL_FUNC_ADD"},
       {GL_FUNC_SUBTRACT, "GL_FUNC_SUBTRACT"},
@@ -2488,7 +3266,7 @@ std::string GLES2Util::GetStringEquation(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringFaceMode(uint32 value) {
+std::string GLES2Util::GetStringFaceMode(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_CW, "GL_CW"}, {GL_CCW, "GL_CCW"},
   };
@@ -2496,7 +3274,7 @@ std::string GLES2Util::GetStringFaceMode(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringFaceType(uint32 value) {
+std::string GLES2Util::GetStringFaceType(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_FRONT, "GL_FRONT"},
       {GL_BACK, "GL_BACK"},
@@ -2506,7 +3284,7 @@ std::string GLES2Util::GetStringFaceType(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringFrameBufferParameter(uint32 value) {
+std::string GLES2Util::GetStringFrameBufferParameter(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,
        "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE"},
@@ -2521,7 +3299,7 @@ std::string GLES2Util::GetStringFrameBufferParameter(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringFrameBufferTarget(uint32 value) {
+std::string GLES2Util::GetStringFrameBufferTarget(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_FRAMEBUFFER, "GL_FRAMEBUFFER"},
   };
@@ -2529,7 +3307,7 @@ std::string GLES2Util::GetStringFrameBufferTarget(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringGLState(uint32 value) {
+std::string GLES2Util::GetStringGLState(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_ACTIVE_TEXTURE, "GL_ACTIVE_TEXTURE"},
       {GL_ALIASED_LINE_WIDTH_RANGE, "GL_ALIASED_LINE_WIDTH_RANGE"},
@@ -2640,7 +3418,7 @@ std::string GLES2Util::GetStringGLState(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringGetMaxIndexType(uint32 value) {
+std::string GLES2Util::GetStringGetMaxIndexType(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_UNSIGNED_BYTE, "GL_UNSIGNED_BYTE"},
       {GL_UNSIGNED_SHORT, "GL_UNSIGNED_SHORT"},
@@ -2650,7 +3428,7 @@ std::string GLES2Util::GetStringGetMaxIndexType(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringGetTexParamTarget(uint32 value) {
+std::string GLES2Util::GetStringGetTexParamTarget(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_TEXTURE_2D, "GL_TEXTURE_2D"},
       {GL_TEXTURE_CUBE_MAP, "GL_TEXTURE_CUBE_MAP"},
@@ -2659,7 +3437,7 @@ std::string GLES2Util::GetStringGetTexParamTarget(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringHintMode(uint32 value) {
+std::string GLES2Util::GetStringHintMode(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_FASTEST, "GL_FASTEST"},
       {GL_NICEST, "GL_NICEST"},
@@ -2669,7 +3447,7 @@ std::string GLES2Util::GetStringHintMode(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringHintTarget(uint32 value) {
+std::string GLES2Util::GetStringHintTarget(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_GENERATE_MIPMAP_HINT, "GL_GENERATE_MIPMAP_HINT"},
   };
@@ -2677,7 +3455,7 @@ std::string GLES2Util::GetStringHintTarget(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringIndexType(uint32 value) {
+std::string GLES2Util::GetStringIndexType(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_UNSIGNED_BYTE, "GL_UNSIGNED_BYTE"},
       {GL_UNSIGNED_SHORT, "GL_UNSIGNED_SHORT"},
@@ -2686,7 +3464,7 @@ std::string GLES2Util::GetStringIndexType(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringPixelStore(uint32 value) {
+std::string GLES2Util::GetStringPixelStore(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_PACK_ALIGNMENT, "GL_PACK_ALIGNMENT"},
       {GL_UNPACK_ALIGNMENT, "GL_UNPACK_ALIGNMENT"},
@@ -2700,7 +3478,7 @@ std::string GLES2Util::GetStringPixelStore(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringPixelType(uint32 value) {
+std::string GLES2Util::GetStringPixelType(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_UNSIGNED_BYTE, "GL_UNSIGNED_BYTE"},
       {GL_UNSIGNED_SHORT_5_6_5, "GL_UNSIGNED_SHORT_5_6_5"},
@@ -2711,7 +3489,7 @@ std::string GLES2Util::GetStringPixelType(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringProgramParameter(uint32 value) {
+std::string GLES2Util::GetStringProgramParameter(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_DELETE_STATUS, "GL_DELETE_STATUS"},
       {GL_LINK_STATUS, "GL_LINK_STATUS"},
@@ -2727,7 +3505,7 @@ std::string GLES2Util::GetStringProgramParameter(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringQueryObjectParameter(uint32 value) {
+std::string GLES2Util::GetStringQueryObjectParameter(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_QUERY_RESULT_EXT, "GL_QUERY_RESULT_EXT"},
       {GL_QUERY_RESULT_AVAILABLE_EXT, "GL_QUERY_RESULT_AVAILABLE_EXT"},
@@ -2736,7 +3514,7 @@ std::string GLES2Util::GetStringQueryObjectParameter(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringQueryParameter(uint32 value) {
+std::string GLES2Util::GetStringQueryParameter(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_CURRENT_QUERY_EXT, "GL_CURRENT_QUERY_EXT"},
   };
@@ -2744,7 +3522,7 @@ std::string GLES2Util::GetStringQueryParameter(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringQueryTarget(uint32 value) {
+std::string GLES2Util::GetStringQueryTarget(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_ANY_SAMPLES_PASSED_EXT, "GL_ANY_SAMPLES_PASSED_EXT"},
       {GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT,
@@ -2761,7 +3539,7 @@ std::string GLES2Util::GetStringQueryTarget(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringReadPixelFormat(uint32 value) {
+std::string GLES2Util::GetStringReadPixelFormat(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_ALPHA, "GL_ALPHA"}, {GL_RGB, "GL_RGB"}, {GL_RGBA, "GL_RGBA"},
   };
@@ -2769,7 +3547,7 @@ std::string GLES2Util::GetStringReadPixelFormat(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringReadPixelType(uint32 value) {
+std::string GLES2Util::GetStringReadPixelType(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_UNSIGNED_BYTE, "GL_UNSIGNED_BYTE"},
       {GL_UNSIGNED_SHORT_5_6_5, "GL_UNSIGNED_SHORT_5_6_5"},
@@ -2780,7 +3558,7 @@ std::string GLES2Util::GetStringReadPixelType(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringRenderBufferFormat(uint32 value) {
+std::string GLES2Util::GetStringRenderBufferFormat(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_RGBA4, "GL_RGBA4"},
       {GL_RGB565, "GL_RGB565"},
@@ -2792,7 +3570,7 @@ std::string GLES2Util::GetStringRenderBufferFormat(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringRenderBufferParameter(uint32 value) {
+std::string GLES2Util::GetStringRenderBufferParameter(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_RENDERBUFFER_RED_SIZE, "GL_RENDERBUFFER_RED_SIZE"},
       {GL_RENDERBUFFER_GREEN_SIZE, "GL_RENDERBUFFER_GREEN_SIZE"},
@@ -2808,7 +3586,7 @@ std::string GLES2Util::GetStringRenderBufferParameter(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringRenderBufferTarget(uint32 value) {
+std::string GLES2Util::GetStringRenderBufferTarget(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_RENDERBUFFER, "GL_RENDERBUFFER"},
   };
@@ -2816,7 +3594,7 @@ std::string GLES2Util::GetStringRenderBufferTarget(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringResetStatus(uint32 value) {
+std::string GLES2Util::GetStringResetStatus(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_GUILTY_CONTEXT_RESET_ARB, "GL_GUILTY_CONTEXT_RESET_ARB"},
       {GL_INNOCENT_CONTEXT_RESET_ARB, "GL_INNOCENT_CONTEXT_RESET_ARB"},
@@ -2826,11 +3604,11 @@ std::string GLES2Util::GetStringResetStatus(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringShaderBinaryFormat(uint32 value) {
+std::string GLES2Util::GetStringShaderBinaryFormat(uint32_t value) {
   return GLES2Util::GetQualifiedEnumString(NULL, 0, value);
 }
 
-std::string GLES2Util::GetStringShaderParameter(uint32 value) {
+std::string GLES2Util::GetStringShaderParameter(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_SHADER_TYPE, "GL_SHADER_TYPE"},
       {GL_DELETE_STATUS, "GL_DELETE_STATUS"},
@@ -2844,7 +3622,7 @@ std::string GLES2Util::GetStringShaderParameter(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringShaderPrecision(uint32 value) {
+std::string GLES2Util::GetStringShaderPrecision(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_LOW_FLOAT, "GL_LOW_FLOAT"},
       {GL_MEDIUM_FLOAT, "GL_MEDIUM_FLOAT"},
@@ -2857,7 +3635,7 @@ std::string GLES2Util::GetStringShaderPrecision(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringShaderType(uint32 value) {
+std::string GLES2Util::GetStringShaderType(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_VERTEX_SHADER, "GL_VERTEX_SHADER"},
       {GL_FRAGMENT_SHADER, "GL_FRAGMENT_SHADER"},
@@ -2866,7 +3644,7 @@ std::string GLES2Util::GetStringShaderType(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringSrcBlendFactor(uint32 value) {
+std::string GLES2Util::GetStringSrcBlendFactor(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_ZERO, "GL_ZERO"},
       {GL_ONE, "GL_ONE"},
@@ -2888,7 +3666,7 @@ std::string GLES2Util::GetStringSrcBlendFactor(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringStencilOp(uint32 value) {
+std::string GLES2Util::GetStringStencilOp(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_KEEP, "GL_KEEP"},
       {GL_ZERO, "GL_ZERO"},
@@ -2903,7 +3681,7 @@ std::string GLES2Util::GetStringStencilOp(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringStringType(uint32 value) {
+std::string GLES2Util::GetStringStringType(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_VENDOR, "GL_VENDOR"},
       {GL_RENDERER, "GL_RENDERER"},
@@ -2915,7 +3693,7 @@ std::string GLES2Util::GetStringStringType(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringTextureBindTarget(uint32 value) {
+std::string GLES2Util::GetStringTextureBindTarget(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_TEXTURE_2D, "GL_TEXTURE_2D"},
       {GL_TEXTURE_CUBE_MAP, "GL_TEXTURE_CUBE_MAP"},
@@ -2924,7 +3702,7 @@ std::string GLES2Util::GetStringTextureBindTarget(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringTextureFormat(uint32 value) {
+std::string GLES2Util::GetStringTextureFormat(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_ALPHA, "GL_ALPHA"},
       {GL_LUMINANCE, "GL_LUMINANCE"},
@@ -2936,7 +3714,7 @@ std::string GLES2Util::GetStringTextureFormat(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringTextureInternalFormat(uint32 value) {
+std::string GLES2Util::GetStringTextureInternalFormat(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_ALPHA, "GL_ALPHA"},
       {GL_LUMINANCE, "GL_LUMINANCE"},
@@ -2948,7 +3726,7 @@ std::string GLES2Util::GetStringTextureInternalFormat(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringTextureInternalFormatStorage(uint32 value) {
+std::string GLES2Util::GetStringTextureInternalFormatStorage(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_RGB565, "GL_RGB565"},
       {GL_RGBA4, "GL_RGBA4"},
@@ -2963,7 +3741,7 @@ std::string GLES2Util::GetStringTextureInternalFormatStorage(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringTextureMagFilterMode(uint32 value) {
+std::string GLES2Util::GetStringTextureMagFilterMode(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_NEAREST, "GL_NEAREST"}, {GL_LINEAR, "GL_LINEAR"},
   };
@@ -2971,7 +3749,7 @@ std::string GLES2Util::GetStringTextureMagFilterMode(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringTextureMinFilterMode(uint32 value) {
+std::string GLES2Util::GetStringTextureMinFilterMode(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_NEAREST, "GL_NEAREST"},
       {GL_LINEAR, "GL_LINEAR"},
@@ -2984,7 +3762,7 @@ std::string GLES2Util::GetStringTextureMinFilterMode(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringTextureParameter(uint32 value) {
+std::string GLES2Util::GetStringTextureParameter(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_TEXTURE_MAG_FILTER, "GL_TEXTURE_MAG_FILTER"},
       {GL_TEXTURE_MIN_FILTER, "GL_TEXTURE_MIN_FILTER"},
@@ -2996,7 +3774,7 @@ std::string GLES2Util::GetStringTextureParameter(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringTexturePool(uint32 value) {
+std::string GLES2Util::GetStringTexturePool(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_TEXTURE_POOL_MANAGED_CHROMIUM, "GL_TEXTURE_POOL_MANAGED_CHROMIUM"},
       {GL_TEXTURE_POOL_UNMANAGED_CHROMIUM,
@@ -3006,7 +3784,7 @@ std::string GLES2Util::GetStringTexturePool(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringTextureTarget(uint32 value) {
+std::string GLES2Util::GetStringTextureTarget(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_TEXTURE_2D, "GL_TEXTURE_2D"},
       {GL_TEXTURE_CUBE_MAP_POSITIVE_X, "GL_TEXTURE_CUBE_MAP_POSITIVE_X"},
@@ -3020,7 +3798,7 @@ std::string GLES2Util::GetStringTextureTarget(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringTextureUsage(uint32 value) {
+std::string GLES2Util::GetStringTextureUsage(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_NONE, "GL_NONE"},
       {GL_FRAMEBUFFER_ATTACHMENT_ANGLE, "GL_FRAMEBUFFER_ATTACHMENT_ANGLE"},
@@ -3029,7 +3807,7 @@ std::string GLES2Util::GetStringTextureUsage(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringTextureWrapMode(uint32 value) {
+std::string GLES2Util::GetStringTextureWrapMode(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_CLAMP_TO_EDGE, "GL_CLAMP_TO_EDGE"},
       {GL_MIRRORED_REPEAT, "GL_MIRRORED_REPEAT"},
@@ -3039,7 +3817,7 @@ std::string GLES2Util::GetStringTextureWrapMode(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringVertexAttribType(uint32 value) {
+std::string GLES2Util::GetStringVertexAttribType(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_BYTE, "GL_BYTE"},
       {GL_UNSIGNED_BYTE, "GL_UNSIGNED_BYTE"},
@@ -3051,7 +3829,7 @@ std::string GLES2Util::GetStringVertexAttribType(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringVertexAttribute(uint32 value) {
+std::string GLES2Util::GetStringVertexAttribute(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, "GL_VERTEX_ATTRIB_ARRAY_NORMALIZED"},
       {GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING,
@@ -3066,7 +3844,7 @@ std::string GLES2Util::GetStringVertexAttribute(uint32 value) {
       string_table, arraysize(string_table), value);
 }
 
-std::string GLES2Util::GetStringVertexPointer(uint32 value) {
+std::string GLES2Util::GetStringVertexPointer(uint32_t value) {
   static const EnumToString string_table[] = {
       {GL_VERTEX_ATTRIB_ARRAY_POINTER, "GL_VERTEX_ATTRIB_ARRAY_POINTER"},
   };
diff --git a/gpu/command_buffer/common/gles2_cmd_utils_unittest.cc b/gpu/command_buffer/common/gles2_cmd_utils_unittest.cc
index 0ded3b9..d0e7e03 100644
--- a/gpu/command_buffer/common/gles2_cmd_utils_unittest.cc
+++ b/gpu/command_buffer/common/gles2_cmd_utils_unittest.cc
@@ -20,7 +20,7 @@ class GLES2UtilTest : public testing:: Test {
 };
 
 TEST_F(GLES2UtilTest, SafeMultiplyUint32) {
-  uint32 result = 0;
+  uint32_t result = 0;
   EXPECT_TRUE(SafeMultiplyUint32(2u, 3u, &result));
   EXPECT_EQ(6u, result);
   EXPECT_FALSE(SafeMultiplyUint32(0x80000000u, 2u, &result));
@@ -32,7 +32,7 @@ TEST_F(GLES2UtilTest, SafeMultiplyUint32) {
 }
 
 TEST_F(GLES2UtilTest, SafeAddUint32) {
-  uint32 result = 0;
+  uint32_t result = 0;
   EXPECT_TRUE(SafeAddUint32(2u, 3u, &result));
   EXPECT_EQ(5u, result);
   EXPECT_FALSE(SafeAddUint32(0x80000000u, 0x80000000u, &result));
@@ -48,9 +48,9 @@ TEST_F(GLES2UtilTest, SafeAddUint32) {
 }
 
 TEST_F(GLES2UtilTest, SafeAddInt32) {
-  int32 result = 0;
-  const int32 kMax = std::numeric_limits<int32>::max();
-  const int32 kMin = std::numeric_limits<int32>::min();
+  int32_t result = 0;
+  const int32_t kMax = std::numeric_limits<int32_t>::max();
+  const int32_t kMin = std::numeric_limits<int32_t>::min();
   EXPECT_TRUE(SafeAddInt32(2, 3, &result));
   EXPECT_EQ(5, result);
   EXPECT_FALSE(SafeAddInt32(kMax, 1, &result));
@@ -89,11 +89,11 @@ TEST_F(GLES2UtilTest, GLGetNumValuesReturned) {
 }
 
 TEST_F(GLES2UtilTest, ComputeImageDataSizesFormats) {
-  const uint32 kWidth = 16;
-  const uint32 kHeight = 12;
-  uint32 size;
-  uint32 unpadded_row_size;
-  uint32 padded_row_size;
+  const uint32_t kWidth = 16;
+  const uint32_t kHeight = 12;
+  uint32_t size;
+  uint32_t unpadded_row_size;
+  uint32_t padded_row_size;
   EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
       kWidth, kHeight, GL_RGB, GL_UNSIGNED_BYTE, 1, &size, &unpadded_row_size,
       &padded_row_size));
@@ -146,11 +146,11 @@ TEST_F(GLES2UtilTest, ComputeImageDataSizesFormats) {
 }
 
 TEST_F(GLES2UtilTest, ComputeImageDataSizeTypes) {
-  const uint32 kWidth = 16;
-  const uint32 kHeight = 12;
-  uint32 size;
-  uint32 unpadded_row_size;
-  uint32 padded_row_size;
+  const uint32_t kWidth = 16;
+  const uint32_t kHeight = 12;
+  uint32_t size;
+  uint32_t unpadded_row_size;
+  uint32_t padded_row_size;
   EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
       kWidth, kHeight, GL_RGBA, GL_UNSIGNED_BYTE, 1, &size, &unpadded_row_size,
       &padded_row_size));
@@ -184,11 +184,11 @@ TEST_F(GLES2UtilTest, ComputeImageDataSizeTypes) {
 }
 
 TEST_F(GLES2UtilTest, ComputeImageDataSizesUnpackAlignment) {
-  const uint32 kWidth = 19;
-  const uint32 kHeight = 12;
-  uint32 size;
-  uint32 unpadded_row_size;
-  uint32 padded_row_size;
+  const uint32_t kWidth = 19;
+  const uint32_t kHeight = 12;
+  uint32_t size;
+  uint32_t unpadded_row_size;
+  uint32_t padded_row_size;
   EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
       kWidth, kHeight, GL_RGB, GL_UNSIGNED_BYTE, 1, &size, &unpadded_row_size,
       &padded_row_size));
diff --git a/gpu/command_buffer/common/id_allocator.h b/gpu/command_buffer/common/id_allocator.h
index 46fcd1a..3f2dc4a 100644
--- a/gpu/command_buffer/common/id_allocator.h
+++ b/gpu/command_buffer/common/id_allocator.h
@@ -7,17 +7,19 @@
 #ifndef GPU_COMMAND_BUFFER_CLIENT_ID_ALLOCATOR_H_
 #define GPU_COMMAND_BUFFER_CLIENT_ID_ALLOCATOR_H_
 
+#include <stdint.h>
+
 #include <set>
 #include <utility>
 
 #include "base/compiler_specific.h"
-#include "gpu/command_buffer/common/types.h"
+#include "base/macros.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
 
 // A resource ID, key to the resource maps.
-typedef uint32 ResourceId;
+typedef uint32_t ResourceId;
 // Invalid resource ID.
 static const ResourceId kInvalidResource = 0u;
 
diff --git a/gpu/command_buffer/common/mailbox.h b/gpu/command_buffer/common/mailbox.h
index 06b4b59..a45c91f 100644
--- a/gpu/command_buffer/common/mailbox.h
+++ b/gpu/command_buffer/common/mailbox.h
@@ -5,9 +5,9 @@
 #ifndef GPU_COMMAND_BUFFER_MAILBOX_H_
 #define GPU_COMMAND_BUFFER_MAILBOX_H_
 
+#include <stdint.h>
 #include <string.h>
 
-#include "gpu/command_buffer/common/types.h"
 #include "gpu/gpu_export.h"
 
 // From gl2/gl2ext.h.
@@ -21,7 +21,7 @@ struct GPU_EXPORT Mailbox {
   Mailbox();
   bool IsZero() const;
   void SetZero();
-  void SetName(const int8* name);
+  void SetName(const int8_t* name);
 
   // Generate a unique unguessable mailbox name.
   static Mailbox Generate();
@@ -31,7 +31,7 @@ struct GPU_EXPORT Mailbox {
   // check, only to catch bugs where clients forgot to call Mailbox::Generate.
   bool Verify() const;
 
-  int8 name[GL_MAILBOX_SIZE_CHROMIUM];
+  int8_t name[GL_MAILBOX_SIZE_CHROMIUM];
   bool operator<(const Mailbox& other) const {
     return memcmp(this, &other, sizeof other) < 0;
   }
diff --git a/gpu/command_buffer/common/mailbox_holder.cc b/gpu/command_buffer/common/mailbox_holder.cc
index a8cb6fb..87dec36 100644
--- a/gpu/command_buffer/common/mailbox_holder.cc
+++ b/gpu/command_buffer/common/mailbox_holder.cc
@@ -9,8 +9,8 @@ namespace gpu {
 MailboxHolder::MailboxHolder() : texture_target(0), sync_point(0) {}
 
 MailboxHolder::MailboxHolder(const Mailbox& mailbox,
-                             uint32 texture_target,
-                             uint32 sync_point)
+                             uint32_t texture_target,
+                             uint32_t sync_point)
     : mailbox(mailbox),
       texture_target(texture_target),
       sync_point(sync_point) {}
diff --git a/gpu/command_buffer/common/mailbox_holder.h b/gpu/command_buffer/common/mailbox_holder.h
index a17d8d3..7c7a0e2 100644
--- a/gpu/command_buffer/common/mailbox_holder.h
+++ b/gpu/command_buffer/common/mailbox_holder.h
@@ -5,10 +5,10 @@
 #ifndef GPU_COMMAND_BUFFER_MAILBOX_HOLDER_H_
 #define GPU_COMMAND_BUFFER_MAILBOX_HOLDER_H_
 
+#include <stdint.h>
 #include <string.h>
 
 #include "gpu/command_buffer/common/mailbox.h"
-#include "gpu/command_buffer/common/types.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
@@ -16,11 +16,11 @@ namespace gpu {
 struct GPU_EXPORT MailboxHolder {
   MailboxHolder();
   MailboxHolder(const gpu::Mailbox& mailbox,
-                uint32 texture_target,
-                uint32 sync_point);
+                uint32_t texture_target,
+                uint32_t sync_point);
   gpu::Mailbox mailbox;
-  uint32 texture_target;
-  uint32 sync_point;
+  uint32_t texture_target;
+  uint32_t sync_point;
 };
 
 }  // namespace gpu
diff --git a/gpu/command_buffer/common/types.h b/gpu/command_buffer/common/types.h
deleted file mode 100644
index 2e2d13a..0000000
--- a/gpu/command_buffer/common/types.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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.
-
-// TODO(thakis): Change all files that include this file to instead include the
-// base files below directly and remove this file.
-
-#ifndef GPU_COMMAND_BUFFER_COMMON_TYPES_H_
-#define GPU_COMMAND_BUFFER_COMMON_TYPES_H_
-
-#include "base/basictypes.h"
-#include "base/macros.h"
-
-#endif  // GPU_COMMAND_BUFFER_COMMON_TYPES_H_