vk: Update generated headers
authorKristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Thu, 13 Aug 2015 04:05:18 +0000 (21:05 -0700)
committerKristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Thu, 13 Aug 2015 04:05:32 +0000 (21:05 -0700)
This update brings usable IVB/HSW RENDER_SURFACE_STATE structs
and adds more float fields that we previously failed to
recognize.

src/vulkan/gen75_pack.h
src/vulkan/gen7_pack.h
src/vulkan/gen8_pack.h

index 82b4065b7604576b7332438d89acbdfe1e1d394f..7602fb7bb764a27ff76cd6e522a6a988c8a9cb7c 100644 (file)
@@ -92,7 +92,6 @@ __gen_float(float v)
 
 #endif
 
-#define GEN75_3DSTATE_URB_VS_length 0x00000002
 #define GEN75_3DSTATE_URB_VS_length_bias 0x00000002
 #define GEN75_3DSTATE_URB_VS_header             \
    .CommandType          =  3,                  \
@@ -101,6 +100,8 @@ __gen_float(float v)
    ._3DCommandSubOpcode  = 48,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_URB_VS_length 0x00000002
+
 struct GEN75_3DSTATE_URB_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -114,7 +115,7 @@ struct GEN75_3DSTATE_URB_VS {
 
 static inline void
 GEN75_3DSTATE_URB_VS_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN75_3DSTATE_URB_VS * restrict values)
+                          const struct GEN75_3DSTATE_URB_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -134,7 +135,6 @@ GEN75_3DSTATE_URB_VS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_GPGPU_CSR_BASE_ADDRESS_length 0x00000002
 #define GEN75_GPGPU_CSR_BASE_ADDRESS_length_bias 0x00000002
 #define GEN75_GPGPU_CSR_BASE_ADDRESS_header     \
    .CommandType          =  3,                  \
@@ -143,6 +143,8 @@ GEN75_3DSTATE_URB_VS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  4,                  \
    .DwordLength          =  0
 
+#define GEN75_GPGPU_CSR_BASE_ADDRESS_length 0x00000002
+
 struct GEN75_GPGPU_CSR_BASE_ADDRESS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -154,7 +156,7 @@ struct GEN75_GPGPU_CSR_BASE_ADDRESS {
 
 static inline void
 GEN75_GPGPU_CSR_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
-                                const struct GEN75_GPGPU_CSR_BASE_ADDRESS * restrict values)
+                                  const struct GEN75_GPGPU_CSR_BASE_ADDRESS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -174,13 +176,14 @@ GEN75_GPGPU_CSR_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_STORE_REGISTER_MEM_length 0x00000003
 #define GEN75_MI_STORE_REGISTER_MEM_length_bias 0x00000002
 #define GEN75_MI_STORE_REGISTER_MEM_header      \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 36,                  \
    .DwordLength          =  1
 
+#define GEN75_MI_STORE_REGISTER_MEM_length 0x00000003
+
 struct GEN75_MI_STORE_REGISTER_MEM {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -193,7 +196,7 @@ struct GEN75_MI_STORE_REGISTER_MEM {
 
 static inline void
 GEN75_MI_STORE_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
-                               const struct GEN75_MI_STORE_REGISTER_MEM * restrict values)
+                                 const struct GEN75_MI_STORE_REGISTER_MEM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -217,7 +220,6 @@ GEN75_MI_STORE_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_PIPELINE_SELECT_length 0x00000001
 #define GEN75_PIPELINE_SELECT_length_bias 0x00000001
 #define GEN75_PIPELINE_SELECT_header            \
    .CommandType          =  3,                  \
@@ -225,6 +227,8 @@ GEN75_MI_STORE_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  1,                  \
    ._3DCommandSubOpcode  =  4
 
+#define GEN75_PIPELINE_SELECT_length 0x00000001
+
 struct GEN75_PIPELINE_SELECT {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -238,7 +242,7 @@ struct GEN75_PIPELINE_SELECT {
 
 static inline void
 GEN75_PIPELINE_SELECT_pack(__gen_user_data *data, void * restrict dst,
-                         const struct GEN75_PIPELINE_SELECT * restrict values)
+                           const struct GEN75_PIPELINE_SELECT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -252,7 +256,6 @@ GEN75_PIPELINE_SELECT_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_STATE_BASE_ADDRESS_length 0x0000000a
 #define GEN75_STATE_BASE_ADDRESS_length_bias 0x00000002
 #define GEN75_STATE_BASE_ADDRESS_header         \
    .CommandType          =  3,                  \
@@ -261,6 +264,10 @@ GEN75_PIPELINE_SELECT_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  1,                  \
    .DwordLength          =  8
 
+#define GEN75_STATE_BASE_ADDRESS_length 0x0000000a
+
+#define GEN75_MEMORY_OBJECT_CONTROL_STATE_length 0x00000001
+
 struct GEN75_MEMORY_OBJECT_CONTROL_STATE {
    uint32_t                                     LLCeLLCCacheabilityControlLLCCC;
    uint32_t                                     L3CacheabilityControlL3CC;
@@ -268,7 +275,7 @@ struct GEN75_MEMORY_OBJECT_CONTROL_STATE {
 
 static inline void
 GEN75_MEMORY_OBJECT_CONTROL_STATE_pack(__gen_user_data *data, void * restrict dst,
-                                     const struct GEN75_MEMORY_OBJECT_CONTROL_STATE * restrict values)
+                                       const struct GEN75_MEMORY_OBJECT_CONTROL_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -313,7 +320,7 @@ struct GEN75_STATE_BASE_ADDRESS {
 
 static inline void
 GEN75_STATE_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
-                            const struct GEN75_STATE_BASE_ADDRESS * restrict values)
+                              const struct GEN75_STATE_BASE_ADDRESS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -408,7 +415,6 @@ GEN75_STATE_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_STATE_PREFETCH_length 0x00000002
 #define GEN75_STATE_PREFETCH_length_bias 0x00000002
 #define GEN75_STATE_PREFETCH_header             \
    .CommandType          =  3,                  \
@@ -417,6 +423,8 @@ GEN75_STATE_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  3,                  \
    .DwordLength          =  0
 
+#define GEN75_STATE_PREFETCH_length 0x00000002
+
 struct GEN75_STATE_PREFETCH {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -429,7 +437,7 @@ struct GEN75_STATE_PREFETCH {
 
 static inline void
 GEN75_STATE_PREFETCH_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN75_STATE_PREFETCH * restrict values)
+                          const struct GEN75_STATE_PREFETCH * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -450,7 +458,6 @@ GEN75_STATE_PREFETCH_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_STATE_SIP_length 0x00000002
 #define GEN75_STATE_SIP_length_bias 0x00000002
 #define GEN75_STATE_SIP_header                  \
    .CommandType          =  3,                  \
@@ -459,6 +466,8 @@ GEN75_STATE_PREFETCH_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  2,                  \
    .DwordLength          =  0
 
+#define GEN75_STATE_SIP_length 0x00000002
+
 struct GEN75_STATE_SIP {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -470,7 +479,7 @@ struct GEN75_STATE_SIP {
 
 static inline void
 GEN75_STATE_SIP_pack(__gen_user_data *data, void * restrict dst,
-                   const struct GEN75_STATE_SIP * restrict values)
+                     const struct GEN75_STATE_SIP * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -488,7 +497,6 @@ GEN75_STATE_SIP_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_SWTESS_BASE_ADDRESS_length 0x00000002
 #define GEN75_SWTESS_BASE_ADDRESS_length_bias 0x00000002
 #define GEN75_SWTESS_BASE_ADDRESS_header        \
    .CommandType          =  3,                  \
@@ -497,6 +505,8 @@ GEN75_STATE_SIP_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  3,                  \
    .DwordLength          =  0
 
+#define GEN75_SWTESS_BASE_ADDRESS_length 0x00000002
+
 struct GEN75_SWTESS_BASE_ADDRESS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -509,7 +519,7 @@ struct GEN75_SWTESS_BASE_ADDRESS {
 
 static inline void
 GEN75_SWTESS_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN75_SWTESS_BASE_ADDRESS * restrict values)
+                               const struct GEN75_SWTESS_BASE_ADDRESS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -532,7 +542,6 @@ GEN75_SWTESS_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DPRIMITIVE_length 0x00000007
 #define GEN75_3DPRIMITIVE_length_bias 0x00000002
 #define GEN75_3DPRIMITIVE_header                \
    .CommandType          =  3,                  \
@@ -541,6 +550,8 @@ GEN75_SWTESS_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  0,                  \
    .DwordLength          =  5
 
+#define GEN75_3DPRIMITIVE_length 0x00000007
+
 struct GEN75_3DPRIMITIVE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -564,7 +575,7 @@ struct GEN75_3DPRIMITIVE {
 
 static inline void
 GEN75_3DPRIMITIVE_pack(__gen_user_data *data, void * restrict dst,
-                     const struct GEN75_3DPRIMITIVE * restrict values)
+                       const struct GEN75_3DPRIMITIVE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -607,7 +618,6 @@ GEN75_3DPRIMITIVE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_AA_LINE_PARAMETERS_length 0x00000003
 #define GEN75_3DSTATE_AA_LINE_PARAMETERS_length_bias 0x00000002
 #define GEN75_3DSTATE_AA_LINE_PARAMETERS_header \
    .CommandType          =  3,                  \
@@ -616,6 +626,8 @@ GEN75_3DPRIMITIVE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 10,                  \
    .DwordLength          =  1
 
+#define GEN75_3DSTATE_AA_LINE_PARAMETERS_length 0x00000003
+
 struct GEN75_3DSTATE_AA_LINE_PARAMETERS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -630,7 +642,7 @@ struct GEN75_3DSTATE_AA_LINE_PARAMETERS {
 
 static inline void
 GEN75_3DSTATE_AA_LINE_PARAMETERS_pack(__gen_user_data *data, void * restrict dst,
-                                    const struct GEN75_3DSTATE_AA_LINE_PARAMETERS * restrict values)
+                                      const struct GEN75_3DSTATE_AA_LINE_PARAMETERS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -661,6 +673,10 @@ GEN75_3DSTATE_AA_LINE_PARAMETERS_pack(__gen_user_data *data, void * restrict dst
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 70
 
+#define GEN75_3DSTATE_BINDING_TABLE_EDIT_DS_length 0x00000000
+
+#define GEN75_BINDING_TABLE_EDIT_ENTRY_length 0x00000001
+
 struct GEN75_BINDING_TABLE_EDIT_ENTRY {
    uint32_t                                     BindingTableIndex;
    uint32_t                                     SurfaceStatePointer;
@@ -668,7 +684,7 @@ struct GEN75_BINDING_TABLE_EDIT_ENTRY {
 
 static inline void
 GEN75_BINDING_TABLE_EDIT_ENTRY_pack(__gen_user_data *data, void * restrict dst,
-                                  const struct GEN75_BINDING_TABLE_EDIT_ENTRY * restrict values)
+                                    const struct GEN75_BINDING_TABLE_EDIT_ENTRY * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -695,7 +711,7 @@ struct GEN75_3DSTATE_BINDING_TABLE_EDIT_DS {
 
 static inline void
 GEN75_3DSTATE_BINDING_TABLE_EDIT_DS_pack(__gen_user_data *data, void * restrict dst,
-                                       const struct GEN75_3DSTATE_BINDING_TABLE_EDIT_DS * restrict values)
+                                         const struct GEN75_3DSTATE_BINDING_TABLE_EDIT_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -722,6 +738,8 @@ GEN75_3DSTATE_BINDING_TABLE_EDIT_DS_pack(__gen_user_data *data, void * restrict
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 68
 
+#define GEN75_3DSTATE_BINDING_TABLE_EDIT_GS_length 0x00000000
+
 struct GEN75_3DSTATE_BINDING_TABLE_EDIT_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -738,7 +756,7 @@ struct GEN75_3DSTATE_BINDING_TABLE_EDIT_GS {
 
 static inline void
 GEN75_3DSTATE_BINDING_TABLE_EDIT_GS_pack(__gen_user_data *data, void * restrict dst,
-                                       const struct GEN75_3DSTATE_BINDING_TABLE_EDIT_GS * restrict values)
+                                         const struct GEN75_3DSTATE_BINDING_TABLE_EDIT_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -765,6 +783,8 @@ GEN75_3DSTATE_BINDING_TABLE_EDIT_GS_pack(__gen_user_data *data, void * restrict
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 69
 
+#define GEN75_3DSTATE_BINDING_TABLE_EDIT_HS_length 0x00000000
+
 struct GEN75_3DSTATE_BINDING_TABLE_EDIT_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -781,7 +801,7 @@ struct GEN75_3DSTATE_BINDING_TABLE_EDIT_HS {
 
 static inline void
 GEN75_3DSTATE_BINDING_TABLE_EDIT_HS_pack(__gen_user_data *data, void * restrict dst,
-                                       const struct GEN75_3DSTATE_BINDING_TABLE_EDIT_HS * restrict values)
+                                         const struct GEN75_3DSTATE_BINDING_TABLE_EDIT_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -808,6 +828,8 @@ GEN75_3DSTATE_BINDING_TABLE_EDIT_HS_pack(__gen_user_data *data, void * restrict
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 71
 
+#define GEN75_3DSTATE_BINDING_TABLE_EDIT_PS_length 0x00000000
+
 struct GEN75_3DSTATE_BINDING_TABLE_EDIT_PS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -824,7 +846,7 @@ struct GEN75_3DSTATE_BINDING_TABLE_EDIT_PS {
 
 static inline void
 GEN75_3DSTATE_BINDING_TABLE_EDIT_PS_pack(__gen_user_data *data, void * restrict dst,
-                                       const struct GEN75_3DSTATE_BINDING_TABLE_EDIT_PS * restrict values)
+                                         const struct GEN75_3DSTATE_BINDING_TABLE_EDIT_PS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -851,6 +873,8 @@ GEN75_3DSTATE_BINDING_TABLE_EDIT_PS_pack(__gen_user_data *data, void * restrict
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 67
 
+#define GEN75_3DSTATE_BINDING_TABLE_EDIT_VS_length 0x00000000
+
 struct GEN75_3DSTATE_BINDING_TABLE_EDIT_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -867,7 +891,7 @@ struct GEN75_3DSTATE_BINDING_TABLE_EDIT_VS {
 
 static inline void
 GEN75_3DSTATE_BINDING_TABLE_EDIT_VS_pack(__gen_user_data *data, void * restrict dst,
-                                       const struct GEN75_3DSTATE_BINDING_TABLE_EDIT_VS * restrict values)
+                                         const struct GEN75_3DSTATE_BINDING_TABLE_EDIT_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -887,7 +911,6 @@ GEN75_3DSTATE_BINDING_TABLE_EDIT_VS_pack(__gen_user_data *data, void * restrict
    /* variable length fields follow */
 }
 
-#define GEN75_3DSTATE_BINDING_TABLE_POINTERS_DS_length 0x00000002
 #define GEN75_3DSTATE_BINDING_TABLE_POINTERS_DS_length_bias 0x00000002
 #define GEN75_3DSTATE_BINDING_TABLE_POINTERS_DS_header\
    .CommandType          =  3,                  \
@@ -896,6 +919,8 @@ GEN75_3DSTATE_BINDING_TABLE_EDIT_VS_pack(__gen_user_data *data, void * restrict
    ._3DCommandSubOpcode  = 40,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_BINDING_TABLE_POINTERS_DS_length 0x00000002
+
 struct GEN75_3DSTATE_BINDING_TABLE_POINTERS_DS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -907,7 +932,7 @@ struct GEN75_3DSTATE_BINDING_TABLE_POINTERS_DS {
 
 static inline void
 GEN75_3DSTATE_BINDING_TABLE_POINTERS_DS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN75_3DSTATE_BINDING_TABLE_POINTERS_DS * restrict values)
+                                             const struct GEN75_3DSTATE_BINDING_TABLE_POINTERS_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -925,7 +950,6 @@ GEN75_3DSTATE_BINDING_TABLE_POINTERS_DS_pack(__gen_user_data *data, void * restr
 
 }
 
-#define GEN75_3DSTATE_BINDING_TABLE_POINTERS_GS_length 0x00000002
 #define GEN75_3DSTATE_BINDING_TABLE_POINTERS_GS_length_bias 0x00000002
 #define GEN75_3DSTATE_BINDING_TABLE_POINTERS_GS_header\
    .CommandType          =  3,                  \
@@ -934,6 +958,8 @@ GEN75_3DSTATE_BINDING_TABLE_POINTERS_DS_pack(__gen_user_data *data, void * restr
    ._3DCommandSubOpcode  = 41,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_BINDING_TABLE_POINTERS_GS_length 0x00000002
+
 struct GEN75_3DSTATE_BINDING_TABLE_POINTERS_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -945,7 +971,7 @@ struct GEN75_3DSTATE_BINDING_TABLE_POINTERS_GS {
 
 static inline void
 GEN75_3DSTATE_BINDING_TABLE_POINTERS_GS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN75_3DSTATE_BINDING_TABLE_POINTERS_GS * restrict values)
+                                             const struct GEN75_3DSTATE_BINDING_TABLE_POINTERS_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -963,7 +989,6 @@ GEN75_3DSTATE_BINDING_TABLE_POINTERS_GS_pack(__gen_user_data *data, void * restr
 
 }
 
-#define GEN75_3DSTATE_BINDING_TABLE_POINTERS_HS_length 0x00000002
 #define GEN75_3DSTATE_BINDING_TABLE_POINTERS_HS_length_bias 0x00000002
 #define GEN75_3DSTATE_BINDING_TABLE_POINTERS_HS_header\
    .CommandType          =  3,                  \
@@ -972,6 +997,8 @@ GEN75_3DSTATE_BINDING_TABLE_POINTERS_GS_pack(__gen_user_data *data, void * restr
    ._3DCommandSubOpcode  = 39,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_BINDING_TABLE_POINTERS_HS_length 0x00000002
+
 struct GEN75_3DSTATE_BINDING_TABLE_POINTERS_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -983,7 +1010,7 @@ struct GEN75_3DSTATE_BINDING_TABLE_POINTERS_HS {
 
 static inline void
 GEN75_3DSTATE_BINDING_TABLE_POINTERS_HS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN75_3DSTATE_BINDING_TABLE_POINTERS_HS * restrict values)
+                                             const struct GEN75_3DSTATE_BINDING_TABLE_POINTERS_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1001,7 +1028,6 @@ GEN75_3DSTATE_BINDING_TABLE_POINTERS_HS_pack(__gen_user_data *data, void * restr
 
 }
 
-#define GEN75_3DSTATE_BINDING_TABLE_POINTERS_PS_length 0x00000002
 #define GEN75_3DSTATE_BINDING_TABLE_POINTERS_PS_length_bias 0x00000002
 #define GEN75_3DSTATE_BINDING_TABLE_POINTERS_PS_header\
    .CommandType          =  3,                  \
@@ -1010,6 +1036,8 @@ GEN75_3DSTATE_BINDING_TABLE_POINTERS_HS_pack(__gen_user_data *data, void * restr
    ._3DCommandSubOpcode  = 42,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_BINDING_TABLE_POINTERS_PS_length 0x00000002
+
 struct GEN75_3DSTATE_BINDING_TABLE_POINTERS_PS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1021,7 +1049,7 @@ struct GEN75_3DSTATE_BINDING_TABLE_POINTERS_PS {
 
 static inline void
 GEN75_3DSTATE_BINDING_TABLE_POINTERS_PS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN75_3DSTATE_BINDING_TABLE_POINTERS_PS * restrict values)
+                                             const struct GEN75_3DSTATE_BINDING_TABLE_POINTERS_PS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1039,7 +1067,6 @@ GEN75_3DSTATE_BINDING_TABLE_POINTERS_PS_pack(__gen_user_data *data, void * restr
 
 }
 
-#define GEN75_3DSTATE_BINDING_TABLE_POINTERS_VS_length 0x00000002
 #define GEN75_3DSTATE_BINDING_TABLE_POINTERS_VS_length_bias 0x00000002
 #define GEN75_3DSTATE_BINDING_TABLE_POINTERS_VS_header\
    .CommandType          =  3,                  \
@@ -1048,6 +1075,8 @@ GEN75_3DSTATE_BINDING_TABLE_POINTERS_PS_pack(__gen_user_data *data, void * restr
    ._3DCommandSubOpcode  = 38,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_BINDING_TABLE_POINTERS_VS_length 0x00000002
+
 struct GEN75_3DSTATE_BINDING_TABLE_POINTERS_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1059,7 +1088,7 @@ struct GEN75_3DSTATE_BINDING_TABLE_POINTERS_VS {
 
 static inline void
 GEN75_3DSTATE_BINDING_TABLE_POINTERS_VS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN75_3DSTATE_BINDING_TABLE_POINTERS_VS * restrict values)
+                                             const struct GEN75_3DSTATE_BINDING_TABLE_POINTERS_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1077,7 +1106,6 @@ GEN75_3DSTATE_BINDING_TABLE_POINTERS_VS_pack(__gen_user_data *data, void * restr
 
 }
 
-#define GEN75_3DSTATE_BINDING_TABLE_POOL_ALLOC_length 0x00000003
 #define GEN75_3DSTATE_BINDING_TABLE_POOL_ALLOC_length_bias 0x00000002
 #define GEN75_3DSTATE_BINDING_TABLE_POOL_ALLOC_header\
    .CommandType          =  3,                  \
@@ -1086,6 +1114,8 @@ GEN75_3DSTATE_BINDING_TABLE_POINTERS_VS_pack(__gen_user_data *data, void * restr
    ._3DCommandSubOpcode  = 25,                  \
    .DwordLength          =  1
 
+#define GEN75_3DSTATE_BINDING_TABLE_POOL_ALLOC_length 0x00000003
+
 struct GEN75_3DSTATE_BINDING_TABLE_POOL_ALLOC {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1100,7 +1130,7 @@ struct GEN75_3DSTATE_BINDING_TABLE_POOL_ALLOC {
 
 static inline void
 GEN75_3DSTATE_BINDING_TABLE_POOL_ALLOC_pack(__gen_user_data *data, void * restrict dst,
-                                          const struct GEN75_3DSTATE_BINDING_TABLE_POOL_ALLOC * restrict values)
+                                            const struct GEN75_3DSTATE_BINDING_TABLE_POOL_ALLOC * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1130,7 +1160,6 @@ GEN75_3DSTATE_BINDING_TABLE_POOL_ALLOC_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN75_3DSTATE_BLEND_STATE_POINTERS_length 0x00000002
 #define GEN75_3DSTATE_BLEND_STATE_POINTERS_length_bias 0x00000002
 #define GEN75_3DSTATE_BLEND_STATE_POINTERS_header\
    .CommandType          =  3,                  \
@@ -1139,6 +1168,8 @@ GEN75_3DSTATE_BINDING_TABLE_POOL_ALLOC_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 36,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_BLEND_STATE_POINTERS_length 0x00000002
+
 struct GEN75_3DSTATE_BLEND_STATE_POINTERS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1150,7 +1181,7 @@ struct GEN75_3DSTATE_BLEND_STATE_POINTERS {
 
 static inline void
 GEN75_3DSTATE_BLEND_STATE_POINTERS_pack(__gen_user_data *data, void * restrict dst,
-                                      const struct GEN75_3DSTATE_BLEND_STATE_POINTERS * restrict values)
+                                        const struct GEN75_3DSTATE_BLEND_STATE_POINTERS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1169,7 +1200,6 @@ GEN75_3DSTATE_BLEND_STATE_POINTERS_pack(__gen_user_data *data, void * restrict d
 
 }
 
-#define GEN75_3DSTATE_CC_STATE_POINTERS_length 0x00000002
 #define GEN75_3DSTATE_CC_STATE_POINTERS_length_bias 0x00000002
 #define GEN75_3DSTATE_CC_STATE_POINTERS_header  \
    .CommandType          =  3,                  \
@@ -1178,6 +1208,8 @@ GEN75_3DSTATE_BLEND_STATE_POINTERS_pack(__gen_user_data *data, void * restrict d
    ._3DCommandSubOpcode  = 14,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_CC_STATE_POINTERS_length 0x00000002
+
 struct GEN75_3DSTATE_CC_STATE_POINTERS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1189,7 +1221,7 @@ struct GEN75_3DSTATE_CC_STATE_POINTERS {
 
 static inline void
 GEN75_3DSTATE_CC_STATE_POINTERS_pack(__gen_user_data *data, void * restrict dst,
-                                   const struct GEN75_3DSTATE_CC_STATE_POINTERS * restrict values)
+                                     const struct GEN75_3DSTATE_CC_STATE_POINTERS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1208,7 +1240,6 @@ GEN75_3DSTATE_CC_STATE_POINTERS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_CHROMA_KEY_length 0x00000004
 #define GEN75_3DSTATE_CHROMA_KEY_length_bias 0x00000002
 #define GEN75_3DSTATE_CHROMA_KEY_header         \
    .CommandType          =  3,                  \
@@ -1217,6 +1248,8 @@ GEN75_3DSTATE_CC_STATE_POINTERS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  4,                  \
    .DwordLength          =  2
 
+#define GEN75_3DSTATE_CHROMA_KEY_length 0x00000004
+
 struct GEN75_3DSTATE_CHROMA_KEY {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1230,7 +1263,7 @@ struct GEN75_3DSTATE_CHROMA_KEY {
 
 static inline void
 GEN75_3DSTATE_CHROMA_KEY_pack(__gen_user_data *data, void * restrict dst,
-                            const struct GEN75_3DSTATE_CHROMA_KEY * restrict values)
+                              const struct GEN75_3DSTATE_CHROMA_KEY * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1256,7 +1289,6 @@ GEN75_3DSTATE_CHROMA_KEY_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_CLEAR_PARAMS_length 0x00000003
 #define GEN75_3DSTATE_CLEAR_PARAMS_length_bias 0x00000002
 #define GEN75_3DSTATE_CLEAR_PARAMS_header       \
    .CommandType          =  3,                  \
@@ -1265,6 +1297,8 @@ GEN75_3DSTATE_CHROMA_KEY_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  4,                  \
    .DwordLength          =  1
 
+#define GEN75_3DSTATE_CLEAR_PARAMS_length 0x00000003
+
 struct GEN75_3DSTATE_CLEAR_PARAMS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1277,7 +1311,7 @@ struct GEN75_3DSTATE_CLEAR_PARAMS {
 
 static inline void
 GEN75_3DSTATE_CLEAR_PARAMS_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN75_3DSTATE_CLEAR_PARAMS * restrict values)
+                                const struct GEN75_3DSTATE_CLEAR_PARAMS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1299,7 +1333,6 @@ GEN75_3DSTATE_CLEAR_PARAMS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_CLIP_length 0x00000004
 #define GEN75_3DSTATE_CLIP_length_bias 0x00000002
 #define GEN75_3DSTATE_CLIP_header               \
    .CommandType          =  3,                  \
@@ -1308,6 +1341,8 @@ GEN75_3DSTATE_CLEAR_PARAMS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 18,                  \
    .DwordLength          =  2
 
+#define GEN75_3DSTATE_CLIP_length 0x00000004
+
 struct GEN75_3DSTATE_CLIP {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1356,7 +1391,7 @@ struct GEN75_3DSTATE_CLIP {
 
 static inline void
 GEN75_3DSTATE_CLIP_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN75_3DSTATE_CLIP * restrict values)
+                        const struct GEN75_3DSTATE_CLIP * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1401,7 +1436,6 @@ GEN75_3DSTATE_CLIP_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_CONSTANT_DS_length 0x00000007
 #define GEN75_3DSTATE_CONSTANT_DS_length_bias 0x00000002
 #define GEN75_3DSTATE_CONSTANT_DS_header        \
    .CommandType          =  3,                  \
@@ -1410,6 +1444,10 @@ GEN75_3DSTATE_CLIP_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 26,                  \
    .DwordLength          =  5
 
+#define GEN75_3DSTATE_CONSTANT_DS_length 0x00000007
+
+#define GEN75_3DSTATE_CONSTANT_BODY_length 0x00000006
+
 struct GEN75_3DSTATE_CONSTANT_BODY {
    uint32_t                                     ConstantBuffer1ReadLength;
    uint32_t                                     ConstantBuffer0ReadLength;
@@ -1424,7 +1462,7 @@ struct GEN75_3DSTATE_CONSTANT_BODY {
 
 static inline void
 GEN75_3DSTATE_CONSTANT_BODY_pack(__gen_user_data *data, void * restrict dst,
-                               const struct GEN75_3DSTATE_CONSTANT_BODY * restrict values)
+                                 const struct GEN75_3DSTATE_CONSTANT_BODY * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1478,7 +1516,7 @@ struct GEN75_3DSTATE_CONSTANT_DS {
 
 static inline void
 GEN75_3DSTATE_CONSTANT_DS_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN75_3DSTATE_CONSTANT_DS * restrict values)
+                               const struct GEN75_3DSTATE_CONSTANT_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1493,7 +1531,6 @@ GEN75_3DSTATE_CONSTANT_DS_pack(__gen_user_data *data, void * restrict dst,
    GEN75_3DSTATE_CONSTANT_BODY_pack(data, &dw[1], &values->ConstantBody);
 }
 
-#define GEN75_3DSTATE_CONSTANT_GS_length 0x00000007
 #define GEN75_3DSTATE_CONSTANT_GS_length_bias 0x00000002
 #define GEN75_3DSTATE_CONSTANT_GS_header        \
    .CommandType          =  3,                  \
@@ -1502,6 +1539,8 @@ GEN75_3DSTATE_CONSTANT_DS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 22,                  \
    .DwordLength          =  5
 
+#define GEN75_3DSTATE_CONSTANT_GS_length 0x00000007
+
 struct GEN75_3DSTATE_CONSTANT_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1513,7 +1552,7 @@ struct GEN75_3DSTATE_CONSTANT_GS {
 
 static inline void
 GEN75_3DSTATE_CONSTANT_GS_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN75_3DSTATE_CONSTANT_GS * restrict values)
+                               const struct GEN75_3DSTATE_CONSTANT_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1528,7 +1567,6 @@ GEN75_3DSTATE_CONSTANT_GS_pack(__gen_user_data *data, void * restrict dst,
    GEN75_3DSTATE_CONSTANT_BODY_pack(data, &dw[1], &values->ConstantBody);
 }
 
-#define GEN75_3DSTATE_CONSTANT_HS_length 0x00000007
 #define GEN75_3DSTATE_CONSTANT_HS_length_bias 0x00000002
 #define GEN75_3DSTATE_CONSTANT_HS_header        \
    .CommandType          =  3,                  \
@@ -1537,6 +1575,8 @@ GEN75_3DSTATE_CONSTANT_GS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 25,                  \
    .DwordLength          =  5
 
+#define GEN75_3DSTATE_CONSTANT_HS_length 0x00000007
+
 struct GEN75_3DSTATE_CONSTANT_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1548,7 +1588,7 @@ struct GEN75_3DSTATE_CONSTANT_HS {
 
 static inline void
 GEN75_3DSTATE_CONSTANT_HS_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN75_3DSTATE_CONSTANT_HS * restrict values)
+                               const struct GEN75_3DSTATE_CONSTANT_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1563,7 +1603,6 @@ GEN75_3DSTATE_CONSTANT_HS_pack(__gen_user_data *data, void * restrict dst,
    GEN75_3DSTATE_CONSTANT_BODY_pack(data, &dw[1], &values->ConstantBody);
 }
 
-#define GEN75_3DSTATE_CONSTANT_PS_length 0x00000007
 #define GEN75_3DSTATE_CONSTANT_PS_length_bias 0x00000002
 #define GEN75_3DSTATE_CONSTANT_PS_header        \
    .CommandType          =  3,                  \
@@ -1572,6 +1611,8 @@ GEN75_3DSTATE_CONSTANT_HS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 23,                  \
    .DwordLength          =  5
 
+#define GEN75_3DSTATE_CONSTANT_PS_length 0x00000007
+
 struct GEN75_3DSTATE_CONSTANT_PS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1583,7 +1624,7 @@ struct GEN75_3DSTATE_CONSTANT_PS {
 
 static inline void
 GEN75_3DSTATE_CONSTANT_PS_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN75_3DSTATE_CONSTANT_PS * restrict values)
+                               const struct GEN75_3DSTATE_CONSTANT_PS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1598,7 +1639,6 @@ GEN75_3DSTATE_CONSTANT_PS_pack(__gen_user_data *data, void * restrict dst,
    GEN75_3DSTATE_CONSTANT_BODY_pack(data, &dw[1], &values->ConstantBody);
 }
 
-#define GEN75_3DSTATE_CONSTANT_VS_length 0x00000007
 #define GEN75_3DSTATE_CONSTANT_VS_length_bias 0x00000002
 #define GEN75_3DSTATE_CONSTANT_VS_header        \
    .CommandType          =  3,                  \
@@ -1607,6 +1647,8 @@ GEN75_3DSTATE_CONSTANT_PS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 21,                  \
    .DwordLength          =  5
 
+#define GEN75_3DSTATE_CONSTANT_VS_length 0x00000007
+
 struct GEN75_3DSTATE_CONSTANT_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1618,7 +1660,7 @@ struct GEN75_3DSTATE_CONSTANT_VS {
 
 static inline void
 GEN75_3DSTATE_CONSTANT_VS_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN75_3DSTATE_CONSTANT_VS * restrict values)
+                               const struct GEN75_3DSTATE_CONSTANT_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1633,7 +1675,6 @@ GEN75_3DSTATE_CONSTANT_VS_pack(__gen_user_data *data, void * restrict dst,
    GEN75_3DSTATE_CONSTANT_BODY_pack(data, &dw[1], &values->ConstantBody);
 }
 
-#define GEN75_3DSTATE_DEPTH_BUFFER_length 0x00000007
 #define GEN75_3DSTATE_DEPTH_BUFFER_length_bias 0x00000002
 #define GEN75_3DSTATE_DEPTH_BUFFER_header       \
    .CommandType          =  3,                  \
@@ -1642,6 +1683,8 @@ GEN75_3DSTATE_CONSTANT_VS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  5,                  \
    .DwordLength          =  5
 
+#define GEN75_3DSTATE_DEPTH_BUFFER_length 0x00000007
+
 struct GEN75_3DSTATE_DEPTH_BUFFER {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1677,7 +1720,7 @@ struct GEN75_3DSTATE_DEPTH_BUFFER {
 
 static inline void
 GEN75_3DSTATE_DEPTH_BUFFER_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN75_3DSTATE_DEPTH_BUFFER * restrict values)
+                                const struct GEN75_3DSTATE_DEPTH_BUFFER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1729,7 +1772,6 @@ GEN75_3DSTATE_DEPTH_BUFFER_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_DEPTH_STENCIL_STATE_POINTERS_length 0x00000002
 #define GEN75_3DSTATE_DEPTH_STENCIL_STATE_POINTERS_length_bias 0x00000002
 #define GEN75_3DSTATE_DEPTH_STENCIL_STATE_POINTERS_header\
    .CommandType          =  3,                  \
@@ -1738,6 +1780,8 @@ GEN75_3DSTATE_DEPTH_BUFFER_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 37,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_DEPTH_STENCIL_STATE_POINTERS_length 0x00000002
+
 struct GEN75_3DSTATE_DEPTH_STENCIL_STATE_POINTERS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1749,7 +1793,7 @@ struct GEN75_3DSTATE_DEPTH_STENCIL_STATE_POINTERS {
 
 static inline void
 GEN75_3DSTATE_DEPTH_STENCIL_STATE_POINTERS_pack(__gen_user_data *data, void * restrict dst,
-                                              const struct GEN75_3DSTATE_DEPTH_STENCIL_STATE_POINTERS * restrict values)
+                                                const struct GEN75_3DSTATE_DEPTH_STENCIL_STATE_POINTERS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1768,7 +1812,6 @@ GEN75_3DSTATE_DEPTH_STENCIL_STATE_POINTERS_pack(__gen_user_data *data, void * re
 
 }
 
-#define GEN75_3DSTATE_DRAWING_RECTANGLE_length 0x00000004
 #define GEN75_3DSTATE_DRAWING_RECTANGLE_length_bias 0x00000002
 #define GEN75_3DSTATE_DRAWING_RECTANGLE_header  \
    .CommandType          =  3,                  \
@@ -1777,6 +1820,8 @@ GEN75_3DSTATE_DEPTH_STENCIL_STATE_POINTERS_pack(__gen_user_data *data, void * re
    ._3DCommandSubOpcode  =  0,                  \
    .DwordLength          =  2
 
+#define GEN75_3DSTATE_DRAWING_RECTANGLE_length 0x00000004
+
 struct GEN75_3DSTATE_DRAWING_RECTANGLE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1797,7 +1842,7 @@ struct GEN75_3DSTATE_DRAWING_RECTANGLE {
 
 static inline void
 GEN75_3DSTATE_DRAWING_RECTANGLE_pack(__gen_user_data *data, void * restrict dst,
-                                   const struct GEN75_3DSTATE_DRAWING_RECTANGLE * restrict values)
+                                     const struct GEN75_3DSTATE_DRAWING_RECTANGLE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1827,7 +1872,6 @@ GEN75_3DSTATE_DRAWING_RECTANGLE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_DS_length 0x00000006
 #define GEN75_3DSTATE_DS_length_bias 0x00000002
 #define GEN75_3DSTATE_DS_header                 \
    .CommandType          =  3,                  \
@@ -1836,6 +1880,8 @@ GEN75_3DSTATE_DRAWING_RECTANGLE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 29,                  \
    .DwordLength          =  4
 
+#define GEN75_3DSTATE_DS_length 0x00000006
+
 struct GEN75_3DSTATE_DS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1879,7 +1925,7 @@ struct GEN75_3DSTATE_DS {
 
 static inline void
 GEN75_3DSTATE_DS_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN75_3DSTATE_DS * restrict values)
+                      const struct GEN75_3DSTATE_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1935,6 +1981,10 @@ GEN75_3DSTATE_DS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 55
 
+#define GEN75_3DSTATE_GATHER_CONSTANT_DS_length 0x00000000
+
+#define GEN75_GATHER_CONSTANT_ENTRY_length 0x00000001
+
 struct GEN75_GATHER_CONSTANT_ENTRY {
    uint32_t                                     ConstantBufferOffset;
    uint32_t                                     ChannelMask;
@@ -1943,7 +1993,7 @@ struct GEN75_GATHER_CONSTANT_ENTRY {
 
 static inline void
 GEN75_GATHER_CONSTANT_ENTRY_pack(__gen_user_data *data, void * restrict dst,
-                               const struct GEN75_GATHER_CONSTANT_ENTRY * restrict values)
+                                 const struct GEN75_GATHER_CONSTANT_ENTRY * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1969,7 +2019,7 @@ struct GEN75_3DSTATE_GATHER_CONSTANT_DS {
 
 static inline void
 GEN75_3DSTATE_GATHER_CONSTANT_DS_pack(__gen_user_data *data, void * restrict dst,
-                                    const struct GEN75_3DSTATE_GATHER_CONSTANT_DS * restrict values)
+                                      const struct GEN75_3DSTATE_GATHER_CONSTANT_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2000,6 +2050,8 @@ GEN75_3DSTATE_GATHER_CONSTANT_DS_pack(__gen_user_data *data, void * restrict dst
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 53
 
+#define GEN75_3DSTATE_GATHER_CONSTANT_GS_length 0x00000000
+
 struct GEN75_3DSTATE_GATHER_CONSTANT_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2014,7 +2066,7 @@ struct GEN75_3DSTATE_GATHER_CONSTANT_GS {
 
 static inline void
 GEN75_3DSTATE_GATHER_CONSTANT_GS_pack(__gen_user_data *data, void * restrict dst,
-                                    const struct GEN75_3DSTATE_GATHER_CONSTANT_GS * restrict values)
+                                      const struct GEN75_3DSTATE_GATHER_CONSTANT_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2045,6 +2097,8 @@ GEN75_3DSTATE_GATHER_CONSTANT_GS_pack(__gen_user_data *data, void * restrict dst
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 54
 
+#define GEN75_3DSTATE_GATHER_CONSTANT_HS_length 0x00000000
+
 struct GEN75_3DSTATE_GATHER_CONSTANT_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2059,7 +2113,7 @@ struct GEN75_3DSTATE_GATHER_CONSTANT_HS {
 
 static inline void
 GEN75_3DSTATE_GATHER_CONSTANT_HS_pack(__gen_user_data *data, void * restrict dst,
-                                    const struct GEN75_3DSTATE_GATHER_CONSTANT_HS * restrict values)
+                                      const struct GEN75_3DSTATE_GATHER_CONSTANT_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2090,6 +2144,8 @@ GEN75_3DSTATE_GATHER_CONSTANT_HS_pack(__gen_user_data *data, void * restrict dst
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 56
 
+#define GEN75_3DSTATE_GATHER_CONSTANT_PS_length 0x00000000
+
 struct GEN75_3DSTATE_GATHER_CONSTANT_PS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2105,7 +2161,7 @@ struct GEN75_3DSTATE_GATHER_CONSTANT_PS {
 
 static inline void
 GEN75_3DSTATE_GATHER_CONSTANT_PS_pack(__gen_user_data *data, void * restrict dst,
-                                    const struct GEN75_3DSTATE_GATHER_CONSTANT_PS * restrict values)
+                                      const struct GEN75_3DSTATE_GATHER_CONSTANT_PS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2137,6 +2193,8 @@ GEN75_3DSTATE_GATHER_CONSTANT_PS_pack(__gen_user_data *data, void * restrict dst
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 52
 
+#define GEN75_3DSTATE_GATHER_CONSTANT_VS_length 0x00000000
+
 struct GEN75_3DSTATE_GATHER_CONSTANT_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2152,7 +2210,7 @@ struct GEN75_3DSTATE_GATHER_CONSTANT_VS {
 
 static inline void
 GEN75_3DSTATE_GATHER_CONSTANT_VS_pack(__gen_user_data *data, void * restrict dst,
-                                    const struct GEN75_3DSTATE_GATHER_CONSTANT_VS * restrict values)
+                                      const struct GEN75_3DSTATE_GATHER_CONSTANT_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2177,7 +2235,6 @@ GEN75_3DSTATE_GATHER_CONSTANT_VS_pack(__gen_user_data *data, void * restrict dst
    /* variable length fields follow */
 }
 
-#define GEN75_3DSTATE_GATHER_POOL_ALLOC_length 0x00000003
 #define GEN75_3DSTATE_GATHER_POOL_ALLOC_length_bias 0x00000002
 #define GEN75_3DSTATE_GATHER_POOL_ALLOC_header  \
    .CommandType          =  3,                  \
@@ -2186,6 +2243,8 @@ GEN75_3DSTATE_GATHER_CONSTANT_VS_pack(__gen_user_data *data, void * restrict dst
    ._3DCommandSubOpcode  = 26,                  \
    .DwordLength          =  1
 
+#define GEN75_3DSTATE_GATHER_POOL_ALLOC_length 0x00000003
+
 struct GEN75_3DSTATE_GATHER_POOL_ALLOC {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2200,7 +2259,7 @@ struct GEN75_3DSTATE_GATHER_POOL_ALLOC {
 
 static inline void
 GEN75_3DSTATE_GATHER_POOL_ALLOC_pack(__gen_user_data *data, void * restrict dst,
-                                   const struct GEN75_3DSTATE_GATHER_POOL_ALLOC * restrict values)
+                                     const struct GEN75_3DSTATE_GATHER_POOL_ALLOC * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2231,7 +2290,6 @@ GEN75_3DSTATE_GATHER_POOL_ALLOC_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_GS_length 0x00000007
 #define GEN75_3DSTATE_GS_length_bias 0x00000002
 #define GEN75_3DSTATE_GS_header                 \
    .CommandType          =  3,                  \
@@ -2240,6 +2298,8 @@ GEN75_3DSTATE_GATHER_POOL_ALLOC_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 17,                  \
    .DwordLength          =  5
 
+#define GEN75_3DSTATE_GS_length 0x00000007
+
 struct GEN75_3DSTATE_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2301,7 +2361,7 @@ struct GEN75_3DSTATE_GS {
 
 static inline void
 GEN75_3DSTATE_GS_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN75_3DSTATE_GS * restrict values)
+                      const struct GEN75_3DSTATE_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2366,7 +2426,6 @@ GEN75_3DSTATE_GS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_HIER_DEPTH_BUFFER_length 0x00000003
 #define GEN75_3DSTATE_HIER_DEPTH_BUFFER_length_bias 0x00000002
 #define GEN75_3DSTATE_HIER_DEPTH_BUFFER_header  \
    .CommandType          =  3,                  \
@@ -2375,6 +2434,8 @@ GEN75_3DSTATE_GS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  7,                  \
    .DwordLength          =  1
 
+#define GEN75_3DSTATE_HIER_DEPTH_BUFFER_length 0x00000003
+
 struct GEN75_3DSTATE_HIER_DEPTH_BUFFER {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2388,7 +2449,7 @@ struct GEN75_3DSTATE_HIER_DEPTH_BUFFER {
 
 static inline void
 GEN75_3DSTATE_HIER_DEPTH_BUFFER_pack(__gen_user_data *data, void * restrict dst,
-                                   const struct GEN75_3DSTATE_HIER_DEPTH_BUFFER * restrict values)
+                                     const struct GEN75_3DSTATE_HIER_DEPTH_BUFFER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2415,7 +2476,6 @@ GEN75_3DSTATE_HIER_DEPTH_BUFFER_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_HS_length 0x00000007
 #define GEN75_3DSTATE_HS_length_bias 0x00000002
 #define GEN75_3DSTATE_HS_header                 \
    .CommandType          =  3,                  \
@@ -2424,6 +2484,8 @@ GEN75_3DSTATE_HIER_DEPTH_BUFFER_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 27,                  \
    .DwordLength          =  5
 
+#define GEN75_3DSTATE_HS_length 0x00000007
+
 struct GEN75_3DSTATE_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2466,7 +2528,7 @@ struct GEN75_3DSTATE_HS {
 
 static inline void
 GEN75_3DSTATE_HS_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN75_3DSTATE_HS * restrict values)
+                      const struct GEN75_3DSTATE_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2519,7 +2581,6 @@ GEN75_3DSTATE_HS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_INDEX_BUFFER_length 0x00000003
 #define GEN75_3DSTATE_INDEX_BUFFER_length_bias 0x00000002
 #define GEN75_3DSTATE_INDEX_BUFFER_header       \
    .CommandType          =  3,                  \
@@ -2528,6 +2589,8 @@ GEN75_3DSTATE_HS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 10,                  \
    .DwordLength          =  1
 
+#define GEN75_3DSTATE_INDEX_BUFFER_length 0x00000003
+
 struct GEN75_3DSTATE_INDEX_BUFFER {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2545,7 +2608,7 @@ struct GEN75_3DSTATE_INDEX_BUFFER {
 
 static inline void
 GEN75_3DSTATE_INDEX_BUFFER_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN75_3DSTATE_INDEX_BUFFER * restrict values)
+                                const struct GEN75_3DSTATE_INDEX_BUFFER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2575,7 +2638,6 @@ GEN75_3DSTATE_INDEX_BUFFER_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_LINE_STIPPLE_length 0x00000003
 #define GEN75_3DSTATE_LINE_STIPPLE_length_bias 0x00000002
 #define GEN75_3DSTATE_LINE_STIPPLE_header       \
    .CommandType          =  3,                  \
@@ -2584,6 +2646,8 @@ GEN75_3DSTATE_INDEX_BUFFER_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  8,                  \
    .DwordLength          =  1
 
+#define GEN75_3DSTATE_LINE_STIPPLE_length 0x00000003
+
 struct GEN75_3DSTATE_LINE_STIPPLE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2600,7 +2664,7 @@ struct GEN75_3DSTATE_LINE_STIPPLE {
 
 static inline void
 GEN75_3DSTATE_LINE_STIPPLE_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN75_3DSTATE_LINE_STIPPLE * restrict values)
+                                const struct GEN75_3DSTATE_LINE_STIPPLE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2626,7 +2690,6 @@ GEN75_3DSTATE_LINE_STIPPLE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_MONOFILTER_SIZE_length 0x00000002
 #define GEN75_3DSTATE_MONOFILTER_SIZE_length_bias 0x00000002
 #define GEN75_3DSTATE_MONOFILTER_SIZE_header    \
    .CommandType          =  3,                  \
@@ -2635,6 +2698,8 @@ GEN75_3DSTATE_LINE_STIPPLE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 17,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_MONOFILTER_SIZE_length 0x00000002
+
 struct GEN75_3DSTATE_MONOFILTER_SIZE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2647,7 +2712,7 @@ struct GEN75_3DSTATE_MONOFILTER_SIZE {
 
 static inline void
 GEN75_3DSTATE_MONOFILTER_SIZE_pack(__gen_user_data *data, void * restrict dst,
-                                 const struct GEN75_3DSTATE_MONOFILTER_SIZE * restrict values)
+                                   const struct GEN75_3DSTATE_MONOFILTER_SIZE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2666,7 +2731,6 @@ GEN75_3DSTATE_MONOFILTER_SIZE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_MULTISAMPLE_length 0x00000004
 #define GEN75_3DSTATE_MULTISAMPLE_length_bias 0x00000002
 #define GEN75_3DSTATE_MULTISAMPLE_header        \
    .CommandType          =  3,                  \
@@ -2675,6 +2739,8 @@ GEN75_3DSTATE_MONOFILTER_SIZE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 13,                  \
    .DwordLength          =  2
 
+#define GEN75_3DSTATE_MULTISAMPLE_length 0x00000004
+
 struct GEN75_3DSTATE_MULTISAMPLE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2709,7 +2775,7 @@ struct GEN75_3DSTATE_MULTISAMPLE {
 
 static inline void
 GEN75_3DSTATE_MULTISAMPLE_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN75_3DSTATE_MULTISAMPLE * restrict values)
+                               const struct GEN75_3DSTATE_MULTISAMPLE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2751,7 +2817,6 @@ GEN75_3DSTATE_MULTISAMPLE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_POLY_STIPPLE_OFFSET_length 0x00000002
 #define GEN75_3DSTATE_POLY_STIPPLE_OFFSET_length_bias 0x00000002
 #define GEN75_3DSTATE_POLY_STIPPLE_OFFSET_header\
    .CommandType          =  3,                  \
@@ -2760,6 +2825,8 @@ GEN75_3DSTATE_MULTISAMPLE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  6,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_POLY_STIPPLE_OFFSET_length 0x00000002
+
 struct GEN75_3DSTATE_POLY_STIPPLE_OFFSET {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2772,7 +2839,7 @@ struct GEN75_3DSTATE_POLY_STIPPLE_OFFSET {
 
 static inline void
 GEN75_3DSTATE_POLY_STIPPLE_OFFSET_pack(__gen_user_data *data, void * restrict dst,
-                                     const struct GEN75_3DSTATE_POLY_STIPPLE_OFFSET * restrict values)
+                                       const struct GEN75_3DSTATE_POLY_STIPPLE_OFFSET * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2791,7 +2858,6 @@ GEN75_3DSTATE_POLY_STIPPLE_OFFSET_pack(__gen_user_data *data, void * restrict ds
 
 }
 
-#define GEN75_3DSTATE_POLY_STIPPLE_PATTERN_length 0x00000021
 #define GEN75_3DSTATE_POLY_STIPPLE_PATTERN_length_bias 0x00000002
 #define GEN75_3DSTATE_POLY_STIPPLE_PATTERN_header\
    .CommandType          =  3,                  \
@@ -2800,6 +2866,8 @@ GEN75_3DSTATE_POLY_STIPPLE_OFFSET_pack(__gen_user_data *data, void * restrict ds
    ._3DCommandSubOpcode  =  7,                  \
    .DwordLength          = 31
 
+#define GEN75_3DSTATE_POLY_STIPPLE_PATTERN_length 0x00000021
+
 struct GEN75_3DSTATE_POLY_STIPPLE_PATTERN {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2811,7 +2879,7 @@ struct GEN75_3DSTATE_POLY_STIPPLE_PATTERN {
 
 static inline void
 GEN75_3DSTATE_POLY_STIPPLE_PATTERN_pack(__gen_user_data *data, void * restrict dst,
-                                      const struct GEN75_3DSTATE_POLY_STIPPLE_PATTERN * restrict values)
+                                        const struct GEN75_3DSTATE_POLY_STIPPLE_PATTERN * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2831,7 +2899,6 @@ GEN75_3DSTATE_POLY_STIPPLE_PATTERN_pack(__gen_user_data *data, void * restrict d
 
 }
 
-#define GEN75_3DSTATE_PS_length 0x00000008
 #define GEN75_3DSTATE_PS_length_bias 0x00000002
 #define GEN75_3DSTATE_PS_header                 \
    .CommandType          =  3,                  \
@@ -2840,6 +2907,8 @@ GEN75_3DSTATE_POLY_STIPPLE_PATTERN_pack(__gen_user_data *data, void * restrict d
    ._3DCommandSubOpcode  = 32,                  \
    .DwordLength          =  6
 
+#define GEN75_3DSTATE_PS_length 0x00000008
+
 struct GEN75_3DSTATE_PS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2899,7 +2968,7 @@ struct GEN75_3DSTATE_PS {
 
 static inline void
 GEN75_3DSTATE_PS_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN75_3DSTATE_PS * restrict values)
+                      const struct GEN75_3DSTATE_PS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2966,7 +3035,6 @@ GEN75_3DSTATE_PS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_DS_length 0x00000002
 #define GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_DS_length_bias 0x00000002
 #define GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_DS_header\
    .CommandType          =  3,                  \
@@ -2975,6 +3043,8 @@ GEN75_3DSTATE_PS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 20,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_DS_length 0x00000002
+
 struct GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_DS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2987,7 +3057,7 @@ struct GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_DS {
 
 static inline void
 GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_DS_pack(__gen_user_data *data, void * restrict dst,
-                                        const struct GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_DS * restrict values)
+                                          const struct GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3006,7 +3076,6 @@ GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_DS_pack(__gen_user_data *data, void * restrict
 
 }
 
-#define GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_GS_length 0x00000002
 #define GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_GS_length_bias 0x00000002
 #define GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_GS_header\
    .CommandType          =  3,                  \
@@ -3015,6 +3084,8 @@ GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_DS_pack(__gen_user_data *data, void * restrict
    ._3DCommandSubOpcode  = 21,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_GS_length 0x00000002
+
 struct GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3027,7 +3098,7 @@ struct GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_GS {
 
 static inline void
 GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_GS_pack(__gen_user_data *data, void * restrict dst,
-                                        const struct GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_GS * restrict values)
+                                          const struct GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3046,7 +3117,6 @@ GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_GS_pack(__gen_user_data *data, void * restrict
 
 }
 
-#define GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_HS_length 0x00000002
 #define GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_HS_length_bias 0x00000002
 #define GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_HS_header\
    .CommandType          =  3,                  \
@@ -3055,6 +3125,8 @@ GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_GS_pack(__gen_user_data *data, void * restrict
    ._3DCommandSubOpcode  = 19,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_HS_length 0x00000002
+
 struct GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3067,7 +3139,7 @@ struct GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_HS {
 
 static inline void
 GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_HS_pack(__gen_user_data *data, void * restrict dst,
-                                        const struct GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_HS * restrict values)
+                                          const struct GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3086,7 +3158,6 @@ GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_HS_pack(__gen_user_data *data, void * restrict
 
 }
 
-#define GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_PS_length 0x00000002
 #define GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_PS_length_bias 0x00000002
 #define GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_PS_header\
    .CommandType          =  3,                  \
@@ -3095,6 +3166,8 @@ GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_HS_pack(__gen_user_data *data, void * restrict
    ._3DCommandSubOpcode  = 22,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_PS_length 0x00000002
+
 struct GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_PS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3107,7 +3180,7 @@ struct GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_PS {
 
 static inline void
 GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_PS_pack(__gen_user_data *data, void * restrict dst,
-                                        const struct GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_PS * restrict values)
+                                          const struct GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_PS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3126,7 +3199,6 @@ GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_PS_pack(__gen_user_data *data, void * restrict
 
 }
 
-#define GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_VS_length 0x00000002
 #define GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_VS_length_bias 0x00000002
 #define GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_VS_header\
    .CommandType          =  3,                  \
@@ -3135,6 +3207,8 @@ GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_PS_pack(__gen_user_data *data, void * restrict
    ._3DCommandSubOpcode  = 18,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_VS_length 0x00000002
+
 struct GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3147,7 +3221,7 @@ struct GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_VS {
 
 static inline void
 GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_VS_pack(__gen_user_data *data, void * restrict dst,
-                                        const struct GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_VS * restrict values)
+                                          const struct GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3166,7 +3240,6 @@ GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_VS_pack(__gen_user_data *data, void * restrict
 
 }
 
-#define GEN75_3DSTATE_RAST_MULTISAMPLE_length 0x00000006
 #define GEN75_3DSTATE_RAST_MULTISAMPLE_length_bias 0x00000002
 #define GEN75_3DSTATE_RAST_MULTISAMPLE_header   \
    .CommandType          =  3,                  \
@@ -3175,6 +3248,8 @@ GEN75_3DSTATE_PUSH_CONSTANT_ALLOC_VS_pack(__gen_user_data *data, void * restrict
    ._3DCommandSubOpcode  = 14,                  \
    .DwordLength          =  4
 
+#define GEN75_3DSTATE_RAST_MULTISAMPLE_length 0x00000006
+
 struct GEN75_3DSTATE_RAST_MULTISAMPLE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3223,7 +3298,7 @@ struct GEN75_3DSTATE_RAST_MULTISAMPLE {
 
 static inline void
 GEN75_3DSTATE_RAST_MULTISAMPLE_pack(__gen_user_data *data, void * restrict dst,
-                                  const struct GEN75_3DSTATE_RAST_MULTISAMPLE * restrict values)
+                                    const struct GEN75_3DSTATE_RAST_MULTISAMPLE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3292,6 +3367,10 @@ GEN75_3DSTATE_RAST_MULTISAMPLE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  1,                  \
    ._3DCommandSubOpcode  =  2
 
+#define GEN75_3DSTATE_SAMPLER_PALETTE_LOAD0_length 0x00000000
+
+#define GEN75_PALETTE_ENTRY_length 0x00000001
+
 struct GEN75_PALETTE_ENTRY {
    uint32_t                                     Alpha;
    uint32_t                                     Red;
@@ -3301,7 +3380,7 @@ struct GEN75_PALETTE_ENTRY {
 
 static inline void
 GEN75_PALETTE_ENTRY_pack(__gen_user_data *data, void * restrict dst,
-                       const struct GEN75_PALETTE_ENTRY * restrict values)
+                         const struct GEN75_PALETTE_ENTRY * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3325,7 +3404,7 @@ struct GEN75_3DSTATE_SAMPLER_PALETTE_LOAD0 {
 
 static inline void
 GEN75_3DSTATE_SAMPLER_PALETTE_LOAD0_pack(__gen_user_data *data, void * restrict dst,
-                                       const struct GEN75_3DSTATE_SAMPLER_PALETTE_LOAD0 * restrict values)
+                                         const struct GEN75_3DSTATE_SAMPLER_PALETTE_LOAD0 * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3347,6 +3426,8 @@ GEN75_3DSTATE_SAMPLER_PALETTE_LOAD0_pack(__gen_user_data *data, void * restrict
    ._3DCommandOpcode     =  1,                  \
    ._3DCommandSubOpcode  = 12
 
+#define GEN75_3DSTATE_SAMPLER_PALETTE_LOAD1_length 0x00000000
+
 struct GEN75_3DSTATE_SAMPLER_PALETTE_LOAD1 {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3358,7 +3439,7 @@ struct GEN75_3DSTATE_SAMPLER_PALETTE_LOAD1 {
 
 static inline void
 GEN75_3DSTATE_SAMPLER_PALETTE_LOAD1_pack(__gen_user_data *data, void * restrict dst,
-                                       const struct GEN75_3DSTATE_SAMPLER_PALETTE_LOAD1 * restrict values)
+                                         const struct GEN75_3DSTATE_SAMPLER_PALETTE_LOAD1 * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3373,7 +3454,6 @@ GEN75_3DSTATE_SAMPLER_PALETTE_LOAD1_pack(__gen_user_data *data, void * restrict
    /* variable length fields follow */
 }
 
-#define GEN75_3DSTATE_SAMPLER_STATE_POINTERS_DS_length 0x00000002
 #define GEN75_3DSTATE_SAMPLER_STATE_POINTERS_DS_length_bias 0x00000002
 #define GEN75_3DSTATE_SAMPLER_STATE_POINTERS_DS_header\
    .CommandType          =  3,                  \
@@ -3382,6 +3462,8 @@ GEN75_3DSTATE_SAMPLER_PALETTE_LOAD1_pack(__gen_user_data *data, void * restrict
    ._3DCommandSubOpcode  = 45,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_SAMPLER_STATE_POINTERS_DS_length 0x00000002
+
 struct GEN75_3DSTATE_SAMPLER_STATE_POINTERS_DS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3393,7 +3475,7 @@ struct GEN75_3DSTATE_SAMPLER_STATE_POINTERS_DS {
 
 static inline void
 GEN75_3DSTATE_SAMPLER_STATE_POINTERS_DS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN75_3DSTATE_SAMPLER_STATE_POINTERS_DS * restrict values)
+                                             const struct GEN75_3DSTATE_SAMPLER_STATE_POINTERS_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3411,7 +3493,6 @@ GEN75_3DSTATE_SAMPLER_STATE_POINTERS_DS_pack(__gen_user_data *data, void * restr
 
 }
 
-#define GEN75_3DSTATE_SAMPLER_STATE_POINTERS_GS_length 0x00000002
 #define GEN75_3DSTATE_SAMPLER_STATE_POINTERS_GS_length_bias 0x00000002
 #define GEN75_3DSTATE_SAMPLER_STATE_POINTERS_GS_header\
    .CommandType          =  3,                  \
@@ -3420,6 +3501,8 @@ GEN75_3DSTATE_SAMPLER_STATE_POINTERS_DS_pack(__gen_user_data *data, void * restr
    ._3DCommandSubOpcode  = 46,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_SAMPLER_STATE_POINTERS_GS_length 0x00000002
+
 struct GEN75_3DSTATE_SAMPLER_STATE_POINTERS_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3431,7 +3514,7 @@ struct GEN75_3DSTATE_SAMPLER_STATE_POINTERS_GS {
 
 static inline void
 GEN75_3DSTATE_SAMPLER_STATE_POINTERS_GS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN75_3DSTATE_SAMPLER_STATE_POINTERS_GS * restrict values)
+                                             const struct GEN75_3DSTATE_SAMPLER_STATE_POINTERS_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3449,7 +3532,6 @@ GEN75_3DSTATE_SAMPLER_STATE_POINTERS_GS_pack(__gen_user_data *data, void * restr
 
 }
 
-#define GEN75_3DSTATE_SAMPLER_STATE_POINTERS_HS_length 0x00000002
 #define GEN75_3DSTATE_SAMPLER_STATE_POINTERS_HS_length_bias 0x00000002
 #define GEN75_3DSTATE_SAMPLER_STATE_POINTERS_HS_header\
    .CommandType          =  3,                  \
@@ -3458,6 +3540,8 @@ GEN75_3DSTATE_SAMPLER_STATE_POINTERS_GS_pack(__gen_user_data *data, void * restr
    ._3DCommandSubOpcode  = 44,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_SAMPLER_STATE_POINTERS_HS_length 0x00000002
+
 struct GEN75_3DSTATE_SAMPLER_STATE_POINTERS_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3469,7 +3553,7 @@ struct GEN75_3DSTATE_SAMPLER_STATE_POINTERS_HS {
 
 static inline void
 GEN75_3DSTATE_SAMPLER_STATE_POINTERS_HS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN75_3DSTATE_SAMPLER_STATE_POINTERS_HS * restrict values)
+                                             const struct GEN75_3DSTATE_SAMPLER_STATE_POINTERS_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3487,7 +3571,6 @@ GEN75_3DSTATE_SAMPLER_STATE_POINTERS_HS_pack(__gen_user_data *data, void * restr
 
 }
 
-#define GEN75_3DSTATE_SAMPLER_STATE_POINTERS_PS_length 0x00000002
 #define GEN75_3DSTATE_SAMPLER_STATE_POINTERS_PS_length_bias 0x00000002
 #define GEN75_3DSTATE_SAMPLER_STATE_POINTERS_PS_header\
    .CommandType          =  3,                  \
@@ -3496,6 +3579,8 @@ GEN75_3DSTATE_SAMPLER_STATE_POINTERS_HS_pack(__gen_user_data *data, void * restr
    ._3DCommandSubOpcode  = 47,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_SAMPLER_STATE_POINTERS_PS_length 0x00000002
+
 struct GEN75_3DSTATE_SAMPLER_STATE_POINTERS_PS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3507,7 +3592,7 @@ struct GEN75_3DSTATE_SAMPLER_STATE_POINTERS_PS {
 
 static inline void
 GEN75_3DSTATE_SAMPLER_STATE_POINTERS_PS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN75_3DSTATE_SAMPLER_STATE_POINTERS_PS * restrict values)
+                                             const struct GEN75_3DSTATE_SAMPLER_STATE_POINTERS_PS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3525,7 +3610,6 @@ GEN75_3DSTATE_SAMPLER_STATE_POINTERS_PS_pack(__gen_user_data *data, void * restr
 
 }
 
-#define GEN75_3DSTATE_SAMPLER_STATE_POINTERS_VS_length 0x00000002
 #define GEN75_3DSTATE_SAMPLER_STATE_POINTERS_VS_length_bias 0x00000002
 #define GEN75_3DSTATE_SAMPLER_STATE_POINTERS_VS_header\
    .CommandType          =  3,                  \
@@ -3534,6 +3618,8 @@ GEN75_3DSTATE_SAMPLER_STATE_POINTERS_PS_pack(__gen_user_data *data, void * restr
    ._3DCommandSubOpcode  = 43,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_SAMPLER_STATE_POINTERS_VS_length 0x00000002
+
 struct GEN75_3DSTATE_SAMPLER_STATE_POINTERS_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3545,7 +3631,7 @@ struct GEN75_3DSTATE_SAMPLER_STATE_POINTERS_VS {
 
 static inline void
 GEN75_3DSTATE_SAMPLER_STATE_POINTERS_VS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN75_3DSTATE_SAMPLER_STATE_POINTERS_VS * restrict values)
+                                             const struct GEN75_3DSTATE_SAMPLER_STATE_POINTERS_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3563,7 +3649,6 @@ GEN75_3DSTATE_SAMPLER_STATE_POINTERS_VS_pack(__gen_user_data *data, void * restr
 
 }
 
-#define GEN75_3DSTATE_SAMPLE_MASK_length 0x00000002
 #define GEN75_3DSTATE_SAMPLE_MASK_length_bias 0x00000002
 #define GEN75_3DSTATE_SAMPLE_MASK_header        \
    .CommandType          =  3,                  \
@@ -3572,6 +3657,8 @@ GEN75_3DSTATE_SAMPLER_STATE_POINTERS_VS_pack(__gen_user_data *data, void * restr
    ._3DCommandSubOpcode  = 24,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_SAMPLE_MASK_length 0x00000002
+
 struct GEN75_3DSTATE_SAMPLE_MASK {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3583,7 +3670,7 @@ struct GEN75_3DSTATE_SAMPLE_MASK {
 
 static inline void
 GEN75_3DSTATE_SAMPLE_MASK_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN75_3DSTATE_SAMPLE_MASK * restrict values)
+                               const struct GEN75_3DSTATE_SAMPLE_MASK * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3601,7 +3688,6 @@ GEN75_3DSTATE_SAMPLE_MASK_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_SBE_length 0x0000000e
 #define GEN75_3DSTATE_SBE_length_bias 0x00000002
 #define GEN75_3DSTATE_SBE_header                \
    .CommandType          =  3,                  \
@@ -3610,6 +3696,8 @@ GEN75_3DSTATE_SAMPLE_MASK_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 31,                  \
    .DwordLength          = 12
 
+#define GEN75_3DSTATE_SBE_length 0x0000000e
+
 struct GEN75_3DSTATE_SBE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3676,7 +3764,7 @@ struct GEN75_3DSTATE_SBE {
 
 static inline void
 GEN75_3DSTATE_SBE_pack(__gen_user_data *data, void * restrict dst,
-                     const struct GEN75_3DSTATE_SBE * restrict values)
+                       const struct GEN75_3DSTATE_SBE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3746,7 +3834,6 @@ GEN75_3DSTATE_SBE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_SCISSOR_STATE_POINTERS_length 0x00000002
 #define GEN75_3DSTATE_SCISSOR_STATE_POINTERS_length_bias 0x00000002
 #define GEN75_3DSTATE_SCISSOR_STATE_POINTERS_header\
    .CommandType          =  3,                  \
@@ -3755,6 +3842,8 @@ GEN75_3DSTATE_SBE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 15,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_SCISSOR_STATE_POINTERS_length 0x00000002
+
 struct GEN75_3DSTATE_SCISSOR_STATE_POINTERS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3766,7 +3855,7 @@ struct GEN75_3DSTATE_SCISSOR_STATE_POINTERS {
 
 static inline void
 GEN75_3DSTATE_SCISSOR_STATE_POINTERS_pack(__gen_user_data *data, void * restrict dst,
-                                        const struct GEN75_3DSTATE_SCISSOR_STATE_POINTERS * restrict values)
+                                          const struct GEN75_3DSTATE_SCISSOR_STATE_POINTERS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3784,7 +3873,6 @@ GEN75_3DSTATE_SCISSOR_STATE_POINTERS_pack(__gen_user_data *data, void * restrict
 
 }
 
-#define GEN75_3DSTATE_SF_length 0x00000007
 #define GEN75_3DSTATE_SF_length_bias 0x00000002
 #define GEN75_3DSTATE_SF_header                 \
    .CommandType          =  3,                  \
@@ -3793,6 +3881,8 @@ GEN75_3DSTATE_SCISSOR_STATE_POINTERS_pack(__gen_user_data *data, void * restrict
    ._3DCommandSubOpcode  = 19,                  \
    .DwordLength          =  5
 
+#define GEN75_3DSTATE_SF_length 0x00000007
+
 struct GEN75_3DSTATE_SF {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3847,14 +3937,14 @@ struct GEN75_3DSTATE_SF {
    uint32_t                                     VertexSubPixelPrecisionSelect;
    uint32_t                                     UsePointWidthState;
    float                                        PointWidth;
-   uint32_t                                     GlobalDepthOffsetConstant;
-   uint32_t                                     GlobalDepthOffsetScale;
-   uint32_t                                     GlobalDepthOffsetClamp;
+   float                                        GlobalDepthOffsetConstant;
+   float                                        GlobalDepthOffsetScale;
+   float                                        GlobalDepthOffsetClamp;
 };
 
 static inline void
 GEN75_3DSTATE_SF_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN75_3DSTATE_SF * restrict values)
+                      const struct GEN75_3DSTATE_SF * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3902,20 +3992,19 @@ GEN75_3DSTATE_SF_pack(__gen_user_data *data, void * restrict dst,
       0;
 
    dw[4] =
-      __gen_field(values->GlobalDepthOffsetConstant, 0, 31) |
+      __gen_float(values->GlobalDepthOffsetConstant) |
       0;
 
    dw[5] =
-      __gen_field(values->GlobalDepthOffsetScale, 0, 31) |
+      __gen_float(values->GlobalDepthOffsetScale) |
       0;
 
    dw[6] =
-      __gen_field(values->GlobalDepthOffsetClamp, 0, 31) |
+      __gen_float(values->GlobalDepthOffsetClamp) |
       0;
 
 }
 
-#define GEN75_3DSTATE_SO_BUFFER_length 0x00000004
 #define GEN75_3DSTATE_SO_BUFFER_length_bias 0x00000002
 #define GEN75_3DSTATE_SO_BUFFER_header          \
    .CommandType          =  3,                  \
@@ -3924,6 +4013,8 @@ GEN75_3DSTATE_SF_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 24,                  \
    .DwordLength          =  2
 
+#define GEN75_3DSTATE_SO_BUFFER_length 0x00000004
+
 struct GEN75_3DSTATE_SO_BUFFER {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3939,7 +4030,7 @@ struct GEN75_3DSTATE_SO_BUFFER {
 
 static inline void
 GEN75_3DSTATE_SO_BUFFER_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN75_3DSTATE_SO_BUFFER * restrict values)
+                             const struct GEN75_3DSTATE_SO_BUFFER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3980,6 +4071,12 @@ GEN75_3DSTATE_SO_BUFFER_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  1,                  \
    ._3DCommandSubOpcode  = 23
 
+#define GEN75_3DSTATE_SO_DECL_LIST_length 0x00000000
+
+#define GEN75_SO_DECL_ENTRY_length 0x00000002
+
+#define GEN75_SO_DECL_length 0x00000001
+
 struct GEN75_SO_DECL {
    uint32_t                                     OutputBufferSlot;
    uint32_t                                     HoleFlag;
@@ -3989,7 +4086,7 @@ struct GEN75_SO_DECL {
 
 static inline void
 GEN75_SO_DECL_pack(__gen_user_data *data, void * restrict dst,
-                 const struct GEN75_SO_DECL * restrict values)
+                   const struct GEN75_SO_DECL * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4011,7 +4108,7 @@ struct GEN75_SO_DECL_ENTRY {
 
 static inline void
 GEN75_SO_DECL_ENTRY_pack(__gen_user_data *data, void * restrict dst,
-                       const struct GEN75_SO_DECL_ENTRY * restrict values)
+                         const struct GEN75_SO_DECL_ENTRY * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4054,7 +4151,7 @@ struct GEN75_3DSTATE_SO_DECL_LIST {
 
 static inline void
 GEN75_3DSTATE_SO_DECL_LIST_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN75_3DSTATE_SO_DECL_LIST * restrict values)
+                                const struct GEN75_3DSTATE_SO_DECL_LIST * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4083,7 +4180,6 @@ GEN75_3DSTATE_SO_DECL_LIST_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN75_3DSTATE_STENCIL_BUFFER_length 0x00000003
 #define GEN75_3DSTATE_STENCIL_BUFFER_length_bias 0x00000002
 #define GEN75_3DSTATE_STENCIL_BUFFER_header     \
    .CommandType          =  3,                  \
@@ -4092,6 +4188,8 @@ GEN75_3DSTATE_SO_DECL_LIST_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  6,                  \
    .DwordLength          =  1
 
+#define GEN75_3DSTATE_STENCIL_BUFFER_length 0x00000003
+
 struct GEN75_3DSTATE_STENCIL_BUFFER {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4106,7 +4204,7 @@ struct GEN75_3DSTATE_STENCIL_BUFFER {
 
 static inline void
 GEN75_3DSTATE_STENCIL_BUFFER_pack(__gen_user_data *data, void * restrict dst,
-                                const struct GEN75_3DSTATE_STENCIL_BUFFER * restrict values)
+                                  const struct GEN75_3DSTATE_STENCIL_BUFFER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4134,7 +4232,6 @@ GEN75_3DSTATE_STENCIL_BUFFER_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_STREAMOUT_length 0x00000003
 #define GEN75_3DSTATE_STREAMOUT_length_bias 0x00000002
 #define GEN75_3DSTATE_STREAMOUT_header          \
    .CommandType          =  3,                  \
@@ -4143,6 +4240,8 @@ GEN75_3DSTATE_STENCIL_BUFFER_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 30,                  \
    .DwordLength          =  1
 
+#define GEN75_3DSTATE_STREAMOUT_length 0x00000003
+
 struct GEN75_3DSTATE_STREAMOUT {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4172,7 +4271,7 @@ struct GEN75_3DSTATE_STREAMOUT {
 
 static inline void
 GEN75_3DSTATE_STREAMOUT_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN75_3DSTATE_STREAMOUT * restrict values)
+                             const struct GEN75_3DSTATE_STREAMOUT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4209,7 +4308,6 @@ GEN75_3DSTATE_STREAMOUT_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_TE_length 0x00000004
 #define GEN75_3DSTATE_TE_length_bias 0x00000002
 #define GEN75_3DSTATE_TE_header                 \
    .CommandType          =  3,                  \
@@ -4218,6 +4316,8 @@ GEN75_3DSTATE_STREAMOUT_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 28,                  \
    .DwordLength          =  2
 
+#define GEN75_3DSTATE_TE_length 0x00000004
+
 struct GEN75_3DSTATE_TE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4247,7 +4347,7 @@ struct GEN75_3DSTATE_TE {
 
 static inline void
 GEN75_3DSTATE_TE_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN75_3DSTATE_TE * restrict values)
+                      const struct GEN75_3DSTATE_TE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4277,7 +4377,6 @@ GEN75_3DSTATE_TE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_URB_DS_length 0x00000002
 #define GEN75_3DSTATE_URB_DS_length_bias 0x00000002
 #define GEN75_3DSTATE_URB_DS_header             \
    .CommandType          =  3,                  \
@@ -4286,6 +4385,8 @@ GEN75_3DSTATE_TE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 50,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_URB_DS_length 0x00000002
+
 struct GEN75_3DSTATE_URB_DS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4299,7 +4400,7 @@ struct GEN75_3DSTATE_URB_DS {
 
 static inline void
 GEN75_3DSTATE_URB_DS_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN75_3DSTATE_URB_DS * restrict values)
+                          const struct GEN75_3DSTATE_URB_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4319,7 +4420,6 @@ GEN75_3DSTATE_URB_DS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_URB_GS_length 0x00000002
 #define GEN75_3DSTATE_URB_GS_length_bias 0x00000002
 #define GEN75_3DSTATE_URB_GS_header             \
    .CommandType          =  3,                  \
@@ -4328,6 +4428,8 @@ GEN75_3DSTATE_URB_DS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 51,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_URB_GS_length 0x00000002
+
 struct GEN75_3DSTATE_URB_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4341,7 +4443,7 @@ struct GEN75_3DSTATE_URB_GS {
 
 static inline void
 GEN75_3DSTATE_URB_GS_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN75_3DSTATE_URB_GS * restrict values)
+                          const struct GEN75_3DSTATE_URB_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4361,7 +4463,6 @@ GEN75_3DSTATE_URB_GS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_URB_HS_length 0x00000002
 #define GEN75_3DSTATE_URB_HS_length_bias 0x00000002
 #define GEN75_3DSTATE_URB_HS_header             \
    .CommandType          =  3,                  \
@@ -4370,6 +4471,8 @@ GEN75_3DSTATE_URB_GS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 49,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_URB_HS_length 0x00000002
+
 struct GEN75_3DSTATE_URB_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4383,7 +4486,7 @@ struct GEN75_3DSTATE_URB_HS {
 
 static inline void
 GEN75_3DSTATE_URB_HS_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN75_3DSTATE_URB_HS * restrict values)
+                          const struct GEN75_3DSTATE_URB_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4410,6 +4513,10 @@ GEN75_3DSTATE_URB_HS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  =  8
 
+#define GEN75_3DSTATE_VERTEX_BUFFERS_length 0x00000000
+
+#define GEN75_VERTEX_BUFFER_STATE_length 0x00000004
+
 struct GEN75_VERTEX_BUFFER_STATE {
    uint32_t                                     VertexBufferIndex;
 #define     VERTEXDATA                                         0
@@ -4427,7 +4534,7 @@ struct GEN75_VERTEX_BUFFER_STATE {
 
 static inline void
 GEN75_VERTEX_BUFFER_STATE_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN75_VERTEX_BUFFER_STATE * restrict values)
+                               const struct GEN75_VERTEX_BUFFER_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4472,7 +4579,7 @@ struct GEN75_3DSTATE_VERTEX_BUFFERS {
 
 static inline void
 GEN75_3DSTATE_VERTEX_BUFFERS_pack(__gen_user_data *data, void * restrict dst,
-                                const struct GEN75_3DSTATE_VERTEX_BUFFERS * restrict values)
+                                  const struct GEN75_3DSTATE_VERTEX_BUFFERS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4494,6 +4601,10 @@ GEN75_3DSTATE_VERTEX_BUFFERS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  =  9
 
+#define GEN75_3DSTATE_VERTEX_ELEMENTS_length 0x00000000
+
+#define GEN75_VERTEX_ELEMENT_STATE_length 0x00000002
+
 struct GEN75_VERTEX_ELEMENT_STATE {
    uint32_t                                     VertexBufferIndex;
    bool                                         Valid;
@@ -4508,7 +4619,7 @@ struct GEN75_VERTEX_ELEMENT_STATE {
 
 static inline void
 GEN75_VERTEX_ELEMENT_STATE_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN75_VERTEX_ELEMENT_STATE * restrict values)
+                                const struct GEN75_VERTEX_ELEMENT_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4540,7 +4651,7 @@ struct GEN75_3DSTATE_VERTEX_ELEMENTS {
 
 static inline void
 GEN75_3DSTATE_VERTEX_ELEMENTS_pack(__gen_user_data *data, void * restrict dst,
-                                 const struct GEN75_3DSTATE_VERTEX_ELEMENTS * restrict values)
+                                   const struct GEN75_3DSTATE_VERTEX_ELEMENTS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4555,7 +4666,6 @@ GEN75_3DSTATE_VERTEX_ELEMENTS_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN75_3DSTATE_VF_length 0x00000002
 #define GEN75_3DSTATE_VF_length_bias 0x00000002
 #define GEN75_3DSTATE_VF_header                 \
    .CommandType          =  3,                  \
@@ -4564,6 +4674,8 @@ GEN75_3DSTATE_VERTEX_ELEMENTS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 12,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_VF_length 0x00000002
+
 struct GEN75_3DSTATE_VF {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4576,7 +4688,7 @@ struct GEN75_3DSTATE_VF {
 
 static inline void
 GEN75_3DSTATE_VF_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN75_3DSTATE_VF * restrict values)
+                      const struct GEN75_3DSTATE_VF * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4595,7 +4707,6 @@ GEN75_3DSTATE_VF_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_VF_STATISTICS_length 0x00000001
 #define GEN75_3DSTATE_VF_STATISTICS_length_bias 0x00000001
 #define GEN75_3DSTATE_VF_STATISTICS_header      \
    .CommandType          =  3,                  \
@@ -4603,6 +4714,8 @@ GEN75_3DSTATE_VF_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 11
 
+#define GEN75_3DSTATE_VF_STATISTICS_length 0x00000001
+
 struct GEN75_3DSTATE_VF_STATISTICS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4613,7 +4726,7 @@ struct GEN75_3DSTATE_VF_STATISTICS {
 
 static inline void
 GEN75_3DSTATE_VF_STATISTICS_pack(__gen_user_data *data, void * restrict dst,
-                               const struct GEN75_3DSTATE_VF_STATISTICS * restrict values)
+                                 const struct GEN75_3DSTATE_VF_STATISTICS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4627,7 +4740,6 @@ GEN75_3DSTATE_VF_STATISTICS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_CC_length 0x00000002
 #define GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_CC_length_bias 0x00000002
 #define GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_CC_header\
    .CommandType          =  3,                  \
@@ -4636,6 +4748,8 @@ GEN75_3DSTATE_VF_STATISTICS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 35,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_CC_length 0x00000002
+
 struct GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_CC {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4647,7 +4761,7 @@ struct GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_CC {
 
 static inline void
 GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_CC_pack(__gen_user_data *data, void * restrict dst,
-                                            const struct GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_CC * restrict values)
+                                              const struct GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_CC * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4665,7 +4779,6 @@ GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_CC_pack(__gen_user_data *data, void * rest
 
 }
 
-#define GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_length 0x00000002
 #define GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_length_bias 0x00000002
 #define GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_header\
    .CommandType          =  3,                  \
@@ -4674,6 +4787,8 @@ GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_CC_pack(__gen_user_data *data, void * rest
    ._3DCommandSubOpcode  = 33,                  \
    .DwordLength          =  0
 
+#define GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_length 0x00000002
+
 struct GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4685,7 +4800,7 @@ struct GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP {
 
 static inline void
 GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_pack(__gen_user_data *data, void * restrict dst,
-                                                 const struct GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP * restrict values)
+                                                   const struct GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4703,7 +4818,6 @@ GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_pack(__gen_user_data *data, void *
 
 }
 
-#define GEN75_3DSTATE_VS_length 0x00000006
 #define GEN75_3DSTATE_VS_length_bias 0x00000002
 #define GEN75_3DSTATE_VS_header                 \
    .CommandType          =  3,                  \
@@ -4712,6 +4826,8 @@ GEN75_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_pack(__gen_user_data *data, void *
    ._3DCommandSubOpcode  = 16,                  \
    .DwordLength          =  4
 
+#define GEN75_3DSTATE_VS_length 0x00000006
+
 struct GEN75_3DSTATE_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4754,7 +4870,7 @@ struct GEN75_3DSTATE_VS {
 
 static inline void
 GEN75_3DSTATE_VS_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN75_3DSTATE_VS * restrict values)
+                      const struct GEN75_3DSTATE_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4802,7 +4918,6 @@ GEN75_3DSTATE_VS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_WM_length 0x00000003
 #define GEN75_3DSTATE_WM_length_bias 0x00000002
 #define GEN75_3DSTATE_WM_header                 \
    .CommandType          =  3,                  \
@@ -4811,6 +4926,8 @@ GEN75_3DSTATE_VS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 20,                  \
    .DwordLength          =  1
 
+#define GEN75_3DSTATE_WM_length 0x00000003
+
 struct GEN75_3DSTATE_WM {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4864,7 +4981,7 @@ struct GEN75_3DSTATE_WM {
 
 static inline void
 GEN75_3DSTATE_WM_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN75_3DSTATE_WM * restrict values)
+                      const struct GEN75_3DSTATE_WM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4907,7 +5024,6 @@ GEN75_3DSTATE_WM_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_GPGPU_OBJECT_length 0x00000008
 #define GEN75_GPGPU_OBJECT_length_bias 0x00000002
 #define GEN75_GPGPU_OBJECT_header               \
    .CommandType          =  3,                  \
@@ -4916,6 +5032,8 @@ GEN75_3DSTATE_WM_pack(__gen_user_data *data, void * restrict dst,
    .SubOpcode            =  4,                  \
    .DwordLength          =  6
 
+#define GEN75_GPGPU_OBJECT_length 0x00000008
+
 struct GEN75_GPGPU_OBJECT {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -4944,7 +5062,7 @@ struct GEN75_GPGPU_OBJECT {
 
 static inline void
 GEN75_GPGPU_OBJECT_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN75_GPGPU_OBJECT * restrict values)
+                        const struct GEN75_GPGPU_OBJECT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4992,7 +5110,6 @@ GEN75_GPGPU_OBJECT_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_GPGPU_WALKER_length 0x0000000b
 #define GEN75_GPGPU_WALKER_length_bias 0x00000002
 #define GEN75_GPGPU_WALKER_header               \
    .CommandType          =  3,                  \
@@ -5001,6 +5118,8 @@ GEN75_GPGPU_OBJECT_pack(__gen_user_data *data, void * restrict dst,
    .SubOpcodeA           =  5,                  \
    .DwordLength          =  9
 
+#define GEN75_GPGPU_WALKER_length 0x0000000b
+
 struct GEN75_GPGPU_WALKER {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -5029,7 +5148,7 @@ struct GEN75_GPGPU_WALKER {
 
 static inline void
 GEN75_GPGPU_WALKER_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN75_GPGPU_WALKER * restrict values)
+                        const struct GEN75_GPGPU_WALKER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5088,7 +5207,6 @@ GEN75_GPGPU_WALKER_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MEDIA_CURBE_LOAD_length 0x00000004
 #define GEN75_MEDIA_CURBE_LOAD_length_bias 0x00000002
 #define GEN75_MEDIA_CURBE_LOAD_header           \
    .CommandType          =  3,                  \
@@ -5097,6 +5215,8 @@ GEN75_GPGPU_WALKER_pack(__gen_user_data *data, void * restrict dst,
    .SubOpcode            =  1,                  \
    .DwordLength          =  2
 
+#define GEN75_MEDIA_CURBE_LOAD_length 0x00000004
+
 struct GEN75_MEDIA_CURBE_LOAD {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -5109,7 +5229,7 @@ struct GEN75_MEDIA_CURBE_LOAD {
 
 static inline void
 GEN75_MEDIA_CURBE_LOAD_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN75_MEDIA_CURBE_LOAD * restrict values)
+                            const struct GEN75_MEDIA_CURBE_LOAD * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5134,7 +5254,6 @@ GEN75_MEDIA_CURBE_LOAD_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MEDIA_INTERFACE_DESCRIPTOR_LOAD_length 0x00000004
 #define GEN75_MEDIA_INTERFACE_DESCRIPTOR_LOAD_length_bias 0x00000002
 #define GEN75_MEDIA_INTERFACE_DESCRIPTOR_LOAD_header\
    .CommandType          =  3,                  \
@@ -5143,6 +5262,8 @@ GEN75_MEDIA_CURBE_LOAD_pack(__gen_user_data *data, void * restrict dst,
    .SubOpcode            =  2,                  \
    .DwordLength          =  2
 
+#define GEN75_MEDIA_INTERFACE_DESCRIPTOR_LOAD_length 0x00000004
+
 struct GEN75_MEDIA_INTERFACE_DESCRIPTOR_LOAD {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -5155,7 +5276,7 @@ struct GEN75_MEDIA_INTERFACE_DESCRIPTOR_LOAD {
 
 static inline void
 GEN75_MEDIA_INTERFACE_DESCRIPTOR_LOAD_pack(__gen_user_data *data, void * restrict dst,
-                                         const struct GEN75_MEDIA_INTERFACE_DESCRIPTOR_LOAD * restrict values)
+                                           const struct GEN75_MEDIA_INTERFACE_DESCRIPTOR_LOAD * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5187,6 +5308,8 @@ GEN75_MEDIA_INTERFACE_DESCRIPTOR_LOAD_pack(__gen_user_data *data, void * restric
    .MediaCommandOpcode   =  1,                  \
    .MediaCommandSubOpcode =  0
 
+#define GEN75_MEDIA_OBJECT_length 0x00000000
+
 struct GEN75_MEDIA_OBJECT {
    uint32_t                                     CommandType;
    uint32_t                                     MediaCommandPipeline;
@@ -5220,7 +5343,7 @@ struct GEN75_MEDIA_OBJECT {
 
 static inline void
 GEN75_MEDIA_OBJECT_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN75_MEDIA_OBJECT * restrict values)
+                        const struct GEN75_MEDIA_OBJECT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5264,7 +5387,6 @@ GEN75_MEDIA_OBJECT_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN75_MEDIA_OBJECT_PRT_length 0x00000010
 #define GEN75_MEDIA_OBJECT_PRT_length_bias 0x00000002
 #define GEN75_MEDIA_OBJECT_PRT_header           \
    .CommandType          =  3,                  \
@@ -5273,6 +5395,8 @@ GEN75_MEDIA_OBJECT_pack(__gen_user_data *data, void * restrict dst,
    .SubOpcode            =  2,                  \
    .DwordLength          = 14
 
+#define GEN75_MEDIA_OBJECT_PRT_length 0x00000010
+
 struct GEN75_MEDIA_OBJECT_PRT {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -5290,7 +5414,7 @@ struct GEN75_MEDIA_OBJECT_PRT {
 
 static inline void
 GEN75_MEDIA_OBJECT_PRT_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN75_MEDIA_OBJECT_PRT * restrict values)
+                            const struct GEN75_MEDIA_OBJECT_PRT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5330,6 +5454,8 @@ GEN75_MEDIA_OBJECT_PRT_pack(__gen_user_data *data, void * restrict dst,
    .MediaCommandOpcode   =  1,                  \
    .SubOpcode            =  3
 
+#define GEN75_MEDIA_OBJECT_WALKER_length 0x00000000
+
 struct GEN75_MEDIA_OBJECT_WALKER {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -5377,7 +5503,7 @@ struct GEN75_MEDIA_OBJECT_WALKER {
 
 static inline void
 GEN75_MEDIA_OBJECT_WALKER_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN75_MEDIA_OBJECT_WALKER * restrict values)
+                               const struct GEN75_MEDIA_OBJECT_WALKER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5472,7 +5598,6 @@ GEN75_MEDIA_OBJECT_WALKER_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN75_MEDIA_STATE_FLUSH_length 0x00000002
 #define GEN75_MEDIA_STATE_FLUSH_length_bias 0x00000002
 #define GEN75_MEDIA_STATE_FLUSH_header          \
    .CommandType          =  3,                  \
@@ -5481,6 +5606,8 @@ GEN75_MEDIA_OBJECT_WALKER_pack(__gen_user_data *data, void * restrict dst,
    .SubOpcode            =  4,                  \
    .DwordLength          =  0
 
+#define GEN75_MEDIA_STATE_FLUSH_length 0x00000002
+
 struct GEN75_MEDIA_STATE_FLUSH {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -5495,7 +5622,7 @@ struct GEN75_MEDIA_STATE_FLUSH {
 
 static inline void
 GEN75_MEDIA_STATE_FLUSH_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN75_MEDIA_STATE_FLUSH * restrict values)
+                             const struct GEN75_MEDIA_STATE_FLUSH * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5516,7 +5643,6 @@ GEN75_MEDIA_STATE_FLUSH_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MEDIA_VFE_STATE_length 0x00000008
 #define GEN75_MEDIA_VFE_STATE_length_bias 0x00000002
 #define GEN75_MEDIA_VFE_STATE_header            \
    .CommandType          =  3,                  \
@@ -5525,6 +5651,8 @@ GEN75_MEDIA_STATE_FLUSH_pack(__gen_user_data *data, void * restrict dst,
    .SubOpcode            =  0,                  \
    .DwordLength          =  6
 
+#define GEN75_MEDIA_VFE_STATE_length 0x00000008
+
 struct GEN75_MEDIA_VFE_STATE {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -5573,7 +5701,7 @@ struct GEN75_MEDIA_VFE_STATE {
 
 static inline void
 GEN75_MEDIA_VFE_STATE_pack(__gen_user_data *data, void * restrict dst,
-                         const struct GEN75_MEDIA_VFE_STATE * restrict values)
+                           const struct GEN75_MEDIA_VFE_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5638,12 +5766,13 @@ GEN75_MEDIA_VFE_STATE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_ARB_CHECK_length 0x00000001
 #define GEN75_MI_ARB_CHECK_length_bias 0x00000001
 #define GEN75_MI_ARB_CHECK_header               \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  5
 
+#define GEN75_MI_ARB_CHECK_length 0x00000001
+
 struct GEN75_MI_ARB_CHECK {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5651,7 +5780,7 @@ struct GEN75_MI_ARB_CHECK {
 
 static inline void
 GEN75_MI_ARB_CHECK_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN75_MI_ARB_CHECK * restrict values)
+                        const struct GEN75_MI_ARB_CHECK * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5662,12 +5791,13 @@ GEN75_MI_ARB_CHECK_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_ARB_ON_OFF_length 0x00000001
 #define GEN75_MI_ARB_ON_OFF_length_bias 0x00000001
 #define GEN75_MI_ARB_ON_OFF_header              \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  8
 
+#define GEN75_MI_ARB_ON_OFF_length 0x00000001
+
 struct GEN75_MI_ARB_ON_OFF {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5676,7 +5806,7 @@ struct GEN75_MI_ARB_ON_OFF {
 
 static inline void
 GEN75_MI_ARB_ON_OFF_pack(__gen_user_data *data, void * restrict dst,
-                       const struct GEN75_MI_ARB_ON_OFF * restrict values)
+                         const struct GEN75_MI_ARB_ON_OFF * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5688,12 +5818,13 @@ GEN75_MI_ARB_ON_OFF_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_BATCH_BUFFER_END_length 0x00000001
 #define GEN75_MI_BATCH_BUFFER_END_length_bias 0x00000001
 #define GEN75_MI_BATCH_BUFFER_END_header        \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 10
 
+#define GEN75_MI_BATCH_BUFFER_END_length 0x00000001
+
 struct GEN75_MI_BATCH_BUFFER_END {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5701,7 +5832,7 @@ struct GEN75_MI_BATCH_BUFFER_END {
 
 static inline void
 GEN75_MI_BATCH_BUFFER_END_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN75_MI_BATCH_BUFFER_END * restrict values)
+                               const struct GEN75_MI_BATCH_BUFFER_END * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5712,13 +5843,14 @@ GEN75_MI_BATCH_BUFFER_END_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_BATCH_BUFFER_START_length 0x00000002
 #define GEN75_MI_BATCH_BUFFER_START_length_bias 0x00000002
 #define GEN75_MI_BATCH_BUFFER_START_header      \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 49,                  \
    .DwordLength          =  0
 
+#define GEN75_MI_BATCH_BUFFER_START_length 0x00000002
+
 struct GEN75_MI_BATCH_BUFFER_START {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5739,7 +5871,7 @@ struct GEN75_MI_BATCH_BUFFER_START {
 
 static inline void
 GEN75_MI_BATCH_BUFFER_START_pack(__gen_user_data *data, void * restrict dst,
-                               const struct GEN75_MI_BATCH_BUFFER_START * restrict values)
+                                 const struct GEN75_MI_BATCH_BUFFER_START * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5769,6 +5901,8 @@ GEN75_MI_BATCH_BUFFER_START_pack(__gen_user_data *data, void * restrict dst,
    .CommandType          =  0,                  \
    .MICommandOpcode      = 39
 
+#define GEN75_MI_CLFLUSH_length 0x00000000
+
 struct GEN75_MI_CLFLUSH {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5784,7 +5918,7 @@ struct GEN75_MI_CLFLUSH {
 
 static inline void
 GEN75_MI_CLFLUSH_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN75_MI_CLFLUSH * restrict values)
+                      const struct GEN75_MI_CLFLUSH * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5811,7 +5945,6 @@ GEN75_MI_CLFLUSH_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN75_MI_CONDITIONAL_BATCH_BUFFER_END_length 0x00000002
 #define GEN75_MI_CONDITIONAL_BATCH_BUFFER_END_length_bias 0x00000002
 #define GEN75_MI_CONDITIONAL_BATCH_BUFFER_END_header\
    .CommandType          =  0,                  \
@@ -5820,6 +5953,8 @@ GEN75_MI_CLFLUSH_pack(__gen_user_data *data, void * restrict dst,
    .CompareSemaphore     =  0,                  \
    .DwordLength          =  0
 
+#define GEN75_MI_CONDITIONAL_BATCH_BUFFER_END_length 0x00000002
+
 struct GEN75_MI_CONDITIONAL_BATCH_BUFFER_END {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5832,7 +5967,7 @@ struct GEN75_MI_CONDITIONAL_BATCH_BUFFER_END {
 
 static inline void
 GEN75_MI_CONDITIONAL_BATCH_BUFFER_END_pack(__gen_user_data *data, void * restrict dst,
-                                         const struct GEN75_MI_CONDITIONAL_BATCH_BUFFER_END * restrict values)
+                                           const struct GEN75_MI_CONDITIONAL_BATCH_BUFFER_END * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5856,12 +5991,13 @@ GEN75_MI_CONDITIONAL_BATCH_BUFFER_END_pack(__gen_user_data *data, void * restric
 
 }
 
-#define GEN75_MI_FLUSH_length 0x00000001
 #define GEN75_MI_FLUSH_length_bias 0x00000001
 #define GEN75_MI_FLUSH_header                   \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  4
 
+#define GEN75_MI_FLUSH_length 0x00000001
+
 struct GEN75_MI_FLUSH {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5880,7 +6016,7 @@ struct GEN75_MI_FLUSH {
 
 static inline void
 GEN75_MI_FLUSH_pack(__gen_user_data *data, void * restrict dst,
-                  const struct GEN75_MI_FLUSH * restrict values)
+                    const struct GEN75_MI_FLUSH * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5896,13 +6032,14 @@ GEN75_MI_FLUSH_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_LOAD_REGISTER_IMM_length 0x00000003
 #define GEN75_MI_LOAD_REGISTER_IMM_length_bias 0x00000002
 #define GEN75_MI_LOAD_REGISTER_IMM_header       \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 34,                  \
    .DwordLength          =  1
 
+#define GEN75_MI_LOAD_REGISTER_IMM_length 0x00000003
+
 struct GEN75_MI_LOAD_REGISTER_IMM {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5914,7 +6051,7 @@ struct GEN75_MI_LOAD_REGISTER_IMM {
 
 static inline void
 GEN75_MI_LOAD_REGISTER_IMM_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN75_MI_LOAD_REGISTER_IMM * restrict values)
+                                const struct GEN75_MI_LOAD_REGISTER_IMM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5935,13 +6072,14 @@ GEN75_MI_LOAD_REGISTER_IMM_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_LOAD_REGISTER_MEM_length 0x00000003
 #define GEN75_MI_LOAD_REGISTER_MEM_length_bias 0x00000002
 #define GEN75_MI_LOAD_REGISTER_MEM_header       \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 41,                  \
    .DwordLength          =  1
 
+#define GEN75_MI_LOAD_REGISTER_MEM_length 0x00000003
+
 struct GEN75_MI_LOAD_REGISTER_MEM {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5954,7 +6092,7 @@ struct GEN75_MI_LOAD_REGISTER_MEM {
 
 static inline void
 GEN75_MI_LOAD_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN75_MI_LOAD_REGISTER_MEM * restrict values)
+                                const struct GEN75_MI_LOAD_REGISTER_MEM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5978,13 +6116,14 @@ GEN75_MI_LOAD_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_LOAD_REGISTER_REG_length 0x00000003
 #define GEN75_MI_LOAD_REGISTER_REG_length_bias 0x00000002
 #define GEN75_MI_LOAD_REGISTER_REG_header       \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 42,                  \
    .DwordLength          =  1
 
+#define GEN75_MI_LOAD_REGISTER_REG_length 0x00000003
+
 struct GEN75_MI_LOAD_REGISTER_REG {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5995,7 +6134,7 @@ struct GEN75_MI_LOAD_REGISTER_REG {
 
 static inline void
 GEN75_MI_LOAD_REGISTER_REG_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN75_MI_LOAD_REGISTER_REG * restrict values)
+                                const struct GEN75_MI_LOAD_REGISTER_REG * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6015,13 +6154,14 @@ GEN75_MI_LOAD_REGISTER_REG_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_LOAD_SCAN_LINES_EXCL_length 0x00000002
 #define GEN75_MI_LOAD_SCAN_LINES_EXCL_length_bias 0x00000002
 #define GEN75_MI_LOAD_SCAN_LINES_EXCL_header    \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 19,                  \
    .DwordLength          =  0
 
+#define GEN75_MI_LOAD_SCAN_LINES_EXCL_length 0x00000002
+
 struct GEN75_MI_LOAD_SCAN_LINES_EXCL {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6036,7 +6176,7 @@ struct GEN75_MI_LOAD_SCAN_LINES_EXCL {
 
 static inline void
 GEN75_MI_LOAD_SCAN_LINES_EXCL_pack(__gen_user_data *data, void * restrict dst,
-                                 const struct GEN75_MI_LOAD_SCAN_LINES_EXCL * restrict values)
+                                   const struct GEN75_MI_LOAD_SCAN_LINES_EXCL * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6054,13 +6194,14 @@ GEN75_MI_LOAD_SCAN_LINES_EXCL_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_LOAD_SCAN_LINES_INCL_length 0x00000002
 #define GEN75_MI_LOAD_SCAN_LINES_INCL_length_bias 0x00000002
 #define GEN75_MI_LOAD_SCAN_LINES_INCL_header    \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 18,                  \
    .DwordLength          =  0
 
+#define GEN75_MI_LOAD_SCAN_LINES_INCL_length 0x00000002
+
 struct GEN75_MI_LOAD_SCAN_LINES_INCL {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6075,7 +6216,7 @@ struct GEN75_MI_LOAD_SCAN_LINES_INCL {
 
 static inline void
 GEN75_MI_LOAD_SCAN_LINES_INCL_pack(__gen_user_data *data, void * restrict dst,
-                                 const struct GEN75_MI_LOAD_SCAN_LINES_INCL * restrict values)
+                                   const struct GEN75_MI_LOAD_SCAN_LINES_INCL * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6093,13 +6234,14 @@ GEN75_MI_LOAD_SCAN_LINES_INCL_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_LOAD_URB_MEM_length 0x00000003
 #define GEN75_MI_LOAD_URB_MEM_length_bias 0x00000002
 #define GEN75_MI_LOAD_URB_MEM_header            \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 44,                  \
    .DwordLength          =  1
 
+#define GEN75_MI_LOAD_URB_MEM_length 0x00000003
+
 struct GEN75_MI_LOAD_URB_MEM {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6110,7 +6252,7 @@ struct GEN75_MI_LOAD_URB_MEM {
 
 static inline void
 GEN75_MI_LOAD_URB_MEM_pack(__gen_user_data *data, void * restrict dst,
-                         const struct GEN75_MI_LOAD_URB_MEM * restrict values)
+                           const struct GEN75_MI_LOAD_URB_MEM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6137,6 +6279,8 @@ GEN75_MI_LOAD_URB_MEM_pack(__gen_user_data *data, void * restrict dst,
    .CommandType          =  0,                  \
    .MICommandOpcode      = 26
 
+#define GEN75_MI_MATH_length 0x00000000
+
 struct GEN75_MI_MATH {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6148,7 +6292,7 @@ struct GEN75_MI_MATH {
 
 static inline void
 GEN75_MI_MATH_pack(__gen_user_data *data, void * restrict dst,
-                 const struct GEN75_MI_MATH * restrict values)
+                   const struct GEN75_MI_MATH * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6169,12 +6313,13 @@ GEN75_MI_MATH_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN75_MI_NOOP_length 0x00000001
 #define GEN75_MI_NOOP_length_bias 0x00000001
 #define GEN75_MI_NOOP_header                    \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  0
 
+#define GEN75_MI_NOOP_length 0x00000001
+
 struct GEN75_MI_NOOP {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6184,7 +6329,7 @@ struct GEN75_MI_NOOP {
 
 static inline void
 GEN75_MI_NOOP_pack(__gen_user_data *data, void * restrict dst,
-                 const struct GEN75_MI_NOOP * restrict values)
+                   const struct GEN75_MI_NOOP * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6197,12 +6342,13 @@ GEN75_MI_NOOP_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_PREDICATE_length 0x00000001
 #define GEN75_MI_PREDICATE_length_bias 0x00000001
 #define GEN75_MI_PREDICATE_header               \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 12
 
+#define GEN75_MI_PREDICATE_length 0x00000001
+
 struct GEN75_MI_PREDICATE {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6222,7 +6368,7 @@ struct GEN75_MI_PREDICATE {
 
 static inline void
 GEN75_MI_PREDICATE_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN75_MI_PREDICATE * restrict values)
+                        const struct GEN75_MI_PREDICATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6236,12 +6382,13 @@ GEN75_MI_PREDICATE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_REPORT_HEAD_length 0x00000001
 #define GEN75_MI_REPORT_HEAD_length_bias 0x00000001
 #define GEN75_MI_REPORT_HEAD_header             \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  7
 
+#define GEN75_MI_REPORT_HEAD_length 0x00000001
+
 struct GEN75_MI_REPORT_HEAD {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6249,7 +6396,7 @@ struct GEN75_MI_REPORT_HEAD {
 
 static inline void
 GEN75_MI_REPORT_HEAD_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN75_MI_REPORT_HEAD * restrict values)
+                          const struct GEN75_MI_REPORT_HEAD * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6260,12 +6407,13 @@ GEN75_MI_REPORT_HEAD_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_RS_CONTEXT_length 0x00000001
 #define GEN75_MI_RS_CONTEXT_length_bias 0x00000001
 #define GEN75_MI_RS_CONTEXT_header              \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 15
 
+#define GEN75_MI_RS_CONTEXT_length 0x00000001
+
 struct GEN75_MI_RS_CONTEXT {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6276,7 +6424,7 @@ struct GEN75_MI_RS_CONTEXT {
 
 static inline void
 GEN75_MI_RS_CONTEXT_pack(__gen_user_data *data, void * restrict dst,
-                       const struct GEN75_MI_RS_CONTEXT * restrict values)
+                         const struct GEN75_MI_RS_CONTEXT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6288,12 +6436,13 @@ GEN75_MI_RS_CONTEXT_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_RS_CONTROL_length 0x00000001
 #define GEN75_MI_RS_CONTROL_length_bias 0x00000001
 #define GEN75_MI_RS_CONTROL_header              \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  6
 
+#define GEN75_MI_RS_CONTROL_length 0x00000001
+
 struct GEN75_MI_RS_CONTROL {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6304,7 +6453,7 @@ struct GEN75_MI_RS_CONTROL {
 
 static inline void
 GEN75_MI_RS_CONTROL_pack(__gen_user_data *data, void * restrict dst,
-                       const struct GEN75_MI_RS_CONTROL * restrict values)
+                         const struct GEN75_MI_RS_CONTROL * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6316,13 +6465,14 @@ GEN75_MI_RS_CONTROL_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_RS_STORE_DATA_IMM_length 0x00000004
 #define GEN75_MI_RS_STORE_DATA_IMM_length_bias 0x00000002
 #define GEN75_MI_RS_STORE_DATA_IMM_header       \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 43,                  \
    .DwordLength          =  2
 
+#define GEN75_MI_RS_STORE_DATA_IMM_length 0x00000004
+
 struct GEN75_MI_RS_STORE_DATA_IMM {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6334,7 +6484,7 @@ struct GEN75_MI_RS_STORE_DATA_IMM {
 
 static inline void
 GEN75_MI_RS_STORE_DATA_IMM_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN75_MI_RS_STORE_DATA_IMM * restrict values)
+                                const struct GEN75_MI_RS_STORE_DATA_IMM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6360,13 +6510,14 @@ GEN75_MI_RS_STORE_DATA_IMM_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_SEMAPHORE_MBOX_length 0x00000003
 #define GEN75_MI_SEMAPHORE_MBOX_length_bias 0x00000002
 #define GEN75_MI_SEMAPHORE_MBOX_header          \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 22,                  \
    .DwordLength          =  1
 
+#define GEN75_MI_SEMAPHORE_MBOX_length 0x00000003
+
 struct GEN75_MI_SEMAPHORE_MBOX {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6382,7 +6533,7 @@ struct GEN75_MI_SEMAPHORE_MBOX {
 
 static inline void
 GEN75_MI_SEMAPHORE_MBOX_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN75_MI_SEMAPHORE_MBOX * restrict values)
+                             const struct GEN75_MI_SEMAPHORE_MBOX * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6403,13 +6554,14 @@ GEN75_MI_SEMAPHORE_MBOX_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_SET_CONTEXT_length 0x00000002
 #define GEN75_MI_SET_CONTEXT_length_bias 0x00000002
 #define GEN75_MI_SET_CONTEXT_header             \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 24,                  \
    .DwordLength          =  0
 
+#define GEN75_MI_SET_CONTEXT_length 0x00000002
+
 struct GEN75_MI_SET_CONTEXT {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6425,7 +6577,7 @@ struct GEN75_MI_SET_CONTEXT {
 
 static inline void
 GEN75_MI_SET_CONTEXT_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN75_MI_SET_CONTEXT * restrict values)
+                          const struct GEN75_MI_SET_CONTEXT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6449,13 +6601,14 @@ GEN75_MI_SET_CONTEXT_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_SET_PREDICATE_length 0x00000001
 #define GEN75_MI_SET_PREDICATE_length_bias 0x00000001
 #define GEN75_MI_SET_PREDICATE_header           \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  1,                  \
    .PREDICATEENABLE      =  6
 
+#define GEN75_MI_SET_PREDICATE_length 0x00000001
+
 struct GEN75_MI_SET_PREDICATE {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6468,7 +6621,7 @@ struct GEN75_MI_SET_PREDICATE {
 
 static inline void
 GEN75_MI_SET_PREDICATE_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN75_MI_SET_PREDICATE * restrict values)
+                            const struct GEN75_MI_SET_PREDICATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6480,13 +6633,14 @@ GEN75_MI_SET_PREDICATE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_STORE_DATA_IMM_length 0x00000004
 #define GEN75_MI_STORE_DATA_IMM_length_bias 0x00000002
 #define GEN75_MI_STORE_DATA_IMM_header          \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 32,                  \
    .DwordLength          =  2
 
+#define GEN75_MI_STORE_DATA_IMM_length 0x00000004
+
 struct GEN75_MI_STORE_DATA_IMM {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6500,7 +6654,7 @@ struct GEN75_MI_STORE_DATA_IMM {
 
 static inline void
 GEN75_MI_STORE_DATA_IMM_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN75_MI_STORE_DATA_IMM * restrict values)
+                             const struct GEN75_MI_STORE_DATA_IMM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6529,13 +6683,14 @@ GEN75_MI_STORE_DATA_IMM_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_STORE_DATA_INDEX_length 0x00000003
 #define GEN75_MI_STORE_DATA_INDEX_length_bias 0x00000002
 #define GEN75_MI_STORE_DATA_INDEX_header        \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 33,                  \
    .DwordLength          =  1
 
+#define GEN75_MI_STORE_DATA_INDEX_length 0x00000003
+
 struct GEN75_MI_STORE_DATA_INDEX {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6547,7 +6702,7 @@ struct GEN75_MI_STORE_DATA_INDEX {
 
 static inline void
 GEN75_MI_STORE_DATA_INDEX_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN75_MI_STORE_DATA_INDEX * restrict values)
+                               const struct GEN75_MI_STORE_DATA_INDEX * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6571,13 +6726,14 @@ GEN75_MI_STORE_DATA_INDEX_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_STORE_URB_MEM_length 0x00000003
 #define GEN75_MI_STORE_URB_MEM_length_bias 0x00000002
 #define GEN75_MI_STORE_URB_MEM_header           \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 45,                  \
    .DwordLength          =  1
 
+#define GEN75_MI_STORE_URB_MEM_length 0x00000003
+
 struct GEN75_MI_STORE_URB_MEM {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6588,7 +6744,7 @@ struct GEN75_MI_STORE_URB_MEM {
 
 static inline void
 GEN75_MI_STORE_URB_MEM_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN75_MI_STORE_URB_MEM * restrict values)
+                            const struct GEN75_MI_STORE_URB_MEM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6610,12 +6766,13 @@ GEN75_MI_STORE_URB_MEM_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_SUSPEND_FLUSH_length 0x00000001
 #define GEN75_MI_SUSPEND_FLUSH_length_bias 0x00000001
 #define GEN75_MI_SUSPEND_FLUSH_header           \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 11
 
+#define GEN75_MI_SUSPEND_FLUSH_length 0x00000001
+
 struct GEN75_MI_SUSPEND_FLUSH {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6624,7 +6781,7 @@ struct GEN75_MI_SUSPEND_FLUSH {
 
 static inline void
 GEN75_MI_SUSPEND_FLUSH_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN75_MI_SUSPEND_FLUSH * restrict values)
+                            const struct GEN75_MI_SUSPEND_FLUSH * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6636,12 +6793,13 @@ GEN75_MI_SUSPEND_FLUSH_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_TOPOLOGY_FILTER_length 0x00000001
 #define GEN75_MI_TOPOLOGY_FILTER_length_bias 0x00000001
 #define GEN75_MI_TOPOLOGY_FILTER_header         \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 13
 
+#define GEN75_MI_TOPOLOGY_FILTER_length 0x00000001
+
 struct GEN75_MI_TOPOLOGY_FILTER {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6650,7 +6808,7 @@ struct GEN75_MI_TOPOLOGY_FILTER {
 
 static inline void
 GEN75_MI_TOPOLOGY_FILTER_pack(__gen_user_data *data, void * restrict dst,
-                            const struct GEN75_MI_TOPOLOGY_FILTER * restrict values)
+                              const struct GEN75_MI_TOPOLOGY_FILTER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6667,6 +6825,8 @@ GEN75_MI_TOPOLOGY_FILTER_pack(__gen_user_data *data, void * restrict dst,
    .CommandType          =  0,                  \
    .MICommandOpcode      = 35
 
+#define GEN75_MI_UPDATE_GTT_length 0x00000000
+
 struct GEN75_MI_UPDATE_GTT {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6680,7 +6840,7 @@ struct GEN75_MI_UPDATE_GTT {
 
 static inline void
 GEN75_MI_UPDATE_GTT_pack(__gen_user_data *data, void * restrict dst,
-                       const struct GEN75_MI_UPDATE_GTT * restrict values)
+                         const struct GEN75_MI_UPDATE_GTT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6700,12 +6860,13 @@ GEN75_MI_UPDATE_GTT_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN75_MI_URB_ATOMIC_ALLOC_length 0x00000001
 #define GEN75_MI_URB_ATOMIC_ALLOC_length_bias 0x00000001
 #define GEN75_MI_URB_ATOMIC_ALLOC_header        \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  9
 
+#define GEN75_MI_URB_ATOMIC_ALLOC_length 0x00000001
+
 struct GEN75_MI_URB_ATOMIC_ALLOC {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6715,7 +6876,7 @@ struct GEN75_MI_URB_ATOMIC_ALLOC {
 
 static inline void
 GEN75_MI_URB_ATOMIC_ALLOC_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN75_MI_URB_ATOMIC_ALLOC * restrict values)
+                               const struct GEN75_MI_URB_ATOMIC_ALLOC * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6728,13 +6889,14 @@ GEN75_MI_URB_ATOMIC_ALLOC_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_URB_CLEAR_length 0x00000002
 #define GEN75_MI_URB_CLEAR_length_bias 0x00000002
 #define GEN75_MI_URB_CLEAR_header               \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 25,                  \
    .DwordLength          =  0
 
+#define GEN75_MI_URB_CLEAR_length 0x00000002
+
 struct GEN75_MI_URB_CLEAR {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6745,7 +6907,7 @@ struct GEN75_MI_URB_CLEAR {
 
 static inline void
 GEN75_MI_URB_CLEAR_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN75_MI_URB_CLEAR * restrict values)
+                        const struct GEN75_MI_URB_CLEAR * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6762,12 +6924,13 @@ GEN75_MI_URB_CLEAR_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_USER_INTERRUPT_length 0x00000001
 #define GEN75_MI_USER_INTERRUPT_length_bias 0x00000001
 #define GEN75_MI_USER_INTERRUPT_header          \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  2
 
+#define GEN75_MI_USER_INTERRUPT_length 0x00000001
+
 struct GEN75_MI_USER_INTERRUPT {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6775,7 +6938,7 @@ struct GEN75_MI_USER_INTERRUPT {
 
 static inline void
 GEN75_MI_USER_INTERRUPT_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN75_MI_USER_INTERRUPT * restrict values)
+                             const struct GEN75_MI_USER_INTERRUPT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6786,12 +6949,13 @@ GEN75_MI_USER_INTERRUPT_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MI_WAIT_FOR_EVENT_length 0x00000001
 #define GEN75_MI_WAIT_FOR_EVENT_length_bias 0x00000001
 #define GEN75_MI_WAIT_FOR_EVENT_header          \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  3
 
+#define GEN75_MI_WAIT_FOR_EVENT_length 0x00000001
+
 struct GEN75_MI_WAIT_FOR_EVENT {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6816,7 +6980,7 @@ struct GEN75_MI_WAIT_FOR_EVENT {
 
 static inline void
 GEN75_MI_WAIT_FOR_EVENT_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN75_MI_WAIT_FOR_EVENT * restrict values)
+                             const struct GEN75_MI_WAIT_FOR_EVENT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6843,7 +7007,6 @@ GEN75_MI_WAIT_FOR_EVENT_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_PIPE_CONTROL_length 0x00000005
 #define GEN75_PIPE_CONTROL_length_bias 0x00000002
 #define GEN75_PIPE_CONTROL_header               \
    .CommandType          =  3,                  \
@@ -6852,6 +7015,8 @@ GEN75_MI_WAIT_FOR_EVENT_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  0,                  \
    .DwordLength          =  3
 
+#define GEN75_PIPE_CONTROL_length 0x00000005
+
 struct GEN75_PIPE_CONTROL {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -6900,7 +7065,7 @@ struct GEN75_PIPE_CONTROL {
 
 static inline void
 GEN75_PIPE_CONTROL_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN75_PIPE_CONTROL * restrict values)
+                        const struct GEN75_PIPE_CONTROL * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6952,20 +7117,6 @@ GEN75_PIPE_CONTROL_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_3DSTATE_CONSTANT_BODY_length 0x00000006
-
-#define GEN75_BINDING_TABLE_EDIT_ENTRY_length 0x00000001
-
-#define GEN75_GATHER_CONSTANT_ENTRY_length 0x00000001
-
-#define GEN75_VERTEX_BUFFER_STATE_length 0x00000004
-
-#define GEN75_VERTEX_ELEMENT_STATE_length 0x00000002
-
-#define GEN75_SO_DECL_ENTRY_length 0x00000002
-
-#define GEN75_SO_DECL_length 0x00000001
-
 #define GEN75_SCISSOR_RECT_length 0x00000002
 
 struct GEN75_SCISSOR_RECT {
@@ -6977,7 +7128,7 @@ struct GEN75_SCISSOR_RECT {
 
 static inline void
 GEN75_SCISSOR_RECT_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN75_SCISSOR_RECT * restrict values)
+                        const struct GEN75_SCISSOR_RECT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7010,7 +7161,7 @@ struct GEN75_SF_CLIP_VIEWPORT {
 
 static inline void
 GEN75_SF_CLIP_VIEWPORT_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN75_SF_CLIP_VIEWPORT * restrict values)
+                            const struct GEN75_SF_CLIP_VIEWPORT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7155,7 +7306,7 @@ struct GEN75_BLEND_STATE {
 
 static inline void
 GEN75_BLEND_STATE_pack(__gen_user_data *data, void * restrict dst,
-                     const struct GEN75_BLEND_STATE * restrict values)
+                       const struct GEN75_BLEND_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7201,7 +7352,7 @@ struct GEN75_CC_VIEWPORT {
 
 static inline void
 GEN75_CC_VIEWPORT_pack(__gen_user_data *data, void * restrict dst,
-                     const struct GEN75_CC_VIEWPORT * restrict values)
+                       const struct GEN75_CC_VIEWPORT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7236,7 +7387,7 @@ struct GEN75_COLOR_CALC_STATE {
 
 static inline void
 GEN75_COLOR_CALC_STATE_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN75_COLOR_CALC_STATE * restrict values)
+                            const struct GEN75_COLOR_CALC_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7335,7 +7486,7 @@ struct GEN75_DEPTH_STENCIL_STATE {
 
 static inline void
 GEN75_DEPTH_STENCIL_STATE_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN75_DEPTH_STENCIL_STATE * restrict values)
+                               const struct GEN75_DEPTH_STENCIL_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7368,8 +7519,6 @@ GEN75_DEPTH_STENCIL_STATE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_MEMORY_OBJECT_CONTROL_STATE_length 0x00000001
-
 #define GEN75_INTERFACE_DESCRIPTOR_DATA_length 0x00000008
 
 struct GEN75_INTERFACE_DESCRIPTOR_DATA {
@@ -7409,7 +7558,7 @@ struct GEN75_INTERFACE_DESCRIPTOR_DATA {
 
 static inline void
 GEN75_INTERFACE_DESCRIPTOR_DATA_pack(__gen_user_data *data, void * restrict dst,
-                                   const struct GEN75_INTERFACE_DESCRIPTOR_DATA * restrict values)
+                                     const struct GEN75_INTERFACE_DESCRIPTOR_DATA * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7456,8 +7605,6 @@ GEN75_INTERFACE_DESCRIPTOR_DATA_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN75_PALETTE_ENTRY_length 0x00000001
-
 #define GEN75_BINDING_TABLE_STATE_length 0x00000001
 
 struct GEN75_BINDING_TABLE_STATE {
@@ -7466,7 +7613,7 @@ struct GEN75_BINDING_TABLE_STATE {
 
 static inline void
 GEN75_BINDING_TABLE_STATE_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN75_BINDING_TABLE_STATE * restrict values)
+                               const struct GEN75_BINDING_TABLE_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7556,7 +7703,7 @@ struct GEN75_RENDER_SURFACE_STATE {
 
 static inline void
 GEN75_RENDER_SURFACE_STATE_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN75_RENDER_SURFACE_STATE * restrict values)
+                                const struct GEN75_RENDER_SURFACE_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7636,28 +7783,155 @@ GEN75_RENDER_SURFACE_STATE_pack(__gen_user_data *data, void * restrict dst,
 
 #define GEN75_SAMPLER_BORDER_COLOR_STATE_length 0x00000014
 
+#define GEN75_BORDER_COLOR_UINT32_SINT32_length 0x00000004
+
+struct GEN75_BORDER_COLOR_UINT32_SINT32 {
+   uint32_t                                     BorderColorRedui32integerunclamp;
+   uint32_t                                     BorderColorRedsi32integerunclamp;
+   uint32_t                                     BorderColorGreenui32integerunclamp;
+   uint32_t                                     BorderColorGreensi32integerunclamp;
+   uint32_t                                     BorderColorBlueui32integerunclamp;
+   uint32_t                                     BorderColorBluesi32integerunclamp;
+   uint32_t                                     BorderColorGreenui32integerunclamp0;
+   uint32_t                                     BorderColorGreensi32integerunclamp0;
+   uint32_t                                     BorderColorAlphaui32integerunclamp;
+   uint32_t                                     BorderColorAlphasi32integerunclamp;
+};
+
+static inline void
+GEN75_BORDER_COLOR_UINT32_SINT32_pack(__gen_user_data *data, void * restrict dst,
+                                      const struct GEN75_BORDER_COLOR_UINT32_SINT32 * restrict values)
+{
+   uint32_t *dw = (uint32_t * restrict) dst;
+
+   dw[0] =
+      __gen_field(values->BorderColorRedui32integerunclamp, 0, 31) |
+      __gen_field(values->BorderColorRedsi32integerunclamp, 0, 31) |
+      0;
+
+   dw[1] =
+      __gen_field(values->BorderColorGreenui32integerunclamp, 0, 31) |
+      __gen_field(values->BorderColorGreensi32integerunclamp, 0, 31) |
+      0;
+
+   dw[2] =
+      __gen_field(values->BorderColorBlueui32integerunclamp, 0, 31) |
+      __gen_field(values->BorderColorBluesi32integerunclamp, 0, 31) |
+      __gen_field(values->BorderColorGreenui32integerunclamp, 0, 31) |
+      __gen_field(values->BorderColorGreensi32integerunclamp, 0, 31) |
+      0;
+
+   dw[3] =
+      __gen_field(values->BorderColorAlphaui32integerunclamp, 0, 31) |
+      __gen_field(values->BorderColorAlphasi32integerunclamp, 0, 31) |
+      0;
+
+}
+
+#define GEN75_BORDER_COLOR_UINT16_SINT16_length 0x00000004
+
+struct GEN75_BORDER_COLOR_UINT16_SINT16 {
+   uint32_t                                     BorderColorGreenclamptouint16;
+   uint32_t                                     BorderColorGreenclamptosint16;
+   uint32_t                                     BorderColorRedclamptouint16;
+   uint32_t                                     BorderColorRedclamptosint16;
+   uint32_t                                     BorderColorAlphaclamptouint16;
+   uint32_t                                     BorderColorAlphaclamptosint16;
+   uint32_t                                     BorderColorBlueclamptouint16;
+   uint32_t                                     BorderColorBlueclamptosint16;
+};
+
+static inline void
+GEN75_BORDER_COLOR_UINT16_SINT16_pack(__gen_user_data *data, void * restrict dst,
+                                      const struct GEN75_BORDER_COLOR_UINT16_SINT16 * restrict values)
+{
+   uint32_t *dw = (uint32_t * restrict) dst;
+
+   dw[0] =
+      __gen_field(values->BorderColorGreenclamptouint16, 16, 31) |
+      __gen_field(values->BorderColorGreenclamptosint16, 16, 31) |
+      __gen_field(values->BorderColorRedclamptouint16, 0, 15) |
+      __gen_field(values->BorderColorRedclamptosint16, 0, 15) |
+      0;
+
+   dw[1] =
+      0;
+
+   dw[2] =
+      __gen_field(values->BorderColorAlphaclamptouint16, 16, 31) |
+      __gen_field(values->BorderColorAlphaclamptosint16, 16, 31) |
+      __gen_field(values->BorderColorBlueclamptouint16, 0, 15) |
+      __gen_field(values->BorderColorBlueclamptosint16, 0, 15) |
+      0;
+
+   dw[3] =
+      0;
+
+}
+
+#define GEN75_BORDER_COLOR_UINT8_SINT8_length 0x00000004
+
+struct GEN75_BORDER_COLOR_UINT8_SINT8 {
+   uint32_t                                     BorderColorAlphaclamptouint8;
+   uint32_t                                     BorderColorAlphaclamptosint8;
+   uint32_t                                     BorderColorBlueclamptouint8;
+   uint32_t                                     BorderColorBlueclamptosint8;
+   uint32_t                                     BorderColorGreenclamptouint8;
+   uint32_t                                     BorderColorGreenclamptosint8;
+   uint32_t                                     BorderRedAlphaclamptouint8;
+   uint32_t                                     BorderRedAlphaclamptosint8;
+};
+
+static inline void
+GEN75_BORDER_COLOR_UINT8_SINT8_pack(__gen_user_data *data, void * restrict dst,
+                                    const struct GEN75_BORDER_COLOR_UINT8_SINT8 * restrict values)
+{
+   uint32_t *dw = (uint32_t * restrict) dst;
+
+   dw[0] =
+      __gen_field(values->BorderColorAlphaclamptouint8, 24, 31) |
+      __gen_field(values->BorderColorAlphaclamptosint8, 24, 31) |
+      __gen_field(values->BorderColorBlueclamptouint8, 16, 23) |
+      __gen_field(values->BorderColorBlueclamptosint8, 16, 23) |
+      __gen_field(values->BorderColorGreenclamptouint8, 8, 15) |
+      __gen_field(values->BorderColorGreenclamptosint8, 8, 15) |
+      __gen_field(values->BorderRedAlphaclamptouint8, 0, 7) |
+      __gen_field(values->BorderRedAlphaclamptosint8, 0, 7) |
+      0;
+
+   dw[1] =
+      0;
+
+   dw[2] =
+      0;
+
+   dw[3] =
+      0;
+
+}
+
 struct GEN75_SAMPLER_BORDER_COLOR_STATE {
-   uint32_t                                     BorderColorRedDX100GL;
+   float                                        BorderColorRedDX100GL;
    uint32_t                                     BorderColorAlpha;
    uint32_t                                     BorderColorBlue;
    uint32_t                                     BorderColorGreen;
    uint32_t                                     BorderColorRedDX9;
-   uint32_t                                     BorderColorGreen0;
-   uint32_t                                     BorderColorBlue0;
-   uint32_t                                     BorderColorAlpha0;
-   uint64_t                                     BorderColor;
-   uint64_t                                     BorderColor0;
-   uint64_t                                     BorderColor1;
+   float                                        BorderColorGreen0;
+   float                                        BorderColorBlue0;
+   float                                        BorderColorAlpha0;
+   struct GEN75_BORDER_COLOR_UINT32_SINT32      BorderColor;
+   struct GEN75_BORDER_COLOR_UINT16_SINT16      BorderColor0;
+   struct GEN75_BORDER_COLOR_UINT8_SINT8        BorderColor1;
 };
 
 static inline void
 GEN75_SAMPLER_BORDER_COLOR_STATE_pack(__gen_user_data *data, void * restrict dst,
-                                    const struct GEN75_SAMPLER_BORDER_COLOR_STATE * restrict values)
+                                      const struct GEN75_SAMPLER_BORDER_COLOR_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
    dw[0] =
-      __gen_field(values->BorderColorRedDX100GL, 0, 31) |
+      __gen_float(values->BorderColorRedDX100GL) |
       __gen_field(values->BorderColorAlpha, 24, 31) |
       __gen_field(values->BorderColorBlue, 16, 23) |
       __gen_field(values->BorderColorGreen, 8, 15) |
@@ -7665,15 +7939,15 @@ GEN75_SAMPLER_BORDER_COLOR_STATE_pack(__gen_user_data *data, void * restrict dst
       0;
 
    dw[1] =
-      __gen_field(values->BorderColorGreen, 0, 31) |
+      __gen_float(values->BorderColorGreen) |
       0;
 
    dw[2] =
-      __gen_field(values->BorderColorBlue, 0, 31) |
+      __gen_float(values->BorderColorBlue) |
       0;
 
    dw[3] =
-      __gen_field(values->BorderColorAlpha, 0, 31) |
+      __gen_float(values->BorderColorAlpha) |
       0;
 
    for (uint32_t i = 0, j = 4; i < 12; i += 1, j++) {
@@ -7681,12 +7955,7 @@ GEN75_SAMPLER_BORDER_COLOR_STATE_pack(__gen_user_data *data, void * restrict dst
          0;
    }
 
-   dw[16] =
-      __gen_field(values->BorderColor, 0, 127) |
-      __gen_field(values->BorderColor, 0, 127) |
-      __gen_field(values->BorderColor, 0, 127) |
-      0;
-
+   GEN75_BORDER_COLOR_UINT32_SINT32_pack(data, &dw[16], &values->BorderColor);
 }
 
 #define GEN75_SAMPLER_STATE_length 0x00000004
@@ -7765,7 +8034,7 @@ struct GEN75_SAMPLER_STATE {
 
 static inline void
 GEN75_SAMPLER_STATE_pack(__gen_user_data *data, void * restrict dst,
-                       const struct GEN75_SAMPLER_STATE * restrict values)
+                         const struct GEN75_SAMPLER_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
index 886a26c00a26466110a58cffdc54fd11a4b4204a..2204263e1dd119a42aa608c3bbb0b89fc64fed69 100644 (file)
@@ -92,7 +92,6 @@ __gen_float(float v)
 
 #endif
 
-#define GEN7_3DSTATE_URB_VS_length 0x00000002
 #define GEN7_3DSTATE_URB_VS_length_bias 0x00000002
 #define GEN7_3DSTATE_URB_VS_header              \
    .CommandType          =  3,                  \
@@ -101,6 +100,8 @@ __gen_float(float v)
    ._3DCommandSubOpcode  = 48,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_URB_VS_length 0x00000002
+
 struct GEN7_3DSTATE_URB_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -114,7 +115,7 @@ struct GEN7_3DSTATE_URB_VS {
 
 static inline void
 GEN7_3DSTATE_URB_VS_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN7_3DSTATE_URB_VS * restrict values)
+                         const struct GEN7_3DSTATE_URB_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -134,13 +135,14 @@ GEN7_3DSTATE_URB_VS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MI_STORE_REGISTER_MEM_length 0x00000003
 #define GEN7_MI_STORE_REGISTER_MEM_length_bias 0x00000002
 #define GEN7_MI_STORE_REGISTER_MEM_header       \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 36,                  \
    .DwordLength          =  1
 
+#define GEN7_MI_STORE_REGISTER_MEM_length 0x00000003
+
 struct GEN7_MI_STORE_REGISTER_MEM {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -152,7 +154,7 @@ struct GEN7_MI_STORE_REGISTER_MEM {
 
 static inline void
 GEN7_MI_STORE_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
-                               const struct GEN7_MI_STORE_REGISTER_MEM * restrict values)
+                                const struct GEN7_MI_STORE_REGISTER_MEM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -175,7 +177,6 @@ GEN7_MI_STORE_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_PIPELINE_SELECT_length 0x00000001
 #define GEN7_PIPELINE_SELECT_length_bias 0x00000001
 #define GEN7_PIPELINE_SELECT_header             \
    .CommandType          =  3,                  \
@@ -183,6 +184,8 @@ GEN7_MI_STORE_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  1,                  \
    ._3DCommandSubOpcode  =  4
 
+#define GEN7_PIPELINE_SELECT_length 0x00000001
+
 struct GEN7_PIPELINE_SELECT {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -196,7 +199,7 @@ struct GEN7_PIPELINE_SELECT {
 
 static inline void
 GEN7_PIPELINE_SELECT_pack(__gen_user_data *data, void * restrict dst,
-                         const struct GEN7_PIPELINE_SELECT * restrict values)
+                          const struct GEN7_PIPELINE_SELECT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -210,7 +213,6 @@ GEN7_PIPELINE_SELECT_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_STATE_BASE_ADDRESS_length 0x0000000a
 #define GEN7_STATE_BASE_ADDRESS_length_bias 0x00000002
 #define GEN7_STATE_BASE_ADDRESS_header          \
    .CommandType          =  3,                  \
@@ -219,6 +221,10 @@ GEN7_PIPELINE_SELECT_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  1,                  \
    .DwordLength          =  8
 
+#define GEN7_STATE_BASE_ADDRESS_length 0x0000000a
+
+#define GEN7_MEMORY_OBJECT_CONTROL_STATE_length 0x00000001
+
 struct GEN7_MEMORY_OBJECT_CONTROL_STATE {
    uint32_t                                     GraphicsDataTypeGFDT;
    uint32_t                                     LLCCacheabilityControlLLCCC;
@@ -227,7 +233,7 @@ struct GEN7_MEMORY_OBJECT_CONTROL_STATE {
 
 static inline void
 GEN7_MEMORY_OBJECT_CONTROL_STATE_pack(__gen_user_data *data, void * restrict dst,
-                                     const struct GEN7_MEMORY_OBJECT_CONTROL_STATE * restrict values)
+                                      const struct GEN7_MEMORY_OBJECT_CONTROL_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -274,7 +280,7 @@ struct GEN7_STATE_BASE_ADDRESS {
 
 static inline void
 GEN7_STATE_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
-                            const struct GEN7_STATE_BASE_ADDRESS * restrict values)
+                             const struct GEN7_STATE_BASE_ADDRESS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -370,7 +376,6 @@ GEN7_STATE_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_STATE_PREFETCH_length 0x00000002
 #define GEN7_STATE_PREFETCH_length_bias 0x00000002
 #define GEN7_STATE_PREFETCH_header              \
    .CommandType          =  3,                  \
@@ -379,6 +384,8 @@ GEN7_STATE_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  3,                  \
    .DwordLength          =  0
 
+#define GEN7_STATE_PREFETCH_length 0x00000002
+
 struct GEN7_STATE_PREFETCH {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -391,7 +398,7 @@ struct GEN7_STATE_PREFETCH {
 
 static inline void
 GEN7_STATE_PREFETCH_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN7_STATE_PREFETCH * restrict values)
+                         const struct GEN7_STATE_PREFETCH * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -412,7 +419,6 @@ GEN7_STATE_PREFETCH_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_STATE_SIP_length 0x00000002
 #define GEN7_STATE_SIP_length_bias 0x00000002
 #define GEN7_STATE_SIP_header                   \
    .CommandType          =  3,                  \
@@ -421,6 +427,8 @@ GEN7_STATE_PREFETCH_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  2,                  \
    .DwordLength          =  0
 
+#define GEN7_STATE_SIP_length 0x00000002
+
 struct GEN7_STATE_SIP {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -432,7 +440,7 @@ struct GEN7_STATE_SIP {
 
 static inline void
 GEN7_STATE_SIP_pack(__gen_user_data *data, void * restrict dst,
-                   const struct GEN7_STATE_SIP * restrict values)
+                    const struct GEN7_STATE_SIP * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -450,7 +458,6 @@ GEN7_STATE_SIP_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_SWTESS_BASE_ADDRESS_length 0x00000002
 #define GEN7_SWTESS_BASE_ADDRESS_length_bias 0x00000002
 #define GEN7_SWTESS_BASE_ADDRESS_header         \
    .CommandType          =  3,                  \
@@ -459,6 +466,8 @@ GEN7_STATE_SIP_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  3,                  \
    .DwordLength          =  0
 
+#define GEN7_SWTESS_BASE_ADDRESS_length 0x00000002
+
 struct GEN7_SWTESS_BASE_ADDRESS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -471,7 +480,7 @@ struct GEN7_SWTESS_BASE_ADDRESS {
 
 static inline void
 GEN7_SWTESS_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN7_SWTESS_BASE_ADDRESS * restrict values)
+                              const struct GEN7_SWTESS_BASE_ADDRESS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -494,7 +503,6 @@ GEN7_SWTESS_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DPRIMITIVE_length 0x00000007
 #define GEN7_3DPRIMITIVE_length_bias 0x00000002
 #define GEN7_3DPRIMITIVE_header                 \
    .CommandType          =  3,                  \
@@ -503,6 +511,8 @@ GEN7_SWTESS_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  0,                  \
    .DwordLength          =  5
 
+#define GEN7_3DPRIMITIVE_length 0x00000007
+
 struct GEN7_3DPRIMITIVE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -525,7 +535,7 @@ struct GEN7_3DPRIMITIVE {
 
 static inline void
 GEN7_3DPRIMITIVE_pack(__gen_user_data *data, void * restrict dst,
-                     const struct GEN7_3DPRIMITIVE * restrict values)
+                      const struct GEN7_3DPRIMITIVE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -567,7 +577,6 @@ GEN7_3DPRIMITIVE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_AA_LINE_PARAMETERS_length 0x00000003
 #define GEN7_3DSTATE_AA_LINE_PARAMETERS_length_bias 0x00000002
 #define GEN7_3DSTATE_AA_LINE_PARAMETERS_header  \
    .CommandType          =  3,                  \
@@ -576,6 +585,8 @@ GEN7_3DPRIMITIVE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 10,                  \
    .DwordLength          =  1
 
+#define GEN7_3DSTATE_AA_LINE_PARAMETERS_length 0x00000003
+
 struct GEN7_3DSTATE_AA_LINE_PARAMETERS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -590,7 +601,7 @@ struct GEN7_3DSTATE_AA_LINE_PARAMETERS {
 
 static inline void
 GEN7_3DSTATE_AA_LINE_PARAMETERS_pack(__gen_user_data *data, void * restrict dst,
-                                    const struct GEN7_3DSTATE_AA_LINE_PARAMETERS * restrict values)
+                                     const struct GEN7_3DSTATE_AA_LINE_PARAMETERS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -614,7 +625,6 @@ GEN7_3DSTATE_AA_LINE_PARAMETERS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_BINDING_TABLE_POINTERS_DS_length 0x00000002
 #define GEN7_3DSTATE_BINDING_TABLE_POINTERS_DS_length_bias 0x00000002
 #define GEN7_3DSTATE_BINDING_TABLE_POINTERS_DS_header\
    .CommandType          =  3,                  \
@@ -623,6 +633,8 @@ GEN7_3DSTATE_AA_LINE_PARAMETERS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 40,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_BINDING_TABLE_POINTERS_DS_length 0x00000002
+
 struct GEN7_3DSTATE_BINDING_TABLE_POINTERS_DS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -634,7 +646,7 @@ struct GEN7_3DSTATE_BINDING_TABLE_POINTERS_DS {
 
 static inline void
 GEN7_3DSTATE_BINDING_TABLE_POINTERS_DS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN7_3DSTATE_BINDING_TABLE_POINTERS_DS * restrict values)
+                                            const struct GEN7_3DSTATE_BINDING_TABLE_POINTERS_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -652,7 +664,6 @@ GEN7_3DSTATE_BINDING_TABLE_POINTERS_DS_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN7_3DSTATE_BINDING_TABLE_POINTERS_GS_length 0x00000002
 #define GEN7_3DSTATE_BINDING_TABLE_POINTERS_GS_length_bias 0x00000002
 #define GEN7_3DSTATE_BINDING_TABLE_POINTERS_GS_header\
    .CommandType          =  3,                  \
@@ -661,6 +672,8 @@ GEN7_3DSTATE_BINDING_TABLE_POINTERS_DS_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 41,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_BINDING_TABLE_POINTERS_GS_length 0x00000002
+
 struct GEN7_3DSTATE_BINDING_TABLE_POINTERS_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -672,7 +685,7 @@ struct GEN7_3DSTATE_BINDING_TABLE_POINTERS_GS {
 
 static inline void
 GEN7_3DSTATE_BINDING_TABLE_POINTERS_GS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN7_3DSTATE_BINDING_TABLE_POINTERS_GS * restrict values)
+                                            const struct GEN7_3DSTATE_BINDING_TABLE_POINTERS_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -690,7 +703,6 @@ GEN7_3DSTATE_BINDING_TABLE_POINTERS_GS_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN7_3DSTATE_BINDING_TABLE_POINTERS_HS_length 0x00000002
 #define GEN7_3DSTATE_BINDING_TABLE_POINTERS_HS_length_bias 0x00000002
 #define GEN7_3DSTATE_BINDING_TABLE_POINTERS_HS_header\
    .CommandType          =  3,                  \
@@ -699,6 +711,8 @@ GEN7_3DSTATE_BINDING_TABLE_POINTERS_GS_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 39,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_BINDING_TABLE_POINTERS_HS_length 0x00000002
+
 struct GEN7_3DSTATE_BINDING_TABLE_POINTERS_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -710,7 +724,7 @@ struct GEN7_3DSTATE_BINDING_TABLE_POINTERS_HS {
 
 static inline void
 GEN7_3DSTATE_BINDING_TABLE_POINTERS_HS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN7_3DSTATE_BINDING_TABLE_POINTERS_HS * restrict values)
+                                            const struct GEN7_3DSTATE_BINDING_TABLE_POINTERS_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -728,7 +742,6 @@ GEN7_3DSTATE_BINDING_TABLE_POINTERS_HS_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN7_3DSTATE_BINDING_TABLE_POINTERS_PS_length 0x00000002
 #define GEN7_3DSTATE_BINDING_TABLE_POINTERS_PS_length_bias 0x00000002
 #define GEN7_3DSTATE_BINDING_TABLE_POINTERS_PS_header\
    .CommandType          =  3,                  \
@@ -737,6 +750,8 @@ GEN7_3DSTATE_BINDING_TABLE_POINTERS_HS_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 42,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_BINDING_TABLE_POINTERS_PS_length 0x00000002
+
 struct GEN7_3DSTATE_BINDING_TABLE_POINTERS_PS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -748,7 +763,7 @@ struct GEN7_3DSTATE_BINDING_TABLE_POINTERS_PS {
 
 static inline void
 GEN7_3DSTATE_BINDING_TABLE_POINTERS_PS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN7_3DSTATE_BINDING_TABLE_POINTERS_PS * restrict values)
+                                            const struct GEN7_3DSTATE_BINDING_TABLE_POINTERS_PS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -766,7 +781,6 @@ GEN7_3DSTATE_BINDING_TABLE_POINTERS_PS_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN7_3DSTATE_BINDING_TABLE_POINTERS_VS_length 0x00000002
 #define GEN7_3DSTATE_BINDING_TABLE_POINTERS_VS_length_bias 0x00000002
 #define GEN7_3DSTATE_BINDING_TABLE_POINTERS_VS_header\
    .CommandType          =  3,                  \
@@ -775,6 +789,8 @@ GEN7_3DSTATE_BINDING_TABLE_POINTERS_PS_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 38,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_BINDING_TABLE_POINTERS_VS_length 0x00000002
+
 struct GEN7_3DSTATE_BINDING_TABLE_POINTERS_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -786,7 +802,7 @@ struct GEN7_3DSTATE_BINDING_TABLE_POINTERS_VS {
 
 static inline void
 GEN7_3DSTATE_BINDING_TABLE_POINTERS_VS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN7_3DSTATE_BINDING_TABLE_POINTERS_VS * restrict values)
+                                            const struct GEN7_3DSTATE_BINDING_TABLE_POINTERS_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -804,7 +820,6 @@ GEN7_3DSTATE_BINDING_TABLE_POINTERS_VS_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN7_3DSTATE_BLEND_STATE_POINTERS_length 0x00000002
 #define GEN7_3DSTATE_BLEND_STATE_POINTERS_length_bias 0x00000002
 #define GEN7_3DSTATE_BLEND_STATE_POINTERS_header\
    .CommandType          =  3,                  \
@@ -813,6 +828,8 @@ GEN7_3DSTATE_BINDING_TABLE_POINTERS_VS_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 36,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_BLEND_STATE_POINTERS_length 0x00000002
+
 struct GEN7_3DSTATE_BLEND_STATE_POINTERS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -824,7 +841,7 @@ struct GEN7_3DSTATE_BLEND_STATE_POINTERS {
 
 static inline void
 GEN7_3DSTATE_BLEND_STATE_POINTERS_pack(__gen_user_data *data, void * restrict dst,
-                                      const struct GEN7_3DSTATE_BLEND_STATE_POINTERS * restrict values)
+                                       const struct GEN7_3DSTATE_BLEND_STATE_POINTERS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -843,7 +860,6 @@ GEN7_3DSTATE_BLEND_STATE_POINTERS_pack(__gen_user_data *data, void * restrict ds
 
 }
 
-#define GEN7_3DSTATE_CC_STATE_POINTERS_length 0x00000002
 #define GEN7_3DSTATE_CC_STATE_POINTERS_length_bias 0x00000002
 #define GEN7_3DSTATE_CC_STATE_POINTERS_header   \
    .CommandType          =  3,                  \
@@ -852,6 +868,8 @@ GEN7_3DSTATE_BLEND_STATE_POINTERS_pack(__gen_user_data *data, void * restrict ds
    ._3DCommandSubOpcode  = 14,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_CC_STATE_POINTERS_length 0x00000002
+
 struct GEN7_3DSTATE_CC_STATE_POINTERS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -863,7 +881,7 @@ struct GEN7_3DSTATE_CC_STATE_POINTERS {
 
 static inline void
 GEN7_3DSTATE_CC_STATE_POINTERS_pack(__gen_user_data *data, void * restrict dst,
-                                   const struct GEN7_3DSTATE_CC_STATE_POINTERS * restrict values)
+                                    const struct GEN7_3DSTATE_CC_STATE_POINTERS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -882,7 +900,6 @@ GEN7_3DSTATE_CC_STATE_POINTERS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_CHROMA_KEY_length 0x00000004
 #define GEN7_3DSTATE_CHROMA_KEY_length_bias 0x00000002
 #define GEN7_3DSTATE_CHROMA_KEY_header          \
    .CommandType          =  3,                  \
@@ -891,6 +908,8 @@ GEN7_3DSTATE_CC_STATE_POINTERS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  4,                  \
    .DwordLength          =  2
 
+#define GEN7_3DSTATE_CHROMA_KEY_length 0x00000004
+
 struct GEN7_3DSTATE_CHROMA_KEY {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -904,7 +923,7 @@ struct GEN7_3DSTATE_CHROMA_KEY {
 
 static inline void
 GEN7_3DSTATE_CHROMA_KEY_pack(__gen_user_data *data, void * restrict dst,
-                            const struct GEN7_3DSTATE_CHROMA_KEY * restrict values)
+                             const struct GEN7_3DSTATE_CHROMA_KEY * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -930,7 +949,6 @@ GEN7_3DSTATE_CHROMA_KEY_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_CLEAR_PARAMS_length 0x00000003
 #define GEN7_3DSTATE_CLEAR_PARAMS_length_bias 0x00000002
 #define GEN7_3DSTATE_CLEAR_PARAMS_header        \
    .CommandType          =  3,                  \
@@ -939,6 +957,8 @@ GEN7_3DSTATE_CHROMA_KEY_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  4,                  \
    .DwordLength          =  1
 
+#define GEN7_3DSTATE_CLEAR_PARAMS_length 0x00000003
+
 struct GEN7_3DSTATE_CLEAR_PARAMS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -951,7 +971,7 @@ struct GEN7_3DSTATE_CLEAR_PARAMS {
 
 static inline void
 GEN7_3DSTATE_CLEAR_PARAMS_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN7_3DSTATE_CLEAR_PARAMS * restrict values)
+                               const struct GEN7_3DSTATE_CLEAR_PARAMS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -973,7 +993,6 @@ GEN7_3DSTATE_CLEAR_PARAMS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_CLIP_length 0x00000004
 #define GEN7_3DSTATE_CLIP_length_bias 0x00000002
 #define GEN7_3DSTATE_CLIP_header                \
    .CommandType          =  3,                  \
@@ -982,6 +1001,8 @@ GEN7_3DSTATE_CLEAR_PARAMS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 18,                  \
    .DwordLength          =  2
 
+#define GEN7_3DSTATE_CLIP_length 0x00000004
+
 struct GEN7_3DSTATE_CLIP {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1030,7 +1051,7 @@ struct GEN7_3DSTATE_CLIP {
 
 static inline void
 GEN7_3DSTATE_CLIP_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN7_3DSTATE_CLIP * restrict values)
+                       const struct GEN7_3DSTATE_CLIP * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1075,7 +1096,6 @@ GEN7_3DSTATE_CLIP_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_CONSTANT_DS_length 0x00000007
 #define GEN7_3DSTATE_CONSTANT_DS_length_bias 0x00000002
 #define GEN7_3DSTATE_CONSTANT_DS_header         \
    .CommandType          =  3,                  \
@@ -1084,6 +1104,10 @@ GEN7_3DSTATE_CLIP_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 26,                  \
    .DwordLength          =  5
 
+#define GEN7_3DSTATE_CONSTANT_DS_length 0x00000007
+
+#define GEN7_3DSTATE_CONSTANT_BODY_length 0x00000006
+
 struct GEN7_3DSTATE_CONSTANT_BODY {
    uint32_t                                     ConstantBuffer1ReadLength;
    uint32_t                                     ConstantBuffer0ReadLength;
@@ -1098,7 +1122,7 @@ struct GEN7_3DSTATE_CONSTANT_BODY {
 
 static inline void
 GEN7_3DSTATE_CONSTANT_BODY_pack(__gen_user_data *data, void * restrict dst,
-                               const struct GEN7_3DSTATE_CONSTANT_BODY * restrict values)
+                                const struct GEN7_3DSTATE_CONSTANT_BODY * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1152,7 +1176,7 @@ struct GEN7_3DSTATE_CONSTANT_DS {
 
 static inline void
 GEN7_3DSTATE_CONSTANT_DS_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN7_3DSTATE_CONSTANT_DS * restrict values)
+                              const struct GEN7_3DSTATE_CONSTANT_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1167,7 +1191,6 @@ GEN7_3DSTATE_CONSTANT_DS_pack(__gen_user_data *data, void * restrict dst,
    GEN7_3DSTATE_CONSTANT_BODY_pack(data, &dw[1], &values->ConstantBody);
 }
 
-#define GEN7_3DSTATE_CONSTANT_GS_length 0x00000007
 #define GEN7_3DSTATE_CONSTANT_GS_length_bias 0x00000002
 #define GEN7_3DSTATE_CONSTANT_GS_header         \
    .CommandType          =  3,                  \
@@ -1176,6 +1199,8 @@ GEN7_3DSTATE_CONSTANT_DS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 22,                  \
    .DwordLength          =  5
 
+#define GEN7_3DSTATE_CONSTANT_GS_length 0x00000007
+
 struct GEN7_3DSTATE_CONSTANT_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1187,7 +1212,7 @@ struct GEN7_3DSTATE_CONSTANT_GS {
 
 static inline void
 GEN7_3DSTATE_CONSTANT_GS_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN7_3DSTATE_CONSTANT_GS * restrict values)
+                              const struct GEN7_3DSTATE_CONSTANT_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1202,7 +1227,6 @@ GEN7_3DSTATE_CONSTANT_GS_pack(__gen_user_data *data, void * restrict dst,
    GEN7_3DSTATE_CONSTANT_BODY_pack(data, &dw[1], &values->ConstantBody);
 }
 
-#define GEN7_3DSTATE_CONSTANT_HS_length 0x00000007
 #define GEN7_3DSTATE_CONSTANT_HS_length_bias 0x00000002
 #define GEN7_3DSTATE_CONSTANT_HS_header         \
    .CommandType          =  3,                  \
@@ -1211,6 +1235,8 @@ GEN7_3DSTATE_CONSTANT_GS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 25,                  \
    .DwordLength          =  5
 
+#define GEN7_3DSTATE_CONSTANT_HS_length 0x00000007
+
 struct GEN7_3DSTATE_CONSTANT_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1222,7 +1248,7 @@ struct GEN7_3DSTATE_CONSTANT_HS {
 
 static inline void
 GEN7_3DSTATE_CONSTANT_HS_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN7_3DSTATE_CONSTANT_HS * restrict values)
+                              const struct GEN7_3DSTATE_CONSTANT_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1237,7 +1263,6 @@ GEN7_3DSTATE_CONSTANT_HS_pack(__gen_user_data *data, void * restrict dst,
    GEN7_3DSTATE_CONSTANT_BODY_pack(data, &dw[1], &values->ConstantBody);
 }
 
-#define GEN7_3DSTATE_CONSTANT_PS_length 0x00000007
 #define GEN7_3DSTATE_CONSTANT_PS_length_bias 0x00000002
 #define GEN7_3DSTATE_CONSTANT_PS_header         \
    .CommandType          =  3,                  \
@@ -1246,6 +1271,8 @@ GEN7_3DSTATE_CONSTANT_HS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 23,                  \
    .DwordLength          =  5
 
+#define GEN7_3DSTATE_CONSTANT_PS_length 0x00000007
+
 struct GEN7_3DSTATE_CONSTANT_PS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1257,7 +1284,7 @@ struct GEN7_3DSTATE_CONSTANT_PS {
 
 static inline void
 GEN7_3DSTATE_CONSTANT_PS_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN7_3DSTATE_CONSTANT_PS * restrict values)
+                              const struct GEN7_3DSTATE_CONSTANT_PS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1272,7 +1299,6 @@ GEN7_3DSTATE_CONSTANT_PS_pack(__gen_user_data *data, void * restrict dst,
    GEN7_3DSTATE_CONSTANT_BODY_pack(data, &dw[1], &values->ConstantBody);
 }
 
-#define GEN7_3DSTATE_CONSTANT_VS_length 0x00000007
 #define GEN7_3DSTATE_CONSTANT_VS_length_bias 0x00000002
 #define GEN7_3DSTATE_CONSTANT_VS_header         \
    .CommandType          =  3,                  \
@@ -1281,6 +1307,8 @@ GEN7_3DSTATE_CONSTANT_PS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 21,                  \
    .DwordLength          =  5
 
+#define GEN7_3DSTATE_CONSTANT_VS_length 0x00000007
+
 struct GEN7_3DSTATE_CONSTANT_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1292,7 +1320,7 @@ struct GEN7_3DSTATE_CONSTANT_VS {
 
 static inline void
 GEN7_3DSTATE_CONSTANT_VS_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN7_3DSTATE_CONSTANT_VS * restrict values)
+                              const struct GEN7_3DSTATE_CONSTANT_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1307,7 +1335,6 @@ GEN7_3DSTATE_CONSTANT_VS_pack(__gen_user_data *data, void * restrict dst,
    GEN7_3DSTATE_CONSTANT_BODY_pack(data, &dw[1], &values->ConstantBody);
 }
 
-#define GEN7_3DSTATE_DEPTH_BUFFER_length 0x00000007
 #define GEN7_3DSTATE_DEPTH_BUFFER_length_bias 0x00000002
 #define GEN7_3DSTATE_DEPTH_BUFFER_header        \
    .CommandType          =  3,                  \
@@ -1316,6 +1343,8 @@ GEN7_3DSTATE_CONSTANT_VS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  5,                  \
    .DwordLength          =  5
 
+#define GEN7_3DSTATE_DEPTH_BUFFER_length 0x00000007
+
 struct GEN7_3DSTATE_DEPTH_BUFFER {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1351,7 +1380,7 @@ struct GEN7_3DSTATE_DEPTH_BUFFER {
 
 static inline void
 GEN7_3DSTATE_DEPTH_BUFFER_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN7_3DSTATE_DEPTH_BUFFER * restrict values)
+                               const struct GEN7_3DSTATE_DEPTH_BUFFER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1403,7 +1432,6 @@ GEN7_3DSTATE_DEPTH_BUFFER_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_DEPTH_STENCIL_STATE_POINTERS_length 0x00000002
 #define GEN7_3DSTATE_DEPTH_STENCIL_STATE_POINTERS_length_bias 0x00000002
 #define GEN7_3DSTATE_DEPTH_STENCIL_STATE_POINTERS_header\
    .CommandType          =  3,                  \
@@ -1412,6 +1440,8 @@ GEN7_3DSTATE_DEPTH_BUFFER_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 37,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_DEPTH_STENCIL_STATE_POINTERS_length 0x00000002
+
 struct GEN7_3DSTATE_DEPTH_STENCIL_STATE_POINTERS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1423,7 +1453,7 @@ struct GEN7_3DSTATE_DEPTH_STENCIL_STATE_POINTERS {
 
 static inline void
 GEN7_3DSTATE_DEPTH_STENCIL_STATE_POINTERS_pack(__gen_user_data *data, void * restrict dst,
-                                              const struct GEN7_3DSTATE_DEPTH_STENCIL_STATE_POINTERS * restrict values)
+                                               const struct GEN7_3DSTATE_DEPTH_STENCIL_STATE_POINTERS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1442,7 +1472,6 @@ GEN7_3DSTATE_DEPTH_STENCIL_STATE_POINTERS_pack(__gen_user_data *data, void * res
 
 }
 
-#define GEN7_3DSTATE_DRAWING_RECTANGLE_length 0x00000004
 #define GEN7_3DSTATE_DRAWING_RECTANGLE_length_bias 0x00000002
 #define GEN7_3DSTATE_DRAWING_RECTANGLE_header   \
    .CommandType          =  3,                  \
@@ -1451,6 +1480,8 @@ GEN7_3DSTATE_DEPTH_STENCIL_STATE_POINTERS_pack(__gen_user_data *data, void * res
    ._3DCommandSubOpcode  =  0,                  \
    .DwordLength          =  2
 
+#define GEN7_3DSTATE_DRAWING_RECTANGLE_length 0x00000004
+
 struct GEN7_3DSTATE_DRAWING_RECTANGLE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1467,7 +1498,7 @@ struct GEN7_3DSTATE_DRAWING_RECTANGLE {
 
 static inline void
 GEN7_3DSTATE_DRAWING_RECTANGLE_pack(__gen_user_data *data, void * restrict dst,
-                                   const struct GEN7_3DSTATE_DRAWING_RECTANGLE * restrict values)
+                                    const struct GEN7_3DSTATE_DRAWING_RECTANGLE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1496,7 +1527,6 @@ GEN7_3DSTATE_DRAWING_RECTANGLE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_DS_length 0x00000006
 #define GEN7_3DSTATE_DS_length_bias 0x00000002
 #define GEN7_3DSTATE_DS_header                  \
    .CommandType          =  3,                  \
@@ -1505,6 +1535,8 @@ GEN7_3DSTATE_DRAWING_RECTANGLE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 29,                  \
    .DwordLength          =  4
 
+#define GEN7_3DSTATE_DS_length 0x00000006
+
 struct GEN7_3DSTATE_DS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1544,7 +1576,7 @@ struct GEN7_3DSTATE_DS {
 
 static inline void
 GEN7_3DSTATE_DS_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN7_3DSTATE_DS * restrict values)
+                     const struct GEN7_3DSTATE_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1591,7 +1623,6 @@ GEN7_3DSTATE_DS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_GS_length 0x00000007
 #define GEN7_3DSTATE_GS_length_bias 0x00000002
 #define GEN7_3DSTATE_GS_header                  \
    .CommandType          =  3,                  \
@@ -1600,6 +1631,8 @@ GEN7_3DSTATE_DS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 17,                  \
    .DwordLength          =  5
 
+#define GEN7_3DSTATE_GS_length 0x00000007
+
 struct GEN7_3DSTATE_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1658,7 +1691,7 @@ struct GEN7_3DSTATE_GS {
 
 static inline void
 GEN7_3DSTATE_GS_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN7_3DSTATE_GS * restrict values)
+                     const struct GEN7_3DSTATE_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1722,7 +1755,6 @@ GEN7_3DSTATE_GS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_HIER_DEPTH_BUFFER_length 0x00000003
 #define GEN7_3DSTATE_HIER_DEPTH_BUFFER_length_bias 0x00000002
 #define GEN7_3DSTATE_HIER_DEPTH_BUFFER_header   \
    .CommandType          =  3,                  \
@@ -1731,6 +1763,8 @@ GEN7_3DSTATE_GS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  7,                  \
    .DwordLength          =  1
 
+#define GEN7_3DSTATE_HIER_DEPTH_BUFFER_length 0x00000003
+
 struct GEN7_3DSTATE_HIER_DEPTH_BUFFER {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1744,7 +1778,7 @@ struct GEN7_3DSTATE_HIER_DEPTH_BUFFER {
 
 static inline void
 GEN7_3DSTATE_HIER_DEPTH_BUFFER_pack(__gen_user_data *data, void * restrict dst,
-                                   const struct GEN7_3DSTATE_HIER_DEPTH_BUFFER * restrict values)
+                                    const struct GEN7_3DSTATE_HIER_DEPTH_BUFFER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1771,7 +1805,6 @@ GEN7_3DSTATE_HIER_DEPTH_BUFFER_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_HS_length 0x00000007
 #define GEN7_3DSTATE_HS_length_bias 0x00000002
 #define GEN7_3DSTATE_HS_header                  \
    .CommandType          =  3,                  \
@@ -1780,6 +1813,8 @@ GEN7_3DSTATE_HIER_DEPTH_BUFFER_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 27,                  \
    .DwordLength          =  5
 
+#define GEN7_3DSTATE_HS_length 0x00000007
+
 struct GEN7_3DSTATE_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1818,7 +1853,7 @@ struct GEN7_3DSTATE_HS {
 
 static inline void
 GEN7_3DSTATE_HS_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN7_3DSTATE_HS * restrict values)
+                     const struct GEN7_3DSTATE_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1869,7 +1904,6 @@ GEN7_3DSTATE_HS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_INDEX_BUFFER_length 0x00000003
 #define GEN7_3DSTATE_INDEX_BUFFER_length_bias 0x00000002
 #define GEN7_3DSTATE_INDEX_BUFFER_header        \
    .CommandType          =  3,                  \
@@ -1878,6 +1912,8 @@ GEN7_3DSTATE_HS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 10,                  \
    .DwordLength          =  1
 
+#define GEN7_3DSTATE_INDEX_BUFFER_length 0x00000003
+
 struct GEN7_3DSTATE_INDEX_BUFFER {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1896,7 +1932,7 @@ struct GEN7_3DSTATE_INDEX_BUFFER {
 
 static inline void
 GEN7_3DSTATE_INDEX_BUFFER_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN7_3DSTATE_INDEX_BUFFER * restrict values)
+                               const struct GEN7_3DSTATE_INDEX_BUFFER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1927,7 +1963,6 @@ GEN7_3DSTATE_INDEX_BUFFER_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_LINE_STIPPLE_length 0x00000003
 #define GEN7_3DSTATE_LINE_STIPPLE_length_bias 0x00000002
 #define GEN7_3DSTATE_LINE_STIPPLE_header        \
    .CommandType          =  3,                  \
@@ -1936,6 +1971,8 @@ GEN7_3DSTATE_INDEX_BUFFER_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  8,                  \
    .DwordLength          =  1
 
+#define GEN7_3DSTATE_LINE_STIPPLE_length 0x00000003
+
 struct GEN7_3DSTATE_LINE_STIPPLE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1952,7 +1989,7 @@ struct GEN7_3DSTATE_LINE_STIPPLE {
 
 static inline void
 GEN7_3DSTATE_LINE_STIPPLE_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN7_3DSTATE_LINE_STIPPLE * restrict values)
+                               const struct GEN7_3DSTATE_LINE_STIPPLE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1978,7 +2015,6 @@ GEN7_3DSTATE_LINE_STIPPLE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_MONOFILTER_SIZE_length 0x00000002
 #define GEN7_3DSTATE_MONOFILTER_SIZE_length_bias 0x00000002
 #define GEN7_3DSTATE_MONOFILTER_SIZE_header     \
    .CommandType          =  3,                  \
@@ -1987,6 +2023,8 @@ GEN7_3DSTATE_LINE_STIPPLE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 17,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_MONOFILTER_SIZE_length 0x00000002
+
 struct GEN7_3DSTATE_MONOFILTER_SIZE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1999,7 +2037,7 @@ struct GEN7_3DSTATE_MONOFILTER_SIZE {
 
 static inline void
 GEN7_3DSTATE_MONOFILTER_SIZE_pack(__gen_user_data *data, void * restrict dst,
-                                 const struct GEN7_3DSTATE_MONOFILTER_SIZE * restrict values)
+                                  const struct GEN7_3DSTATE_MONOFILTER_SIZE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2018,7 +2056,6 @@ GEN7_3DSTATE_MONOFILTER_SIZE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_MULTISAMPLE_length 0x00000004
 #define GEN7_3DSTATE_MULTISAMPLE_length_bias 0x00000002
 #define GEN7_3DSTATE_MULTISAMPLE_header         \
    .CommandType          =  3,                  \
@@ -2027,6 +2064,8 @@ GEN7_3DSTATE_MONOFILTER_SIZE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 13,                  \
    .DwordLength          =  2
 
+#define GEN7_3DSTATE_MULTISAMPLE_length 0x00000004
+
 struct GEN7_3DSTATE_MULTISAMPLE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2060,7 +2099,7 @@ struct GEN7_3DSTATE_MULTISAMPLE {
 
 static inline void
 GEN7_3DSTATE_MULTISAMPLE_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN7_3DSTATE_MULTISAMPLE * restrict values)
+                              const struct GEN7_3DSTATE_MULTISAMPLE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2101,7 +2140,6 @@ GEN7_3DSTATE_MULTISAMPLE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_POLY_STIPPLE_OFFSET_length 0x00000002
 #define GEN7_3DSTATE_POLY_STIPPLE_OFFSET_length_bias 0x00000002
 #define GEN7_3DSTATE_POLY_STIPPLE_OFFSET_header \
    .CommandType          =  3,                  \
@@ -2110,6 +2148,8 @@ GEN7_3DSTATE_MULTISAMPLE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  6,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_POLY_STIPPLE_OFFSET_length 0x00000002
+
 struct GEN7_3DSTATE_POLY_STIPPLE_OFFSET {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2122,7 +2162,7 @@ struct GEN7_3DSTATE_POLY_STIPPLE_OFFSET {
 
 static inline void
 GEN7_3DSTATE_POLY_STIPPLE_OFFSET_pack(__gen_user_data *data, void * restrict dst,
-                                     const struct GEN7_3DSTATE_POLY_STIPPLE_OFFSET * restrict values)
+                                      const struct GEN7_3DSTATE_POLY_STIPPLE_OFFSET * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2141,7 +2181,6 @@ GEN7_3DSTATE_POLY_STIPPLE_OFFSET_pack(__gen_user_data *data, void * restrict dst
 
 }
 
-#define GEN7_3DSTATE_POLY_STIPPLE_PATTERN_length 0x00000021
 #define GEN7_3DSTATE_POLY_STIPPLE_PATTERN_length_bias 0x00000002
 #define GEN7_3DSTATE_POLY_STIPPLE_PATTERN_header\
    .CommandType          =  3,                  \
@@ -2150,6 +2189,8 @@ GEN7_3DSTATE_POLY_STIPPLE_OFFSET_pack(__gen_user_data *data, void * restrict dst
    ._3DCommandSubOpcode  =  7,                  \
    .DwordLength          = 31
 
+#define GEN7_3DSTATE_POLY_STIPPLE_PATTERN_length 0x00000021
+
 struct GEN7_3DSTATE_POLY_STIPPLE_PATTERN {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2161,7 +2202,7 @@ struct GEN7_3DSTATE_POLY_STIPPLE_PATTERN {
 
 static inline void
 GEN7_3DSTATE_POLY_STIPPLE_PATTERN_pack(__gen_user_data *data, void * restrict dst,
-                                      const struct GEN7_3DSTATE_POLY_STIPPLE_PATTERN * restrict values)
+                                       const struct GEN7_3DSTATE_POLY_STIPPLE_PATTERN * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2181,7 +2222,6 @@ GEN7_3DSTATE_POLY_STIPPLE_PATTERN_pack(__gen_user_data *data, void * restrict ds
 
 }
 
-#define GEN7_3DSTATE_PS_length 0x00000008
 #define GEN7_3DSTATE_PS_length_bias 0x00000002
 #define GEN7_3DSTATE_PS_header                  \
    .CommandType          =  3,                  \
@@ -2190,6 +2230,8 @@ GEN7_3DSTATE_POLY_STIPPLE_PATTERN_pack(__gen_user_data *data, void * restrict ds
    ._3DCommandSubOpcode  = 32,                  \
    .DwordLength          =  6
 
+#define GEN7_3DSTATE_PS_length 0x00000008
+
 struct GEN7_3DSTATE_PS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2244,7 +2286,7 @@ struct GEN7_3DSTATE_PS {
 
 static inline void
 GEN7_3DSTATE_PS_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN7_3DSTATE_PS * restrict values)
+                     const struct GEN7_3DSTATE_PS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2308,7 +2350,6 @@ GEN7_3DSTATE_PS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_DS_length 0x00000002
 #define GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_DS_length_bias 0x00000002
 #define GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_DS_header\
    .CommandType          =  3,                  \
@@ -2317,6 +2358,8 @@ GEN7_3DSTATE_PS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 20,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_DS_length 0x00000002
+
 struct GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_DS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2331,7 +2374,7 @@ struct GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_DS {
 
 static inline void
 GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_DS_pack(__gen_user_data *data, void * restrict dst,
-                                        const struct GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_DS * restrict values)
+                                         const struct GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2350,7 +2393,6 @@ GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_DS_pack(__gen_user_data *data, void * restrict
 
 }
 
-#define GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_GS_length 0x00000002
 #define GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_GS_length_bias 0x00000002
 #define GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_GS_header\
    .CommandType          =  3,                  \
@@ -2359,6 +2401,8 @@ GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_DS_pack(__gen_user_data *data, void * restrict
    ._3DCommandSubOpcode  = 21,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_GS_length 0x00000002
+
 struct GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2373,7 +2417,7 @@ struct GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_GS {
 
 static inline void
 GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_GS_pack(__gen_user_data *data, void * restrict dst,
-                                        const struct GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_GS * restrict values)
+                                         const struct GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2392,7 +2436,6 @@ GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_GS_pack(__gen_user_data *data, void * restrict
 
 }
 
-#define GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_HS_length 0x00000002
 #define GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_HS_length_bias 0x00000002
 #define GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_HS_header\
    .CommandType          =  3,                  \
@@ -2401,6 +2444,8 @@ GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_GS_pack(__gen_user_data *data, void * restrict
    ._3DCommandSubOpcode  = 19,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_HS_length 0x00000002
+
 struct GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2415,7 +2460,7 @@ struct GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_HS {
 
 static inline void
 GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_HS_pack(__gen_user_data *data, void * restrict dst,
-                                        const struct GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_HS * restrict values)
+                                         const struct GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2434,7 +2479,6 @@ GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_HS_pack(__gen_user_data *data, void * restrict
 
 }
 
-#define GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_PS_length 0x00000002
 #define GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_PS_length_bias 0x00000002
 #define GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_PS_header\
    .CommandType          =  3,                  \
@@ -2443,6 +2487,8 @@ GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_HS_pack(__gen_user_data *data, void * restrict
    ._3DCommandSubOpcode  = 22,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_PS_length 0x00000002
+
 struct GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_PS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2457,7 +2503,7 @@ struct GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_PS {
 
 static inline void
 GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_PS_pack(__gen_user_data *data, void * restrict dst,
-                                        const struct GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_PS * restrict values)
+                                         const struct GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_PS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2476,7 +2522,6 @@ GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_PS_pack(__gen_user_data *data, void * restrict
 
 }
 
-#define GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_VS_length 0x00000002
 #define GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_VS_length_bias 0x00000002
 #define GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_VS_header\
    .CommandType          =  3,                  \
@@ -2485,6 +2530,8 @@ GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_PS_pack(__gen_user_data *data, void * restrict
    ._3DCommandSubOpcode  = 18,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_VS_length 0x00000002
+
 struct GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2499,7 +2546,7 @@ struct GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_VS {
 
 static inline void
 GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_VS_pack(__gen_user_data *data, void * restrict dst,
-                                        const struct GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_VS * restrict values)
+                                         const struct GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2525,6 +2572,10 @@ GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_VS_pack(__gen_user_data *data, void * restrict
    ._3DCommandOpcode     =  1,                  \
    ._3DCommandSubOpcode  =  2
 
+#define GEN7_3DSTATE_SAMPLER_PALETTE_LOAD0_length 0x00000000
+
+#define GEN7_PALETTE_ENTRY_length 0x00000001
+
 struct GEN7_PALETTE_ENTRY {
    uint32_t                                     Alpha;
    uint32_t                                     Red;
@@ -2534,7 +2585,7 @@ struct GEN7_PALETTE_ENTRY {
 
 static inline void
 GEN7_PALETTE_ENTRY_pack(__gen_user_data *data, void * restrict dst,
-                       const struct GEN7_PALETTE_ENTRY * restrict values)
+                        const struct GEN7_PALETTE_ENTRY * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2558,7 +2609,7 @@ struct GEN7_3DSTATE_SAMPLER_PALETTE_LOAD0 {
 
 static inline void
 GEN7_3DSTATE_SAMPLER_PALETTE_LOAD0_pack(__gen_user_data *data, void * restrict dst,
-                                       const struct GEN7_3DSTATE_SAMPLER_PALETTE_LOAD0 * restrict values)
+                                        const struct GEN7_3DSTATE_SAMPLER_PALETTE_LOAD0 * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2580,6 +2631,8 @@ GEN7_3DSTATE_SAMPLER_PALETTE_LOAD0_pack(__gen_user_data *data, void * restrict d
    ._3DCommandOpcode     =  1,                  \
    ._3DCommandSubOpcode  = 12
 
+#define GEN7_3DSTATE_SAMPLER_PALETTE_LOAD1_length 0x00000000
+
 struct GEN7_3DSTATE_SAMPLER_PALETTE_LOAD1 {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2591,7 +2644,7 @@ struct GEN7_3DSTATE_SAMPLER_PALETTE_LOAD1 {
 
 static inline void
 GEN7_3DSTATE_SAMPLER_PALETTE_LOAD1_pack(__gen_user_data *data, void * restrict dst,
-                                       const struct GEN7_3DSTATE_SAMPLER_PALETTE_LOAD1 * restrict values)
+                                        const struct GEN7_3DSTATE_SAMPLER_PALETTE_LOAD1 * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2606,7 +2659,6 @@ GEN7_3DSTATE_SAMPLER_PALETTE_LOAD1_pack(__gen_user_data *data, void * restrict d
    /* variable length fields follow */
 }
 
-#define GEN7_3DSTATE_SAMPLER_STATE_POINTERS_DS_length 0x00000002
 #define GEN7_3DSTATE_SAMPLER_STATE_POINTERS_DS_length_bias 0x00000002
 #define GEN7_3DSTATE_SAMPLER_STATE_POINTERS_DS_header\
    .CommandType          =  3,                  \
@@ -2615,6 +2667,8 @@ GEN7_3DSTATE_SAMPLER_PALETTE_LOAD1_pack(__gen_user_data *data, void * restrict d
    ._3DCommandSubOpcode  = 45,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_SAMPLER_STATE_POINTERS_DS_length 0x00000002
+
 struct GEN7_3DSTATE_SAMPLER_STATE_POINTERS_DS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2626,7 +2680,7 @@ struct GEN7_3DSTATE_SAMPLER_STATE_POINTERS_DS {
 
 static inline void
 GEN7_3DSTATE_SAMPLER_STATE_POINTERS_DS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN7_3DSTATE_SAMPLER_STATE_POINTERS_DS * restrict values)
+                                            const struct GEN7_3DSTATE_SAMPLER_STATE_POINTERS_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2644,7 +2698,6 @@ GEN7_3DSTATE_SAMPLER_STATE_POINTERS_DS_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN7_3DSTATE_SAMPLER_STATE_POINTERS_GS_length 0x00000002
 #define GEN7_3DSTATE_SAMPLER_STATE_POINTERS_GS_length_bias 0x00000002
 #define GEN7_3DSTATE_SAMPLER_STATE_POINTERS_GS_header\
    .CommandType          =  3,                  \
@@ -2653,6 +2706,8 @@ GEN7_3DSTATE_SAMPLER_STATE_POINTERS_DS_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 46,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_SAMPLER_STATE_POINTERS_GS_length 0x00000002
+
 struct GEN7_3DSTATE_SAMPLER_STATE_POINTERS_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2664,7 +2719,7 @@ struct GEN7_3DSTATE_SAMPLER_STATE_POINTERS_GS {
 
 static inline void
 GEN7_3DSTATE_SAMPLER_STATE_POINTERS_GS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN7_3DSTATE_SAMPLER_STATE_POINTERS_GS * restrict values)
+                                            const struct GEN7_3DSTATE_SAMPLER_STATE_POINTERS_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2682,7 +2737,6 @@ GEN7_3DSTATE_SAMPLER_STATE_POINTERS_GS_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN7_3DSTATE_SAMPLER_STATE_POINTERS_HS_length 0x00000002
 #define GEN7_3DSTATE_SAMPLER_STATE_POINTERS_HS_length_bias 0x00000002
 #define GEN7_3DSTATE_SAMPLER_STATE_POINTERS_HS_header\
    .CommandType          =  3,                  \
@@ -2691,6 +2745,8 @@ GEN7_3DSTATE_SAMPLER_STATE_POINTERS_GS_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 44,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_SAMPLER_STATE_POINTERS_HS_length 0x00000002
+
 struct GEN7_3DSTATE_SAMPLER_STATE_POINTERS_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2702,7 +2758,7 @@ struct GEN7_3DSTATE_SAMPLER_STATE_POINTERS_HS {
 
 static inline void
 GEN7_3DSTATE_SAMPLER_STATE_POINTERS_HS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN7_3DSTATE_SAMPLER_STATE_POINTERS_HS * restrict values)
+                                            const struct GEN7_3DSTATE_SAMPLER_STATE_POINTERS_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2720,7 +2776,6 @@ GEN7_3DSTATE_SAMPLER_STATE_POINTERS_HS_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN7_3DSTATE_SAMPLER_STATE_POINTERS_PS_length 0x00000002
 #define GEN7_3DSTATE_SAMPLER_STATE_POINTERS_PS_length_bias 0x00000002
 #define GEN7_3DSTATE_SAMPLER_STATE_POINTERS_PS_header\
    .CommandType          =  3,                  \
@@ -2729,6 +2784,8 @@ GEN7_3DSTATE_SAMPLER_STATE_POINTERS_HS_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 47,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_SAMPLER_STATE_POINTERS_PS_length 0x00000002
+
 struct GEN7_3DSTATE_SAMPLER_STATE_POINTERS_PS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2740,7 +2797,7 @@ struct GEN7_3DSTATE_SAMPLER_STATE_POINTERS_PS {
 
 static inline void
 GEN7_3DSTATE_SAMPLER_STATE_POINTERS_PS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN7_3DSTATE_SAMPLER_STATE_POINTERS_PS * restrict values)
+                                            const struct GEN7_3DSTATE_SAMPLER_STATE_POINTERS_PS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2758,7 +2815,6 @@ GEN7_3DSTATE_SAMPLER_STATE_POINTERS_PS_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN7_3DSTATE_SAMPLER_STATE_POINTERS_VS_length 0x00000002
 #define GEN7_3DSTATE_SAMPLER_STATE_POINTERS_VS_length_bias 0x00000002
 #define GEN7_3DSTATE_SAMPLER_STATE_POINTERS_VS_header\
    .CommandType          =  3,                  \
@@ -2767,6 +2823,8 @@ GEN7_3DSTATE_SAMPLER_STATE_POINTERS_PS_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 43,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_SAMPLER_STATE_POINTERS_VS_length 0x00000002
+
 struct GEN7_3DSTATE_SAMPLER_STATE_POINTERS_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2778,7 +2836,7 @@ struct GEN7_3DSTATE_SAMPLER_STATE_POINTERS_VS {
 
 static inline void
 GEN7_3DSTATE_SAMPLER_STATE_POINTERS_VS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN7_3DSTATE_SAMPLER_STATE_POINTERS_VS * restrict values)
+                                            const struct GEN7_3DSTATE_SAMPLER_STATE_POINTERS_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2796,7 +2854,6 @@ GEN7_3DSTATE_SAMPLER_STATE_POINTERS_VS_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN7_3DSTATE_SAMPLE_MASK_length 0x00000002
 #define GEN7_3DSTATE_SAMPLE_MASK_length_bias 0x00000002
 #define GEN7_3DSTATE_SAMPLE_MASK_header         \
    .CommandType          =  3,                  \
@@ -2805,6 +2862,8 @@ GEN7_3DSTATE_SAMPLER_STATE_POINTERS_VS_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 24,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_SAMPLE_MASK_length 0x00000002
+
 struct GEN7_3DSTATE_SAMPLE_MASK {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2816,7 +2875,7 @@ struct GEN7_3DSTATE_SAMPLE_MASK {
 
 static inline void
 GEN7_3DSTATE_SAMPLE_MASK_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN7_3DSTATE_SAMPLE_MASK * restrict values)
+                              const struct GEN7_3DSTATE_SAMPLE_MASK * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2834,7 +2893,6 @@ GEN7_3DSTATE_SAMPLE_MASK_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_SBE_length 0x0000000e
 #define GEN7_3DSTATE_SBE_length_bias 0x00000002
 #define GEN7_3DSTATE_SBE_header                 \
    .CommandType          =  3,                  \
@@ -2843,6 +2901,8 @@ GEN7_3DSTATE_SAMPLE_MASK_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 31,                  \
    .DwordLength          = 12
 
+#define GEN7_3DSTATE_SBE_length 0x0000000e
+
 struct GEN7_3DSTATE_SBE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2911,7 +2971,7 @@ struct GEN7_3DSTATE_SBE {
 
 static inline void
 GEN7_3DSTATE_SBE_pack(__gen_user_data *data, void * restrict dst,
-                     const struct GEN7_3DSTATE_SBE * restrict values)
+                      const struct GEN7_3DSTATE_SBE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2981,7 +3041,6 @@ GEN7_3DSTATE_SBE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_SCISSOR_STATE_POINTERS_length 0x00000002
 #define GEN7_3DSTATE_SCISSOR_STATE_POINTERS_length_bias 0x00000002
 #define GEN7_3DSTATE_SCISSOR_STATE_POINTERS_header\
    .CommandType          =  3,                  \
@@ -2990,6 +3049,8 @@ GEN7_3DSTATE_SBE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 15,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_SCISSOR_STATE_POINTERS_length 0x00000002
+
 struct GEN7_3DSTATE_SCISSOR_STATE_POINTERS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3001,7 +3062,7 @@ struct GEN7_3DSTATE_SCISSOR_STATE_POINTERS {
 
 static inline void
 GEN7_3DSTATE_SCISSOR_STATE_POINTERS_pack(__gen_user_data *data, void * restrict dst,
-                                        const struct GEN7_3DSTATE_SCISSOR_STATE_POINTERS * restrict values)
+                                         const struct GEN7_3DSTATE_SCISSOR_STATE_POINTERS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3019,7 +3080,6 @@ GEN7_3DSTATE_SCISSOR_STATE_POINTERS_pack(__gen_user_data *data, void * restrict
 
 }
 
-#define GEN7_3DSTATE_SF_length 0x00000007
 #define GEN7_3DSTATE_SF_length_bias 0x00000002
 #define GEN7_3DSTATE_SF_header                  \
    .CommandType          =  3,                  \
@@ -3028,6 +3088,8 @@ GEN7_3DSTATE_SCISSOR_STATE_POINTERS_pack(__gen_user_data *data, void * restrict
    ._3DCommandSubOpcode  = 19,                  \
    .DwordLength          =  5
 
+#define GEN7_3DSTATE_SF_length 0x00000007
+
 struct GEN7_3DSTATE_SF {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3080,14 +3142,14 @@ struct GEN7_3DSTATE_SF {
    uint32_t                                     VertexSubPixelPrecisionSelect;
    uint32_t                                     UsePointWidthState;
    float                                        PointWidth;
-   uint32_t                                     GlobalDepthOffsetConstant;
-   uint32_t                                     GlobalDepthOffsetScale;
-   uint32_t                                     GlobalDepthOffsetClamp;
+   float                                        GlobalDepthOffsetConstant;
+   float                                        GlobalDepthOffsetScale;
+   float                                        GlobalDepthOffsetClamp;
 };
 
 static inline void
 GEN7_3DSTATE_SF_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN7_3DSTATE_SF * restrict values)
+                     const struct GEN7_3DSTATE_SF * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3133,20 +3195,19 @@ GEN7_3DSTATE_SF_pack(__gen_user_data *data, void * restrict dst,
       0;
 
    dw[4] =
-      __gen_field(values->GlobalDepthOffsetConstant, 0, 31) |
+      __gen_float(values->GlobalDepthOffsetConstant) |
       0;
 
    dw[5] =
-      __gen_field(values->GlobalDepthOffsetScale, 0, 31) |
+      __gen_float(values->GlobalDepthOffsetScale) |
       0;
 
    dw[6] =
-      __gen_field(values->GlobalDepthOffsetClamp, 0, 31) |
+      __gen_float(values->GlobalDepthOffsetClamp) |
       0;
 
 }
 
-#define GEN7_3DSTATE_SO_BUFFER_length 0x00000004
 #define GEN7_3DSTATE_SO_BUFFER_length_bias 0x00000002
 #define GEN7_3DSTATE_SO_BUFFER_header           \
    .CommandType          =  3,                  \
@@ -3155,6 +3216,8 @@ GEN7_3DSTATE_SF_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 24,                  \
    .DwordLength          =  2
 
+#define GEN7_3DSTATE_SO_BUFFER_length 0x00000004
+
 struct GEN7_3DSTATE_SO_BUFFER {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3170,7 +3233,7 @@ struct GEN7_3DSTATE_SO_BUFFER {
 
 static inline void
 GEN7_3DSTATE_SO_BUFFER_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN7_3DSTATE_SO_BUFFER * restrict values)
+                            const struct GEN7_3DSTATE_SO_BUFFER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3211,6 +3274,12 @@ GEN7_3DSTATE_SO_BUFFER_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  1,                  \
    ._3DCommandSubOpcode  = 23
 
+#define GEN7_3DSTATE_SO_DECL_LIST_length 0x00000000
+
+#define GEN7_SO_DECL_ENTRY_length 0x00000002
+
+#define GEN7_SO_DECL_length 0x00000001
+
 struct GEN7_SO_DECL {
    uint32_t                                     OutputBufferSlot;
    uint32_t                                     HoleFlag;
@@ -3220,7 +3289,7 @@ struct GEN7_SO_DECL {
 
 static inline void
 GEN7_SO_DECL_pack(__gen_user_data *data, void * restrict dst,
-                 const struct GEN7_SO_DECL * restrict values)
+                  const struct GEN7_SO_DECL * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3242,7 +3311,7 @@ struct GEN7_SO_DECL_ENTRY {
 
 static inline void
 GEN7_SO_DECL_ENTRY_pack(__gen_user_data *data, void * restrict dst,
-                       const struct GEN7_SO_DECL_ENTRY * restrict values)
+                        const struct GEN7_SO_DECL_ENTRY * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3285,7 +3354,7 @@ struct GEN7_3DSTATE_SO_DECL_LIST {
 
 static inline void
 GEN7_3DSTATE_SO_DECL_LIST_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN7_3DSTATE_SO_DECL_LIST * restrict values)
+                               const struct GEN7_3DSTATE_SO_DECL_LIST * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3314,7 +3383,6 @@ GEN7_3DSTATE_SO_DECL_LIST_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN7_3DSTATE_STENCIL_BUFFER_length 0x00000003
 #define GEN7_3DSTATE_STENCIL_BUFFER_length_bias 0x00000002
 #define GEN7_3DSTATE_STENCIL_BUFFER_header      \
    .CommandType          =  3,                  \
@@ -3323,6 +3391,8 @@ GEN7_3DSTATE_SO_DECL_LIST_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  6,                  \
    .DwordLength          =  1
 
+#define GEN7_3DSTATE_STENCIL_BUFFER_length 0x00000003
+
 struct GEN7_3DSTATE_STENCIL_BUFFER {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3336,7 +3406,7 @@ struct GEN7_3DSTATE_STENCIL_BUFFER {
 
 static inline void
 GEN7_3DSTATE_STENCIL_BUFFER_pack(__gen_user_data *data, void * restrict dst,
-                                const struct GEN7_3DSTATE_STENCIL_BUFFER * restrict values)
+                                 const struct GEN7_3DSTATE_STENCIL_BUFFER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3363,7 +3433,6 @@ GEN7_3DSTATE_STENCIL_BUFFER_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_STREAMOUT_length 0x00000003
 #define GEN7_3DSTATE_STREAMOUT_length_bias 0x00000002
 #define GEN7_3DSTATE_STREAMOUT_header           \
    .CommandType          =  3,                  \
@@ -3372,6 +3441,8 @@ GEN7_3DSTATE_STENCIL_BUFFER_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 30,                  \
    .DwordLength          =  1
 
+#define GEN7_3DSTATE_STREAMOUT_length 0x00000003
+
 struct GEN7_3DSTATE_STREAMOUT {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3401,7 +3472,7 @@ struct GEN7_3DSTATE_STREAMOUT {
 
 static inline void
 GEN7_3DSTATE_STREAMOUT_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN7_3DSTATE_STREAMOUT * restrict values)
+                            const struct GEN7_3DSTATE_STREAMOUT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3438,7 +3509,6 @@ GEN7_3DSTATE_STREAMOUT_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_TE_length 0x00000004
 #define GEN7_3DSTATE_TE_length_bias 0x00000002
 #define GEN7_3DSTATE_TE_header                  \
    .CommandType          =  3,                  \
@@ -3447,6 +3517,8 @@ GEN7_3DSTATE_STREAMOUT_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 28,                  \
    .DwordLength          =  2
 
+#define GEN7_3DSTATE_TE_length 0x00000004
+
 struct GEN7_3DSTATE_TE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3476,7 +3548,7 @@ struct GEN7_3DSTATE_TE {
 
 static inline void
 GEN7_3DSTATE_TE_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN7_3DSTATE_TE * restrict values)
+                     const struct GEN7_3DSTATE_TE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3506,7 +3578,6 @@ GEN7_3DSTATE_TE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_URB_DS_length 0x00000002
 #define GEN7_3DSTATE_URB_DS_length_bias 0x00000002
 #define GEN7_3DSTATE_URB_DS_header              \
    .CommandType          =  3,                  \
@@ -3515,6 +3586,8 @@ GEN7_3DSTATE_TE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 50,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_URB_DS_length 0x00000002
+
 struct GEN7_3DSTATE_URB_DS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3528,7 +3601,7 @@ struct GEN7_3DSTATE_URB_DS {
 
 static inline void
 GEN7_3DSTATE_URB_DS_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN7_3DSTATE_URB_DS * restrict values)
+                         const struct GEN7_3DSTATE_URB_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3548,7 +3621,6 @@ GEN7_3DSTATE_URB_DS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_URB_GS_length 0x00000002
 #define GEN7_3DSTATE_URB_GS_length_bias 0x00000002
 #define GEN7_3DSTATE_URB_GS_header              \
    .CommandType          =  3,                  \
@@ -3557,6 +3629,8 @@ GEN7_3DSTATE_URB_DS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 51,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_URB_GS_length 0x00000002
+
 struct GEN7_3DSTATE_URB_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3570,7 +3644,7 @@ struct GEN7_3DSTATE_URB_GS {
 
 static inline void
 GEN7_3DSTATE_URB_GS_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN7_3DSTATE_URB_GS * restrict values)
+                         const struct GEN7_3DSTATE_URB_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3590,7 +3664,6 @@ GEN7_3DSTATE_URB_GS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_URB_HS_length 0x00000002
 #define GEN7_3DSTATE_URB_HS_length_bias 0x00000002
 #define GEN7_3DSTATE_URB_HS_header              \
    .CommandType          =  3,                  \
@@ -3599,6 +3672,8 @@ GEN7_3DSTATE_URB_GS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 49,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_URB_HS_length 0x00000002
+
 struct GEN7_3DSTATE_URB_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3612,7 +3687,7 @@ struct GEN7_3DSTATE_URB_HS {
 
 static inline void
 GEN7_3DSTATE_URB_HS_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN7_3DSTATE_URB_HS * restrict values)
+                         const struct GEN7_3DSTATE_URB_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3639,6 +3714,10 @@ GEN7_3DSTATE_URB_HS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  =  8
 
+#define GEN7_3DSTATE_VERTEX_BUFFERS_length 0x00000000
+
+#define GEN7_VERTEX_BUFFER_STATE_length 0x00000004
+
 struct GEN7_VERTEX_BUFFER_STATE {
    uint32_t                                     VertexBufferIndex;
 #define     VERTEXDATA                                         0
@@ -3656,7 +3735,7 @@ struct GEN7_VERTEX_BUFFER_STATE {
 
 static inline void
 GEN7_VERTEX_BUFFER_STATE_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN7_VERTEX_BUFFER_STATE * restrict values)
+                              const struct GEN7_VERTEX_BUFFER_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3701,7 +3780,7 @@ struct GEN7_3DSTATE_VERTEX_BUFFERS {
 
 static inline void
 GEN7_3DSTATE_VERTEX_BUFFERS_pack(__gen_user_data *data, void * restrict dst,
-                                const struct GEN7_3DSTATE_VERTEX_BUFFERS * restrict values)
+                                 const struct GEN7_3DSTATE_VERTEX_BUFFERS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3723,6 +3802,10 @@ GEN7_3DSTATE_VERTEX_BUFFERS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  =  9
 
+#define GEN7_3DSTATE_VERTEX_ELEMENTS_length 0x00000000
+
+#define GEN7_VERTEX_ELEMENT_STATE_length 0x00000002
+
 struct GEN7_VERTEX_ELEMENT_STATE {
    uint32_t                                     VertexBufferIndex;
    bool                                         Valid;
@@ -3737,7 +3820,7 @@ struct GEN7_VERTEX_ELEMENT_STATE {
 
 static inline void
 GEN7_VERTEX_ELEMENT_STATE_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN7_VERTEX_ELEMENT_STATE * restrict values)
+                               const struct GEN7_VERTEX_ELEMENT_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3769,7 +3852,7 @@ struct GEN7_3DSTATE_VERTEX_ELEMENTS {
 
 static inline void
 GEN7_3DSTATE_VERTEX_ELEMENTS_pack(__gen_user_data *data, void * restrict dst,
-                                 const struct GEN7_3DSTATE_VERTEX_ELEMENTS * restrict values)
+                                  const struct GEN7_3DSTATE_VERTEX_ELEMENTS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3784,7 +3867,6 @@ GEN7_3DSTATE_VERTEX_ELEMENTS_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN7_3DSTATE_VF_STATISTICS_length 0x00000001
 #define GEN7_3DSTATE_VF_STATISTICS_length_bias 0x00000001
 #define GEN7_3DSTATE_VF_STATISTICS_header       \
    .CommandType          =  3,                  \
@@ -3792,6 +3874,8 @@ GEN7_3DSTATE_VERTEX_ELEMENTS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 11
 
+#define GEN7_3DSTATE_VF_STATISTICS_length 0x00000001
+
 struct GEN7_3DSTATE_VF_STATISTICS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3802,7 +3886,7 @@ struct GEN7_3DSTATE_VF_STATISTICS {
 
 static inline void
 GEN7_3DSTATE_VF_STATISTICS_pack(__gen_user_data *data, void * restrict dst,
-                               const struct GEN7_3DSTATE_VF_STATISTICS * restrict values)
+                                const struct GEN7_3DSTATE_VF_STATISTICS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3816,7 +3900,6 @@ GEN7_3DSTATE_VF_STATISTICS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_CC_length 0x00000002
 #define GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_CC_length_bias 0x00000002
 #define GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_CC_header\
    .CommandType          =  3,                  \
@@ -3825,6 +3908,8 @@ GEN7_3DSTATE_VF_STATISTICS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 35,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_CC_length 0x00000002
+
 struct GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_CC {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3836,7 +3921,7 @@ struct GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_CC {
 
 static inline void
 GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_CC_pack(__gen_user_data *data, void * restrict dst,
-                                            const struct GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_CC * restrict values)
+                                             const struct GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_CC * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3854,7 +3939,6 @@ GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_CC_pack(__gen_user_data *data, void * restr
 
 }
 
-#define GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_length 0x00000002
 #define GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_length_bias 0x00000002
 #define GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_header\
    .CommandType          =  3,                  \
@@ -3863,6 +3947,8 @@ GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_CC_pack(__gen_user_data *data, void * restr
    ._3DCommandSubOpcode  = 33,                  \
    .DwordLength          =  0
 
+#define GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_length 0x00000002
+
 struct GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3874,7 +3960,7 @@ struct GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP {
 
 static inline void
 GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_pack(__gen_user_data *data, void * restrict dst,
-                                                 const struct GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP * restrict values)
+                                                  const struct GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3892,7 +3978,6 @@ GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_pack(__gen_user_data *data, void *
 
 }
 
-#define GEN7_3DSTATE_VS_length 0x00000006
 #define GEN7_3DSTATE_VS_length_bias 0x00000002
 #define GEN7_3DSTATE_VS_header                  \
    .CommandType          =  3,                  \
@@ -3901,6 +3986,8 @@ GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_pack(__gen_user_data *data, void *
    ._3DCommandSubOpcode  = 16,                  \
    .DwordLength          =  4
 
+#define GEN7_3DSTATE_VS_length 0x00000006
+
 struct GEN7_3DSTATE_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3939,7 +4026,7 @@ struct GEN7_3DSTATE_VS {
 
 static inline void
 GEN7_3DSTATE_VS_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN7_3DSTATE_VS * restrict values)
+                     const struct GEN7_3DSTATE_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3985,7 +4072,6 @@ GEN7_3DSTATE_VS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_WM_length 0x00000003
 #define GEN7_3DSTATE_WM_length_bias 0x00000002
 #define GEN7_3DSTATE_WM_header                  \
    .CommandType          =  3,                  \
@@ -3994,6 +4080,8 @@ GEN7_3DSTATE_VS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 20,                  \
    .DwordLength          =  1
 
+#define GEN7_3DSTATE_WM_length 0x00000003
+
 struct GEN7_3DSTATE_WM {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4043,7 +4131,7 @@ struct GEN7_3DSTATE_WM {
 
 static inline void
 GEN7_3DSTATE_WM_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN7_3DSTATE_WM * restrict values)
+                     const struct GEN7_3DSTATE_WM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4084,7 +4172,6 @@ GEN7_3DSTATE_WM_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_GPGPU_OBJECT_length 0x00000008
 #define GEN7_GPGPU_OBJECT_length_bias 0x00000002
 #define GEN7_GPGPU_OBJECT_header                \
    .CommandType          =  3,                  \
@@ -4093,6 +4180,8 @@ GEN7_3DSTATE_WM_pack(__gen_user_data *data, void * restrict dst,
    .SubOpcode            =  4,                  \
    .DwordLength          =  6
 
+#define GEN7_GPGPU_OBJECT_length 0x00000008
+
 struct GEN7_GPGPU_OBJECT {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -4118,7 +4207,7 @@ struct GEN7_GPGPU_OBJECT {
 
 static inline void
 GEN7_GPGPU_OBJECT_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN7_GPGPU_OBJECT * restrict values)
+                       const struct GEN7_GPGPU_OBJECT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4165,7 +4254,6 @@ GEN7_GPGPU_OBJECT_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_GPGPU_WALKER_length 0x0000000b
 #define GEN7_GPGPU_WALKER_length_bias 0x00000002
 #define GEN7_GPGPU_WALKER_header                \
    .CommandType          =  3,                  \
@@ -4174,6 +4262,8 @@ GEN7_GPGPU_OBJECT_pack(__gen_user_data *data, void * restrict dst,
    .SubOpcodeA           =  5,                  \
    .DwordLength          =  9
 
+#define GEN7_GPGPU_WALKER_length 0x0000000b
+
 struct GEN7_GPGPU_WALKER {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -4202,7 +4292,7 @@ struct GEN7_GPGPU_WALKER {
 
 static inline void
 GEN7_GPGPU_WALKER_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN7_GPGPU_WALKER * restrict values)
+                       const struct GEN7_GPGPU_WALKER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4261,7 +4351,6 @@ GEN7_GPGPU_WALKER_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MEDIA_CURBE_LOAD_length 0x00000004
 #define GEN7_MEDIA_CURBE_LOAD_length_bias 0x00000002
 #define GEN7_MEDIA_CURBE_LOAD_header            \
    .CommandType          =  3,                  \
@@ -4270,6 +4359,8 @@ GEN7_GPGPU_WALKER_pack(__gen_user_data *data, void * restrict dst,
    .SubOpcode            =  1,                  \
    .DwordLength          =  2
 
+#define GEN7_MEDIA_CURBE_LOAD_length 0x00000004
+
 struct GEN7_MEDIA_CURBE_LOAD {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -4282,7 +4373,7 @@ struct GEN7_MEDIA_CURBE_LOAD {
 
 static inline void
 GEN7_MEDIA_CURBE_LOAD_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN7_MEDIA_CURBE_LOAD * restrict values)
+                           const struct GEN7_MEDIA_CURBE_LOAD * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4307,7 +4398,6 @@ GEN7_MEDIA_CURBE_LOAD_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MEDIA_INTERFACE_DESCRIPTOR_LOAD_length 0x00000004
 #define GEN7_MEDIA_INTERFACE_DESCRIPTOR_LOAD_length_bias 0x00000002
 #define GEN7_MEDIA_INTERFACE_DESCRIPTOR_LOAD_header\
    .CommandType          =  3,                  \
@@ -4316,6 +4406,8 @@ GEN7_MEDIA_CURBE_LOAD_pack(__gen_user_data *data, void * restrict dst,
    .SubOpcode            =  2,                  \
    .DwordLength          =  2
 
+#define GEN7_MEDIA_INTERFACE_DESCRIPTOR_LOAD_length 0x00000004
+
 struct GEN7_MEDIA_INTERFACE_DESCRIPTOR_LOAD {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -4328,7 +4420,7 @@ struct GEN7_MEDIA_INTERFACE_DESCRIPTOR_LOAD {
 
 static inline void
 GEN7_MEDIA_INTERFACE_DESCRIPTOR_LOAD_pack(__gen_user_data *data, void * restrict dst,
-                                         const struct GEN7_MEDIA_INTERFACE_DESCRIPTOR_LOAD * restrict values)
+                                          const struct GEN7_MEDIA_INTERFACE_DESCRIPTOR_LOAD * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4360,6 +4452,8 @@ GEN7_MEDIA_INTERFACE_DESCRIPTOR_LOAD_pack(__gen_user_data *data, void * restrict
    .MediaCommandOpcode   =  1,                  \
    .MediaCommandSubOpcode =  0
 
+#define GEN7_MEDIA_OBJECT_length 0x00000000
+
 struct GEN7_MEDIA_OBJECT {
    uint32_t                                     CommandType;
    uint32_t                                     MediaCommandPipeline;
@@ -4389,7 +4483,7 @@ struct GEN7_MEDIA_OBJECT {
 
 static inline void
 GEN7_MEDIA_OBJECT_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN7_MEDIA_OBJECT * restrict values)
+                       const struct GEN7_MEDIA_OBJECT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4432,7 +4526,6 @@ GEN7_MEDIA_OBJECT_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN7_MEDIA_OBJECT_PRT_length 0x00000010
 #define GEN7_MEDIA_OBJECT_PRT_length_bias 0x00000002
 #define GEN7_MEDIA_OBJECT_PRT_header            \
    .CommandType          =  3,                  \
@@ -4441,6 +4534,8 @@ GEN7_MEDIA_OBJECT_pack(__gen_user_data *data, void * restrict dst,
    .SubOpcode            =  2,                  \
    .DwordLength          = 14
 
+#define GEN7_MEDIA_OBJECT_PRT_length 0x00000010
+
 struct GEN7_MEDIA_OBJECT_PRT {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -4458,7 +4553,7 @@ struct GEN7_MEDIA_OBJECT_PRT {
 
 static inline void
 GEN7_MEDIA_OBJECT_PRT_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN7_MEDIA_OBJECT_PRT * restrict values)
+                           const struct GEN7_MEDIA_OBJECT_PRT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4498,6 +4593,8 @@ GEN7_MEDIA_OBJECT_PRT_pack(__gen_user_data *data, void * restrict dst,
    .MediaCommandOpcode   =  1,                  \
    .SubOpcode            =  3
 
+#define GEN7_MEDIA_OBJECT_WALKER_length 0x00000000
+
 struct GEN7_MEDIA_OBJECT_WALKER {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -4546,7 +4643,7 @@ struct GEN7_MEDIA_OBJECT_WALKER {
 
 static inline void
 GEN7_MEDIA_OBJECT_WALKER_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN7_MEDIA_OBJECT_WALKER * restrict values)
+                              const struct GEN7_MEDIA_OBJECT_WALKER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4642,7 +4739,6 @@ GEN7_MEDIA_OBJECT_WALKER_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN7_MEDIA_STATE_FLUSH_length 0x00000002
 #define GEN7_MEDIA_STATE_FLUSH_length_bias 0x00000002
 #define GEN7_MEDIA_STATE_FLUSH_header           \
    .CommandType          =  3,                  \
@@ -4651,6 +4747,8 @@ GEN7_MEDIA_OBJECT_WALKER_pack(__gen_user_data *data, void * restrict dst,
    .SubOpcode            =  4,                  \
    .DwordLength          =  0
 
+#define GEN7_MEDIA_STATE_FLUSH_length 0x00000002
+
 struct GEN7_MEDIA_STATE_FLUSH {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -4663,7 +4761,7 @@ struct GEN7_MEDIA_STATE_FLUSH {
 
 static inline void
 GEN7_MEDIA_STATE_FLUSH_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN7_MEDIA_STATE_FLUSH * restrict values)
+                            const struct GEN7_MEDIA_STATE_FLUSH * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4682,7 +4780,6 @@ GEN7_MEDIA_STATE_FLUSH_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MEDIA_VFE_STATE_length 0x00000008
 #define GEN7_MEDIA_VFE_STATE_length_bias 0x00000002
 #define GEN7_MEDIA_VFE_STATE_header             \
    .CommandType          =  3,                  \
@@ -4691,6 +4788,8 @@ GEN7_MEDIA_STATE_FLUSH_pack(__gen_user_data *data, void * restrict dst,
    .SubOpcode            =  0,                  \
    .DwordLength          =  6
 
+#define GEN7_MEDIA_VFE_STATE_length 0x00000008
+
 struct GEN7_MEDIA_VFE_STATE {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -4740,7 +4839,7 @@ struct GEN7_MEDIA_VFE_STATE {
 
 static inline void
 GEN7_MEDIA_VFE_STATE_pack(__gen_user_data *data, void * restrict dst,
-                         const struct GEN7_MEDIA_VFE_STATE * restrict values)
+                          const struct GEN7_MEDIA_VFE_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4804,12 +4903,13 @@ GEN7_MEDIA_VFE_STATE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MI_ARB_CHECK_length 0x00000001
 #define GEN7_MI_ARB_CHECK_length_bias 0x00000001
 #define GEN7_MI_ARB_CHECK_header                \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  5
 
+#define GEN7_MI_ARB_CHECK_length 0x00000001
+
 struct GEN7_MI_ARB_CHECK {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -4817,7 +4917,7 @@ struct GEN7_MI_ARB_CHECK {
 
 static inline void
 GEN7_MI_ARB_CHECK_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN7_MI_ARB_CHECK * restrict values)
+                       const struct GEN7_MI_ARB_CHECK * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4828,12 +4928,13 @@ GEN7_MI_ARB_CHECK_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MI_ARB_ON_OFF_length 0x00000001
 #define GEN7_MI_ARB_ON_OFF_length_bias 0x00000001
 #define GEN7_MI_ARB_ON_OFF_header               \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  8
 
+#define GEN7_MI_ARB_ON_OFF_length 0x00000001
+
 struct GEN7_MI_ARB_ON_OFF {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -4842,7 +4943,7 @@ struct GEN7_MI_ARB_ON_OFF {
 
 static inline void
 GEN7_MI_ARB_ON_OFF_pack(__gen_user_data *data, void * restrict dst,
-                       const struct GEN7_MI_ARB_ON_OFF * restrict values)
+                        const struct GEN7_MI_ARB_ON_OFF * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4854,12 +4955,13 @@ GEN7_MI_ARB_ON_OFF_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MI_BATCH_BUFFER_END_length 0x00000001
 #define GEN7_MI_BATCH_BUFFER_END_length_bias 0x00000001
 #define GEN7_MI_BATCH_BUFFER_END_header         \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 10
 
+#define GEN7_MI_BATCH_BUFFER_END_length 0x00000001
+
 struct GEN7_MI_BATCH_BUFFER_END {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -4867,7 +4969,7 @@ struct GEN7_MI_BATCH_BUFFER_END {
 
 static inline void
 GEN7_MI_BATCH_BUFFER_END_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN7_MI_BATCH_BUFFER_END * restrict values)
+                              const struct GEN7_MI_BATCH_BUFFER_END * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4878,13 +4980,14 @@ GEN7_MI_BATCH_BUFFER_END_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MI_BATCH_BUFFER_START_length 0x00000002
 #define GEN7_MI_BATCH_BUFFER_START_length_bias 0x00000002
 #define GEN7_MI_BATCH_BUFFER_START_header       \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 49,                  \
    .DwordLength          =  0
 
+#define GEN7_MI_BATCH_BUFFER_START_length 0x00000002
+
 struct GEN7_MI_BATCH_BUFFER_START {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -4898,7 +5001,7 @@ struct GEN7_MI_BATCH_BUFFER_START {
 
 static inline void
 GEN7_MI_BATCH_BUFFER_START_pack(__gen_user_data *data, void * restrict dst,
-                               const struct GEN7_MI_BATCH_BUFFER_START * restrict values)
+                                const struct GEN7_MI_BATCH_BUFFER_START * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4923,6 +5026,8 @@ GEN7_MI_BATCH_BUFFER_START_pack(__gen_user_data *data, void * restrict dst,
    .CommandType          =  0,                  \
    .MICommandOpcode      = 39
 
+#define GEN7_MI_CLFLUSH_length 0x00000000
+
 struct GEN7_MI_CLFLUSH {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -4938,7 +5043,7 @@ struct GEN7_MI_CLFLUSH {
 
 static inline void
 GEN7_MI_CLFLUSH_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN7_MI_CLFLUSH * restrict values)
+                     const struct GEN7_MI_CLFLUSH * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4965,7 +5070,6 @@ GEN7_MI_CLFLUSH_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN7_MI_CONDITIONAL_BATCH_BUFFER_END_length 0x00000002
 #define GEN7_MI_CONDITIONAL_BATCH_BUFFER_END_length_bias 0x00000002
 #define GEN7_MI_CONDITIONAL_BATCH_BUFFER_END_header\
    .CommandType          =  0,                  \
@@ -4974,6 +5078,8 @@ GEN7_MI_CLFLUSH_pack(__gen_user_data *data, void * restrict dst,
    .CompareSemaphore     =  0,                  \
    .DwordLength          =  0
 
+#define GEN7_MI_CONDITIONAL_BATCH_BUFFER_END_length 0x00000002
+
 struct GEN7_MI_CONDITIONAL_BATCH_BUFFER_END {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -4986,7 +5092,7 @@ struct GEN7_MI_CONDITIONAL_BATCH_BUFFER_END {
 
 static inline void
 GEN7_MI_CONDITIONAL_BATCH_BUFFER_END_pack(__gen_user_data *data, void * restrict dst,
-                                         const struct GEN7_MI_CONDITIONAL_BATCH_BUFFER_END * restrict values)
+                                          const struct GEN7_MI_CONDITIONAL_BATCH_BUFFER_END * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5010,12 +5116,13 @@ GEN7_MI_CONDITIONAL_BATCH_BUFFER_END_pack(__gen_user_data *data, void * restrict
 
 }
 
-#define GEN7_MI_FLUSH_length 0x00000001
 #define GEN7_MI_FLUSH_length_bias 0x00000001
 #define GEN7_MI_FLUSH_header                    \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  4
 
+#define GEN7_MI_FLUSH_length 0x00000001
+
 struct GEN7_MI_FLUSH {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5034,7 +5141,7 @@ struct GEN7_MI_FLUSH {
 
 static inline void
 GEN7_MI_FLUSH_pack(__gen_user_data *data, void * restrict dst,
-                  const struct GEN7_MI_FLUSH * restrict values)
+                   const struct GEN7_MI_FLUSH * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5050,13 +5157,14 @@ GEN7_MI_FLUSH_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MI_LOAD_REGISTER_IMM_length 0x00000003
 #define GEN7_MI_LOAD_REGISTER_IMM_length_bias 0x00000002
 #define GEN7_MI_LOAD_REGISTER_IMM_header        \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 34,                  \
    .DwordLength          =  1
 
+#define GEN7_MI_LOAD_REGISTER_IMM_length 0x00000003
+
 struct GEN7_MI_LOAD_REGISTER_IMM {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5068,7 +5176,7 @@ struct GEN7_MI_LOAD_REGISTER_IMM {
 
 static inline void
 GEN7_MI_LOAD_REGISTER_IMM_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN7_MI_LOAD_REGISTER_IMM * restrict values)
+                               const struct GEN7_MI_LOAD_REGISTER_IMM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5089,13 +5197,14 @@ GEN7_MI_LOAD_REGISTER_IMM_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MI_LOAD_REGISTER_MEM_length 0x00000003
 #define GEN7_MI_LOAD_REGISTER_MEM_length_bias 0x00000002
 #define GEN7_MI_LOAD_REGISTER_MEM_header        \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 41,                  \
    .DwordLength          =  1
 
+#define GEN7_MI_LOAD_REGISTER_MEM_length 0x00000003
+
 struct GEN7_MI_LOAD_REGISTER_MEM {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5108,7 +5217,7 @@ struct GEN7_MI_LOAD_REGISTER_MEM {
 
 static inline void
 GEN7_MI_LOAD_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN7_MI_LOAD_REGISTER_MEM * restrict values)
+                               const struct GEN7_MI_LOAD_REGISTER_MEM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5132,12 +5241,13 @@ GEN7_MI_LOAD_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MI_NOOP_length 0x00000001
 #define GEN7_MI_NOOP_length_bias 0x00000001
 #define GEN7_MI_NOOP_header                     \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  0
 
+#define GEN7_MI_NOOP_length 0x00000001
+
 struct GEN7_MI_NOOP {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5147,7 +5257,7 @@ struct GEN7_MI_NOOP {
 
 static inline void
 GEN7_MI_NOOP_pack(__gen_user_data *data, void * restrict dst,
-                 const struct GEN7_MI_NOOP * restrict values)
+                  const struct GEN7_MI_NOOP * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5160,12 +5270,13 @@ GEN7_MI_NOOP_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MI_PREDICATE_length 0x00000001
 #define GEN7_MI_PREDICATE_length_bias 0x00000001
 #define GEN7_MI_PREDICATE_header                \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 12
 
+#define GEN7_MI_PREDICATE_length 0x00000001
+
 struct GEN7_MI_PREDICATE {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5185,7 +5296,7 @@ struct GEN7_MI_PREDICATE {
 
 static inline void
 GEN7_MI_PREDICATE_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN7_MI_PREDICATE * restrict values)
+                       const struct GEN7_MI_PREDICATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5199,12 +5310,13 @@ GEN7_MI_PREDICATE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MI_REPORT_HEAD_length 0x00000001
 #define GEN7_MI_REPORT_HEAD_length_bias 0x00000001
 #define GEN7_MI_REPORT_HEAD_header              \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  7
 
+#define GEN7_MI_REPORT_HEAD_length 0x00000001
+
 struct GEN7_MI_REPORT_HEAD {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5212,7 +5324,7 @@ struct GEN7_MI_REPORT_HEAD {
 
 static inline void
 GEN7_MI_REPORT_HEAD_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN7_MI_REPORT_HEAD * restrict values)
+                         const struct GEN7_MI_REPORT_HEAD * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5223,13 +5335,14 @@ GEN7_MI_REPORT_HEAD_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MI_SEMAPHORE_MBOX_length 0x00000003
 #define GEN7_MI_SEMAPHORE_MBOX_length_bias 0x00000002
 #define GEN7_MI_SEMAPHORE_MBOX_header           \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 22,                  \
    .DwordLength          =  1
 
+#define GEN7_MI_SEMAPHORE_MBOX_length 0x00000003
+
 struct GEN7_MI_SEMAPHORE_MBOX {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5243,7 +5356,7 @@ struct GEN7_MI_SEMAPHORE_MBOX {
 
 static inline void
 GEN7_MI_SEMAPHORE_MBOX_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN7_MI_SEMAPHORE_MBOX * restrict values)
+                            const struct GEN7_MI_SEMAPHORE_MBOX * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5263,13 +5376,14 @@ GEN7_MI_SEMAPHORE_MBOX_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MI_SET_CONTEXT_length 0x00000002
 #define GEN7_MI_SET_CONTEXT_length_bias 0x00000002
 #define GEN7_MI_SET_CONTEXT_header              \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 24,                  \
    .DwordLength          =  0
 
+#define GEN7_MI_SET_CONTEXT_length 0x00000002
+
 struct GEN7_MI_SET_CONTEXT {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5284,7 +5398,7 @@ struct GEN7_MI_SET_CONTEXT {
 
 static inline void
 GEN7_MI_SET_CONTEXT_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN7_MI_SET_CONTEXT * restrict values)
+                         const struct GEN7_MI_SET_CONTEXT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5307,13 +5421,14 @@ GEN7_MI_SET_CONTEXT_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MI_STORE_DATA_IMM_length 0x00000004
 #define GEN7_MI_STORE_DATA_IMM_length_bias 0x00000002
 #define GEN7_MI_STORE_DATA_IMM_header           \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 32,                  \
    .DwordLength          =  2
 
+#define GEN7_MI_STORE_DATA_IMM_length 0x00000004
+
 struct GEN7_MI_STORE_DATA_IMM {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5327,7 +5442,7 @@ struct GEN7_MI_STORE_DATA_IMM {
 
 static inline void
 GEN7_MI_STORE_DATA_IMM_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN7_MI_STORE_DATA_IMM * restrict values)
+                            const struct GEN7_MI_STORE_DATA_IMM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5356,13 +5471,14 @@ GEN7_MI_STORE_DATA_IMM_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MI_STORE_DATA_INDEX_length 0x00000003
 #define GEN7_MI_STORE_DATA_INDEX_length_bias 0x00000002
 #define GEN7_MI_STORE_DATA_INDEX_header         \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 33,                  \
    .DwordLength          =  1
 
+#define GEN7_MI_STORE_DATA_INDEX_length 0x00000003
+
 struct GEN7_MI_STORE_DATA_INDEX {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5374,7 +5490,7 @@ struct GEN7_MI_STORE_DATA_INDEX {
 
 static inline void
 GEN7_MI_STORE_DATA_INDEX_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN7_MI_STORE_DATA_INDEX * restrict values)
+                              const struct GEN7_MI_STORE_DATA_INDEX * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5398,12 +5514,13 @@ GEN7_MI_STORE_DATA_INDEX_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MI_SUSPEND_FLUSH_length 0x00000001
 #define GEN7_MI_SUSPEND_FLUSH_length_bias 0x00000001
 #define GEN7_MI_SUSPEND_FLUSH_header            \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 11
 
+#define GEN7_MI_SUSPEND_FLUSH_length 0x00000001
+
 struct GEN7_MI_SUSPEND_FLUSH {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5412,7 +5529,7 @@ struct GEN7_MI_SUSPEND_FLUSH {
 
 static inline void
 GEN7_MI_SUSPEND_FLUSH_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN7_MI_SUSPEND_FLUSH * restrict values)
+                           const struct GEN7_MI_SUSPEND_FLUSH * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5424,12 +5541,13 @@ GEN7_MI_SUSPEND_FLUSH_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MI_TOPOLOGY_FILTER_length 0x00000001
 #define GEN7_MI_TOPOLOGY_FILTER_length_bias 0x00000001
 #define GEN7_MI_TOPOLOGY_FILTER_header          \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 13
 
+#define GEN7_MI_TOPOLOGY_FILTER_length 0x00000001
+
 struct GEN7_MI_TOPOLOGY_FILTER {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5438,7 +5556,7 @@ struct GEN7_MI_TOPOLOGY_FILTER {
 
 static inline void
 GEN7_MI_TOPOLOGY_FILTER_pack(__gen_user_data *data, void * restrict dst,
-                            const struct GEN7_MI_TOPOLOGY_FILTER * restrict values)
+                             const struct GEN7_MI_TOPOLOGY_FILTER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5455,6 +5573,8 @@ GEN7_MI_TOPOLOGY_FILTER_pack(__gen_user_data *data, void * restrict dst,
    .CommandType          =  0,                  \
    .MICommandOpcode      = 35
 
+#define GEN7_MI_UPDATE_GTT_length 0x00000000
+
 struct GEN7_MI_UPDATE_GTT {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5468,7 +5588,7 @@ struct GEN7_MI_UPDATE_GTT {
 
 static inline void
 GEN7_MI_UPDATE_GTT_pack(__gen_user_data *data, void * restrict dst,
-                       const struct GEN7_MI_UPDATE_GTT * restrict values)
+                        const struct GEN7_MI_UPDATE_GTT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5488,13 +5608,14 @@ GEN7_MI_UPDATE_GTT_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN7_MI_URB_CLEAR_length 0x00000002
 #define GEN7_MI_URB_CLEAR_length_bias 0x00000002
 #define GEN7_MI_URB_CLEAR_header                \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 25,                  \
    .DwordLength          =  0
 
+#define GEN7_MI_URB_CLEAR_length 0x00000002
+
 struct GEN7_MI_URB_CLEAR {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5505,7 +5626,7 @@ struct GEN7_MI_URB_CLEAR {
 
 static inline void
 GEN7_MI_URB_CLEAR_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN7_MI_URB_CLEAR * restrict values)
+                       const struct GEN7_MI_URB_CLEAR * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5522,12 +5643,13 @@ GEN7_MI_URB_CLEAR_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MI_USER_INTERRUPT_length 0x00000001
 #define GEN7_MI_USER_INTERRUPT_length_bias 0x00000001
 #define GEN7_MI_USER_INTERRUPT_header           \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  2
 
+#define GEN7_MI_USER_INTERRUPT_length 0x00000001
+
 struct GEN7_MI_USER_INTERRUPT {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5535,7 +5657,7 @@ struct GEN7_MI_USER_INTERRUPT {
 
 static inline void
 GEN7_MI_USER_INTERRUPT_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN7_MI_USER_INTERRUPT * restrict values)
+                            const struct GEN7_MI_USER_INTERRUPT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5546,12 +5668,13 @@ GEN7_MI_USER_INTERRUPT_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MI_WAIT_FOR_EVENT_length 0x00000001
 #define GEN7_MI_WAIT_FOR_EVENT_length_bias 0x00000001
 #define GEN7_MI_WAIT_FOR_EVENT_header           \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  3
 
+#define GEN7_MI_WAIT_FOR_EVENT_length 0x00000001
+
 struct GEN7_MI_WAIT_FOR_EVENT {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -5576,7 +5699,7 @@ struct GEN7_MI_WAIT_FOR_EVENT {
 
 static inline void
 GEN7_MI_WAIT_FOR_EVENT_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN7_MI_WAIT_FOR_EVENT * restrict values)
+                            const struct GEN7_MI_WAIT_FOR_EVENT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5603,7 +5726,6 @@ GEN7_MI_WAIT_FOR_EVENT_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_PIPE_CONTROL_length 0x00000005
 #define GEN7_PIPE_CONTROL_length_bias 0x00000002
 #define GEN7_PIPE_CONTROL_header                \
    .CommandType          =  3,                  \
@@ -5612,6 +5734,8 @@ GEN7_MI_WAIT_FOR_EVENT_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  0,                  \
    .DwordLength          =  3
 
+#define GEN7_PIPE_CONTROL_length 0x00000005
+
 struct GEN7_PIPE_CONTROL {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -5660,7 +5784,7 @@ struct GEN7_PIPE_CONTROL {
 
 static inline void
 GEN7_PIPE_CONTROL_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN7_PIPE_CONTROL * restrict values)
+                       const struct GEN7_PIPE_CONTROL * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5712,16 +5836,6 @@ GEN7_PIPE_CONTROL_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_3DSTATE_CONSTANT_BODY_length 0x00000006
-
-#define GEN7_VERTEX_BUFFER_STATE_length 0x00000004
-
-#define GEN7_VERTEX_ELEMENT_STATE_length 0x00000002
-
-#define GEN7_SO_DECL_ENTRY_length 0x00000002
-
-#define GEN7_SO_DECL_length 0x00000001
-
 #define GEN7_SCISSOR_RECT_length 0x00000002
 
 struct GEN7_SCISSOR_RECT {
@@ -5733,7 +5847,7 @@ struct GEN7_SCISSOR_RECT {
 
 static inline void
 GEN7_SCISSOR_RECT_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN7_SCISSOR_RECT * restrict values)
+                       const struct GEN7_SCISSOR_RECT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5766,7 +5880,7 @@ struct GEN7_SF_CLIP_VIEWPORT {
 
 static inline void
 GEN7_SF_CLIP_VIEWPORT_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN7_SF_CLIP_VIEWPORT * restrict values)
+                           const struct GEN7_SF_CLIP_VIEWPORT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5911,7 +6025,7 @@ struct GEN7_BLEND_STATE {
 
 static inline void
 GEN7_BLEND_STATE_pack(__gen_user_data *data, void * restrict dst,
-                     const struct GEN7_BLEND_STATE * restrict values)
+                      const struct GEN7_BLEND_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5957,7 +6071,7 @@ struct GEN7_CC_VIEWPORT {
 
 static inline void
 GEN7_CC_VIEWPORT_pack(__gen_user_data *data, void * restrict dst,
-                     const struct GEN7_CC_VIEWPORT * restrict values)
+                      const struct GEN7_CC_VIEWPORT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5992,7 +6106,7 @@ struct GEN7_COLOR_CALC_STATE {
 
 static inline void
 GEN7_COLOR_CALC_STATE_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN7_COLOR_CALC_STATE * restrict values)
+                           const struct GEN7_COLOR_CALC_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6091,7 +6205,7 @@ struct GEN7_DEPTH_STENCIL_STATE {
 
 static inline void
 GEN7_DEPTH_STENCIL_STATE_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN7_DEPTH_STENCIL_STATE * restrict values)
+                              const struct GEN7_DEPTH_STENCIL_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6124,8 +6238,6 @@ GEN7_DEPTH_STENCIL_STATE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_MEMORY_OBJECT_CONTROL_STATE_length 0x00000001
-
 #define GEN7_INTERFACE_DESCRIPTOR_DATA_length 0x00000008
 
 struct GEN7_INTERFACE_DESCRIPTOR_DATA {
@@ -6165,7 +6277,7 @@ struct GEN7_INTERFACE_DESCRIPTOR_DATA {
 
 static inline void
 GEN7_INTERFACE_DESCRIPTOR_DATA_pack(__gen_user_data *data, void * restrict dst,
-                                   const struct GEN7_INTERFACE_DESCRIPTOR_DATA * restrict values)
+                                    const struct GEN7_INTERFACE_DESCRIPTOR_DATA * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6212,8 +6324,6 @@ GEN7_INTERFACE_DESCRIPTOR_DATA_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN7_PALETTE_ENTRY_length 0x00000001
-
 #define GEN7_BINDING_TABLE_STATE_length 0x00000001
 
 struct GEN7_BINDING_TABLE_STATE {
@@ -6222,7 +6332,7 @@ struct GEN7_BINDING_TABLE_STATE {
 
 static inline void
 GEN7_BINDING_TABLE_STATE_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN7_BINDING_TABLE_STATE * restrict values)
+                              const struct GEN7_BINDING_TABLE_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6243,7 +6353,7 @@ struct GEN7_RENDER_SURFACE_STATE {
 #define     SURFTYPE_STRBUF                                    5
 #define     SURFTYPE_NULL                                      7
    uint32_t                                     SurfaceType;
-   uint32_t                                     SurfaceArray;
+   bool                                         SurfaceArray;
    uint32_t                                     SurfaceFormat;
    uint32_t                                     SurfaceVerticalAlignment;
 #define     HALIGN_4                                           0
@@ -6264,7 +6374,7 @@ struct GEN7_RENDER_SURFACE_STATE {
 #define     INTERLACED_FRAME                                   3
    uint32_t                                     MediaBoundaryPixelMode;
    uint32_t                                     CubeFaceEnables;
-   uint32_t                                     SurfaceBaseAddress;
+   __gen_address_type                           SurfaceBaseAddress;
    uint32_t                                     Height;
    uint32_t                                     Width;
    uint32_t                                     Depth;
@@ -6286,14 +6396,14 @@ struct GEN7_RENDER_SURFACE_STATE {
    uint32_t                                     MinimumArrayElement0;
    uint32_t                                     XOffset;
    uint32_t                                     YOffset;
-   uint32_t                                     SurfaceObjectControlState;
+   struct GEN7_MEMORY_OBJECT_CONTROL_STATE      SurfaceObjectControlState;
    uint32_t                                     SurfaceMinLOD;
    uint32_t                                     MIPCountLOD;
-   uint32_t                                     MCSBaseAddress;
+   __gen_address_type                           MCSBaseAddress;
    uint32_t                                     MCSSurfacePitch;
-   uint32_t                                     AppendCounterAddress;
-   uint32_t                                     AppendCounterEnable;
-   uint32_t                                     MCSEnable;
+   __gen_address_type                           AppendCounterAddress;
+   bool                                         AppendCounterEnable;
+   bool                                         MCSEnable;
    uint32_t                                     XOffsetforUVPlane;
    uint32_t                                     YOffsetforUVPlane;
 #define     CC_ZERO                                            0
@@ -6308,12 +6418,12 @@ struct GEN7_RENDER_SURFACE_STATE {
 #define     CC_ZERO                                            0
 #define     CC_ONE                                             1
    uint32_t                                     AlphaClearColor;
-   uint32_t                                     ResourceMinLOD;
+   float                                        ResourceMinLOD;
 };
 
 static inline void
 GEN7_RENDER_SURFACE_STATE_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN7_RENDER_SURFACE_STATE * restrict values)
+                               const struct GEN7_RENDER_SURFACE_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6333,10 +6443,12 @@ GEN7_RENDER_SURFACE_STATE_pack(__gen_user_data *data, void * restrict dst,
       __gen_field(values->CubeFaceEnables, 0, 5) |
       0;
 
-   dw[1] =
-      __gen_field(values->SurfaceBaseAddress, 0, 31) |
+   uint32_t dw1 =
       0;
 
+   dw[1] =
+      __gen_combine_address(data, &dw[1], values->SurfaceBaseAddress, dw1);
+
    dw[2] =
       __gen_field(values->Height, 16, 29) |
       __gen_field(values->Width, 0, 13) |
@@ -6357,30 +6469,33 @@ GEN7_RENDER_SURFACE_STATE_pack(__gen_user_data *data, void * restrict dst,
       __gen_field(values->MinimumArrayElement, 0, 26) |
       0;
 
+   uint32_t dw_SurfaceObjectControlState;
+   GEN7_MEMORY_OBJECT_CONTROL_STATE_pack(data, &dw_SurfaceObjectControlState, &values->SurfaceObjectControlState);
    dw[5] =
-      __gen_field(values->XOffset, 25, 31) |
-      __gen_field(values->YOffset, 20, 23) |
-      __gen_field(values->SurfaceObjectControlState, 16, 19) |
+      __gen_offset(values->XOffset, 25, 31) |
+      __gen_offset(values->YOffset, 20, 23) |
+      __gen_field(dw_SurfaceObjectControlState, 16, 19) |
       __gen_field(values->SurfaceMinLOD, 4, 7) |
       __gen_field(values->MIPCountLOD, 0, 3) |
       0;
 
-   dw[6] =
-      __gen_field(values->MCSBaseAddress, 12, 31) |
+   uint32_t dw6 =
       __gen_field(values->MCSSurfacePitch, 3, 11) |
-      __gen_field(values->AppendCounterAddress, 6, 31) |
       __gen_field(values->AppendCounterEnable, 1, 1) |
       __gen_field(values->MCSEnable, 0, 0) |
       __gen_field(values->XOffsetforUVPlane, 16, 29) |
       __gen_field(values->YOffsetforUVPlane, 0, 13) |
       0;
 
+   dw[6] =
+      __gen_combine_address(data, &dw[6], values->AppendCounterAddress, dw6);
+
    dw[7] =
       __gen_field(values->RedClearColor, 31, 31) |
       __gen_field(values->GreenClearColor, 30, 30) |
       __gen_field(values->BlueClearColor, 29, 29) |
       __gen_field(values->AlphaClearColor, 28, 28) |
-      __gen_field(values->ResourceMinLOD, 0, 11) |
+      __gen_field(values->ResourceMinLOD * (1 << 8), 0, 11) |
       0;
 
 }
@@ -6388,24 +6503,24 @@ GEN7_RENDER_SURFACE_STATE_pack(__gen_user_data *data, void * restrict dst,
 #define GEN7_SAMPLER_BORDER_COLOR_STATE_length 0x00000004
 
 struct GEN7_SAMPLER_BORDER_COLOR_STATE {
-   uint32_t                                     BorderColorRedDX100GL;
+   float                                        BorderColorRedDX100GL;
    uint32_t                                     BorderColorAlpha;
    uint32_t                                     BorderColorBlue;
    uint32_t                                     BorderColorGreen;
    uint32_t                                     BorderColorRedDX9;
-   uint32_t                                     BorderColorGreen0;
-   uint32_t                                     BorderColorBlue0;
-   uint32_t                                     BorderColorAlpha0;
+   float                                        BorderColorGreen0;
+   float                                        BorderColorBlue0;
+   float                                        BorderColorAlpha0;
 };
 
 static inline void
 GEN7_SAMPLER_BORDER_COLOR_STATE_pack(__gen_user_data *data, void * restrict dst,
-                                    const struct GEN7_SAMPLER_BORDER_COLOR_STATE * restrict values)
+                                     const struct GEN7_SAMPLER_BORDER_COLOR_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
    dw[0] =
-      __gen_field(values->BorderColorRedDX100GL, 0, 31) |
+      __gen_float(values->BorderColorRedDX100GL) |
       __gen_field(values->BorderColorAlpha, 24, 31) |
       __gen_field(values->BorderColorBlue, 16, 23) |
       __gen_field(values->BorderColorGreen, 8, 15) |
@@ -6413,15 +6528,15 @@ GEN7_SAMPLER_BORDER_COLOR_STATE_pack(__gen_user_data *data, void * restrict dst,
       0;
 
    dw[1] =
-      __gen_field(values->BorderColorGreen, 0, 31) |
+      __gen_float(values->BorderColorGreen) |
       0;
 
    dw[2] =
-      __gen_field(values->BorderColorBlue, 0, 31) |
+      __gen_float(values->BorderColorBlue) |
       0;
 
    dw[3] =
-      __gen_field(values->BorderColorAlpha, 0, 31) |
+      __gen_float(values->BorderColorAlpha) |
       0;
 
 }
@@ -6501,7 +6616,7 @@ struct GEN7_SAMPLER_STATE {
 
 static inline void
 GEN7_SAMPLER_STATE_pack(__gen_user_data *data, void * restrict dst,
-                       const struct GEN7_SAMPLER_STATE * restrict values)
+                        const struct GEN7_SAMPLER_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
index cafccc94741a4c09933f55ca1695f9c9f783b247..4d6b7c0a04dd96d513f2e46d4ccbd47dfada041d 100644 (file)
@@ -92,7 +92,6 @@ __gen_float(float v)
 
 #endif
 
-#define GEN8_3DSTATE_URB_VS_length 0x00000002
 #define GEN8_3DSTATE_URB_VS_length_bias 0x00000002
 #define GEN8_3DSTATE_URB_VS_header              \
    .CommandType          =  3,                  \
@@ -101,6 +100,8 @@ __gen_float(float v)
    ._3DCommandSubOpcode  = 48,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_URB_VS_length 0x00000002
+
 struct GEN8_3DSTATE_URB_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -114,7 +115,7 @@ struct GEN8_3DSTATE_URB_VS {
 
 static inline void
 GEN8_3DSTATE_URB_VS_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN8_3DSTATE_URB_VS * restrict values)
+                         const struct GEN8_3DSTATE_URB_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -134,7 +135,6 @@ GEN8_3DSTATE_URB_VS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_VS_length 0x00000009
 #define GEN8_3DSTATE_VS_length_bias 0x00000002
 #define GEN8_3DSTATE_VS_header                  \
    .CommandType          =  3,                  \
@@ -143,6 +143,8 @@ GEN8_3DSTATE_URB_VS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 16,                  \
    .DwordLength          =  7
 
+#define GEN8_3DSTATE_VS_length 0x00000009
+
 struct GEN8_3DSTATE_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -190,7 +192,7 @@ struct GEN8_3DSTATE_VS {
 
 static inline void
 GEN8_3DSTATE_VS_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN8_3DSTATE_VS * restrict values)
+                     const struct GEN8_3DSTATE_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -252,7 +254,6 @@ GEN8_3DSTATE_VS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_GPGPU_CSR_BASE_ADDRESS_length 0x00000003
 #define GEN8_GPGPU_CSR_BASE_ADDRESS_length_bias 0x00000002
 #define GEN8_GPGPU_CSR_BASE_ADDRESS_header      \
    .CommandType          =  3,                  \
@@ -261,6 +262,8 @@ GEN8_3DSTATE_VS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  4,                  \
    .DwordLength          =  1
 
+#define GEN8_GPGPU_CSR_BASE_ADDRESS_length 0x00000003
+
 struct GEN8_GPGPU_CSR_BASE_ADDRESS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -272,7 +275,7 @@ struct GEN8_GPGPU_CSR_BASE_ADDRESS {
 
 static inline void
 GEN8_GPGPU_CSR_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
-                                const struct GEN8_GPGPU_CSR_BASE_ADDRESS * restrict values)
+                                 const struct GEN8_GPGPU_CSR_BASE_ADDRESS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -295,12 +298,13 @@ GEN8_GPGPU_CSR_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_ATOMIC_length 0x00000003
 #define GEN8_MI_ATOMIC_length_bias 0x00000002
 #define GEN8_MI_ATOMIC_header                   \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 47
 
+#define GEN8_MI_ATOMIC_length 0x00000003
+
 struct GEN8_MI_ATOMIC {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -331,7 +335,7 @@ struct GEN8_MI_ATOMIC {
 
 static inline void
 GEN8_MI_ATOMIC_pack(__gen_user_data *data, void * restrict dst,
-                   const struct GEN8_MI_ATOMIC * restrict values)
+                    const struct GEN8_MI_ATOMIC * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -391,13 +395,14 @@ GEN8_MI_ATOMIC_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_LOAD_REGISTER_REG_length 0x00000003
 #define GEN8_MI_LOAD_REGISTER_REG_length_bias 0x00000002
 #define GEN8_MI_LOAD_REGISTER_REG_header        \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 42,                  \
    .DwordLength          =  1
 
+#define GEN8_MI_LOAD_REGISTER_REG_length 0x00000003
+
 struct GEN8_MI_LOAD_REGISTER_REG {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -408,7 +413,7 @@ struct GEN8_MI_LOAD_REGISTER_REG {
 
 static inline void
 GEN8_MI_LOAD_REGISTER_REG_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN8_MI_LOAD_REGISTER_REG * restrict values)
+                               const struct GEN8_MI_LOAD_REGISTER_REG * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -428,13 +433,14 @@ GEN8_MI_LOAD_REGISTER_REG_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_SEMAPHORE_SIGNAL_length 0x00000002
 #define GEN8_MI_SEMAPHORE_SIGNAL_length_bias 0x00000002
 #define GEN8_MI_SEMAPHORE_SIGNAL_header         \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 27,                  \
    .DwordLength          =  0
 
+#define GEN8_MI_SEMAPHORE_SIGNAL_length 0x00000002
+
 struct GEN8_MI_SEMAPHORE_SIGNAL {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -451,7 +457,7 @@ struct GEN8_MI_SEMAPHORE_SIGNAL {
 
 static inline void
 GEN8_MI_SEMAPHORE_SIGNAL_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN8_MI_SEMAPHORE_SIGNAL * restrict values)
+                              const struct GEN8_MI_SEMAPHORE_SIGNAL * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -469,13 +475,14 @@ GEN8_MI_SEMAPHORE_SIGNAL_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_SEMAPHORE_WAIT_length 0x00000004
 #define GEN8_MI_SEMAPHORE_WAIT_length_bias 0x00000002
 #define GEN8_MI_SEMAPHORE_WAIT_header           \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 28,                  \
    .DwordLength          =  2
 
+#define GEN8_MI_SEMAPHORE_WAIT_length 0x00000004
+
 struct GEN8_MI_SEMAPHORE_WAIT {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -499,7 +506,7 @@ struct GEN8_MI_SEMAPHORE_WAIT {
 
 static inline void
 GEN8_MI_SEMAPHORE_WAIT_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN8_MI_SEMAPHORE_WAIT * restrict values)
+                            const struct GEN8_MI_SEMAPHORE_WAIT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -527,13 +534,14 @@ GEN8_MI_SEMAPHORE_WAIT_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_STORE_REGISTER_MEM_length 0x00000004
 #define GEN8_MI_STORE_REGISTER_MEM_length_bias 0x00000002
 #define GEN8_MI_STORE_REGISTER_MEM_header       \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 36,                  \
    .DwordLength          =  2
 
+#define GEN8_MI_STORE_REGISTER_MEM_length 0x00000004
+
 struct GEN8_MI_STORE_REGISTER_MEM {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -546,7 +554,7 @@ struct GEN8_MI_STORE_REGISTER_MEM {
 
 static inline void
 GEN8_MI_STORE_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
-                               const struct GEN8_MI_STORE_REGISTER_MEM * restrict values)
+                                const struct GEN8_MI_STORE_REGISTER_MEM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -573,7 +581,6 @@ GEN8_MI_STORE_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_PIPELINE_SELECT_length 0x00000001
 #define GEN8_PIPELINE_SELECT_length_bias 0x00000001
 #define GEN8_PIPELINE_SELECT_header             \
    .CommandType          =  3,                  \
@@ -581,6 +588,8 @@ GEN8_MI_STORE_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  1,                  \
    ._3DCommandSubOpcode  =  4
 
+#define GEN8_PIPELINE_SELECT_length 0x00000001
+
 struct GEN8_PIPELINE_SELECT {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -594,7 +603,7 @@ struct GEN8_PIPELINE_SELECT {
 
 static inline void
 GEN8_PIPELINE_SELECT_pack(__gen_user_data *data, void * restrict dst,
-                         const struct GEN8_PIPELINE_SELECT * restrict values)
+                          const struct GEN8_PIPELINE_SELECT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -608,7 +617,6 @@ GEN8_PIPELINE_SELECT_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_STATE_BASE_ADDRESS_length 0x00000010
 #define GEN8_STATE_BASE_ADDRESS_length_bias 0x00000002
 #define GEN8_STATE_BASE_ADDRESS_header          \
    .CommandType          =  3,                  \
@@ -617,6 +625,10 @@ GEN8_PIPELINE_SELECT_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  1,                  \
    .DwordLength          = 14
 
+#define GEN8_STATE_BASE_ADDRESS_length 0x00000010
+
+#define GEN8_MEMORY_OBJECT_CONTROL_STATE_length 0x00000001
+
 struct GEN8_MEMORY_OBJECT_CONTROL_STATE {
 #define     UCwithFenceifcoherentcycle                         0
 #define     UCUncacheable                                      1
@@ -633,7 +645,7 @@ struct GEN8_MEMORY_OBJECT_CONTROL_STATE {
 
 static inline void
 GEN8_MEMORY_OBJECT_CONTROL_STATE_pack(__gen_user_data *data, void * restrict dst,
-                                     const struct GEN8_MEMORY_OBJECT_CONTROL_STATE * restrict values)
+                                      const struct GEN8_MEMORY_OBJECT_CONTROL_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -679,7 +691,7 @@ struct GEN8_STATE_BASE_ADDRESS {
 
 static inline void
 GEN8_STATE_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
-                            const struct GEN8_STATE_BASE_ADDRESS * restrict values)
+                             const struct GEN8_STATE_BASE_ADDRESS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -784,7 +796,6 @@ GEN8_STATE_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_STATE_PREFETCH_length 0x00000002
 #define GEN8_STATE_PREFETCH_length_bias 0x00000002
 #define GEN8_STATE_PREFETCH_header              \
    .CommandType          =  3,                  \
@@ -793,6 +804,8 @@ GEN8_STATE_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  3,                  \
    .DwordLength          =  0
 
+#define GEN8_STATE_PREFETCH_length 0x00000002
+
 struct GEN8_STATE_PREFETCH {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -805,7 +818,7 @@ struct GEN8_STATE_PREFETCH {
 
 static inline void
 GEN8_STATE_PREFETCH_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN8_STATE_PREFETCH * restrict values)
+                         const struct GEN8_STATE_PREFETCH * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -826,7 +839,6 @@ GEN8_STATE_PREFETCH_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_STATE_SIP_length 0x00000003
 #define GEN8_STATE_SIP_length_bias 0x00000002
 #define GEN8_STATE_SIP_header                   \
    .CommandType          =  3,                  \
@@ -835,6 +847,8 @@ GEN8_STATE_PREFETCH_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  2,                  \
    .DwordLength          =  1
 
+#define GEN8_STATE_SIP_length 0x00000003
+
 struct GEN8_STATE_SIP {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -846,7 +860,7 @@ struct GEN8_STATE_SIP {
 
 static inline void
 GEN8_STATE_SIP_pack(__gen_user_data *data, void * restrict dst,
-                   const struct GEN8_STATE_SIP * restrict values)
+                    const struct GEN8_STATE_SIP * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -867,7 +881,6 @@ GEN8_STATE_SIP_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_SWTESS_BASE_ADDRESS_length 0x00000002
 #define GEN8_SWTESS_BASE_ADDRESS_length_bias 0x00000002
 #define GEN8_SWTESS_BASE_ADDRESS_header         \
    .CommandType          =  3,                  \
@@ -876,6 +889,8 @@ GEN8_STATE_SIP_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  3,                  \
    .DwordLength          =  0
 
+#define GEN8_SWTESS_BASE_ADDRESS_length 0x00000002
+
 struct GEN8_SWTESS_BASE_ADDRESS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -888,7 +903,7 @@ struct GEN8_SWTESS_BASE_ADDRESS {
 
 static inline void
 GEN8_SWTESS_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN8_SWTESS_BASE_ADDRESS * restrict values)
+                              const struct GEN8_SWTESS_BASE_ADDRESS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -914,7 +929,6 @@ GEN8_SWTESS_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DPRIMITIVE_length 0x00000007
 #define GEN8_3DPRIMITIVE_length_bias 0x00000002
 #define GEN8_3DPRIMITIVE_header                 \
    .CommandType          =  3,                  \
@@ -923,6 +937,8 @@ GEN8_SWTESS_BASE_ADDRESS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  0,                  \
    .DwordLength          =  5
 
+#define GEN8_3DPRIMITIVE_length 0x00000007
+
 struct GEN8_3DPRIMITIVE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -946,7 +962,7 @@ struct GEN8_3DPRIMITIVE {
 
 static inline void
 GEN8_3DPRIMITIVE_pack(__gen_user_data *data, void * restrict dst,
-                     const struct GEN8_3DPRIMITIVE * restrict values)
+                      const struct GEN8_3DPRIMITIVE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -989,7 +1005,6 @@ GEN8_3DPRIMITIVE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_AA_LINE_PARAMETERS_length 0x00000003
 #define GEN8_3DSTATE_AA_LINE_PARAMETERS_length_bias 0x00000002
 #define GEN8_3DSTATE_AA_LINE_PARAMETERS_header  \
    .CommandType          =  3,                  \
@@ -998,6 +1013,8 @@ GEN8_3DPRIMITIVE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 10,                  \
    .DwordLength          =  1
 
+#define GEN8_3DSTATE_AA_LINE_PARAMETERS_length 0x00000003
+
 struct GEN8_3DSTATE_AA_LINE_PARAMETERS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1016,7 +1033,7 @@ struct GEN8_3DSTATE_AA_LINE_PARAMETERS {
 
 static inline void
 GEN8_3DSTATE_AA_LINE_PARAMETERS_pack(__gen_user_data *data, void * restrict dst,
-                                    const struct GEN8_3DSTATE_AA_LINE_PARAMETERS * restrict values)
+                                     const struct GEN8_3DSTATE_AA_LINE_PARAMETERS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1051,6 +1068,10 @@ GEN8_3DSTATE_AA_LINE_PARAMETERS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 70
 
+#define GEN8_3DSTATE_BINDING_TABLE_EDIT_DS_length 0x00000000
+
+#define GEN8_BINDING_TABLE_EDIT_ENTRY_length 0x00000001
+
 struct GEN8_BINDING_TABLE_EDIT_ENTRY {
    uint32_t                                     BindingTableIndex;
    uint32_t                                     SurfaceStatePointer;
@@ -1058,7 +1079,7 @@ struct GEN8_BINDING_TABLE_EDIT_ENTRY {
 
 static inline void
 GEN8_BINDING_TABLE_EDIT_ENTRY_pack(__gen_user_data *data, void * restrict dst,
-                                  const struct GEN8_BINDING_TABLE_EDIT_ENTRY * restrict values)
+                                   const struct GEN8_BINDING_TABLE_EDIT_ENTRY * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1085,7 +1106,7 @@ struct GEN8_3DSTATE_BINDING_TABLE_EDIT_DS {
 
 static inline void
 GEN8_3DSTATE_BINDING_TABLE_EDIT_DS_pack(__gen_user_data *data, void * restrict dst,
-                                       const struct GEN8_3DSTATE_BINDING_TABLE_EDIT_DS * restrict values)
+                                        const struct GEN8_3DSTATE_BINDING_TABLE_EDIT_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1112,6 +1133,8 @@ GEN8_3DSTATE_BINDING_TABLE_EDIT_DS_pack(__gen_user_data *data, void * restrict d
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 68
 
+#define GEN8_3DSTATE_BINDING_TABLE_EDIT_GS_length 0x00000000
+
 struct GEN8_3DSTATE_BINDING_TABLE_EDIT_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1128,7 +1151,7 @@ struct GEN8_3DSTATE_BINDING_TABLE_EDIT_GS {
 
 static inline void
 GEN8_3DSTATE_BINDING_TABLE_EDIT_GS_pack(__gen_user_data *data, void * restrict dst,
-                                       const struct GEN8_3DSTATE_BINDING_TABLE_EDIT_GS * restrict values)
+                                        const struct GEN8_3DSTATE_BINDING_TABLE_EDIT_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1155,6 +1178,8 @@ GEN8_3DSTATE_BINDING_TABLE_EDIT_GS_pack(__gen_user_data *data, void * restrict d
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 69
 
+#define GEN8_3DSTATE_BINDING_TABLE_EDIT_HS_length 0x00000000
+
 struct GEN8_3DSTATE_BINDING_TABLE_EDIT_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1171,7 +1196,7 @@ struct GEN8_3DSTATE_BINDING_TABLE_EDIT_HS {
 
 static inline void
 GEN8_3DSTATE_BINDING_TABLE_EDIT_HS_pack(__gen_user_data *data, void * restrict dst,
-                                       const struct GEN8_3DSTATE_BINDING_TABLE_EDIT_HS * restrict values)
+                                        const struct GEN8_3DSTATE_BINDING_TABLE_EDIT_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1198,6 +1223,8 @@ GEN8_3DSTATE_BINDING_TABLE_EDIT_HS_pack(__gen_user_data *data, void * restrict d
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 71
 
+#define GEN8_3DSTATE_BINDING_TABLE_EDIT_PS_length 0x00000000
+
 struct GEN8_3DSTATE_BINDING_TABLE_EDIT_PS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1214,7 +1241,7 @@ struct GEN8_3DSTATE_BINDING_TABLE_EDIT_PS {
 
 static inline void
 GEN8_3DSTATE_BINDING_TABLE_EDIT_PS_pack(__gen_user_data *data, void * restrict dst,
-                                       const struct GEN8_3DSTATE_BINDING_TABLE_EDIT_PS * restrict values)
+                                        const struct GEN8_3DSTATE_BINDING_TABLE_EDIT_PS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1241,6 +1268,8 @@ GEN8_3DSTATE_BINDING_TABLE_EDIT_PS_pack(__gen_user_data *data, void * restrict d
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 67
 
+#define GEN8_3DSTATE_BINDING_TABLE_EDIT_VS_length 0x00000000
+
 struct GEN8_3DSTATE_BINDING_TABLE_EDIT_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1257,7 +1286,7 @@ struct GEN8_3DSTATE_BINDING_TABLE_EDIT_VS {
 
 static inline void
 GEN8_3DSTATE_BINDING_TABLE_EDIT_VS_pack(__gen_user_data *data, void * restrict dst,
-                                       const struct GEN8_3DSTATE_BINDING_TABLE_EDIT_VS * restrict values)
+                                        const struct GEN8_3DSTATE_BINDING_TABLE_EDIT_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1277,7 +1306,6 @@ GEN8_3DSTATE_BINDING_TABLE_EDIT_VS_pack(__gen_user_data *data, void * restrict d
    /* variable length fields follow */
 }
 
-#define GEN8_3DSTATE_BINDING_TABLE_POINTERS_DS_length 0x00000002
 #define GEN8_3DSTATE_BINDING_TABLE_POINTERS_DS_length_bias 0x00000002
 #define GEN8_3DSTATE_BINDING_TABLE_POINTERS_DS_header\
    .CommandType          =  3,                  \
@@ -1286,6 +1314,8 @@ GEN8_3DSTATE_BINDING_TABLE_EDIT_VS_pack(__gen_user_data *data, void * restrict d
    ._3DCommandSubOpcode  = 40,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_BINDING_TABLE_POINTERS_DS_length 0x00000002
+
 struct GEN8_3DSTATE_BINDING_TABLE_POINTERS_DS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1297,7 +1327,7 @@ struct GEN8_3DSTATE_BINDING_TABLE_POINTERS_DS {
 
 static inline void
 GEN8_3DSTATE_BINDING_TABLE_POINTERS_DS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN8_3DSTATE_BINDING_TABLE_POINTERS_DS * restrict values)
+                                            const struct GEN8_3DSTATE_BINDING_TABLE_POINTERS_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1315,7 +1345,6 @@ GEN8_3DSTATE_BINDING_TABLE_POINTERS_DS_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN8_3DSTATE_BINDING_TABLE_POINTERS_GS_length 0x00000002
 #define GEN8_3DSTATE_BINDING_TABLE_POINTERS_GS_length_bias 0x00000002
 #define GEN8_3DSTATE_BINDING_TABLE_POINTERS_GS_header\
    .CommandType          =  3,                  \
@@ -1324,6 +1353,8 @@ GEN8_3DSTATE_BINDING_TABLE_POINTERS_DS_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 41,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_BINDING_TABLE_POINTERS_GS_length 0x00000002
+
 struct GEN8_3DSTATE_BINDING_TABLE_POINTERS_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1335,7 +1366,7 @@ struct GEN8_3DSTATE_BINDING_TABLE_POINTERS_GS {
 
 static inline void
 GEN8_3DSTATE_BINDING_TABLE_POINTERS_GS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN8_3DSTATE_BINDING_TABLE_POINTERS_GS * restrict values)
+                                            const struct GEN8_3DSTATE_BINDING_TABLE_POINTERS_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1353,7 +1384,6 @@ GEN8_3DSTATE_BINDING_TABLE_POINTERS_GS_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN8_3DSTATE_BINDING_TABLE_POINTERS_HS_length 0x00000002
 #define GEN8_3DSTATE_BINDING_TABLE_POINTERS_HS_length_bias 0x00000002
 #define GEN8_3DSTATE_BINDING_TABLE_POINTERS_HS_header\
    .CommandType          =  3,                  \
@@ -1362,6 +1392,8 @@ GEN8_3DSTATE_BINDING_TABLE_POINTERS_GS_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 39,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_BINDING_TABLE_POINTERS_HS_length 0x00000002
+
 struct GEN8_3DSTATE_BINDING_TABLE_POINTERS_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1373,7 +1405,7 @@ struct GEN8_3DSTATE_BINDING_TABLE_POINTERS_HS {
 
 static inline void
 GEN8_3DSTATE_BINDING_TABLE_POINTERS_HS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN8_3DSTATE_BINDING_TABLE_POINTERS_HS * restrict values)
+                                            const struct GEN8_3DSTATE_BINDING_TABLE_POINTERS_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1391,7 +1423,6 @@ GEN8_3DSTATE_BINDING_TABLE_POINTERS_HS_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN8_3DSTATE_BINDING_TABLE_POINTERS_PS_length 0x00000002
 #define GEN8_3DSTATE_BINDING_TABLE_POINTERS_PS_length_bias 0x00000002
 #define GEN8_3DSTATE_BINDING_TABLE_POINTERS_PS_header\
    .CommandType          =  3,                  \
@@ -1400,6 +1431,8 @@ GEN8_3DSTATE_BINDING_TABLE_POINTERS_HS_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 42,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_BINDING_TABLE_POINTERS_PS_length 0x00000002
+
 struct GEN8_3DSTATE_BINDING_TABLE_POINTERS_PS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1411,7 +1444,7 @@ struct GEN8_3DSTATE_BINDING_TABLE_POINTERS_PS {
 
 static inline void
 GEN8_3DSTATE_BINDING_TABLE_POINTERS_PS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN8_3DSTATE_BINDING_TABLE_POINTERS_PS * restrict values)
+                                            const struct GEN8_3DSTATE_BINDING_TABLE_POINTERS_PS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1429,7 +1462,6 @@ GEN8_3DSTATE_BINDING_TABLE_POINTERS_PS_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN8_3DSTATE_BINDING_TABLE_POINTERS_VS_length 0x00000002
 #define GEN8_3DSTATE_BINDING_TABLE_POINTERS_VS_length_bias 0x00000002
 #define GEN8_3DSTATE_BINDING_TABLE_POINTERS_VS_header\
    .CommandType          =  3,                  \
@@ -1438,6 +1470,8 @@ GEN8_3DSTATE_BINDING_TABLE_POINTERS_PS_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 38,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_BINDING_TABLE_POINTERS_VS_length 0x00000002
+
 struct GEN8_3DSTATE_BINDING_TABLE_POINTERS_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1449,7 +1483,7 @@ struct GEN8_3DSTATE_BINDING_TABLE_POINTERS_VS {
 
 static inline void
 GEN8_3DSTATE_BINDING_TABLE_POINTERS_VS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN8_3DSTATE_BINDING_TABLE_POINTERS_VS * restrict values)
+                                            const struct GEN8_3DSTATE_BINDING_TABLE_POINTERS_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1467,7 +1501,6 @@ GEN8_3DSTATE_BINDING_TABLE_POINTERS_VS_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN8_3DSTATE_BINDING_TABLE_POOL_ALLOC_length 0x00000004
 #define GEN8_3DSTATE_BINDING_TABLE_POOL_ALLOC_length_bias 0x00000002
 #define GEN8_3DSTATE_BINDING_TABLE_POOL_ALLOC_header\
    .CommandType          =  3,                  \
@@ -1476,6 +1509,8 @@ GEN8_3DSTATE_BINDING_TABLE_POINTERS_VS_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 25,                  \
    .DwordLength          =  2
 
+#define GEN8_3DSTATE_BINDING_TABLE_POOL_ALLOC_length 0x00000004
+
 struct GEN8_3DSTATE_BINDING_TABLE_POOL_ALLOC {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1491,7 +1526,7 @@ struct GEN8_3DSTATE_BINDING_TABLE_POOL_ALLOC {
 
 static inline void
 GEN8_3DSTATE_BINDING_TABLE_POOL_ALLOC_pack(__gen_user_data *data, void * restrict dst,
-                                          const struct GEN8_3DSTATE_BINDING_TABLE_POOL_ALLOC * restrict values)
+                                           const struct GEN8_3DSTATE_BINDING_TABLE_POOL_ALLOC * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1522,7 +1557,6 @@ GEN8_3DSTATE_BINDING_TABLE_POOL_ALLOC_pack(__gen_user_data *data, void * restric
 
 }
 
-#define GEN8_3DSTATE_BLEND_STATE_POINTERS_length 0x00000002
 #define GEN8_3DSTATE_BLEND_STATE_POINTERS_length_bias 0x00000002
 #define GEN8_3DSTATE_BLEND_STATE_POINTERS_header\
    .CommandType          =  3,                  \
@@ -1531,6 +1565,8 @@ GEN8_3DSTATE_BINDING_TABLE_POOL_ALLOC_pack(__gen_user_data *data, void * restric
    ._3DCommandSubOpcode  = 36,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_BLEND_STATE_POINTERS_length 0x00000002
+
 struct GEN8_3DSTATE_BLEND_STATE_POINTERS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1543,7 +1579,7 @@ struct GEN8_3DSTATE_BLEND_STATE_POINTERS {
 
 static inline void
 GEN8_3DSTATE_BLEND_STATE_POINTERS_pack(__gen_user_data *data, void * restrict dst,
-                                      const struct GEN8_3DSTATE_BLEND_STATE_POINTERS * restrict values)
+                                       const struct GEN8_3DSTATE_BLEND_STATE_POINTERS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1562,7 +1598,6 @@ GEN8_3DSTATE_BLEND_STATE_POINTERS_pack(__gen_user_data *data, void * restrict ds
 
 }
 
-#define GEN8_3DSTATE_CC_STATE_POINTERS_length 0x00000002
 #define GEN8_3DSTATE_CC_STATE_POINTERS_length_bias 0x00000002
 #define GEN8_3DSTATE_CC_STATE_POINTERS_header   \
    .CommandType          =  3,                  \
@@ -1571,6 +1606,8 @@ GEN8_3DSTATE_BLEND_STATE_POINTERS_pack(__gen_user_data *data, void * restrict ds
    ._3DCommandSubOpcode  = 14,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_CC_STATE_POINTERS_length 0x00000002
+
 struct GEN8_3DSTATE_CC_STATE_POINTERS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1583,7 +1620,7 @@ struct GEN8_3DSTATE_CC_STATE_POINTERS {
 
 static inline void
 GEN8_3DSTATE_CC_STATE_POINTERS_pack(__gen_user_data *data, void * restrict dst,
-                                   const struct GEN8_3DSTATE_CC_STATE_POINTERS * restrict values)
+                                    const struct GEN8_3DSTATE_CC_STATE_POINTERS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1602,7 +1639,6 @@ GEN8_3DSTATE_CC_STATE_POINTERS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_CHROMA_KEY_length 0x00000004
 #define GEN8_3DSTATE_CHROMA_KEY_length_bias 0x00000002
 #define GEN8_3DSTATE_CHROMA_KEY_header          \
    .CommandType          =  3,                  \
@@ -1611,6 +1647,8 @@ GEN8_3DSTATE_CC_STATE_POINTERS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  4,                  \
    .DwordLength          =  2
 
+#define GEN8_3DSTATE_CHROMA_KEY_length 0x00000004
+
 struct GEN8_3DSTATE_CHROMA_KEY {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1624,7 +1662,7 @@ struct GEN8_3DSTATE_CHROMA_KEY {
 
 static inline void
 GEN8_3DSTATE_CHROMA_KEY_pack(__gen_user_data *data, void * restrict dst,
-                            const struct GEN8_3DSTATE_CHROMA_KEY * restrict values)
+                             const struct GEN8_3DSTATE_CHROMA_KEY * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1650,7 +1688,6 @@ GEN8_3DSTATE_CHROMA_KEY_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_CLEAR_PARAMS_length 0x00000003
 #define GEN8_3DSTATE_CLEAR_PARAMS_length_bias 0x00000002
 #define GEN8_3DSTATE_CLEAR_PARAMS_header        \
    .CommandType          =  3,                  \
@@ -1659,6 +1696,8 @@ GEN8_3DSTATE_CHROMA_KEY_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  4,                  \
    .DwordLength          =  1
 
+#define GEN8_3DSTATE_CLEAR_PARAMS_length 0x00000003
+
 struct GEN8_3DSTATE_CLEAR_PARAMS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1671,7 +1710,7 @@ struct GEN8_3DSTATE_CLEAR_PARAMS {
 
 static inline void
 GEN8_3DSTATE_CLEAR_PARAMS_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN8_3DSTATE_CLEAR_PARAMS * restrict values)
+                               const struct GEN8_3DSTATE_CLEAR_PARAMS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1693,7 +1732,6 @@ GEN8_3DSTATE_CLEAR_PARAMS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_CLIP_length 0x00000004
 #define GEN8_3DSTATE_CLIP_length_bias 0x00000002
 #define GEN8_3DSTATE_CLIP_header                \
    .CommandType          =  3,                  \
@@ -1702,6 +1740,8 @@ GEN8_3DSTATE_CLEAR_PARAMS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 18,                  \
    .DwordLength          =  2
 
+#define GEN8_3DSTATE_CLIP_length 0x00000004
+
 struct GEN8_3DSTATE_CLIP {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1746,7 +1786,7 @@ struct GEN8_3DSTATE_CLIP {
 
 static inline void
 GEN8_3DSTATE_CLIP_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN8_3DSTATE_CLIP * restrict values)
+                       const struct GEN8_3DSTATE_CLIP * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1791,7 +1831,6 @@ GEN8_3DSTATE_CLIP_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_CONSTANT_DS_length 0x0000000b
 #define GEN8_3DSTATE_CONSTANT_DS_length_bias 0x00000002
 #define GEN8_3DSTATE_CONSTANT_DS_header         \
    .CommandType          =  3,                  \
@@ -1800,6 +1839,10 @@ GEN8_3DSTATE_CLIP_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 26,                  \
    .DwordLength          =  9
 
+#define GEN8_3DSTATE_CONSTANT_DS_length 0x0000000b
+
+#define GEN8_3DSTATE_CONSTANT_BODY_length 0x0000000a
+
 struct GEN8_3DSTATE_CONSTANT_BODY {
    uint32_t                                     ConstantBuffer1ReadLength;
    uint32_t                                     ConstantBuffer0ReadLength;
@@ -1813,7 +1856,7 @@ struct GEN8_3DSTATE_CONSTANT_BODY {
 
 static inline void
 GEN8_3DSTATE_CONSTANT_BODY_pack(__gen_user_data *data, void * restrict dst,
-                               const struct GEN8_3DSTATE_CONSTANT_BODY * restrict values)
+                                const struct GEN8_3DSTATE_CONSTANT_BODY * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1877,7 +1920,7 @@ struct GEN8_3DSTATE_CONSTANT_DS {
 
 static inline void
 GEN8_3DSTATE_CONSTANT_DS_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN8_3DSTATE_CONSTANT_DS * restrict values)
+                              const struct GEN8_3DSTATE_CONSTANT_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1895,7 +1938,6 @@ GEN8_3DSTATE_CONSTANT_DS_pack(__gen_user_data *data, void * restrict dst,
    GEN8_3DSTATE_CONSTANT_BODY_pack(data, &dw[1], &values->ConstantBody);
 }
 
-#define GEN8_3DSTATE_CONSTANT_GS_length 0x0000000b
 #define GEN8_3DSTATE_CONSTANT_GS_length_bias 0x00000002
 #define GEN8_3DSTATE_CONSTANT_GS_header         \
    .CommandType          =  3,                  \
@@ -1904,6 +1946,8 @@ GEN8_3DSTATE_CONSTANT_DS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 22,                  \
    .DwordLength          =  9
 
+#define GEN8_3DSTATE_CONSTANT_GS_length 0x0000000b
+
 struct GEN8_3DSTATE_CONSTANT_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1916,7 +1960,7 @@ struct GEN8_3DSTATE_CONSTANT_GS {
 
 static inline void
 GEN8_3DSTATE_CONSTANT_GS_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN8_3DSTATE_CONSTANT_GS * restrict values)
+                              const struct GEN8_3DSTATE_CONSTANT_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1934,7 +1978,6 @@ GEN8_3DSTATE_CONSTANT_GS_pack(__gen_user_data *data, void * restrict dst,
    GEN8_3DSTATE_CONSTANT_BODY_pack(data, &dw[1], &values->ConstantBody);
 }
 
-#define GEN8_3DSTATE_CONSTANT_HS_length 0x0000000b
 #define GEN8_3DSTATE_CONSTANT_HS_length_bias 0x00000002
 #define GEN8_3DSTATE_CONSTANT_HS_header         \
    .CommandType          =  3,                  \
@@ -1943,6 +1986,8 @@ GEN8_3DSTATE_CONSTANT_GS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 25,                  \
    .DwordLength          =  9
 
+#define GEN8_3DSTATE_CONSTANT_HS_length 0x0000000b
+
 struct GEN8_3DSTATE_CONSTANT_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1955,7 +2000,7 @@ struct GEN8_3DSTATE_CONSTANT_HS {
 
 static inline void
 GEN8_3DSTATE_CONSTANT_HS_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN8_3DSTATE_CONSTANT_HS * restrict values)
+                              const struct GEN8_3DSTATE_CONSTANT_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -1973,7 +2018,6 @@ GEN8_3DSTATE_CONSTANT_HS_pack(__gen_user_data *data, void * restrict dst,
    GEN8_3DSTATE_CONSTANT_BODY_pack(data, &dw[1], &values->ConstantBody);
 }
 
-#define GEN8_3DSTATE_CONSTANT_PS_length 0x0000000b
 #define GEN8_3DSTATE_CONSTANT_PS_length_bias 0x00000002
 #define GEN8_3DSTATE_CONSTANT_PS_header         \
    .CommandType          =  3,                  \
@@ -1982,6 +2026,8 @@ GEN8_3DSTATE_CONSTANT_HS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 23,                  \
    .DwordLength          =  9
 
+#define GEN8_3DSTATE_CONSTANT_PS_length 0x0000000b
+
 struct GEN8_3DSTATE_CONSTANT_PS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -1994,7 +2040,7 @@ struct GEN8_3DSTATE_CONSTANT_PS {
 
 static inline void
 GEN8_3DSTATE_CONSTANT_PS_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN8_3DSTATE_CONSTANT_PS * restrict values)
+                              const struct GEN8_3DSTATE_CONSTANT_PS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2012,7 +2058,6 @@ GEN8_3DSTATE_CONSTANT_PS_pack(__gen_user_data *data, void * restrict dst,
    GEN8_3DSTATE_CONSTANT_BODY_pack(data, &dw[1], &values->ConstantBody);
 }
 
-#define GEN8_3DSTATE_CONSTANT_VS_length 0x0000000b
 #define GEN8_3DSTATE_CONSTANT_VS_length_bias 0x00000002
 #define GEN8_3DSTATE_CONSTANT_VS_header         \
    .CommandType          =  3,                  \
@@ -2021,6 +2066,8 @@ GEN8_3DSTATE_CONSTANT_PS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 21,                  \
    .DwordLength          =  9
 
+#define GEN8_3DSTATE_CONSTANT_VS_length 0x0000000b
+
 struct GEN8_3DSTATE_CONSTANT_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2033,7 +2080,7 @@ struct GEN8_3DSTATE_CONSTANT_VS {
 
 static inline void
 GEN8_3DSTATE_CONSTANT_VS_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN8_3DSTATE_CONSTANT_VS * restrict values)
+                              const struct GEN8_3DSTATE_CONSTANT_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2051,7 +2098,6 @@ GEN8_3DSTATE_CONSTANT_VS_pack(__gen_user_data *data, void * restrict dst,
    GEN8_3DSTATE_CONSTANT_BODY_pack(data, &dw[1], &values->ConstantBody);
 }
 
-#define GEN8_3DSTATE_DEPTH_BUFFER_length 0x00000008
 #define GEN8_3DSTATE_DEPTH_BUFFER_length_bias 0x00000002
 #define GEN8_3DSTATE_DEPTH_BUFFER_header        \
    .CommandType          =  3,                  \
@@ -2060,6 +2106,8 @@ GEN8_3DSTATE_CONSTANT_VS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  5,                  \
    .DwordLength          =  6
 
+#define GEN8_3DSTATE_DEPTH_BUFFER_length 0x00000008
+
 struct GEN8_3DSTATE_DEPTH_BUFFER {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2093,7 +2141,7 @@ struct GEN8_3DSTATE_DEPTH_BUFFER {
 
 static inline void
 GEN8_3DSTATE_DEPTH_BUFFER_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN8_3DSTATE_DEPTH_BUFFER * restrict values)
+                               const struct GEN8_3DSTATE_DEPTH_BUFFER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2147,7 +2195,6 @@ GEN8_3DSTATE_DEPTH_BUFFER_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_DRAWING_RECTANGLE_length 0x00000004
 #define GEN8_3DSTATE_DRAWING_RECTANGLE_length_bias 0x00000002
 #define GEN8_3DSTATE_DRAWING_RECTANGLE_header   \
    .CommandType          =  3,                  \
@@ -2156,6 +2203,8 @@ GEN8_3DSTATE_DEPTH_BUFFER_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  0,                  \
    .DwordLength          =  2
 
+#define GEN8_3DSTATE_DRAWING_RECTANGLE_length 0x00000004
+
 struct GEN8_3DSTATE_DRAWING_RECTANGLE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2176,7 +2225,7 @@ struct GEN8_3DSTATE_DRAWING_RECTANGLE {
 
 static inline void
 GEN8_3DSTATE_DRAWING_RECTANGLE_pack(__gen_user_data *data, void * restrict dst,
-                                   const struct GEN8_3DSTATE_DRAWING_RECTANGLE * restrict values)
+                                    const struct GEN8_3DSTATE_DRAWING_RECTANGLE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2206,7 +2255,6 @@ GEN8_3DSTATE_DRAWING_RECTANGLE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_DS_length 0x00000009
 #define GEN8_3DSTATE_DS_length_bias 0x00000002
 #define GEN8_3DSTATE_DS_header                  \
    .CommandType          =  3,                  \
@@ -2215,6 +2263,8 @@ GEN8_3DSTATE_DRAWING_RECTANGLE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 29,                  \
    .DwordLength          =  7
 
+#define GEN8_3DSTATE_DS_length 0x00000009
+
 struct GEN8_3DSTATE_DS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2263,7 +2313,7 @@ struct GEN8_3DSTATE_DS {
 
 static inline void
 GEN8_3DSTATE_DS_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN8_3DSTATE_DS * restrict values)
+                     const struct GEN8_3DSTATE_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2333,6 +2383,10 @@ GEN8_3DSTATE_DS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 55
 
+#define GEN8_3DSTATE_GATHER_CONSTANT_DS_length 0x00000000
+
+#define GEN8_GATHER_CONSTANT_ENTRY_length 0x00000001
+
 struct GEN8_GATHER_CONSTANT_ENTRY {
    uint32_t                                     ConstantBufferOffset;
    uint32_t                                     ChannelMask;
@@ -2341,7 +2395,7 @@ struct GEN8_GATHER_CONSTANT_ENTRY {
 
 static inline void
 GEN8_GATHER_CONSTANT_ENTRY_pack(__gen_user_data *data, void * restrict dst,
-                               const struct GEN8_GATHER_CONSTANT_ENTRY * restrict values)
+                                const struct GEN8_GATHER_CONSTANT_ENTRY * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2368,7 +2422,7 @@ struct GEN8_3DSTATE_GATHER_CONSTANT_DS {
 
 static inline void
 GEN8_3DSTATE_GATHER_CONSTANT_DS_pack(__gen_user_data *data, void * restrict dst,
-                                    const struct GEN8_3DSTATE_GATHER_CONSTANT_DS * restrict values)
+                                     const struct GEN8_3DSTATE_GATHER_CONSTANT_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2400,6 +2454,8 @@ GEN8_3DSTATE_GATHER_CONSTANT_DS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 53
 
+#define GEN8_3DSTATE_GATHER_CONSTANT_GS_length 0x00000000
+
 struct GEN8_3DSTATE_GATHER_CONSTANT_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2415,7 +2471,7 @@ struct GEN8_3DSTATE_GATHER_CONSTANT_GS {
 
 static inline void
 GEN8_3DSTATE_GATHER_CONSTANT_GS_pack(__gen_user_data *data, void * restrict dst,
-                                    const struct GEN8_3DSTATE_GATHER_CONSTANT_GS * restrict values)
+                                     const struct GEN8_3DSTATE_GATHER_CONSTANT_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2447,6 +2503,8 @@ GEN8_3DSTATE_GATHER_CONSTANT_GS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 54
 
+#define GEN8_3DSTATE_GATHER_CONSTANT_HS_length 0x00000000
+
 struct GEN8_3DSTATE_GATHER_CONSTANT_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2462,7 +2520,7 @@ struct GEN8_3DSTATE_GATHER_CONSTANT_HS {
 
 static inline void
 GEN8_3DSTATE_GATHER_CONSTANT_HS_pack(__gen_user_data *data, void * restrict dst,
-                                    const struct GEN8_3DSTATE_GATHER_CONSTANT_HS * restrict values)
+                                     const struct GEN8_3DSTATE_GATHER_CONSTANT_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2494,6 +2552,8 @@ GEN8_3DSTATE_GATHER_CONSTANT_HS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 56
 
+#define GEN8_3DSTATE_GATHER_CONSTANT_PS_length 0x00000000
+
 struct GEN8_3DSTATE_GATHER_CONSTANT_PS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2510,7 +2570,7 @@ struct GEN8_3DSTATE_GATHER_CONSTANT_PS {
 
 static inline void
 GEN8_3DSTATE_GATHER_CONSTANT_PS_pack(__gen_user_data *data, void * restrict dst,
-                                    const struct GEN8_3DSTATE_GATHER_CONSTANT_PS * restrict values)
+                                     const struct GEN8_3DSTATE_GATHER_CONSTANT_PS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2543,6 +2603,8 @@ GEN8_3DSTATE_GATHER_CONSTANT_PS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 52
 
+#define GEN8_3DSTATE_GATHER_CONSTANT_VS_length 0x00000000
+
 struct GEN8_3DSTATE_GATHER_CONSTANT_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2559,7 +2621,7 @@ struct GEN8_3DSTATE_GATHER_CONSTANT_VS {
 
 static inline void
 GEN8_3DSTATE_GATHER_CONSTANT_VS_pack(__gen_user_data *data, void * restrict dst,
-                                    const struct GEN8_3DSTATE_GATHER_CONSTANT_VS * restrict values)
+                                     const struct GEN8_3DSTATE_GATHER_CONSTANT_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2585,7 +2647,6 @@ GEN8_3DSTATE_GATHER_CONSTANT_VS_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN8_3DSTATE_GATHER_POOL_ALLOC_length 0x00000004
 #define GEN8_3DSTATE_GATHER_POOL_ALLOC_length_bias 0x00000002
 #define GEN8_3DSTATE_GATHER_POOL_ALLOC_header   \
    .CommandType          =  3,                  \
@@ -2594,6 +2655,8 @@ GEN8_3DSTATE_GATHER_CONSTANT_VS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 26,                  \
    .DwordLength          =  2
 
+#define GEN8_3DSTATE_GATHER_POOL_ALLOC_length 0x00000004
+
 struct GEN8_3DSTATE_GATHER_POOL_ALLOC {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2608,7 +2671,7 @@ struct GEN8_3DSTATE_GATHER_POOL_ALLOC {
 
 static inline void
 GEN8_3DSTATE_GATHER_POOL_ALLOC_pack(__gen_user_data *data, void * restrict dst,
-                                   const struct GEN8_3DSTATE_GATHER_POOL_ALLOC * restrict values)
+                                    const struct GEN8_3DSTATE_GATHER_POOL_ALLOC * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2639,7 +2702,6 @@ GEN8_3DSTATE_GATHER_POOL_ALLOC_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_GS_length 0x0000000a
 #define GEN8_3DSTATE_GS_length_bias 0x00000002
 #define GEN8_3DSTATE_GS_header                  \
    .CommandType          =  3,                  \
@@ -2648,6 +2710,8 @@ GEN8_3DSTATE_GATHER_POOL_ALLOC_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 17,                  \
    .DwordLength          =  8
 
+#define GEN8_3DSTATE_GS_length 0x0000000a
+
 struct GEN8_3DSTATE_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2716,7 +2780,7 @@ struct GEN8_3DSTATE_GS {
 
 static inline void
 GEN8_3DSTATE_GS_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN8_3DSTATE_GS * restrict values)
+                     const struct GEN8_3DSTATE_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2796,7 +2860,6 @@ GEN8_3DSTATE_GS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_HIER_DEPTH_BUFFER_length 0x00000005
 #define GEN8_3DSTATE_HIER_DEPTH_BUFFER_length_bias 0x00000002
 #define GEN8_3DSTATE_HIER_DEPTH_BUFFER_header   \
    .CommandType          =  3,                  \
@@ -2805,6 +2868,8 @@ GEN8_3DSTATE_GS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  7,                  \
    .DwordLength          =  3
 
+#define GEN8_3DSTATE_HIER_DEPTH_BUFFER_length 0x00000005
+
 struct GEN8_3DSTATE_HIER_DEPTH_BUFFER {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2819,7 +2884,7 @@ struct GEN8_3DSTATE_HIER_DEPTH_BUFFER {
 
 static inline void
 GEN8_3DSTATE_HIER_DEPTH_BUFFER_pack(__gen_user_data *data, void * restrict dst,
-                                   const struct GEN8_3DSTATE_HIER_DEPTH_BUFFER * restrict values)
+                                    const struct GEN8_3DSTATE_HIER_DEPTH_BUFFER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2853,7 +2918,6 @@ GEN8_3DSTATE_HIER_DEPTH_BUFFER_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_HS_length 0x00000009
 #define GEN8_3DSTATE_HS_length_bias 0x00000002
 #define GEN8_3DSTATE_HS_header                  \
    .CommandType          =  3,                  \
@@ -2862,6 +2926,8 @@ GEN8_3DSTATE_HIER_DEPTH_BUFFER_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 27,                  \
    .DwordLength          =  7
 
+#define GEN8_3DSTATE_HS_length 0x00000009
+
 struct GEN8_3DSTATE_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2903,7 +2969,7 @@ struct GEN8_3DSTATE_HS {
 
 static inline void
 GEN8_3DSTATE_HS_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN8_3DSTATE_HS * restrict values)
+                     const struct GEN8_3DSTATE_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -2961,7 +3027,6 @@ GEN8_3DSTATE_HS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_INDEX_BUFFER_length 0x00000005
 #define GEN8_3DSTATE_INDEX_BUFFER_length_bias 0x00000002
 #define GEN8_3DSTATE_INDEX_BUFFER_header        \
    .CommandType          =  3,                  \
@@ -2970,6 +3035,8 @@ GEN8_3DSTATE_HS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 10,                  \
    .DwordLength          =  3
 
+#define GEN8_3DSTATE_INDEX_BUFFER_length 0x00000005
+
 struct GEN8_3DSTATE_INDEX_BUFFER {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -2987,7 +3054,7 @@ struct GEN8_3DSTATE_INDEX_BUFFER {
 
 static inline void
 GEN8_3DSTATE_INDEX_BUFFER_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN8_3DSTATE_INDEX_BUFFER * restrict values)
+                               const struct GEN8_3DSTATE_INDEX_BUFFER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3021,7 +3088,6 @@ GEN8_3DSTATE_INDEX_BUFFER_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_LINE_STIPPLE_length 0x00000003
 #define GEN8_3DSTATE_LINE_STIPPLE_length_bias 0x00000002
 #define GEN8_3DSTATE_LINE_STIPPLE_header        \
    .CommandType          =  3,                  \
@@ -3030,6 +3096,8 @@ GEN8_3DSTATE_INDEX_BUFFER_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  8,                  \
    .DwordLength          =  1
 
+#define GEN8_3DSTATE_LINE_STIPPLE_length 0x00000003
+
 struct GEN8_3DSTATE_LINE_STIPPLE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3046,7 +3114,7 @@ struct GEN8_3DSTATE_LINE_STIPPLE {
 
 static inline void
 GEN8_3DSTATE_LINE_STIPPLE_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN8_3DSTATE_LINE_STIPPLE * restrict values)
+                               const struct GEN8_3DSTATE_LINE_STIPPLE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3072,7 +3140,6 @@ GEN8_3DSTATE_LINE_STIPPLE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_MONOFILTER_SIZE_length 0x00000002
 #define GEN8_3DSTATE_MONOFILTER_SIZE_length_bias 0x00000002
 #define GEN8_3DSTATE_MONOFILTER_SIZE_header     \
    .CommandType          =  3,                  \
@@ -3081,6 +3148,8 @@ GEN8_3DSTATE_LINE_STIPPLE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 17,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_MONOFILTER_SIZE_length 0x00000002
+
 struct GEN8_3DSTATE_MONOFILTER_SIZE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3093,7 +3162,7 @@ struct GEN8_3DSTATE_MONOFILTER_SIZE {
 
 static inline void
 GEN8_3DSTATE_MONOFILTER_SIZE_pack(__gen_user_data *data, void * restrict dst,
-                                 const struct GEN8_3DSTATE_MONOFILTER_SIZE * restrict values)
+                                  const struct GEN8_3DSTATE_MONOFILTER_SIZE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3112,7 +3181,6 @@ GEN8_3DSTATE_MONOFILTER_SIZE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_MULTISAMPLE_length 0x00000002
 #define GEN8_3DSTATE_MULTISAMPLE_length_bias 0x00000002
 #define GEN8_3DSTATE_MULTISAMPLE_header         \
    .CommandType          =  3,                  \
@@ -3121,6 +3189,8 @@ GEN8_3DSTATE_MONOFILTER_SIZE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 13,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_MULTISAMPLE_length 0x00000002
+
 struct GEN8_3DSTATE_MULTISAMPLE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3136,7 +3206,7 @@ struct GEN8_3DSTATE_MULTISAMPLE {
 
 static inline void
 GEN8_3DSTATE_MULTISAMPLE_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN8_3DSTATE_MULTISAMPLE * restrict values)
+                              const struct GEN8_3DSTATE_MULTISAMPLE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3156,7 +3226,6 @@ GEN8_3DSTATE_MULTISAMPLE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_POLY_STIPPLE_OFFSET_length 0x00000002
 #define GEN8_3DSTATE_POLY_STIPPLE_OFFSET_length_bias 0x00000002
 #define GEN8_3DSTATE_POLY_STIPPLE_OFFSET_header \
    .CommandType          =  3,                  \
@@ -3165,6 +3234,8 @@ GEN8_3DSTATE_MULTISAMPLE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  6,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_POLY_STIPPLE_OFFSET_length 0x00000002
+
 struct GEN8_3DSTATE_POLY_STIPPLE_OFFSET {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3177,7 +3248,7 @@ struct GEN8_3DSTATE_POLY_STIPPLE_OFFSET {
 
 static inline void
 GEN8_3DSTATE_POLY_STIPPLE_OFFSET_pack(__gen_user_data *data, void * restrict dst,
-                                     const struct GEN8_3DSTATE_POLY_STIPPLE_OFFSET * restrict values)
+                                      const struct GEN8_3DSTATE_POLY_STIPPLE_OFFSET * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3196,7 +3267,6 @@ GEN8_3DSTATE_POLY_STIPPLE_OFFSET_pack(__gen_user_data *data, void * restrict dst
 
 }
 
-#define GEN8_3DSTATE_POLY_STIPPLE_PATTERN_length 0x00000021
 #define GEN8_3DSTATE_POLY_STIPPLE_PATTERN_length_bias 0x00000002
 #define GEN8_3DSTATE_POLY_STIPPLE_PATTERN_header\
    .CommandType          =  3,                  \
@@ -3205,6 +3275,8 @@ GEN8_3DSTATE_POLY_STIPPLE_OFFSET_pack(__gen_user_data *data, void * restrict dst
    ._3DCommandSubOpcode  =  7,                  \
    .DwordLength          = 31
 
+#define GEN8_3DSTATE_POLY_STIPPLE_PATTERN_length 0x00000021
+
 struct GEN8_3DSTATE_POLY_STIPPLE_PATTERN {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3216,7 +3288,7 @@ struct GEN8_3DSTATE_POLY_STIPPLE_PATTERN {
 
 static inline void
 GEN8_3DSTATE_POLY_STIPPLE_PATTERN_pack(__gen_user_data *data, void * restrict dst,
-                                      const struct GEN8_3DSTATE_POLY_STIPPLE_PATTERN * restrict values)
+                                       const struct GEN8_3DSTATE_POLY_STIPPLE_PATTERN * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3236,7 +3308,6 @@ GEN8_3DSTATE_POLY_STIPPLE_PATTERN_pack(__gen_user_data *data, void * restrict ds
 
 }
 
-#define GEN8_3DSTATE_PS_length 0x0000000c
 #define GEN8_3DSTATE_PS_length_bias 0x00000002
 #define GEN8_3DSTATE_PS_header                  \
    .CommandType          =  3,                  \
@@ -3245,6 +3316,8 @@ GEN8_3DSTATE_POLY_STIPPLE_PATTERN_pack(__gen_user_data *data, void * restrict ds
    ._3DCommandSubOpcode  = 32,                  \
    .DwordLength          = 10
 
+#define GEN8_3DSTATE_PS_length 0x0000000c
+
 struct GEN8_3DSTATE_PS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3304,7 +3377,7 @@ struct GEN8_3DSTATE_PS {
 
 static inline void
 GEN8_3DSTATE_PS_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN8_3DSTATE_PS * restrict values)
+                     const struct GEN8_3DSTATE_PS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3378,7 +3451,6 @@ GEN8_3DSTATE_PS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_PS_BLEND_length 0x00000002
 #define GEN8_3DSTATE_PS_BLEND_length_bias 0x00000002
 #define GEN8_3DSTATE_PS_BLEND_header            \
    .CommandType          =  3,                  \
@@ -3387,6 +3459,8 @@ GEN8_3DSTATE_PS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 77,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_PS_BLEND_length 0x00000002
+
 struct GEN8_3DSTATE_PS_BLEND {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3406,7 +3480,7 @@ struct GEN8_3DSTATE_PS_BLEND {
 
 static inline void
 GEN8_3DSTATE_PS_BLEND_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN8_3DSTATE_PS_BLEND * restrict values)
+                           const struct GEN8_3DSTATE_PS_BLEND * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3432,7 +3506,6 @@ GEN8_3DSTATE_PS_BLEND_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_PS_EXTRA_length 0x00000002
 #define GEN8_3DSTATE_PS_EXTRA_length_bias 0x00000002
 #define GEN8_3DSTATE_PS_EXTRA_header            \
    .CommandType          =  3,                  \
@@ -3441,6 +3514,8 @@ GEN8_3DSTATE_PS_BLEND_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 79,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_PS_EXTRA_length 0x00000002
+
 struct GEN8_3DSTATE_PS_EXTRA {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3469,7 +3544,7 @@ struct GEN8_3DSTATE_PS_EXTRA {
 
 static inline void
 GEN8_3DSTATE_PS_EXTRA_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN8_3DSTATE_PS_EXTRA * restrict values)
+                           const struct GEN8_3DSTATE_PS_EXTRA * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3500,7 +3575,6 @@ GEN8_3DSTATE_PS_EXTRA_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_DS_length 0x00000002
 #define GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_DS_length_bias 0x00000002
 #define GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_DS_header\
    .CommandType          =  3,                  \
@@ -3509,6 +3583,8 @@ GEN8_3DSTATE_PS_EXTRA_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 20,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_DS_length 0x00000002
+
 struct GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_DS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3521,7 +3597,7 @@ struct GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_DS {
 
 static inline void
 GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_DS_pack(__gen_user_data *data, void * restrict dst,
-                                        const struct GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_DS * restrict values)
+                                         const struct GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3540,7 +3616,6 @@ GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_DS_pack(__gen_user_data *data, void * restrict
 
 }
 
-#define GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_GS_length 0x00000002
 #define GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_GS_length_bias 0x00000002
 #define GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_GS_header\
    .CommandType          =  3,                  \
@@ -3549,6 +3624,8 @@ GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_DS_pack(__gen_user_data *data, void * restrict
    ._3DCommandSubOpcode  = 21,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_GS_length 0x00000002
+
 struct GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3561,7 +3638,7 @@ struct GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_GS {
 
 static inline void
 GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_GS_pack(__gen_user_data *data, void * restrict dst,
-                                        const struct GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_GS * restrict values)
+                                         const struct GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3580,7 +3657,6 @@ GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_GS_pack(__gen_user_data *data, void * restrict
 
 }
 
-#define GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_HS_length 0x00000002
 #define GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_HS_length_bias 0x00000002
 #define GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_HS_header\
    .CommandType          =  3,                  \
@@ -3589,6 +3665,8 @@ GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_GS_pack(__gen_user_data *data, void * restrict
    ._3DCommandSubOpcode  = 19,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_HS_length 0x00000002
+
 struct GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3601,7 +3679,7 @@ struct GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_HS {
 
 static inline void
 GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_HS_pack(__gen_user_data *data, void * restrict dst,
-                                        const struct GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_HS * restrict values)
+                                         const struct GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3620,7 +3698,6 @@ GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_HS_pack(__gen_user_data *data, void * restrict
 
 }
 
-#define GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_PS_length 0x00000002
 #define GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_PS_length_bias 0x00000002
 #define GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_PS_header\
    .CommandType          =  3,                  \
@@ -3629,6 +3706,8 @@ GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_HS_pack(__gen_user_data *data, void * restrict
    ._3DCommandSubOpcode  = 22,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_PS_length 0x00000002
+
 struct GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_PS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3641,7 +3720,7 @@ struct GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_PS {
 
 static inline void
 GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_PS_pack(__gen_user_data *data, void * restrict dst,
-                                        const struct GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_PS * restrict values)
+                                         const struct GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_PS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3660,7 +3739,6 @@ GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_PS_pack(__gen_user_data *data, void * restrict
 
 }
 
-#define GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_VS_length 0x00000002
 #define GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_VS_length_bias 0x00000002
 #define GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_VS_header\
    .CommandType          =  3,                  \
@@ -3669,6 +3747,8 @@ GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_PS_pack(__gen_user_data *data, void * restrict
    ._3DCommandSubOpcode  = 18,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_VS_length 0x00000002
+
 struct GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3681,7 +3761,7 @@ struct GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_VS {
 
 static inline void
 GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_VS_pack(__gen_user_data *data, void * restrict dst,
-                                        const struct GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_VS * restrict values)
+                                         const struct GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3700,7 +3780,6 @@ GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_VS_pack(__gen_user_data *data, void * restrict
 
 }
 
-#define GEN8_3DSTATE_RASTER_length 0x00000005
 #define GEN8_3DSTATE_RASTER_length_bias 0x00000002
 #define GEN8_3DSTATE_RASTER_header              \
    .CommandType          =  3,                  \
@@ -3709,6 +3788,8 @@ GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_VS_pack(__gen_user_data *data, void * restrict
    ._3DCommandSubOpcode  = 80,                  \
    .DwordLength          =  3
 
+#define GEN8_3DSTATE_RASTER_length 0x00000005
+
 struct GEN8_3DSTATE_RASTER {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3765,7 +3846,7 @@ struct GEN8_3DSTATE_RASTER {
 
 static inline void
 GEN8_3DSTATE_RASTER_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN8_3DSTATE_RASTER * restrict values)
+                         const struct GEN8_3DSTATE_RASTER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3817,6 +3898,10 @@ GEN8_3DSTATE_RASTER_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  1,                  \
    ._3DCommandSubOpcode  =  2
 
+#define GEN8_3DSTATE_SAMPLER_PALETTE_LOAD0_length 0x00000000
+
+#define GEN8_PALETTE_ENTRY_length 0x00000001
+
 struct GEN8_PALETTE_ENTRY {
    uint32_t                                     Alpha;
    uint32_t                                     Red;
@@ -3826,7 +3911,7 @@ struct GEN8_PALETTE_ENTRY {
 
 static inline void
 GEN8_PALETTE_ENTRY_pack(__gen_user_data *data, void * restrict dst,
-                       const struct GEN8_PALETTE_ENTRY * restrict values)
+                        const struct GEN8_PALETTE_ENTRY * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3850,7 +3935,7 @@ struct GEN8_3DSTATE_SAMPLER_PALETTE_LOAD0 {
 
 static inline void
 GEN8_3DSTATE_SAMPLER_PALETTE_LOAD0_pack(__gen_user_data *data, void * restrict dst,
-                                       const struct GEN8_3DSTATE_SAMPLER_PALETTE_LOAD0 * restrict values)
+                                        const struct GEN8_3DSTATE_SAMPLER_PALETTE_LOAD0 * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3872,6 +3957,8 @@ GEN8_3DSTATE_SAMPLER_PALETTE_LOAD0_pack(__gen_user_data *data, void * restrict d
    ._3DCommandOpcode     =  1,                  \
    ._3DCommandSubOpcode  = 12
 
+#define GEN8_3DSTATE_SAMPLER_PALETTE_LOAD1_length 0x00000000
+
 struct GEN8_3DSTATE_SAMPLER_PALETTE_LOAD1 {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3883,7 +3970,7 @@ struct GEN8_3DSTATE_SAMPLER_PALETTE_LOAD1 {
 
 static inline void
 GEN8_3DSTATE_SAMPLER_PALETTE_LOAD1_pack(__gen_user_data *data, void * restrict dst,
-                                       const struct GEN8_3DSTATE_SAMPLER_PALETTE_LOAD1 * restrict values)
+                                        const struct GEN8_3DSTATE_SAMPLER_PALETTE_LOAD1 * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3898,7 +3985,6 @@ GEN8_3DSTATE_SAMPLER_PALETTE_LOAD1_pack(__gen_user_data *data, void * restrict d
    /* variable length fields follow */
 }
 
-#define GEN8_3DSTATE_SAMPLER_STATE_POINTERS_DS_length 0x00000002
 #define GEN8_3DSTATE_SAMPLER_STATE_POINTERS_DS_length_bias 0x00000002
 #define GEN8_3DSTATE_SAMPLER_STATE_POINTERS_DS_header\
    .CommandType          =  3,                  \
@@ -3907,6 +3993,8 @@ GEN8_3DSTATE_SAMPLER_PALETTE_LOAD1_pack(__gen_user_data *data, void * restrict d
    ._3DCommandSubOpcode  = 45,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_SAMPLER_STATE_POINTERS_DS_length 0x00000002
+
 struct GEN8_3DSTATE_SAMPLER_STATE_POINTERS_DS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3918,7 +4006,7 @@ struct GEN8_3DSTATE_SAMPLER_STATE_POINTERS_DS {
 
 static inline void
 GEN8_3DSTATE_SAMPLER_STATE_POINTERS_DS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN8_3DSTATE_SAMPLER_STATE_POINTERS_DS * restrict values)
+                                            const struct GEN8_3DSTATE_SAMPLER_STATE_POINTERS_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3936,7 +4024,6 @@ GEN8_3DSTATE_SAMPLER_STATE_POINTERS_DS_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN8_3DSTATE_SAMPLER_STATE_POINTERS_GS_length 0x00000002
 #define GEN8_3DSTATE_SAMPLER_STATE_POINTERS_GS_length_bias 0x00000002
 #define GEN8_3DSTATE_SAMPLER_STATE_POINTERS_GS_header\
    .CommandType          =  3,                  \
@@ -3945,6 +4032,8 @@ GEN8_3DSTATE_SAMPLER_STATE_POINTERS_DS_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 46,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_SAMPLER_STATE_POINTERS_GS_length 0x00000002
+
 struct GEN8_3DSTATE_SAMPLER_STATE_POINTERS_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3956,7 +4045,7 @@ struct GEN8_3DSTATE_SAMPLER_STATE_POINTERS_GS {
 
 static inline void
 GEN8_3DSTATE_SAMPLER_STATE_POINTERS_GS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN8_3DSTATE_SAMPLER_STATE_POINTERS_GS * restrict values)
+                                            const struct GEN8_3DSTATE_SAMPLER_STATE_POINTERS_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -3974,7 +4063,6 @@ GEN8_3DSTATE_SAMPLER_STATE_POINTERS_GS_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN8_3DSTATE_SAMPLER_STATE_POINTERS_HS_length 0x00000002
 #define GEN8_3DSTATE_SAMPLER_STATE_POINTERS_HS_length_bias 0x00000002
 #define GEN8_3DSTATE_SAMPLER_STATE_POINTERS_HS_header\
    .CommandType          =  3,                  \
@@ -3983,6 +4071,8 @@ GEN8_3DSTATE_SAMPLER_STATE_POINTERS_GS_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 44,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_SAMPLER_STATE_POINTERS_HS_length 0x00000002
+
 struct GEN8_3DSTATE_SAMPLER_STATE_POINTERS_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -3994,7 +4084,7 @@ struct GEN8_3DSTATE_SAMPLER_STATE_POINTERS_HS {
 
 static inline void
 GEN8_3DSTATE_SAMPLER_STATE_POINTERS_HS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN8_3DSTATE_SAMPLER_STATE_POINTERS_HS * restrict values)
+                                            const struct GEN8_3DSTATE_SAMPLER_STATE_POINTERS_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4012,7 +4102,6 @@ GEN8_3DSTATE_SAMPLER_STATE_POINTERS_HS_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN8_3DSTATE_SAMPLER_STATE_POINTERS_PS_length 0x00000002
 #define GEN8_3DSTATE_SAMPLER_STATE_POINTERS_PS_length_bias 0x00000002
 #define GEN8_3DSTATE_SAMPLER_STATE_POINTERS_PS_header\
    .CommandType          =  3,                  \
@@ -4021,6 +4110,8 @@ GEN8_3DSTATE_SAMPLER_STATE_POINTERS_HS_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 47,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_SAMPLER_STATE_POINTERS_PS_length 0x00000002
+
 struct GEN8_3DSTATE_SAMPLER_STATE_POINTERS_PS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4032,7 +4123,7 @@ struct GEN8_3DSTATE_SAMPLER_STATE_POINTERS_PS {
 
 static inline void
 GEN8_3DSTATE_SAMPLER_STATE_POINTERS_PS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN8_3DSTATE_SAMPLER_STATE_POINTERS_PS * restrict values)
+                                            const struct GEN8_3DSTATE_SAMPLER_STATE_POINTERS_PS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4050,7 +4141,6 @@ GEN8_3DSTATE_SAMPLER_STATE_POINTERS_PS_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN8_3DSTATE_SAMPLER_STATE_POINTERS_VS_length 0x00000002
 #define GEN8_3DSTATE_SAMPLER_STATE_POINTERS_VS_length_bias 0x00000002
 #define GEN8_3DSTATE_SAMPLER_STATE_POINTERS_VS_header\
    .CommandType          =  3,                  \
@@ -4059,6 +4149,8 @@ GEN8_3DSTATE_SAMPLER_STATE_POINTERS_PS_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 43,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_SAMPLER_STATE_POINTERS_VS_length 0x00000002
+
 struct GEN8_3DSTATE_SAMPLER_STATE_POINTERS_VS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4070,7 +4162,7 @@ struct GEN8_3DSTATE_SAMPLER_STATE_POINTERS_VS {
 
 static inline void
 GEN8_3DSTATE_SAMPLER_STATE_POINTERS_VS_pack(__gen_user_data *data, void * restrict dst,
-                                           const struct GEN8_3DSTATE_SAMPLER_STATE_POINTERS_VS * restrict values)
+                                            const struct GEN8_3DSTATE_SAMPLER_STATE_POINTERS_VS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4088,7 +4180,6 @@ GEN8_3DSTATE_SAMPLER_STATE_POINTERS_VS_pack(__gen_user_data *data, void * restri
 
 }
 
-#define GEN8_3DSTATE_SAMPLE_MASK_length 0x00000002
 #define GEN8_3DSTATE_SAMPLE_MASK_length_bias 0x00000002
 #define GEN8_3DSTATE_SAMPLE_MASK_header         \
    .CommandType          =  3,                  \
@@ -4097,6 +4188,8 @@ GEN8_3DSTATE_SAMPLER_STATE_POINTERS_VS_pack(__gen_user_data *data, void * restri
    ._3DCommandSubOpcode  = 24,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_SAMPLE_MASK_length 0x00000002
+
 struct GEN8_3DSTATE_SAMPLE_MASK {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4108,7 +4201,7 @@ struct GEN8_3DSTATE_SAMPLE_MASK {
 
 static inline void
 GEN8_3DSTATE_SAMPLE_MASK_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN8_3DSTATE_SAMPLE_MASK * restrict values)
+                              const struct GEN8_3DSTATE_SAMPLE_MASK * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4126,7 +4219,6 @@ GEN8_3DSTATE_SAMPLE_MASK_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_SAMPLE_PATTERN_length 0x00000009
 #define GEN8_3DSTATE_SAMPLE_PATTERN_length_bias 0x00000002
 #define GEN8_3DSTATE_SAMPLE_PATTERN_header      \
    .CommandType          =  3,                  \
@@ -4135,6 +4227,8 @@ GEN8_3DSTATE_SAMPLE_MASK_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 28,                  \
    .DwordLength          =  7
 
+#define GEN8_3DSTATE_SAMPLE_PATTERN_length 0x00000009
+
 struct GEN8_3DSTATE_SAMPLE_PATTERN {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4175,7 +4269,7 @@ struct GEN8_3DSTATE_SAMPLE_PATTERN {
 
 static inline void
 GEN8_3DSTATE_SAMPLE_PATTERN_pack(__gen_user_data *data, void * restrict dst,
-                                const struct GEN8_3DSTATE_SAMPLE_PATTERN * restrict values)
+                                 const struct GEN8_3DSTATE_SAMPLE_PATTERN * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4236,7 +4330,6 @@ GEN8_3DSTATE_SAMPLE_PATTERN_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_SBE_length 0x00000004
 #define GEN8_3DSTATE_SBE_length_bias 0x00000002
 #define GEN8_3DSTATE_SBE_header                 \
    .CommandType          =  3,                  \
@@ -4245,6 +4338,8 @@ GEN8_3DSTATE_SAMPLE_PATTERN_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 31,                  \
    .DwordLength          =  2
 
+#define GEN8_3DSTATE_SBE_length 0x00000004
+
 struct GEN8_3DSTATE_SBE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4271,7 +4366,7 @@ struct GEN8_3DSTATE_SBE {
 
 static inline void
 GEN8_3DSTATE_SBE_pack(__gen_user_data *data, void * restrict dst,
-                     const struct GEN8_3DSTATE_SBE * restrict values)
+                      const struct GEN8_3DSTATE_SBE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4308,7 +4403,6 @@ GEN8_3DSTATE_SBE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_SBE_SWIZ_length 0x0000000b
 #define GEN8_3DSTATE_SBE_SWIZ_length_bias 0x00000002
 #define GEN8_3DSTATE_SBE_SWIZ_header            \
    .CommandType          =  3,                  \
@@ -4317,6 +4411,10 @@ GEN8_3DSTATE_SBE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 81,                  \
    .DwordLength          =  9
 
+#define GEN8_3DSTATE_SBE_SWIZ_length 0x0000000b
+
+#define GEN8_SF_OUTPUT_ATTRIBUTE_DETAIL_length 0x00000001
+
 struct GEN8_SF_OUTPUT_ATTRIBUTE_DETAIL {
    bool                                         ComponentOverrideW;
    bool                                         ComponentOverrideZ;
@@ -4338,7 +4436,7 @@ struct GEN8_SF_OUTPUT_ATTRIBUTE_DETAIL {
 
 static inline void
 GEN8_SF_OUTPUT_ATTRIBUTE_DETAIL_pack(__gen_user_data *data, void * restrict dst,
-                                    const struct GEN8_SF_OUTPUT_ATTRIBUTE_DETAIL * restrict values)
+                                     const struct GEN8_SF_OUTPUT_ATTRIBUTE_DETAIL * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4367,7 +4465,7 @@ struct GEN8_3DSTATE_SBE_SWIZ {
 
 static inline void
 GEN8_3DSTATE_SBE_SWIZ_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN8_3DSTATE_SBE_SWIZ * restrict values)
+                           const struct GEN8_3DSTATE_SBE_SWIZ * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4405,7 +4503,6 @@ GEN8_3DSTATE_SBE_SWIZ_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_SCISSOR_STATE_POINTERS_length 0x00000002
 #define GEN8_3DSTATE_SCISSOR_STATE_POINTERS_length_bias 0x00000002
 #define GEN8_3DSTATE_SCISSOR_STATE_POINTERS_header\
    .CommandType          =  3,                  \
@@ -4414,6 +4511,8 @@ GEN8_3DSTATE_SBE_SWIZ_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 15,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_SCISSOR_STATE_POINTERS_length 0x00000002
+
 struct GEN8_3DSTATE_SCISSOR_STATE_POINTERS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4425,7 +4524,7 @@ struct GEN8_3DSTATE_SCISSOR_STATE_POINTERS {
 
 static inline void
 GEN8_3DSTATE_SCISSOR_STATE_POINTERS_pack(__gen_user_data *data, void * restrict dst,
-                                        const struct GEN8_3DSTATE_SCISSOR_STATE_POINTERS * restrict values)
+                                         const struct GEN8_3DSTATE_SCISSOR_STATE_POINTERS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4443,7 +4542,6 @@ GEN8_3DSTATE_SCISSOR_STATE_POINTERS_pack(__gen_user_data *data, void * restrict
 
 }
 
-#define GEN8_3DSTATE_SF_length 0x00000004
 #define GEN8_3DSTATE_SF_length_bias 0x00000002
 #define GEN8_3DSTATE_SF_header                  \
    .CommandType          =  3,                  \
@@ -4452,6 +4550,8 @@ GEN8_3DSTATE_SCISSOR_STATE_POINTERS_pack(__gen_user_data *data, void * restrict
    ._3DCommandSubOpcode  = 19,                  \
    .DwordLength          =  2
 
+#define GEN8_3DSTATE_SF_length 0x00000004
+
 struct GEN8_3DSTATE_SF {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4483,7 +4583,7 @@ struct GEN8_3DSTATE_SF {
 
 static inline void
 GEN8_3DSTATE_SF_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN8_3DSTATE_SF * restrict values)
+                     const struct GEN8_3DSTATE_SF * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4520,7 +4620,6 @@ GEN8_3DSTATE_SF_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_SO_BUFFER_length 0x00000008
 #define GEN8_3DSTATE_SO_BUFFER_length_bias 0x00000002
 #define GEN8_3DSTATE_SO_BUFFER_header           \
    .CommandType          =  3,                  \
@@ -4529,6 +4628,8 @@ GEN8_3DSTATE_SF_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 24,                  \
    .DwordLength          =  6
 
+#define GEN8_3DSTATE_SO_BUFFER_length 0x00000008
+
 struct GEN8_3DSTATE_SO_BUFFER {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4548,7 +4649,7 @@ struct GEN8_3DSTATE_SO_BUFFER {
 
 static inline void
 GEN8_3DSTATE_SO_BUFFER_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN8_3DSTATE_SO_BUFFER * restrict values)
+                            const struct GEN8_3DSTATE_SO_BUFFER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4605,6 +4706,12 @@ GEN8_3DSTATE_SO_BUFFER_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  1,                  \
    ._3DCommandSubOpcode  = 23
 
+#define GEN8_3DSTATE_SO_DECL_LIST_length 0x00000000
+
+#define GEN8_SO_DECL_ENTRY_length 0x00000002
+
+#define GEN8_SO_DECL_length 0x00000001
+
 struct GEN8_SO_DECL {
    uint32_t                                     OutputBufferSlot;
    uint32_t                                     HoleFlag;
@@ -4614,7 +4721,7 @@ struct GEN8_SO_DECL {
 
 static inline void
 GEN8_SO_DECL_pack(__gen_user_data *data, void * restrict dst,
-                 const struct GEN8_SO_DECL * restrict values)
+                  const struct GEN8_SO_DECL * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4636,7 +4743,7 @@ struct GEN8_SO_DECL_ENTRY {
 
 static inline void
 GEN8_SO_DECL_ENTRY_pack(__gen_user_data *data, void * restrict dst,
-                       const struct GEN8_SO_DECL_ENTRY * restrict values)
+                        const struct GEN8_SO_DECL_ENTRY * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4679,7 +4786,7 @@ struct GEN8_3DSTATE_SO_DECL_LIST {
 
 static inline void
 GEN8_3DSTATE_SO_DECL_LIST_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN8_3DSTATE_SO_DECL_LIST * restrict values)
+                               const struct GEN8_3DSTATE_SO_DECL_LIST * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4708,7 +4815,6 @@ GEN8_3DSTATE_SO_DECL_LIST_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN8_3DSTATE_STENCIL_BUFFER_length 0x00000005
 #define GEN8_3DSTATE_STENCIL_BUFFER_length_bias 0x00000002
 #define GEN8_3DSTATE_STENCIL_BUFFER_header      \
    .CommandType          =  3,                  \
@@ -4717,6 +4823,8 @@ GEN8_3DSTATE_SO_DECL_LIST_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  6,                  \
    .DwordLength          =  3
 
+#define GEN8_3DSTATE_STENCIL_BUFFER_length 0x00000005
+
 struct GEN8_3DSTATE_STENCIL_BUFFER {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4732,7 +4840,7 @@ struct GEN8_3DSTATE_STENCIL_BUFFER {
 
 static inline void
 GEN8_3DSTATE_STENCIL_BUFFER_pack(__gen_user_data *data, void * restrict dst,
-                                const struct GEN8_3DSTATE_STENCIL_BUFFER * restrict values)
+                                 const struct GEN8_3DSTATE_STENCIL_BUFFER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4767,7 +4875,6 @@ GEN8_3DSTATE_STENCIL_BUFFER_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_STREAMOUT_length 0x00000005
 #define GEN8_3DSTATE_STREAMOUT_length_bias 0x00000002
 #define GEN8_3DSTATE_STREAMOUT_header           \
    .CommandType          =  3,                  \
@@ -4776,6 +4883,8 @@ GEN8_3DSTATE_STENCIL_BUFFER_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 30,                  \
    .DwordLength          =  3
 
+#define GEN8_3DSTATE_STREAMOUT_length 0x00000005
+
 struct GEN8_3DSTATE_STREAMOUT {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4810,7 +4919,7 @@ struct GEN8_3DSTATE_STREAMOUT {
 
 static inline void
 GEN8_3DSTATE_STREAMOUT_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN8_3DSTATE_STREAMOUT * restrict values)
+                            const struct GEN8_3DSTATE_STREAMOUT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4854,7 +4963,6 @@ GEN8_3DSTATE_STREAMOUT_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_TE_length 0x00000004
 #define GEN8_3DSTATE_TE_length_bias 0x00000002
 #define GEN8_3DSTATE_TE_header                  \
    .CommandType          =  3,                  \
@@ -4863,6 +4971,8 @@ GEN8_3DSTATE_STREAMOUT_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 28,                  \
    .DwordLength          =  2
 
+#define GEN8_3DSTATE_TE_length 0x00000004
+
 struct GEN8_3DSTATE_TE {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4892,7 +5002,7 @@ struct GEN8_3DSTATE_TE {
 
 static inline void
 GEN8_3DSTATE_TE_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN8_3DSTATE_TE * restrict values)
+                     const struct GEN8_3DSTATE_TE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4922,7 +5032,6 @@ GEN8_3DSTATE_TE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_URB_DS_length 0x00000002
 #define GEN8_3DSTATE_URB_DS_length_bias 0x00000002
 #define GEN8_3DSTATE_URB_DS_header              \
    .CommandType          =  3,                  \
@@ -4931,6 +5040,8 @@ GEN8_3DSTATE_TE_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 50,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_URB_DS_length 0x00000002
+
 struct GEN8_3DSTATE_URB_DS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4944,7 +5055,7 @@ struct GEN8_3DSTATE_URB_DS {
 
 static inline void
 GEN8_3DSTATE_URB_DS_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN8_3DSTATE_URB_DS * restrict values)
+                         const struct GEN8_3DSTATE_URB_DS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -4964,7 +5075,6 @@ GEN8_3DSTATE_URB_DS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_URB_GS_length 0x00000002
 #define GEN8_3DSTATE_URB_GS_length_bias 0x00000002
 #define GEN8_3DSTATE_URB_GS_header              \
    .CommandType          =  3,                  \
@@ -4973,6 +5083,8 @@ GEN8_3DSTATE_URB_DS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 51,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_URB_GS_length 0x00000002
+
 struct GEN8_3DSTATE_URB_GS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -4986,7 +5098,7 @@ struct GEN8_3DSTATE_URB_GS {
 
 static inline void
 GEN8_3DSTATE_URB_GS_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN8_3DSTATE_URB_GS * restrict values)
+                         const struct GEN8_3DSTATE_URB_GS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5006,7 +5118,6 @@ GEN8_3DSTATE_URB_GS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_URB_HS_length 0x00000002
 #define GEN8_3DSTATE_URB_HS_length_bias 0x00000002
 #define GEN8_3DSTATE_URB_HS_header              \
    .CommandType          =  3,                  \
@@ -5015,6 +5126,8 @@ GEN8_3DSTATE_URB_GS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 49,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_URB_HS_length 0x00000002
+
 struct GEN8_3DSTATE_URB_HS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -5028,7 +5141,7 @@ struct GEN8_3DSTATE_URB_HS {
 
 static inline void
 GEN8_3DSTATE_URB_HS_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN8_3DSTATE_URB_HS * restrict values)
+                         const struct GEN8_3DSTATE_URB_HS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5055,6 +5168,10 @@ GEN8_3DSTATE_URB_HS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  =  8
 
+#define GEN8_3DSTATE_VERTEX_BUFFERS_length 0x00000000
+
+#define GEN8_VERTEX_BUFFER_STATE_length 0x00000004
+
 struct GEN8_VERTEX_BUFFER_STATE {
    uint32_t                                     VertexBufferIndex;
    struct GEN8_MEMORY_OBJECT_CONTROL_STATE      MemoryObjectControlState;
@@ -5067,7 +5184,7 @@ struct GEN8_VERTEX_BUFFER_STATE {
 
 static inline void
 GEN8_VERTEX_BUFFER_STATE_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN8_VERTEX_BUFFER_STATE * restrict values)
+                              const struct GEN8_VERTEX_BUFFER_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5107,7 +5224,7 @@ struct GEN8_3DSTATE_VERTEX_BUFFERS {
 
 static inline void
 GEN8_3DSTATE_VERTEX_BUFFERS_pack(__gen_user_data *data, void * restrict dst,
-                                const struct GEN8_3DSTATE_VERTEX_BUFFERS * restrict values)
+                                 const struct GEN8_3DSTATE_VERTEX_BUFFERS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5129,6 +5246,10 @@ GEN8_3DSTATE_VERTEX_BUFFERS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  =  9
 
+#define GEN8_3DSTATE_VERTEX_ELEMENTS_length 0x00000000
+
+#define GEN8_VERTEX_ELEMENT_STATE_length 0x00000002
+
 struct GEN8_VERTEX_ELEMENT_STATE {
    uint32_t                                     VertexBufferIndex;
    bool                                         Valid;
@@ -5143,7 +5264,7 @@ struct GEN8_VERTEX_ELEMENT_STATE {
 
 static inline void
 GEN8_VERTEX_ELEMENT_STATE_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN8_VERTEX_ELEMENT_STATE * restrict values)
+                               const struct GEN8_VERTEX_ELEMENT_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5175,7 +5296,7 @@ struct GEN8_3DSTATE_VERTEX_ELEMENTS {
 
 static inline void
 GEN8_3DSTATE_VERTEX_ELEMENTS_pack(__gen_user_data *data, void * restrict dst,
-                                 const struct GEN8_3DSTATE_VERTEX_ELEMENTS * restrict values)
+                                  const struct GEN8_3DSTATE_VERTEX_ELEMENTS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5190,7 +5311,6 @@ GEN8_3DSTATE_VERTEX_ELEMENTS_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN8_3DSTATE_VF_length 0x00000002
 #define GEN8_3DSTATE_VF_length_bias 0x00000002
 #define GEN8_3DSTATE_VF_header                  \
    .CommandType          =  3,                  \
@@ -5199,6 +5319,8 @@ GEN8_3DSTATE_VERTEX_ELEMENTS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 12,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_VF_length 0x00000002
+
 struct GEN8_3DSTATE_VF {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -5211,7 +5333,7 @@ struct GEN8_3DSTATE_VF {
 
 static inline void
 GEN8_3DSTATE_VF_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN8_3DSTATE_VF * restrict values)
+                     const struct GEN8_3DSTATE_VF * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5230,7 +5352,6 @@ GEN8_3DSTATE_VF_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_VF_INSTANCING_length 0x00000003
 #define GEN8_3DSTATE_VF_INSTANCING_length_bias 0x00000002
 #define GEN8_3DSTATE_VF_INSTANCING_header       \
    .CommandType          =  3,                  \
@@ -5239,6 +5360,8 @@ GEN8_3DSTATE_VF_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 73,                  \
    .DwordLength          =  1
 
+#define GEN8_3DSTATE_VF_INSTANCING_length 0x00000003
+
 struct GEN8_3DSTATE_VF_INSTANCING {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -5252,7 +5375,7 @@ struct GEN8_3DSTATE_VF_INSTANCING {
 
 static inline void
 GEN8_3DSTATE_VF_INSTANCING_pack(__gen_user_data *data, void * restrict dst,
-                               const struct GEN8_3DSTATE_VF_INSTANCING * restrict values)
+                                const struct GEN8_3DSTATE_VF_INSTANCING * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5275,7 +5398,6 @@ GEN8_3DSTATE_VF_INSTANCING_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_VF_SGVS_length 0x00000002
 #define GEN8_3DSTATE_VF_SGVS_length_bias 0x00000002
 #define GEN8_3DSTATE_VF_SGVS_header             \
    .CommandType          =  3,                  \
@@ -5284,6 +5406,8 @@ GEN8_3DSTATE_VF_INSTANCING_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 74,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_VF_SGVS_length 0x00000002
+
 struct GEN8_3DSTATE_VF_SGVS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -5308,7 +5432,7 @@ struct GEN8_3DSTATE_VF_SGVS {
 
 static inline void
 GEN8_3DSTATE_VF_SGVS_pack(__gen_user_data *data, void * restrict dst,
-                         const struct GEN8_3DSTATE_VF_SGVS * restrict values)
+                          const struct GEN8_3DSTATE_VF_SGVS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5331,7 +5455,6 @@ GEN8_3DSTATE_VF_SGVS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_VF_STATISTICS_length 0x00000001
 #define GEN8_3DSTATE_VF_STATISTICS_length_bias 0x00000001
 #define GEN8_3DSTATE_VF_STATISTICS_header       \
    .CommandType          =  3,                  \
@@ -5339,6 +5462,8 @@ GEN8_3DSTATE_VF_SGVS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandOpcode     =  0,                  \
    ._3DCommandSubOpcode  = 11
 
+#define GEN8_3DSTATE_VF_STATISTICS_length 0x00000001
+
 struct GEN8_3DSTATE_VF_STATISTICS {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -5349,7 +5474,7 @@ struct GEN8_3DSTATE_VF_STATISTICS {
 
 static inline void
 GEN8_3DSTATE_VF_STATISTICS_pack(__gen_user_data *data, void * restrict dst,
-                               const struct GEN8_3DSTATE_VF_STATISTICS * restrict values)
+                                const struct GEN8_3DSTATE_VF_STATISTICS * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5363,7 +5488,6 @@ GEN8_3DSTATE_VF_STATISTICS_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_VF_TOPOLOGY_length 0x00000002
 #define GEN8_3DSTATE_VF_TOPOLOGY_length_bias 0x00000002
 #define GEN8_3DSTATE_VF_TOPOLOGY_header         \
    .CommandType          =  3,                  \
@@ -5372,6 +5496,8 @@ GEN8_3DSTATE_VF_STATISTICS_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 75,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_VF_TOPOLOGY_length 0x00000002
+
 struct GEN8_3DSTATE_VF_TOPOLOGY {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -5383,7 +5509,7 @@ struct GEN8_3DSTATE_VF_TOPOLOGY {
 
 static inline void
 GEN8_3DSTATE_VF_TOPOLOGY_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN8_3DSTATE_VF_TOPOLOGY * restrict values)
+                              const struct GEN8_3DSTATE_VF_TOPOLOGY * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5401,7 +5527,6 @@ GEN8_3DSTATE_VF_TOPOLOGY_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_CC_length 0x00000002
 #define GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_CC_length_bias 0x00000002
 #define GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_CC_header\
    .CommandType          =  3,                  \
@@ -5410,6 +5535,8 @@ GEN8_3DSTATE_VF_TOPOLOGY_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 35,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_CC_length 0x00000002
+
 struct GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_CC {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -5421,7 +5548,7 @@ struct GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_CC {
 
 static inline void
 GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_CC_pack(__gen_user_data *data, void * restrict dst,
-                                            const struct GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_CC * restrict values)
+                                             const struct GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_CC * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5439,7 +5566,6 @@ GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_CC_pack(__gen_user_data *data, void * restr
 
 }
 
-#define GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_length 0x00000002
 #define GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_length_bias 0x00000002
 #define GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_header\
    .CommandType          =  3,                  \
@@ -5448,6 +5574,8 @@ GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_CC_pack(__gen_user_data *data, void * restr
    ._3DCommandSubOpcode  = 33,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_length 0x00000002
+
 struct GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -5459,7 +5587,7 @@ struct GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP {
 
 static inline void
 GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_pack(__gen_user_data *data, void * restrict dst,
-                                                 const struct GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP * restrict values)
+                                                  const struct GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5477,7 +5605,6 @@ GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_pack(__gen_user_data *data, void *
 
 }
 
-#define GEN8_3DSTATE_WM_length 0x00000002
 #define GEN8_3DSTATE_WM_length_bias 0x00000002
 #define GEN8_3DSTATE_WM_header                  \
    .CommandType          =  3,                  \
@@ -5486,6 +5613,8 @@ GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_pack(__gen_user_data *data, void *
    ._3DCommandSubOpcode  = 20,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_WM_length 0x00000002
+
 struct GEN8_3DSTATE_WM {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -5533,7 +5662,7 @@ struct GEN8_3DSTATE_WM {
 
 static inline void
 GEN8_3DSTATE_WM_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN8_3DSTATE_WM * restrict values)
+                     const struct GEN8_3DSTATE_WM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5565,7 +5694,6 @@ GEN8_3DSTATE_WM_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_WM_CHROMAKEY_length 0x00000002
 #define GEN8_3DSTATE_WM_CHROMAKEY_length_bias 0x00000002
 #define GEN8_3DSTATE_WM_CHROMAKEY_header        \
    .CommandType          =  3,                  \
@@ -5574,6 +5702,8 @@ GEN8_3DSTATE_WM_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 76,                  \
    .DwordLength          =  0
 
+#define GEN8_3DSTATE_WM_CHROMAKEY_length 0x00000002
+
 struct GEN8_3DSTATE_WM_CHROMAKEY {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -5585,7 +5715,7 @@ struct GEN8_3DSTATE_WM_CHROMAKEY {
 
 static inline void
 GEN8_3DSTATE_WM_CHROMAKEY_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN8_3DSTATE_WM_CHROMAKEY * restrict values)
+                               const struct GEN8_3DSTATE_WM_CHROMAKEY * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5603,7 +5733,6 @@ GEN8_3DSTATE_WM_CHROMAKEY_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_WM_DEPTH_STENCIL_length 0x00000003
 #define GEN8_3DSTATE_WM_DEPTH_STENCIL_length_bias 0x00000002
 #define GEN8_3DSTATE_WM_DEPTH_STENCIL_header    \
    .CommandType          =  3,                  \
@@ -5612,6 +5741,8 @@ GEN8_3DSTATE_WM_CHROMAKEY_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 78,                  \
    .DwordLength          =  1
 
+#define GEN8_3DSTATE_WM_DEPTH_STENCIL_length 0x00000003
+
 struct GEN8_3DSTATE_WM_DEPTH_STENCIL {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -5640,7 +5771,7 @@ struct GEN8_3DSTATE_WM_DEPTH_STENCIL {
 
 static inline void
 GEN8_3DSTATE_WM_DEPTH_STENCIL_pack(__gen_user_data *data, void * restrict dst,
-                                  const struct GEN8_3DSTATE_WM_DEPTH_STENCIL * restrict values)
+                                   const struct GEN8_3DSTATE_WM_DEPTH_STENCIL * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5678,7 +5809,6 @@ GEN8_3DSTATE_WM_DEPTH_STENCIL_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_WM_HZ_OP_length 0x00000005
 #define GEN8_3DSTATE_WM_HZ_OP_length_bias 0x00000002
 #define GEN8_3DSTATE_WM_HZ_OP_header            \
    .CommandType          =  3,                  \
@@ -5687,6 +5817,8 @@ GEN8_3DSTATE_WM_DEPTH_STENCIL_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  = 82,                  \
    .DwordLength          =  3
 
+#define GEN8_3DSTATE_WM_HZ_OP_length 0x00000005
+
 struct GEN8_3DSTATE_WM_HZ_OP {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -5711,7 +5843,7 @@ struct GEN8_3DSTATE_WM_HZ_OP {
 
 static inline void
 GEN8_3DSTATE_WM_HZ_OP_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN8_3DSTATE_WM_HZ_OP * restrict values)
+                           const struct GEN8_3DSTATE_WM_HZ_OP * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5751,7 +5883,6 @@ GEN8_3DSTATE_WM_HZ_OP_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_GPGPU_WALKER_length 0x0000000f
 #define GEN8_GPGPU_WALKER_length_bias 0x00000002
 #define GEN8_GPGPU_WALKER_header                \
    .CommandType          =  3,                  \
@@ -5760,6 +5891,8 @@ GEN8_3DSTATE_WM_HZ_OP_pack(__gen_user_data *data, void * restrict dst,
    .SubOpcode            =  5,                  \
    .DwordLength          = 13
 
+#define GEN8_GPGPU_WALKER_length 0x0000000f
+
 struct GEN8_GPGPU_WALKER {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -5790,7 +5923,7 @@ struct GEN8_GPGPU_WALKER {
 
 static inline void
 GEN8_GPGPU_WALKER_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN8_GPGPU_WALKER * restrict values)
+                       const struct GEN8_GPGPU_WALKER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5863,7 +5996,6 @@ GEN8_GPGPU_WALKER_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MEDIA_CURBE_LOAD_length 0x00000004
 #define GEN8_MEDIA_CURBE_LOAD_length_bias 0x00000002
 #define GEN8_MEDIA_CURBE_LOAD_header            \
    .CommandType          =  3,                  \
@@ -5872,6 +6004,8 @@ GEN8_GPGPU_WALKER_pack(__gen_user_data *data, void * restrict dst,
    .SubOpcode            =  1,                  \
    .DwordLength          =  2
 
+#define GEN8_MEDIA_CURBE_LOAD_length 0x00000004
+
 struct GEN8_MEDIA_CURBE_LOAD {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -5884,7 +6018,7 @@ struct GEN8_MEDIA_CURBE_LOAD {
 
 static inline void
 GEN8_MEDIA_CURBE_LOAD_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN8_MEDIA_CURBE_LOAD * restrict values)
+                           const struct GEN8_MEDIA_CURBE_LOAD * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5909,7 +6043,6 @@ GEN8_MEDIA_CURBE_LOAD_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MEDIA_INTERFACE_DESCRIPTOR_LOAD_length 0x00000004
 #define GEN8_MEDIA_INTERFACE_DESCRIPTOR_LOAD_length_bias 0x00000002
 #define GEN8_MEDIA_INTERFACE_DESCRIPTOR_LOAD_header\
    .CommandType          =  3,                  \
@@ -5918,6 +6051,8 @@ GEN8_MEDIA_CURBE_LOAD_pack(__gen_user_data *data, void * restrict dst,
    .SubOpcode            =  2,                  \
    .DwordLength          =  2
 
+#define GEN8_MEDIA_INTERFACE_DESCRIPTOR_LOAD_length 0x00000004
+
 struct GEN8_MEDIA_INTERFACE_DESCRIPTOR_LOAD {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -5930,7 +6065,7 @@ struct GEN8_MEDIA_INTERFACE_DESCRIPTOR_LOAD {
 
 static inline void
 GEN8_MEDIA_INTERFACE_DESCRIPTOR_LOAD_pack(__gen_user_data *data, void * restrict dst,
-                                         const struct GEN8_MEDIA_INTERFACE_DESCRIPTOR_LOAD * restrict values)
+                                          const struct GEN8_MEDIA_INTERFACE_DESCRIPTOR_LOAD * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -5962,6 +6097,8 @@ GEN8_MEDIA_INTERFACE_DESCRIPTOR_LOAD_pack(__gen_user_data *data, void * restrict
    .MediaCommandOpcode   =  1,                  \
    .MediaCommandSubOpcode =  0
 
+#define GEN8_MEDIA_OBJECT_length 0x00000000
+
 struct GEN8_MEDIA_OBJECT {
    uint32_t                                     CommandType;
    uint32_t                                     MediaCommandPipeline;
@@ -5996,7 +6133,7 @@ struct GEN8_MEDIA_OBJECT {
 
 static inline void
 GEN8_MEDIA_OBJECT_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN8_MEDIA_OBJECT * restrict values)
+                       const struct GEN8_MEDIA_OBJECT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6048,6 +6185,8 @@ GEN8_MEDIA_OBJECT_pack(__gen_user_data *data, void * restrict dst,
    .MediaCommandOpcode   =  1,                  \
    .MediaCommandSubOpcode =  6
 
+#define GEN8_MEDIA_OBJECT_GRPID_length 0x00000000
+
 struct GEN8_MEDIA_OBJECT_GRPID {
    uint32_t                                     CommandType;
    uint32_t                                     MediaCommandPipeline;
@@ -6080,7 +6219,7 @@ struct GEN8_MEDIA_OBJECT_GRPID {
 
 static inline void
 GEN8_MEDIA_OBJECT_GRPID_pack(__gen_user_data *data, void * restrict dst,
-                            const struct GEN8_MEDIA_OBJECT_GRPID * restrict values)
+                             const struct GEN8_MEDIA_OBJECT_GRPID * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6128,7 +6267,6 @@ GEN8_MEDIA_OBJECT_GRPID_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN8_MEDIA_OBJECT_PRT_length 0x00000010
 #define GEN8_MEDIA_OBJECT_PRT_length_bias 0x00000002
 #define GEN8_MEDIA_OBJECT_PRT_header            \
    .CommandType          =  3,                  \
@@ -6137,6 +6275,8 @@ GEN8_MEDIA_OBJECT_GRPID_pack(__gen_user_data *data, void * restrict dst,
    .SubOpcode            =  2,                  \
    .DwordLength          = 14
 
+#define GEN8_MEDIA_OBJECT_PRT_length 0x00000010
+
 struct GEN8_MEDIA_OBJECT_PRT {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -6154,7 +6294,7 @@ struct GEN8_MEDIA_OBJECT_PRT {
 
 static inline void
 GEN8_MEDIA_OBJECT_PRT_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN8_MEDIA_OBJECT_PRT * restrict values)
+                           const struct GEN8_MEDIA_OBJECT_PRT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6194,6 +6334,8 @@ GEN8_MEDIA_OBJECT_PRT_pack(__gen_user_data *data, void * restrict dst,
    .MediaCommandOpcode   =  1,                  \
    .SubOpcode            =  3
 
+#define GEN8_MEDIA_OBJECT_WALKER_length 0x00000000
+
 struct GEN8_MEDIA_OBJECT_WALKER {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -6239,7 +6381,7 @@ struct GEN8_MEDIA_OBJECT_WALKER {
 
 static inline void
 GEN8_MEDIA_OBJECT_WALKER_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN8_MEDIA_OBJECT_WALKER * restrict values)
+                              const struct GEN8_MEDIA_OBJECT_WALKER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6332,7 +6474,6 @@ GEN8_MEDIA_OBJECT_WALKER_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN8_MEDIA_STATE_FLUSH_length 0x00000002
 #define GEN8_MEDIA_STATE_FLUSH_length_bias 0x00000002
 #define GEN8_MEDIA_STATE_FLUSH_header           \
    .CommandType          =  3,                  \
@@ -6341,6 +6482,8 @@ GEN8_MEDIA_OBJECT_WALKER_pack(__gen_user_data *data, void * restrict dst,
    .SubOpcode            =  4,                  \
    .DwordLength          =  0
 
+#define GEN8_MEDIA_STATE_FLUSH_length 0x00000002
+
 struct GEN8_MEDIA_STATE_FLUSH {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -6354,7 +6497,7 @@ struct GEN8_MEDIA_STATE_FLUSH {
 
 static inline void
 GEN8_MEDIA_STATE_FLUSH_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN8_MEDIA_STATE_FLUSH * restrict values)
+                            const struct GEN8_MEDIA_STATE_FLUSH * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6374,7 +6517,6 @@ GEN8_MEDIA_STATE_FLUSH_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MEDIA_VFE_STATE_length 0x00000009
 #define GEN8_MEDIA_VFE_STATE_length_bias 0x00000002
 #define GEN8_MEDIA_VFE_STATE_header             \
    .CommandType          =  3,                  \
@@ -6383,6 +6525,8 @@ GEN8_MEDIA_STATE_FLUSH_pack(__gen_user_data *data, void * restrict dst,
    .SubOpcode            =  0,                  \
    .DwordLength          =  7
 
+#define GEN8_MEDIA_VFE_STATE_length 0x00000009
+
 struct GEN8_MEDIA_VFE_STATE {
    uint32_t                                     CommandType;
    uint32_t                                     Pipeline;
@@ -6431,7 +6575,7 @@ struct GEN8_MEDIA_VFE_STATE {
 
 static inline void
 GEN8_MEDIA_VFE_STATE_pack(__gen_user_data *data, void * restrict dst,
-                         const struct GEN8_MEDIA_VFE_STATE * restrict values)
+                          const struct GEN8_MEDIA_VFE_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6499,12 +6643,13 @@ GEN8_MEDIA_VFE_STATE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_ARB_CHECK_length 0x00000001
 #define GEN8_MI_ARB_CHECK_length_bias 0x00000001
 #define GEN8_MI_ARB_CHECK_header                \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  5
 
+#define GEN8_MI_ARB_CHECK_length 0x00000001
+
 struct GEN8_MI_ARB_CHECK {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6512,7 +6657,7 @@ struct GEN8_MI_ARB_CHECK {
 
 static inline void
 GEN8_MI_ARB_CHECK_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN8_MI_ARB_CHECK * restrict values)
+                       const struct GEN8_MI_ARB_CHECK * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6523,12 +6668,13 @@ GEN8_MI_ARB_CHECK_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_BATCH_BUFFER_END_length 0x00000001
 #define GEN8_MI_BATCH_BUFFER_END_length_bias 0x00000001
 #define GEN8_MI_BATCH_BUFFER_END_header         \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 10
 
+#define GEN8_MI_BATCH_BUFFER_END_length 0x00000001
+
 struct GEN8_MI_BATCH_BUFFER_END {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6536,7 +6682,7 @@ struct GEN8_MI_BATCH_BUFFER_END {
 
 static inline void
 GEN8_MI_BATCH_BUFFER_END_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN8_MI_BATCH_BUFFER_END * restrict values)
+                              const struct GEN8_MI_BATCH_BUFFER_END * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6547,13 +6693,14 @@ GEN8_MI_BATCH_BUFFER_END_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_BATCH_BUFFER_START_length 0x00000003
 #define GEN8_MI_BATCH_BUFFER_START_length_bias 0x00000002
 #define GEN8_MI_BATCH_BUFFER_START_header       \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 49,                  \
    .DwordLength          =  1
 
+#define GEN8_MI_BATCH_BUFFER_START_length 0x00000003
+
 struct GEN8_MI_BATCH_BUFFER_START {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6572,7 +6719,7 @@ struct GEN8_MI_BATCH_BUFFER_START {
 
 static inline void
 GEN8_MI_BATCH_BUFFER_START_pack(__gen_user_data *data, void * restrict dst,
-                               const struct GEN8_MI_BATCH_BUFFER_START * restrict values)
+                                const struct GEN8_MI_BATCH_BUFFER_START * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6603,6 +6750,8 @@ GEN8_MI_BATCH_BUFFER_START_pack(__gen_user_data *data, void * restrict dst,
    .CommandType          =  0,                  \
    .MICommandOpcode      = 39
 
+#define GEN8_MI_CLFLUSH_length 0x00000000
+
 struct GEN8_MI_CLFLUSH {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6617,7 +6766,7 @@ struct GEN8_MI_CLFLUSH {
 
 static inline void
 GEN8_MI_CLFLUSH_pack(__gen_user_data *data, void * restrict dst,
-                    const struct GEN8_MI_CLFLUSH * restrict values)
+                     const struct GEN8_MI_CLFLUSH * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6641,7 +6790,6 @@ GEN8_MI_CLFLUSH_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN8_MI_CONDITIONAL_BATCH_BUFFER_END_length 0x00000003
 #define GEN8_MI_CONDITIONAL_BATCH_BUFFER_END_length_bias 0x00000002
 #define GEN8_MI_CONDITIONAL_BATCH_BUFFER_END_header\
    .CommandType          =  0,                  \
@@ -6650,6 +6798,8 @@ GEN8_MI_CLFLUSH_pack(__gen_user_data *data, void * restrict dst,
    .CompareSemaphore     =  0,                  \
    .DwordLength          =  1
 
+#define GEN8_MI_CONDITIONAL_BATCH_BUFFER_END_length 0x00000003
+
 struct GEN8_MI_CONDITIONAL_BATCH_BUFFER_END {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6662,7 +6812,7 @@ struct GEN8_MI_CONDITIONAL_BATCH_BUFFER_END {
 
 static inline void
 GEN8_MI_CONDITIONAL_BATCH_BUFFER_END_pack(__gen_user_data *data, void * restrict dst,
-                                         const struct GEN8_MI_CONDITIONAL_BATCH_BUFFER_END * restrict values)
+                                          const struct GEN8_MI_CONDITIONAL_BATCH_BUFFER_END * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6689,13 +6839,14 @@ GEN8_MI_CONDITIONAL_BATCH_BUFFER_END_pack(__gen_user_data *data, void * restrict
 
 }
 
-#define GEN8_MI_COPY_MEM_MEM_length 0x00000005
 #define GEN8_MI_COPY_MEM_MEM_length_bias 0x00000002
 #define GEN8_MI_COPY_MEM_MEM_header             \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 46,                  \
    .DwordLength          =  3
 
+#define GEN8_MI_COPY_MEM_MEM_length 0x00000005
+
 struct GEN8_MI_COPY_MEM_MEM {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6712,7 +6863,7 @@ struct GEN8_MI_COPY_MEM_MEM {
 
 static inline void
 GEN8_MI_COPY_MEM_MEM_pack(__gen_user_data *data, void * restrict dst,
-                         const struct GEN8_MI_COPY_MEM_MEM * restrict values)
+                          const struct GEN8_MI_COPY_MEM_MEM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6744,13 +6895,14 @@ GEN8_MI_COPY_MEM_MEM_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_LOAD_REGISTER_IMM_length 0x00000003
 #define GEN8_MI_LOAD_REGISTER_IMM_length_bias 0x00000002
 #define GEN8_MI_LOAD_REGISTER_IMM_header        \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 34,                  \
    .DwordLength          =  1
 
+#define GEN8_MI_LOAD_REGISTER_IMM_length 0x00000003
+
 struct GEN8_MI_LOAD_REGISTER_IMM {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6762,7 +6914,7 @@ struct GEN8_MI_LOAD_REGISTER_IMM {
 
 static inline void
 GEN8_MI_LOAD_REGISTER_IMM_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN8_MI_LOAD_REGISTER_IMM * restrict values)
+                               const struct GEN8_MI_LOAD_REGISTER_IMM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6783,13 +6935,14 @@ GEN8_MI_LOAD_REGISTER_IMM_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_LOAD_REGISTER_MEM_length 0x00000004
 #define GEN8_MI_LOAD_REGISTER_MEM_length_bias 0x00000002
 #define GEN8_MI_LOAD_REGISTER_MEM_header        \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 41,                  \
    .DwordLength          =  2
 
+#define GEN8_MI_LOAD_REGISTER_MEM_length 0x00000004
+
 struct GEN8_MI_LOAD_REGISTER_MEM {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6802,7 +6955,7 @@ struct GEN8_MI_LOAD_REGISTER_MEM {
 
 static inline void
 GEN8_MI_LOAD_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN8_MI_LOAD_REGISTER_MEM * restrict values)
+                               const struct GEN8_MI_LOAD_REGISTER_MEM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6829,13 +6982,14 @@ GEN8_MI_LOAD_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_LOAD_SCAN_LINES_EXCL_length 0x00000002
 #define GEN8_MI_LOAD_SCAN_LINES_EXCL_length_bias 0x00000002
 #define GEN8_MI_LOAD_SCAN_LINES_EXCL_header     \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 19,                  \
    .DwordLength          =  0
 
+#define GEN8_MI_LOAD_SCAN_LINES_EXCL_length 0x00000002
+
 struct GEN8_MI_LOAD_SCAN_LINES_EXCL {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6850,7 +7004,7 @@ struct GEN8_MI_LOAD_SCAN_LINES_EXCL {
 
 static inline void
 GEN8_MI_LOAD_SCAN_LINES_EXCL_pack(__gen_user_data *data, void * restrict dst,
-                                 const struct GEN8_MI_LOAD_SCAN_LINES_EXCL * restrict values)
+                                  const struct GEN8_MI_LOAD_SCAN_LINES_EXCL * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6868,13 +7022,14 @@ GEN8_MI_LOAD_SCAN_LINES_EXCL_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_LOAD_SCAN_LINES_INCL_length 0x00000002
 #define GEN8_MI_LOAD_SCAN_LINES_INCL_length_bias 0x00000002
 #define GEN8_MI_LOAD_SCAN_LINES_INCL_header     \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 18,                  \
    .DwordLength          =  0
 
+#define GEN8_MI_LOAD_SCAN_LINES_INCL_length 0x00000002
+
 struct GEN8_MI_LOAD_SCAN_LINES_INCL {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6893,7 +7048,7 @@ struct GEN8_MI_LOAD_SCAN_LINES_INCL {
 
 static inline void
 GEN8_MI_LOAD_SCAN_LINES_INCL_pack(__gen_user_data *data, void * restrict dst,
-                                 const struct GEN8_MI_LOAD_SCAN_LINES_INCL * restrict values)
+                                  const struct GEN8_MI_LOAD_SCAN_LINES_INCL * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6912,13 +7067,14 @@ GEN8_MI_LOAD_SCAN_LINES_INCL_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_LOAD_URB_MEM_length 0x00000004
 #define GEN8_MI_LOAD_URB_MEM_length_bias 0x00000002
 #define GEN8_MI_LOAD_URB_MEM_header             \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 44,                  \
    .DwordLength          =  2
 
+#define GEN8_MI_LOAD_URB_MEM_length 0x00000004
+
 struct GEN8_MI_LOAD_URB_MEM {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6929,7 +7085,7 @@ struct GEN8_MI_LOAD_URB_MEM {
 
 static inline void
 GEN8_MI_LOAD_URB_MEM_pack(__gen_user_data *data, void * restrict dst,
-                         const struct GEN8_MI_LOAD_URB_MEM * restrict values)
+                          const struct GEN8_MI_LOAD_URB_MEM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6959,6 +7115,8 @@ GEN8_MI_LOAD_URB_MEM_pack(__gen_user_data *data, void * restrict dst,
    .CommandType          =  0,                  \
    .MICommandOpcode      = 26
 
+#define GEN8_MI_MATH_length 0x00000000
+
 struct GEN8_MI_MATH {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -6970,7 +7128,7 @@ struct GEN8_MI_MATH {
 
 static inline void
 GEN8_MI_MATH_pack(__gen_user_data *data, void * restrict dst,
-                 const struct GEN8_MI_MATH * restrict values)
+                  const struct GEN8_MI_MATH * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -6991,12 +7149,13 @@ GEN8_MI_MATH_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN8_MI_NOOP_length 0x00000001
 #define GEN8_MI_NOOP_length_bias 0x00000001
 #define GEN8_MI_NOOP_header                     \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  0
 
+#define GEN8_MI_NOOP_length 0x00000001
+
 struct GEN8_MI_NOOP {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -7006,7 +7165,7 @@ struct GEN8_MI_NOOP {
 
 static inline void
 GEN8_MI_NOOP_pack(__gen_user_data *data, void * restrict dst,
-                 const struct GEN8_MI_NOOP * restrict values)
+                  const struct GEN8_MI_NOOP * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7019,12 +7178,13 @@ GEN8_MI_NOOP_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_PREDICATE_length 0x00000001
 #define GEN8_MI_PREDICATE_length_bias 0x00000001
 #define GEN8_MI_PREDICATE_header                \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 12
 
+#define GEN8_MI_PREDICATE_length 0x00000001
+
 struct GEN8_MI_PREDICATE {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -7044,7 +7204,7 @@ struct GEN8_MI_PREDICATE {
 
 static inline void
 GEN8_MI_PREDICATE_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN8_MI_PREDICATE * restrict values)
+                       const struct GEN8_MI_PREDICATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7058,12 +7218,13 @@ GEN8_MI_PREDICATE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_REPORT_HEAD_length 0x00000001
 #define GEN8_MI_REPORT_HEAD_length_bias 0x00000001
 #define GEN8_MI_REPORT_HEAD_header              \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  7
 
+#define GEN8_MI_REPORT_HEAD_length 0x00000001
+
 struct GEN8_MI_REPORT_HEAD {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -7071,7 +7232,7 @@ struct GEN8_MI_REPORT_HEAD {
 
 static inline void
 GEN8_MI_REPORT_HEAD_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN8_MI_REPORT_HEAD * restrict values)
+                         const struct GEN8_MI_REPORT_HEAD * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7082,12 +7243,13 @@ GEN8_MI_REPORT_HEAD_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_RS_CONTEXT_length 0x00000001
 #define GEN8_MI_RS_CONTEXT_length_bias 0x00000001
 #define GEN8_MI_RS_CONTEXT_header               \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 15
 
+#define GEN8_MI_RS_CONTEXT_length 0x00000001
+
 struct GEN8_MI_RS_CONTEXT {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -7098,7 +7260,7 @@ struct GEN8_MI_RS_CONTEXT {
 
 static inline void
 GEN8_MI_RS_CONTEXT_pack(__gen_user_data *data, void * restrict dst,
-                       const struct GEN8_MI_RS_CONTEXT * restrict values)
+                        const struct GEN8_MI_RS_CONTEXT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7110,12 +7272,13 @@ GEN8_MI_RS_CONTEXT_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_RS_CONTROL_length 0x00000001
 #define GEN8_MI_RS_CONTROL_length_bias 0x00000001
 #define GEN8_MI_RS_CONTROL_header               \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  6
 
+#define GEN8_MI_RS_CONTROL_length 0x00000001
+
 struct GEN8_MI_RS_CONTROL {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -7126,7 +7289,7 @@ struct GEN8_MI_RS_CONTROL {
 
 static inline void
 GEN8_MI_RS_CONTROL_pack(__gen_user_data *data, void * restrict dst,
-                       const struct GEN8_MI_RS_CONTROL * restrict values)
+                        const struct GEN8_MI_RS_CONTROL * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7138,13 +7301,14 @@ GEN8_MI_RS_CONTROL_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_RS_STORE_DATA_IMM_length 0x00000004
 #define GEN8_MI_RS_STORE_DATA_IMM_length_bias 0x00000002
 #define GEN8_MI_RS_STORE_DATA_IMM_header        \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 43,                  \
    .DwordLength          =  2
 
+#define GEN8_MI_RS_STORE_DATA_IMM_length 0x00000004
+
 struct GEN8_MI_RS_STORE_DATA_IMM {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -7156,7 +7320,7 @@ struct GEN8_MI_RS_STORE_DATA_IMM {
 
 static inline void
 GEN8_MI_RS_STORE_DATA_IMM_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN8_MI_RS_STORE_DATA_IMM * restrict values)
+                               const struct GEN8_MI_RS_STORE_DATA_IMM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7182,13 +7346,14 @@ GEN8_MI_RS_STORE_DATA_IMM_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_SET_CONTEXT_length 0x00000002
 #define GEN8_MI_SET_CONTEXT_length_bias 0x00000002
 #define GEN8_MI_SET_CONTEXT_header              \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 24,                  \
    .DwordLength          =  0
 
+#define GEN8_MI_SET_CONTEXT_length 0x00000002
+
 struct GEN8_MI_SET_CONTEXT {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -7204,7 +7369,7 @@ struct GEN8_MI_SET_CONTEXT {
 
 static inline void
 GEN8_MI_SET_CONTEXT_pack(__gen_user_data *data, void * restrict dst,
-                        const struct GEN8_MI_SET_CONTEXT * restrict values)
+                         const struct GEN8_MI_SET_CONTEXT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7228,12 +7393,13 @@ GEN8_MI_SET_CONTEXT_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_SET_PREDICATE_length 0x00000001
 #define GEN8_MI_SET_PREDICATE_length_bias 0x00000001
 #define GEN8_MI_SET_PREDICATE_header            \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  1
 
+#define GEN8_MI_SET_PREDICATE_length 0x00000001
+
 struct GEN8_MI_SET_PREDICATE {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -7251,7 +7417,7 @@ struct GEN8_MI_SET_PREDICATE {
 
 static inline void
 GEN8_MI_SET_PREDICATE_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN8_MI_SET_PREDICATE * restrict values)
+                           const struct GEN8_MI_SET_PREDICATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7263,13 +7429,14 @@ GEN8_MI_SET_PREDICATE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_STORE_DATA_IMM_length 0x00000004
 #define GEN8_MI_STORE_DATA_IMM_length_bias 0x00000002
 #define GEN8_MI_STORE_DATA_IMM_header           \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 32,                  \
    .DwordLength          =  2
 
+#define GEN8_MI_STORE_DATA_IMM_length 0x00000004
+
 struct GEN8_MI_STORE_DATA_IMM {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -7284,7 +7451,7 @@ struct GEN8_MI_STORE_DATA_IMM {
 
 static inline void
 GEN8_MI_STORE_DATA_IMM_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN8_MI_STORE_DATA_IMM * restrict values)
+                            const struct GEN8_MI_STORE_DATA_IMM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7316,13 +7483,14 @@ GEN8_MI_STORE_DATA_IMM_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_STORE_DATA_INDEX_length 0x00000003
 #define GEN8_MI_STORE_DATA_INDEX_length_bias 0x00000002
 #define GEN8_MI_STORE_DATA_INDEX_header         \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 33,                  \
    .DwordLength          =  1
 
+#define GEN8_MI_STORE_DATA_INDEX_length 0x00000003
+
 struct GEN8_MI_STORE_DATA_INDEX {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -7335,7 +7503,7 @@ struct GEN8_MI_STORE_DATA_INDEX {
 
 static inline void
 GEN8_MI_STORE_DATA_INDEX_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN8_MI_STORE_DATA_INDEX * restrict values)
+                              const struct GEN8_MI_STORE_DATA_INDEX * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7360,13 +7528,14 @@ GEN8_MI_STORE_DATA_INDEX_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_STORE_URB_MEM_length 0x00000004
 #define GEN8_MI_STORE_URB_MEM_length_bias 0x00000002
 #define GEN8_MI_STORE_URB_MEM_header            \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 45,                  \
    .DwordLength          =  2
 
+#define GEN8_MI_STORE_URB_MEM_length 0x00000004
+
 struct GEN8_MI_STORE_URB_MEM {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -7377,7 +7546,7 @@ struct GEN8_MI_STORE_URB_MEM {
 
 static inline void
 GEN8_MI_STORE_URB_MEM_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN8_MI_STORE_URB_MEM * restrict values)
+                           const struct GEN8_MI_STORE_URB_MEM * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7402,12 +7571,13 @@ GEN8_MI_STORE_URB_MEM_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_SUSPEND_FLUSH_length 0x00000001
 #define GEN8_MI_SUSPEND_FLUSH_length_bias 0x00000001
 #define GEN8_MI_SUSPEND_FLUSH_header            \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 11
 
+#define GEN8_MI_SUSPEND_FLUSH_length 0x00000001
+
 struct GEN8_MI_SUSPEND_FLUSH {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -7416,7 +7586,7 @@ struct GEN8_MI_SUSPEND_FLUSH {
 
 static inline void
 GEN8_MI_SUSPEND_FLUSH_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN8_MI_SUSPEND_FLUSH * restrict values)
+                           const struct GEN8_MI_SUSPEND_FLUSH * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7428,12 +7598,13 @@ GEN8_MI_SUSPEND_FLUSH_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_TOPOLOGY_FILTER_length 0x00000001
 #define GEN8_MI_TOPOLOGY_FILTER_length_bias 0x00000001
 #define GEN8_MI_TOPOLOGY_FILTER_header          \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 13
 
+#define GEN8_MI_TOPOLOGY_FILTER_length 0x00000001
+
 struct GEN8_MI_TOPOLOGY_FILTER {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -7442,7 +7613,7 @@ struct GEN8_MI_TOPOLOGY_FILTER {
 
 static inline void
 GEN8_MI_TOPOLOGY_FILTER_pack(__gen_user_data *data, void * restrict dst,
-                            const struct GEN8_MI_TOPOLOGY_FILTER * restrict values)
+                             const struct GEN8_MI_TOPOLOGY_FILTER * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7459,6 +7630,8 @@ GEN8_MI_TOPOLOGY_FILTER_pack(__gen_user_data *data, void * restrict dst,
    .CommandType          =  0,                  \
    .MICommandOpcode      = 35
 
+#define GEN8_MI_UPDATE_GTT_length 0x00000000
+
 struct GEN8_MI_UPDATE_GTT {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -7469,7 +7642,7 @@ struct GEN8_MI_UPDATE_GTT {
 
 static inline void
 GEN8_MI_UPDATE_GTT_pack(__gen_user_data *data, void * restrict dst,
-                       const struct GEN8_MI_UPDATE_GTT * restrict values)
+                        const struct GEN8_MI_UPDATE_GTT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7488,12 +7661,13 @@ GEN8_MI_UPDATE_GTT_pack(__gen_user_data *data, void * restrict dst,
    /* variable length fields follow */
 }
 
-#define GEN8_MI_URB_ATOMIC_ALLOC_length 0x00000001
 #define GEN8_MI_URB_ATOMIC_ALLOC_length_bias 0x00000001
 #define GEN8_MI_URB_ATOMIC_ALLOC_header         \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  9
 
+#define GEN8_MI_URB_ATOMIC_ALLOC_length 0x00000001
+
 struct GEN8_MI_URB_ATOMIC_ALLOC {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -7503,7 +7677,7 @@ struct GEN8_MI_URB_ATOMIC_ALLOC {
 
 static inline void
 GEN8_MI_URB_ATOMIC_ALLOC_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN8_MI_URB_ATOMIC_ALLOC * restrict values)
+                              const struct GEN8_MI_URB_ATOMIC_ALLOC * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7516,13 +7690,14 @@ GEN8_MI_URB_ATOMIC_ALLOC_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_URB_CLEAR_length 0x00000002
 #define GEN8_MI_URB_CLEAR_length_bias 0x00000002
 #define GEN8_MI_URB_CLEAR_header                \
    .CommandType          =  0,                  \
    .MICommandOpcode      = 25,                  \
    .DwordLength          =  0
 
+#define GEN8_MI_URB_CLEAR_length 0x00000002
+
 struct GEN8_MI_URB_CLEAR {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -7533,7 +7708,7 @@ struct GEN8_MI_URB_CLEAR {
 
 static inline void
 GEN8_MI_URB_CLEAR_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN8_MI_URB_CLEAR * restrict values)
+                       const struct GEN8_MI_URB_CLEAR * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7550,12 +7725,13 @@ GEN8_MI_URB_CLEAR_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_USER_INTERRUPT_length 0x00000001
 #define GEN8_MI_USER_INTERRUPT_length_bias 0x00000001
 #define GEN8_MI_USER_INTERRUPT_header           \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  2
 
+#define GEN8_MI_USER_INTERRUPT_length 0x00000001
+
 struct GEN8_MI_USER_INTERRUPT {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -7563,7 +7739,7 @@ struct GEN8_MI_USER_INTERRUPT {
 
 static inline void
 GEN8_MI_USER_INTERRUPT_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN8_MI_USER_INTERRUPT * restrict values)
+                            const struct GEN8_MI_USER_INTERRUPT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7574,12 +7750,13 @@ GEN8_MI_USER_INTERRUPT_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MI_WAIT_FOR_EVENT_length 0x00000001
 #define GEN8_MI_WAIT_FOR_EVENT_length_bias 0x00000001
 #define GEN8_MI_WAIT_FOR_EVENT_header           \
    .CommandType          =  0,                  \
    .MICommandOpcode      =  3
 
+#define GEN8_MI_WAIT_FOR_EVENT_length 0x00000001
+
 struct GEN8_MI_WAIT_FOR_EVENT {
    uint32_t                                     CommandType;
    uint32_t                                     MICommandOpcode;
@@ -7599,7 +7776,7 @@ struct GEN8_MI_WAIT_FOR_EVENT {
 
 static inline void
 GEN8_MI_WAIT_FOR_EVENT_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN8_MI_WAIT_FOR_EVENT * restrict values)
+                            const struct GEN8_MI_WAIT_FOR_EVENT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7622,7 +7799,6 @@ GEN8_MI_WAIT_FOR_EVENT_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_PIPE_CONTROL_length 0x00000006
 #define GEN8_PIPE_CONTROL_length_bias 0x00000002
 #define GEN8_PIPE_CONTROL_header                \
    .CommandType          =  3,                  \
@@ -7631,6 +7807,8 @@ GEN8_MI_WAIT_FOR_EVENT_pack(__gen_user_data *data, void * restrict dst,
    ._3DCommandSubOpcode  =  0,                  \
    .DwordLength          =  4
 
+#define GEN8_PIPE_CONTROL_length 0x00000006
+
 struct GEN8_PIPE_CONTROL {
    uint32_t                                     CommandType;
    uint32_t                                     CommandSubType;
@@ -7678,7 +7856,7 @@ struct GEN8_PIPE_CONTROL {
 
 static inline void
 GEN8_PIPE_CONTROL_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN8_PIPE_CONTROL * restrict values)
+                       const struct GEN8_PIPE_CONTROL * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7732,22 +7910,6 @@ GEN8_PIPE_CONTROL_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_3DSTATE_CONSTANT_BODY_length 0x0000000a
-
-#define GEN8_BINDING_TABLE_EDIT_ENTRY_length 0x00000001
-
-#define GEN8_GATHER_CONSTANT_ENTRY_length 0x00000001
-
-#define GEN8_VERTEX_BUFFER_STATE_length 0x00000004
-
-#define GEN8_VERTEX_ELEMENT_STATE_length 0x00000002
-
-#define GEN8_SO_DECL_ENTRY_length 0x00000002
-
-#define GEN8_SO_DECL_length 0x00000001
-
-#define GEN8_SF_OUTPUT_ATTRIBUTE_DETAIL_length 0x00000001
-
 #define GEN8_SCISSOR_RECT_length 0x00000002
 
 struct GEN8_SCISSOR_RECT {
@@ -7759,7 +7921,7 @@ struct GEN8_SCISSOR_RECT {
 
 static inline void
 GEN8_SCISSOR_RECT_pack(__gen_user_data *data, void * restrict dst,
-                      const struct GEN8_SCISSOR_RECT * restrict values)
+                       const struct GEN8_SCISSOR_RECT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7796,7 +7958,7 @@ struct GEN8_SF_CLIP_VIEWPORT {
 
 static inline void
 GEN8_SF_CLIP_VIEWPORT_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN8_SF_CLIP_VIEWPORT * restrict values)
+                           const struct GEN8_SF_CLIP_VIEWPORT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7866,6 +8028,8 @@ GEN8_SF_CLIP_VIEWPORT_pack(__gen_user_data *data, void * restrict dst,
 
 #define GEN8_BLEND_STATE_length 0x00000011
 
+#define GEN8_BLEND_STATE_ENTRY_length 0x00000002
+
 struct GEN8_BLEND_STATE_ENTRY {
    bool                                         LogicOpEnable;
    uint32_t                                     LogicOpFunction;
@@ -7891,7 +8055,7 @@ struct GEN8_BLEND_STATE_ENTRY {
 
 static inline void
 GEN8_BLEND_STATE_ENTRY_pack(__gen_user_data *data, void * restrict dst,
-                           const struct GEN8_BLEND_STATE_ENTRY * restrict values)
+                            const struct GEN8_BLEND_STATE_ENTRY * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7935,7 +8099,7 @@ struct GEN8_BLEND_STATE {
 
 static inline void
 GEN8_BLEND_STATE_pack(__gen_user_data *data, void * restrict dst,
-                     const struct GEN8_BLEND_STATE * restrict values)
+                      const struct GEN8_BLEND_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -7955,8 +8119,6 @@ GEN8_BLEND_STATE_pack(__gen_user_data *data, void * restrict dst,
       GEN8_BLEND_STATE_ENTRY_pack(data, &dw[j], &values->Entry[i]);
 }
 
-#define GEN8_BLEND_STATE_ENTRY_length 0x00000002
-
 #define GEN8_CC_VIEWPORT_length 0x00000002
 
 struct GEN8_CC_VIEWPORT {
@@ -7966,7 +8128,7 @@ struct GEN8_CC_VIEWPORT {
 
 static inline void
 GEN8_CC_VIEWPORT_pack(__gen_user_data *data, void * restrict dst,
-                     const struct GEN8_CC_VIEWPORT * restrict values)
+                      const struct GEN8_CC_VIEWPORT * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -8001,7 +8163,7 @@ struct GEN8_COLOR_CALC_STATE {
 
 static inline void
 GEN8_COLOR_CALC_STATE_pack(__gen_user_data *data, void * restrict dst,
-                          const struct GEN8_COLOR_CALC_STATE * restrict values)
+                           const struct GEN8_COLOR_CALC_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -8035,7 +8197,30 @@ GEN8_COLOR_CALC_STATE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_MEMORY_OBJECT_CONTROL_STATE_length 0x00000001
+#define GEN8_BLACK_LEVEL_CORRECTION_STATE__DW7576_length 0x00000002
+
+struct GEN8_BLACK_LEVEL_CORRECTION_STATE__DW7576 {
+   uint32_t                                     BlackPointOffsetR;
+   uint32_t                                     BlackPointOffsetG;
+   uint32_t                                     BlackPointOffsetB;
+};
+
+static inline void
+GEN8_BLACK_LEVEL_CORRECTION_STATE__DW7576_pack(__gen_user_data *data, void * restrict dst,
+                                               const struct GEN8_BLACK_LEVEL_CORRECTION_STATE__DW7576 * restrict values)
+{
+   uint32_t *dw = (uint32_t * restrict) dst;
+
+   dw[0] =
+      __gen_field(values->BlackPointOffsetR, 0, 12) |
+      0;
+
+   dw[1] =
+      __gen_field(values->BlackPointOffsetG, 13, 25) |
+      __gen_field(values->BlackPointOffsetB, 0, 12) |
+      0;
+
+}
 
 #define GEN8_INTERFACE_DESCRIPTOR_DATA_length 0x00000008
 
@@ -8087,7 +8272,7 @@ struct GEN8_INTERFACE_DESCRIPTOR_DATA {
 
 static inline void
 GEN8_INTERFACE_DESCRIPTOR_DATA_pack(__gen_user_data *data, void * restrict dst,
-                                   const struct GEN8_INTERFACE_DESCRIPTOR_DATA * restrict values)
+                                    const struct GEN8_INTERFACE_DESCRIPTOR_DATA * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -8137,8 +8322,6 @@ GEN8_INTERFACE_DESCRIPTOR_DATA_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
-#define GEN8_PALETTE_ENTRY_length 0x00000001
-
 #define GEN8_BINDING_TABLE_STATE_length 0x00000001
 
 struct GEN8_BINDING_TABLE_STATE {
@@ -8147,7 +8330,7 @@ struct GEN8_BINDING_TABLE_STATE {
 
 static inline void
 GEN8_BINDING_TABLE_STATE_pack(__gen_user_data *data, void * restrict dst,
-                             const struct GEN8_BINDING_TABLE_STATE * restrict values)
+                              const struct GEN8_BINDING_TABLE_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -8257,7 +8440,7 @@ struct GEN8_RENDER_SURFACE_STATE {
 
 static inline void
 GEN8_RENDER_SURFACE_STATE_pack(__gen_user_data *data, void * restrict dst,
-                              const struct GEN8_RENDER_SURFACE_STATE * restrict values)
+                               const struct GEN8_RENDER_SURFACE_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -8373,6 +8556,24 @@ GEN8_RENDER_SURFACE_STATE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
+#define GEN8_FILTER_COEFFICIENT_length 0x00000001
+
+struct GEN8_FILTER_COEFFICIENT {
+   uint32_t                                     FilterCoefficient;
+};
+
+static inline void
+GEN8_FILTER_COEFFICIENT_pack(__gen_user_data *data, void * restrict dst,
+                             const struct GEN8_FILTER_COEFFICIENT * restrict values)
+{
+   uint32_t *dw = (uint32_t * restrict) dst;
+
+   dw[0] =
+      __gen_field(values->FilterCoefficient, 0, 7) |
+      0;
+
+}
+
 #define GEN8_SAMPLER_STATE_length 0x00000004
 
 struct GEN8_SAMPLER_STATE {
@@ -8453,7 +8654,7 @@ struct GEN8_SAMPLER_STATE {
 
 static inline void
 GEN8_SAMPLER_STATE_pack(__gen_user_data *data, void * restrict dst,
-                       const struct GEN8_SAMPLER_STATE * restrict values)
+                        const struct GEN8_SAMPLER_STATE * restrict values)
 {
    uint32_t *dw = (uint32_t * restrict) dst;
 
@@ -8501,6 +8702,91 @@ GEN8_SAMPLER_STATE_pack(__gen_user_data *data, void * restrict dst,
 
 }
 
+#define GEN8_SAMPLER_STATE_8X8_AVS_COEFFICIENTS_length 0x00000008
+
+struct GEN8_SAMPLER_STATE_8X8_AVS_COEFFICIENTS {
+   uint32_t                                     Table0YFilterCoefficientn1;
+   uint32_t                                     Table0XFilterCoefficientn1;
+   uint32_t                                     Table0YFilterCoefficientn0;
+   uint32_t                                     Table0XFilterCoefficientn0;
+   uint32_t                                     Table0YFilterCoefficientn3;
+   uint32_t                                     Table0XFilterCoefficientn3;
+   uint32_t                                     Table0YFilterCoefficientn2;
+   uint32_t                                     Table0XFilterCoefficientn2;
+   uint32_t                                     Table0YFilterCoefficientn5;
+   uint32_t                                     Table0XFilterCoefficientn5;
+   uint32_t                                     Table0YFilterCoefficientn4;
+   uint32_t                                     Table0XFilterCoefficientn4;
+   uint32_t                                     Table0YFilterCoefficientn7;
+   uint32_t                                     Table0XFilterCoefficientn7;
+   uint32_t                                     Table0YFilterCoefficientn6;
+   uint32_t                                     Table0XFilterCoefficientn6;
+   uint32_t                                     Table1XFilterCoefficientn3;
+   uint32_t                                     Table1XFilterCoefficientn2;
+   uint32_t                                     Table1XFilterCoefficientn5;
+   uint32_t                                     Table1XFilterCoefficientn4;
+   uint32_t                                     Table1YFilterCoefficientn3;
+   uint32_t                                     Table1YFilterCoefficientn2;
+   uint32_t                                     Table1YFilterCoefficientn5;
+   uint32_t                                     Table1YFilterCoefficientn4;
+};
+
+static inline void
+GEN8_SAMPLER_STATE_8X8_AVS_COEFFICIENTS_pack(__gen_user_data *data, void * restrict dst,
+                                             const struct GEN8_SAMPLER_STATE_8X8_AVS_COEFFICIENTS * restrict values)
+{
+   uint32_t *dw = (uint32_t * restrict) dst;
+
+   dw[0] =
+      __gen_field(values->Table0YFilterCoefficientn1, 24, 31) |
+      __gen_field(values->Table0XFilterCoefficientn1, 16, 23) |
+      __gen_field(values->Table0YFilterCoefficientn0, 8, 15) |
+      __gen_field(values->Table0XFilterCoefficientn0, 0, 7) |
+      0;
+
+   dw[1] =
+      __gen_field(values->Table0YFilterCoefficientn3, 24, 31) |
+      __gen_field(values->Table0XFilterCoefficientn3, 16, 23) |
+      __gen_field(values->Table0YFilterCoefficientn2, 8, 15) |
+      __gen_field(values->Table0XFilterCoefficientn2, 0, 7) |
+      0;
+
+   dw[2] =
+      __gen_field(values->Table0YFilterCoefficientn5, 24, 31) |
+      __gen_field(values->Table0XFilterCoefficientn5, 16, 23) |
+      __gen_field(values->Table0YFilterCoefficientn4, 8, 15) |
+      __gen_field(values->Table0XFilterCoefficientn4, 0, 7) |
+      0;
+
+   dw[3] =
+      __gen_field(values->Table0YFilterCoefficientn7, 24, 31) |
+      __gen_field(values->Table0XFilterCoefficientn7, 16, 23) |
+      __gen_field(values->Table0YFilterCoefficientn6, 8, 15) |
+      __gen_field(values->Table0XFilterCoefficientn6, 0, 7) |
+      0;
+
+   dw[4] =
+      __gen_field(values->Table1XFilterCoefficientn3, 24, 31) |
+      __gen_field(values->Table1XFilterCoefficientn2, 16, 23) |
+      0;
+
+   dw[5] =
+      __gen_field(values->Table1XFilterCoefficientn5, 8, 15) |
+      __gen_field(values->Table1XFilterCoefficientn4, 0, 7) |
+      0;
+
+   dw[6] =
+      __gen_field(values->Table1YFilterCoefficientn3, 24, 31) |
+      __gen_field(values->Table1YFilterCoefficientn2, 16, 23) |
+      0;
+
+   dw[7] =
+      __gen_field(values->Table1YFilterCoefficientn5, 8, 15) |
+      __gen_field(values->Table1YFilterCoefficientn4, 0, 7) |
+      0;
+
+}
+
 /* Enum 3D_Prim_Topo_Type */
 #define     _3DPRIM_POINTLIST                                  1
 #define     _3DPRIM_LINELIST                                   2