Merge Mesa 19.0.5

1 files changed, 176 insertions, 145 deletions

diff --git a/lib/mesa/src/intel/genxml/gen10.xml b/lib/mesa/src/intel/genxml/gen10.xml
index 668cab4c7..4cb1f05ae 100644
--- a/lib/mesa/src/intel/genxml/gen10.xml
+++ b/lib/mesa/src/intel/genxml/gen10.xml
@@ -219,14 +219,9 @@
     <field name="Binding Table Index Offset" start="0" end="3" type="uint"/>
   </struct>
 
-  <struct name="MEMORY_OBJECT_CONTROL_STATE" length="1">
-    <field name="Index to MOCS Tables" start="1" end="6" type="uint"/>
-  </struct>
-
   <struct name="VERTEX_BUFFER_STATE" length="4">
     <field name="Vertex Buffer Index" start="26" end="31" type="uint"/>
-    <field name="Memory Object Control State" start="16" end="22" type="MEMORY_OBJECT_CONTROL_STATE"/>
-    <field name="Vertex Buffer MOCS" start="16" end="22" type="uint"/>
+    <field name="MOCS" start="16" end="22" type="uint"/>
     <field name="Address Modify Enable" start="14" end="14" type="bool"/>
     <field name="Null Vertex Buffer" start="13" end="13" type="bool"/>
     <field name="Buffer Pitch" start="0" end="11" type="uint"/>
@@ -495,7 +490,6 @@
     <field name="Cube Face Enable - Negative Y" start="3" end="3" type="bool"/>
     <field name="Cube Face Enable - Positive X" start="4" end="4" type="bool"/>
     <field name="Cube Face Enable - Negative X" start="5" end="5" type="bool"/>
-    <field name="Memory Object Control State" start="56" end="62" type="MEMORY_OBJECT_CONTROL_STATE"/>
     <field name="MOCS" start="56" end="62" type="uint"/>
     <field name="Base Mip Level" start="51" end="55" type="u4.1"/>
     <field name="Surface QPitch" start="32" end="46" type="uint"/>
@@ -813,7 +807,7 @@
     </field>
   </struct>
 
-  <instruction name="3DPRIMITIVE" bias="2" length="7">
+  <instruction name="3DPRIMITIVE" bias="2" length="7" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="3"/>
@@ -839,7 +833,7 @@
     <field name="Extended Parameter 2" start="288" end="319" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_AA_LINE_PARAMETERS" bias="2" length="3">
+  <instruction name="3DSTATE_AA_LINE_PARAMETERS" bias="2" length="3" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -855,7 +849,7 @@
     <field name="AA Coverage EndCap Slope" start="64" end="71" type="u0.8"/>
   </instruction>
 
-  <instruction name="3DSTATE_BINDING_TABLE_EDIT_DS" bias="2">
+  <instruction name="3DSTATE_BINDING_TABLE_EDIT_DS" bias="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -872,7 +866,7 @@
     </group>
   </instruction>
 
-  <instruction name="3DSTATE_BINDING_TABLE_EDIT_GS" bias="2">
+  <instruction name="3DSTATE_BINDING_TABLE_EDIT_GS" bias="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -889,7 +883,7 @@
     </group>
   </instruction>
 
-  <instruction name="3DSTATE_BINDING_TABLE_EDIT_HS" bias="2">
+  <instruction name="3DSTATE_BINDING_TABLE_EDIT_HS" bias="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -906,7 +900,7 @@
     </group>
   </instruction>
 
-  <instruction name="3DSTATE_BINDING_TABLE_EDIT_PS" bias="2">
+  <instruction name="3DSTATE_BINDING_TABLE_EDIT_PS" bias="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -923,7 +917,7 @@
     </group>
   </instruction>
 
-  <instruction name="3DSTATE_BINDING_TABLE_EDIT_VS" bias="2">
+  <instruction name="3DSTATE_BINDING_TABLE_EDIT_VS" bias="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -940,7 +934,7 @@
     </group>
   </instruction>
 
-  <instruction name="3DSTATE_BINDING_TABLE_POINTERS_DS" bias="2" length="2">
+  <instruction name="3DSTATE_BINDING_TABLE_POINTERS_DS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -949,7 +943,7 @@
     <field name="Pointer to DS Binding Table" start="37" end="47" type="offset"/>
   </instruction>
 
-  <instruction name="3DSTATE_BINDING_TABLE_POINTERS_GS" bias="2" length="2">
+  <instruction name="3DSTATE_BINDING_TABLE_POINTERS_GS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -958,7 +952,7 @@
     <field name="Pointer to GS Binding Table" start="37" end="47" type="offset"/>
   </instruction>
 
-  <instruction name="3DSTATE_BINDING_TABLE_POINTERS_HS" bias="2" length="2">
+  <instruction name="3DSTATE_BINDING_TABLE_POINTERS_HS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -967,7 +961,7 @@
     <field name="Pointer to HS Binding Table" start="37" end="47" type="offset"/>
   </instruction>
 
-  <instruction name="3DSTATE_BINDING_TABLE_POINTERS_PS" bias="2" length="2">
+  <instruction name="3DSTATE_BINDING_TABLE_POINTERS_PS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -976,7 +970,7 @@
     <field name="Pointer to PS Binding Table" start="37" end="47" type="offset"/>
   </instruction>
 
-  <instruction name="3DSTATE_BINDING_TABLE_POINTERS_VS" bias="2" length="2">
+  <instruction name="3DSTATE_BINDING_TABLE_POINTERS_VS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -985,7 +979,7 @@
     <field name="Pointer to VS Binding Table" start="37" end="47" type="offset"/>
   </instruction>
 
-  <instruction name="3DSTATE_BINDING_TABLE_POOL_ALLOC" bias="2" length="4">
+  <instruction name="3DSTATE_BINDING_TABLE_POOL_ALLOC" bias="2" length="4" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -993,13 +987,13 @@
     <field name="DWord Length" start="0" end="7" type="uint" default="2"/>
     <field name="Binding Table Pool Base Address" start="44" end="95" type="address"/>
     <field name="Binding Table Pool Enable" start="43" end="43" type="uint"/>
-    <field name="Surface Object Control State" start="32" end="38" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="MOCS" start="32" end="38" type="uint"/>
     <field name="Binding Table Pool Buffer Size" start="108" end="127" type="uint">
       <value name="No Valid Data" value="0"/>
     </field>
   </instruction>
 
-  <instruction name="3DSTATE_BLEND_STATE_POINTERS" bias="2" length="2">
+  <instruction name="3DSTATE_BLEND_STATE_POINTERS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1009,7 +1003,7 @@
     <field name="Blend State Pointer Valid" start="32" end="32" type="bool"/>
   </instruction>
 
-  <instruction name="3DSTATE_CC_STATE_POINTERS" bias="2" length="2">
+  <instruction name="3DSTATE_CC_STATE_POINTERS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1019,7 +1013,7 @@
     <field name="Color Calc State Pointer Valid" start="32" end="32" type="bool"/>
   </instruction>
 
-  <instruction name="3DSTATE_CHROMA_KEY" bias="2" length="4">
+  <instruction name="3DSTATE_CHROMA_KEY" bias="2" length="4" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -1030,7 +1024,7 @@
     <field name="ChromaKey High Value" start="96" end="127" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_CLEAR_PARAMS" bias="2" length="3">
+  <instruction name="3DSTATE_CLEAR_PARAMS" bias="2" length="3" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1040,7 +1034,7 @@
     <field name="Depth Clear Value Valid" start="64" end="64" type="bool"/>
   </instruction>
 
-  <instruction name="3DSTATE_CLIP" bias="2" length="4">
+  <instruction name="3DSTATE_CLIP" bias="2" length="4" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1080,58 +1074,58 @@
     <field name="Maximum VP Index" start="96" end="99" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_CONSTANT_DS" bias="2" length="11">
+  <instruction name="3DSTATE_CONSTANT_DS" bias="2" length="11" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="26"/>
-    <field name="Constant Buffer Object Control State" start="8" end="14" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="MOCS" start="8" end="14" type="uint"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="9"/>
     <field name="Constant Body" start="32" end="351" type="3DSTATE_CONSTANT_BODY"/>
   </instruction>
 
-  <instruction name="3DSTATE_CONSTANT_GS" bias="2" length="11">
+  <instruction name="3DSTATE_CONSTANT_GS" bias="2" length="11" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="22"/>
-    <field name="Constant Buffer Object Control State" start="8" end="14" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="MOCS" start="8" end="14" type="uint"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="9"/>
     <field name="Constant Body" start="32" end="351" type="3DSTATE_CONSTANT_BODY"/>
   </instruction>
 
-  <instruction name="3DSTATE_CONSTANT_HS" bias="2" length="11">
+  <instruction name="3DSTATE_CONSTANT_HS" bias="2" length="11" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="25"/>
-    <field name="Constant Buffer Object Control State" start="8" end="14" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="MOCS" start="8" end="14" type="uint"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="9"/>
     <field name="Constant Body" start="32" end="351" type="3DSTATE_CONSTANT_BODY"/>
   </instruction>
 
-  <instruction name="3DSTATE_CONSTANT_PS" bias="2" length="11">
+  <instruction name="3DSTATE_CONSTANT_PS" bias="2" length="11" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="23"/>
     <field name="Disable Gather at Set Shader Hint" start="15" end="15" type="uint"/>
-    <field name="Constant Buffer Object Control State" start="8" end="14" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="MOCS" start="8" end="14" type="uint"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="9"/>
     <field name="Constant Body" start="32" end="351" type="3DSTATE_CONSTANT_BODY"/>
   </instruction>
 
-  <instruction name="3DSTATE_CONSTANT_VS" bias="2" length="11">
+  <instruction name="3DSTATE_CONSTANT_VS" bias="2" length="11" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="21"/>
-    <field name="Constant Buffer Object Control State" start="8" end="14" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="MOCS" start="8" end="14" type="uint"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="9"/>
     <field name="Constant Body" start="32" end="351" type="3DSTATE_CONSTANT_BODY"/>
   </instruction>
 
-  <instruction name="3DSTATE_DEPTH_BUFFER" bias="2" length="8">
+  <instruction name="3DSTATE_DEPTH_BUFFER" bias="2" length="8" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1157,8 +1151,7 @@
     <field name="LOD" start="128" end="131" type="uint"/>
     <field name="Depth" start="181" end="191" type="uint"/>
     <field name="Minimum Array Element" start="170" end="180" type="uint"/>
-    <field name="Depth Buffer Object Control State" start="160" end="166" type="MEMORY_OBJECT_CONTROL_STATE"/>
-    <field name="Depth Buffer MOCS" start="160" end="166" type="uint"/>
+    <field name="MOCS" start="160" end="166" type="uint"/>
     <field name="Tiled Resource Mode" start="222" end="223" type="uint">
       <value name="NONE" value="0"/>
       <value name="TILEYF" value="1"/>
@@ -1169,7 +1162,7 @@
     <field name="Surface QPitch" start="224" end="238" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_DRAWING_RECTANGLE" bias="2" length="4">
+  <instruction name="3DSTATE_DRAWING_RECTANGLE" bias="2" length="4" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -1188,7 +1181,7 @@
     <field name="Drawing Rectangle Origin X" start="96" end="111" type="int"/>
   </instruction>
 
-  <instruction name="3DSTATE_DS" bias="2" length="11">
+  <instruction name="3DSTATE_DS" bias="2" length="11" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1236,7 +1229,7 @@
     <field name="DUAL_PATCH Kernel Start Pointer" start="294" end="351" type="offset"/>
   </instruction>
 
-  <instruction name="3DSTATE_GATHER_CONSTANT_DS" bias="2">
+  <instruction name="3DSTATE_GATHER_CONSTANT_DS" bias="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1260,7 +1253,7 @@
     </group>
   </instruction>
 
-  <instruction name="3DSTATE_GATHER_CONSTANT_GS" bias="2">
+  <instruction name="3DSTATE_GATHER_CONSTANT_GS" bias="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1284,7 +1277,7 @@
     </group>
   </instruction>
 
-  <instruction name="3DSTATE_GATHER_CONSTANT_HS" bias="2">
+  <instruction name="3DSTATE_GATHER_CONSTANT_HS" bias="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1308,7 +1301,7 @@
     </group>
   </instruction>
 
-  <instruction name="3DSTATE_GATHER_CONSTANT_PS" bias="2">
+  <instruction name="3DSTATE_GATHER_CONSTANT_PS" bias="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1334,7 +1327,7 @@
     </group>
   </instruction>
 
-  <instruction name="3DSTATE_GATHER_CONSTANT_VS" bias="2">
+  <instruction name="3DSTATE_GATHER_CONSTANT_VS" bias="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1360,7 +1353,7 @@
     </group>
   </instruction>
 
-  <instruction name="3DSTATE_GATHER_POOL_ALLOC" bias="2" length="4">
+  <instruction name="3DSTATE_GATHER_POOL_ALLOC" bias="2" length="4" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -1368,11 +1361,11 @@
     <field name="DWord Length" start="0" end="7" type="uint" default="2"/>
     <field name="Gather Pool Base Address" start="44" end="95" type="address"/>
     <field name="Gather Pool Enable" start="43" end="43" type="bool"/>
-    <field name="Memory Object Control State" start="32" end="38" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="MOCS" start="32" end="38" type="uint"/>
     <field name="Gather Pool Buffer Size" start="108" end="127" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_GS" bias="2" length="10">
+  <instruction name="3DSTATE_GS" bias="2" length="10" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1441,20 +1434,19 @@
     <field name="User Clip Distance Cull Test Enable Bitmask" start="288" end="295" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_HIER_DEPTH_BUFFER" bias="2" length="5">
+  <instruction name="3DSTATE_HIER_DEPTH_BUFFER" bias="2" length="5" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="7"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="3"/>
-    <field name="Hierarchical Depth Buffer Object Control State" start="57" end="63" type="MEMORY_OBJECT_CONTROL_STATE"/>
-    <field name="Hierarchical Depth Buffer MOCS" start="57" end="63" type="uint"/>
+    <field name="MOCS" start="57" end="63" type="uint"/>
     <field name="Surface Pitch" start="32" end="48" type="uint"/>
     <field name="Surface Base Address" start="64" end="127" type="address"/>
     <field name="Surface QPitch" start="128" end="142" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_HS" bias="2" length="9">
+  <instruction name="3DSTATE_HS" bias="2" length="9" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1500,7 +1492,7 @@
     <field name="Include Primitive ID" start="224" end="224" type="bool"/>
   </instruction>
 
-  <instruction name="3DSTATE_INDEX_BUFFER" bias="2" length="5">
+  <instruction name="3DSTATE_INDEX_BUFFER" bias="2" length="5" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1511,13 +1503,12 @@
       <value name="WORD" value="1"/>
       <value name="DWORD" value="2"/>
     </field>
-    <field name="Memory Object Control State" start="32" end="38" type="MEMORY_OBJECT_CONTROL_STATE"/>
-    <field name="IndexBufferMOCS" start="32" end="38" type="uint"/>
+    <field name="MOCS" start="32" end="38" type="uint"/>
     <field name="Buffer Starting Address" start="64" end="127" type="address"/>
     <field name="Buffer Size" start="128" end="159" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_LINE_STIPPLE" bias="2" length="3">
+  <instruction name="3DSTATE_LINE_STIPPLE" bias="2" length="3" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -1531,7 +1522,7 @@
     <field name="Line Stipple Repeat Count" start="64" end="72" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_MONOFILTER_SIZE" bias="2" length="2">
+  <instruction name="3DSTATE_MONOFILTER_SIZE" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -1541,7 +1532,7 @@
     <field name="Monochrome Filter Height" start="32" end="34" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_MULTISAMPLE" bias="2" length="2">
+  <instruction name="3DSTATE_MULTISAMPLE" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1555,7 +1546,7 @@
     <field name="Number of Multisamples" start="33" end="35" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_POLY_STIPPLE_OFFSET" bias="2" length="2">
+  <instruction name="3DSTATE_POLY_STIPPLE_OFFSET" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -1565,7 +1556,7 @@
     <field name="Polygon Stipple Y Offset" start="32" end="36" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_POLY_STIPPLE_PATTERN" bias="2" length="33">
+  <instruction name="3DSTATE_POLY_STIPPLE_PATTERN" bias="2" length="33" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -1576,7 +1567,7 @@
     </group>
   </instruction>
 
-  <instruction name="3DSTATE_PS" bias="2" length="12">
+  <instruction name="3DSTATE_PS" bias="2" length="12" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1639,7 +1630,7 @@
     <field name="Kernel Start Pointer 2" start="326" end="383" type="offset"/>
   </instruction>
 
-  <instruction name="3DSTATE_PS_BLEND" bias="2" length="2">
+  <instruction name="3DSTATE_PS_BLEND" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1656,7 +1647,7 @@
     <field name="Independent Alpha Blend Enable" start="39" end="39" type="bool"/>
   </instruction>
 
-  <instruction name="3DSTATE_PS_EXTRA" bias="2" length="2">
+  <instruction name="3DSTATE_PS_EXTRA" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1694,7 +1685,7 @@
     </field>
   </instruction>
 
-  <instruction name="3DSTATE_PUSH_CONSTANT_ALLOC_DS" bias="2" length="2">
+  <instruction name="3DSTATE_PUSH_CONSTANT_ALLOC_DS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -1704,7 +1695,7 @@
     <field name="Constant Buffer Size" start="32" end="37" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_PUSH_CONSTANT_ALLOC_GS" bias="2" length="2">
+  <instruction name="3DSTATE_PUSH_CONSTANT_ALLOC_GS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -1714,7 +1705,7 @@
     <field name="Constant Buffer Size" start="32" end="37" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_PUSH_CONSTANT_ALLOC_HS" bias="2" length="2">
+  <instruction name="3DSTATE_PUSH_CONSTANT_ALLOC_HS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -1724,7 +1715,7 @@
     <field name="Constant Buffer Size" start="32" end="37" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_PUSH_CONSTANT_ALLOC_PS" bias="2" length="2">
+  <instruction name="3DSTATE_PUSH_CONSTANT_ALLOC_PS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -1734,7 +1725,7 @@
     <field name="Constant Buffer Size" start="32" end="37" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_PUSH_CONSTANT_ALLOC_VS" bias="2" length="2">
+  <instruction name="3DSTATE_PUSH_CONSTANT_ALLOC_VS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -1744,7 +1735,7 @@
     <field name="Constant Buffer Size" start="32" end="37" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_RASTER" bias="2" length="5">
+  <instruction name="3DSTATE_RASTER" bias="2" length="5" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1805,7 +1796,7 @@
     <field name="Global Depth Offset Clamp" start="128" end="159" type="float"/>
   </instruction>
 
-  <instruction name="3DSTATE_RS_CONSTANT_POINTER" bias="2" length="4">
+  <instruction name="3DSTATE_RS_CONSTANT_POINTER" bias="2" length="4" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1823,7 +1814,7 @@
     <field name="Global Constant Buffer Address High" start="96" end="127" type="address"/>
   </instruction>
 
-  <instruction name="3DSTATE_SAMPLER_PALETTE_LOAD0" bias="2">
+  <instruction name="3DSTATE_SAMPLER_PALETTE_LOAD0" bias="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -1834,7 +1825,7 @@
     </group>
   </instruction>
 
-  <instruction name="3DSTATE_SAMPLER_PALETTE_LOAD1" bias="2">
+  <instruction name="3DSTATE_SAMPLER_PALETTE_LOAD1" bias="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -1848,7 +1839,7 @@
     </group>
   </instruction>
 
-  <instruction name="3DSTATE_SAMPLER_STATE_POINTERS_DS" bias="2" length="2">
+  <instruction name="3DSTATE_SAMPLER_STATE_POINTERS_DS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1857,7 +1848,7 @@
     <field name="Pointer to DS Sampler State" start="37" end="63" type="offset"/>
   </instruction>
 
-  <instruction name="3DSTATE_SAMPLER_STATE_POINTERS_GS" bias="2" length="2">
+  <instruction name="3DSTATE_SAMPLER_STATE_POINTERS_GS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1866,7 +1857,7 @@
     <field name="Pointer to GS Sampler State" start="37" end="63" type="offset"/>
   </instruction>
 
-  <instruction name="3DSTATE_SAMPLER_STATE_POINTERS_HS" bias="2" length="2">
+  <instruction name="3DSTATE_SAMPLER_STATE_POINTERS_HS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1875,7 +1866,7 @@
     <field name="Pointer to HS Sampler State" start="37" end="63" type="offset"/>
   </instruction>
 
-  <instruction name="3DSTATE_SAMPLER_STATE_POINTERS_PS" bias="2" length="2">
+  <instruction name="3DSTATE_SAMPLER_STATE_POINTERS_PS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1884,7 +1875,7 @@
     <field name="Pointer to PS Sampler State" start="37" end="63" type="offset"/>
   </instruction>
 
-  <instruction name="3DSTATE_SAMPLER_STATE_POINTERS_VS" bias="2" length="2">
+  <instruction name="3DSTATE_SAMPLER_STATE_POINTERS_VS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1893,7 +1884,7 @@
     <field name="Pointer to VS Sampler State" start="37" end="63" type="offset"/>
   </instruction>
 
-  <instruction name="3DSTATE_SAMPLE_MASK" bias="2" length="2">
+  <instruction name="3DSTATE_SAMPLE_MASK" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1902,7 +1893,7 @@
     <field name="Sample Mask" start="32" end="47" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_SAMPLE_PATTERN" bias="2" length="9">
+  <instruction name="3DSTATE_SAMPLE_PATTERN" bias="2" length="9" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -1972,7 +1963,7 @@
     <field name="2x Sample0 Y Offset" start="256" end="259" type="u0.4"/>
   </instruction>
 
-  <instruction name="3DSTATE_SBE" bias="2" length="6">
+  <instruction name="3DSTATE_SBE" bias="2" length="6" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2005,7 +1996,7 @@
     </group>
   </instruction>
 
-  <instruction name="3DSTATE_SBE_SWIZ" bias="2" length="11">
+  <instruction name="3DSTATE_SBE_SWIZ" bias="2" length="11" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2019,7 +2010,7 @@
     </group>
   </instruction>
 
-  <instruction name="3DSTATE_SCISSOR_STATE_POINTERS" bias="2" length="2">
+  <instruction name="3DSTATE_SCISSOR_STATE_POINTERS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2028,7 +2019,7 @@
     <field name="Scissor Rect Pointer" start="37" end="63" type="offset"/>
   </instruction>
 
-  <instruction name="3DSTATE_SF" bias="2" length="4">
+  <instruction name="3DSTATE_SF" bias="2" length="4" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2063,7 +2054,7 @@
     <field name="Point Width" start="96" end="106" type="u8.3"/>
   </instruction>
 
-  <instruction name="3DSTATE_SO_BUFFER" bias="2" length="8">
+  <instruction name="3DSTATE_SO_BUFFER" bias="2" length="8" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -2071,8 +2062,7 @@
     <field name="DWord Length" start="0" end="7" type="uint" default="6"/>
     <field name="SO Buffer Enable" start="63" end="63" type="bool"/>
     <field name="SO Buffer Index" start="61" end="62" type="uint"/>
-    <field name="SO Buffer Object Control State" start="54" end="60" type="MEMORY_OBJECT_CONTROL_STATE"/>
-    <field name="SO Buffer MOCS" start="54" end="60" type="uint"/>
+    <field name="MOCS" start="54" end="60" type="uint"/>
     <field name="Stream Offset Write Enable" start="53" end="53" type="bool"/>
     <field name="Stream Output Buffer Offset Address Enable" start="52" end="52" type="bool"/>
     <field name="Surface Base Address" start="66" end="111" type="address"/>
@@ -2081,7 +2071,7 @@
     <field name="Stream Offset" start="224" end="255" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_SO_DECL_LIST" bias="2">
+  <instruction name="3DSTATE_SO_DECL_LIST" bias="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -2100,21 +2090,20 @@
     </group>
   </instruction>
 
-  <instruction name="3DSTATE_STENCIL_BUFFER" bias="2" length="5">
+  <instruction name="3DSTATE_STENCIL_BUFFER" bias="2" length="5" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="6"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="3"/>
     <field name="Stencil Buffer Enable" start="63" end="63" type="bool"/>
-    <field name="Stencil Buffer Object Control State" start="54" end="60" type="MEMORY_OBJECT_CONTROL_STATE"/>
-    <field name="Stencil Buffer MOCS" start="54" end="60" type="uint"/>
+    <field name="MOCS" start="54" end="60" type="uint"/>
     <field name="Surface Pitch" start="32" end="48" type="uint"/>
     <field name="Surface Base Address" start="64" end="127" type="address"/>
     <field name="Surface QPitch" start="128" end="142" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_STREAMOUT" bias="2" length="5">
+  <instruction name="3DSTATE_STREAMOUT" bias="2" length="5" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2147,7 +2136,7 @@
     <field name="Buffer 2 Surface Pitch" start="128" end="139" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_TE" bias="2" length="4">
+  <instruction name="3DSTATE_TE" bias="2" length="4" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2177,7 +2166,7 @@
     <field name="Maximum Tessellation Factor Not Odd" start="96" end="127" type="float"/>
   </instruction>
 
-  <instruction name="3DSTATE_URB_CLEAR" bias="2" length="2">
+  <instruction name="3DSTATE_URB_CLEAR" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -2187,7 +2176,7 @@
     <field name="URB Address" start="32" end="46" type="offset"/>
   </instruction>
 
-  <instruction name="3DSTATE_URB_DS" bias="2" length="2">
+  <instruction name="3DSTATE_URB_DS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2198,7 +2187,7 @@
     <field name="DS Number of URB Entries" start="32" end="47" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_URB_GS" bias="2" length="2">
+  <instruction name="3DSTATE_URB_GS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2209,7 +2198,7 @@
     <field name="GS Number of URB Entries" start="32" end="47" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_URB_HS" bias="2" length="2">
+  <instruction name="3DSTATE_URB_HS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2220,7 +2209,7 @@
     <field name="HS Number of URB Entries" start="32" end="47" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_URB_VS" bias="2" length="2">
+  <instruction name="3DSTATE_URB_VS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2231,7 +2220,7 @@
     <field name="VS Number of URB Entries" start="32" end="47" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_VERTEX_BUFFERS" bias="2">
+  <instruction name="3DSTATE_VERTEX_BUFFERS" bias="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2242,7 +2231,7 @@
     </group>
   </instruction>
 
-  <instruction name="3DSTATE_VERTEX_ELEMENTS" bias="2">
+  <instruction name="3DSTATE_VERTEX_ELEMENTS" bias="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2253,7 +2242,7 @@
     </group>
   </instruction>
 
-  <instruction name="3DSTATE_VF" bias="2" length="2">
+  <instruction name="3DSTATE_VF" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2266,7 +2255,7 @@
     <field name="Cut Index" start="32" end="63" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_VF_COMPONENT_PACKING" bias="2" length="5">
+  <instruction name="3DSTATE_VF_COMPONENT_PACKING" bias="2" length="5" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2306,7 +2295,7 @@
     <field name="Vertex Element 24 Enables" start="128" end="131" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_VF_INSTANCING" bias="2" length="3">
+  <instruction name="3DSTATE_VF_INSTANCING" bias="2" length="3" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2317,7 +2306,7 @@
     <field name="Instance Data Step Rate" start="64" end="95" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_VF_SGVS" bias="2" length="2">
+  <instruction name="3DSTATE_VF_SGVS" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2341,7 +2330,7 @@
     <field name="VertexID Element Offset" start="32" end="37" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_VF_SGVS_2" bias="2" length="3">
+  <instruction name="3DSTATE_VF_SGVS_2" bias="2" length="3" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2381,7 +2370,7 @@
     <field name="XP2 Element Offset" start="64" end="69" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_VF_STATISTICS" bias="1" length="1">
+  <instruction name="3DSTATE_VF_STATISTICS" bias="1" length="1" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="1"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2389,7 +2378,7 @@
     <field name="Statistics Enable" start="0" end="0" type="bool"/>
   </instruction>
 
-  <instruction name="3DSTATE_VF_TOPOLOGY" bias="2" length="2">
+  <instruction name="3DSTATE_VF_TOPOLOGY" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2398,7 +2387,7 @@
     <field name="Primitive Topology Type" start="32" end="37" type="3D_Prim_Topo_Type"/>
   </instruction>
 
-  <instruction name="3DSTATE_VIEWPORT_STATE_POINTERS_CC" bias="2" length="2">
+  <instruction name="3DSTATE_VIEWPORT_STATE_POINTERS_CC" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2407,7 +2396,7 @@
     <field name="CC Viewport Pointer" start="37" end="63" type="offset"/>
   </instruction>
 
-  <instruction name="3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP" bias="2" length="2">
+  <instruction name="3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2416,7 +2405,7 @@
     <field name="SF Clip Viewport Pointer" start="38" end="63" type="offset"/>
   </instruction>
 
-  <instruction name="3DSTATE_VS" bias="2" length="9">
+  <instruction name="3DSTATE_VS" bias="2" length="9" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2460,7 +2449,7 @@
     <field name="User Clip Distance Cull Test Enable Bitmask" start="256" end="263" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_WM" bias="2" length="2">
+  <instruction name="3DSTATE_WM" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2517,7 +2506,7 @@
     </field>
   </instruction>
 
-  <instruction name="3DSTATE_WM_CHROMAKEY" bias="2" length="2">
+  <instruction name="3DSTATE_WM_CHROMAKEY" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2526,7 +2515,7 @@
     <field name="ChromaKey Kill Enable" start="63" end="63" type="bool"/>
   </instruction>
 
-  <instruction name="3DSTATE_WM_DEPTH_STENCIL" bias="2" length="4">
+  <instruction name="3DSTATE_WM_DEPTH_STENCIL" bias="2" length="4" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2554,7 +2543,7 @@
     <field name="Backface Stencil Reference Value" start="96" end="103" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_WM_HZ_OP" bias="2" length="5">
+  <instruction name="3DSTATE_WM_HZ_OP" bias="2" length="5" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2576,7 +2565,7 @@
     <field name="Sample Mask" start="128" end="143" type="uint"/>
   </instruction>
 
-  <instruction name="GPGPU_WALKER" bias="2" length="15">
+  <instruction name="GPGPU_WALKER" bias="2" length="15" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Pipeline" start="27" end="28" type="uint" default="2"/>
     <field name="Media Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -2605,7 +2594,7 @@
     <field name="Bottom Execution Mask" start="448" end="479" type="uint"/>
   </instruction>
 
-  <instruction name="MEDIA_CURBE_LOAD" bias="2" length="4">
+  <instruction name="MEDIA_CURBE_LOAD" bias="2" length="4" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Pipeline" start="27" end="28" type="uint" default="2"/>
     <field name="Media Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2615,7 +2604,7 @@
     <field name="CURBE Data Start Address" start="96" end="127" type="uint"/>
   </instruction>
 
-  <instruction name="MEDIA_INTERFACE_DESCRIPTOR_LOAD" bias="2" length="4">
+  <instruction name="MEDIA_INTERFACE_DESCRIPTOR_LOAD" bias="2" length="4" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Pipeline" start="27" end="28" type="uint" default="2"/>
     <field name="Media Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2625,7 +2614,7 @@
     <field name="Interface Descriptor Data Start Address" start="96" end="127" type="offset"/>
   </instruction>
 
-  <instruction name="MEDIA_OBJECT" bias="2">
+  <instruction name="MEDIA_OBJECT" bias="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Media Command Pipeline" start="27" end="28" type="uint" default="2"/>
     <field name="Media Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -2665,7 +2654,7 @@
     </group>
   </instruction>
 
-  <instruction name="MEDIA_OBJECT_GRPID" bias="2">
+  <instruction name="MEDIA_OBJECT_GRPID" bias="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Media Command Pipeline" start="27" end="28" type="uint" default="2"/>
     <field name="Media Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -2689,7 +2678,7 @@
     </group>
   </instruction>
 
-  <instruction name="MEDIA_OBJECT_PRT" bias="2" length="16">
+  <instruction name="MEDIA_OBJECT_PRT" bias="2" length="16" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Pipeline" start="27" end="28" type="uint" default="2"/>
     <field name="Media Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -2707,7 +2696,7 @@
     </group>
   </instruction>
 
-  <instruction name="MEDIA_OBJECT_WALKER" bias="2">
+  <instruction name="MEDIA_OBJECT_WALKER" bias="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Pipeline" start="27" end="28" type="uint" default="2"/>
     <field name="Media Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -2761,7 +2750,7 @@
     </group>
   </instruction>
 
-  <instruction name="MEDIA_STATE_FLUSH" bias="2" length="2">
+  <instruction name="MEDIA_STATE_FLUSH" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Pipeline" start="27" end="28" type="uint" default="2"/>
     <field name="Media Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2772,7 +2761,7 @@
     <field name="Interface Descriptor Offset" start="32" end="37" type="uint"/>
   </instruction>
 
-  <instruction name="MEDIA_VFE_STATE" bias="2" length="9">
+  <instruction name="MEDIA_VFE_STATE" bias="2" length="9" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Pipeline" start="27" end="28" type="uint" default="2"/>
     <field name="Media Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -2895,7 +2884,7 @@
     <field name="Batch Buffer Start Address" start="34" end="95" type="address"/>
   </instruction>
 
-  <instruction name="MI_CLFLUSH" bias="2">
+  <instruction name="MI_CLFLUSH" bias="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="39"/>
     <field name="Use Global GTT" start="22" end="22" type="bool"/>
@@ -2931,7 +2920,7 @@
     <field name="Source Memory Address" start="98" end="159" type="address"/>
   </instruction>
 
-  <instruction name="MI_DISPLAY_FLIP" bias="2" length="3">
+  <instruction name="MI_DISPLAY_FLIP" bias="2" length="3" engine="render|blitter">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="20"/>
     <field name="Async Flip Indicator" start="22" end="22" type="bool"/>
@@ -3003,7 +2992,7 @@
     <field name="Destination Register Address" start="66" end="86" type="offset"/>
   </instruction>
 
-  <instruction name="MI_LOAD_SCAN_LINES_EXCL" bias="2" length="2">
+  <instruction name="MI_LOAD_SCAN_LINES_EXCL" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="19"/>
     <field name="Display (Plane) Select" start="19" end="21" type="uint">
@@ -3016,7 +3005,7 @@
     <field name="End Scan Line Number" start="32" end="44" type="uint"/>
   </instruction>
 
-  <instruction name="MI_LOAD_SCAN_LINES_INCL" bias="2" length="2">
+  <instruction name="MI_LOAD_SCAN_LINES_INCL" bias="2" length="2" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="18"/>
     <field name="Display (Plane) Select" start="19" end="21" type="uint">
@@ -3061,6 +3050,8 @@
       <value name="XOR" value="3"/>
     </field>
     <field name="Compare Operation" start="0" end="1" type="uint" prefix="COMPARE">
+      <value name="TRUE" value="0"/>
+      <value name="FALSE" value="1"/>
       <value name="SRCS_EQUAL" value="2"/>
       <value name="DELTAS_EQUAL" value="3"/>
     </field>
@@ -3071,7 +3062,7 @@
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="7"/>
   </instruction>
 
-  <instruction name="MI_REPORT_PERF_COUNT" bias="2" length="4">
+  <instruction name="MI_REPORT_PERF_COUNT" bias="2" length="4" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="40"/>
     <field name="DWord Length" start="0" end="5" type="uint" default="2"/>
@@ -3081,7 +3072,7 @@
     <field name="Report ID" start="96" end="127" type="uint"/>
   </instruction>
 
-  <instruction name="MI_RS_CONTEXT" bias="1" length="1">
+  <instruction name="MI_RS_CONTEXT" bias="1" length="1" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="15"/>
     <field name="Resource Streamer Save" start="0" end="0" type="uint" prefix="RS">
@@ -3090,7 +3081,7 @@
     </field>
   </instruction>
 
-  <instruction name="MI_RS_CONTROL" bias="1" length="1">
+  <instruction name="MI_RS_CONTROL" bias="1" length="1" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="6"/>
     <field name="Resource Streamer Control" start="0" end="0" type="uint" prefix="RS">
@@ -3099,7 +3090,7 @@
     </field>
   </instruction>
 
-  <instruction name="MI_RS_STORE_DATA_IMM" bias="2" length="4">
+  <instruction name="MI_RS_STORE_DATA_IMM" bias="2" length="4" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="43"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="2"/>
@@ -3211,7 +3202,7 @@
     <field name="Suspend Flush" start="0" end="0" type="bool"/>
   </instruction>
 
-  <instruction name="MI_TOPOLOGY_FILTER" bias="1" length="1">
+  <instruction name="MI_TOPOLOGY_FILTER" bias="1" length="1" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="13"/>
     <field name="Topology Filter Value" start="0" end="5" type="3D_Prim_Topo_Type"/>
@@ -3232,7 +3223,7 @@
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="2"/>
   </instruction>
 
-  <instruction name="MI_WAIT_FOR_EVENT" bias="1" length="1">
+  <instruction name="MI_WAIT_FOR_EVENT" bias="1" length="1" engine="render|blitter">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="3"/>
     <field name="Display Plane 1 C Vertical Blank Wait Enable" start="21" end="21" type="bool"/>
@@ -3255,7 +3246,7 @@
     <field name="Display Plnae 1 A Scan Line Wait Enable" start="0" end="0" type="bool"/>
   </instruction>
 
-  <instruction name="PIPELINE_SELECT" bias="1" length="1">
+  <instruction name="PIPELINE_SELECT" bias="1" length="1" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="1"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -3270,7 +3261,7 @@
     </field>
   </instruction>
 
-  <instruction name="PIPE_CONTROL" bias="2" length="6">
+  <instruction name="PIPE_CONTROL" bias="2" length="6" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="2"/>
@@ -3314,27 +3305,27 @@
     <field name="Immediate Data" start="128" end="191" type="uint"/>
   </instruction>
 
-  <instruction name="STATE_BASE_ADDRESS" bias="2" length="22">
+  <instruction name="STATE_BASE_ADDRESS" bias="2" length="22" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="0"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="1"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="20"/>
     <field name="General State Base Address" start="44" end="95" type="address"/>
-    <field name="General State Memory Object Control State" start="36" end="42" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="General State MOCS" start="36" end="42" type="uint"/>
     <field name="General State Base Address Modify Enable" start="32" end="32" type="bool"/>
-    <field name="Stateless Data Port Access Memory Object Control State" start="112" end="118" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="Stateless Data Port Access MOCS" start="112" end="118" type="uint"/>
     <field name="Surface State Base Address" start="140" end="191" type="address"/>
-    <field name="Surface State Memory Object Control State" start="132" end="138" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="Surface State MOCS" start="132" end="138" type="uint"/>
     <field name="Surface State Base Address Modify Enable" start="128" end="128" type="bool"/>
     <field name="Dynamic State Base Address" start="204" end="255" type="address"/>
-    <field name="Dynamic State Memory Object Control State" start="196" end="202" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="Dynamic State MOCS" start="196" end="202" type="uint"/>
     <field name="Dynamic State Base Address Modify Enable" start="192" end="192" type="bool"/>
     <field name="Indirect Object Base Address" start="268" end="319" type="address"/>
-    <field name="Indirect Object Memory Object Control State" start="260" end="266" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="Indirect Object MOCS" start="260" end="266" type="uint"/>
     <field name="Indirect Object Base Address Modify Enable" start="256" end="256" type="bool"/>
     <field name="Instruction Base Address" start="332" end="383" type="address"/>
-    <field name="Instruction Memory Object Control State" start="324" end="330" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="Instruction MOCS" start="324" end="330" type="uint"/>
     <field name="Instruction Base Address Modify Enable" start="320" end="320" type="bool"/>
     <field name="General State Buffer Size" start="396" end="415" type="uint"/>
     <field name="General State Buffer Size Modify Enable" start="384" end="384" type="bool"/>
@@ -3345,16 +3336,16 @@
     <field name="Instruction Buffer Size" start="492" end="511" type="uint"/>
     <field name="Instruction Buffer size Modify Enable" start="480" end="480" type="bool"/>
     <field name="Bindless Surface State Base Address" start="524" end="575" type="address"/>
-    <field name="Bindless Surface State Memory Object Control State" start="516" end="522" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="Bindless Surface State MOCS" start="516" end="522" type="uint"/>
     <field name="Bindless Surface State Base Address Modify Enable" start="512" end="512" type="bool"/>
     <field name="Bindless Surface State Size" start="588" end="607" type="uint"/>
     <field name="Bindless Sampler State Base Address" start="620" end="671" type="address"/>
-    <field name="Bindless Sampler State Memory Object Control State" start="612" end="618" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="Bindless Sampler State MOCS" start="612" end="618" type="uint"/>
     <field name="Bindless Sampler State Base Address Modify Enable" start="608" end="608" type="bool"/>
     <field name="Bindless Sampler State Buffer Size" start="684" end="703" type="uint"/>
   </instruction>
 
-  <instruction name="STATE_SIP" bias="2" length="3">
+  <instruction name="STATE_SIP" bias="2" length="3" engine="render">
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="0"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -3556,6 +3547,46 @@
     <field name="All Allocation" start="25" end="31" type="uint"/>
   </register>
 
+  <register name="CS_CHICKEN1" length="1" num="0x2580">
+    <field name="Replay Mode" start="0" end="0" type="uint">
+      <value name="Mid-cmdbuffer Preemption" value="0"/>
+      <value name="Object Level Preemption" value="1"/>
+    </field>
+    <field name="Replay Mode Mask" start="16" end="16" type="bool"/>
+  </register>
+
+  <register name="SO_NUM_PRIMS_WRITTEN0" length="2" num="0x5200">
+    <field name="Num Prims Written Count" start="0" end="63" type="uint"/>
+  </register>
+
+  <register name="SO_NUM_PRIMS_WRITTEN1" length="2" num="0x5208">
+    <field name="Num Prims Written Count" start="0" end="63" type="uint"/>
+  </register>
+
+  <register name="SO_NUM_PRIMS_WRITTEN2" length="2" num="0x5210">
+    <field name="Num Prims Written Count" start="0" end="63" type="uint"/>
+  </register>
+
+  <register name="SO_NUM_PRIMS_WRITTEN3" length="2" num="0x5218">
+    <field name="Num Prims Written Count" start="0" end="63" type="uint"/>
+  </register>
+
+  <register name="SO_PRIM_STORAGE_NEEDED0" length="2" num="0x5240">
+    <field name="Prim Storage Needed Count" start="0" end="63" type="uint"/>
+  </register>
+
+  <register name="SO_PRIM_STORAGE_NEEDED1" length="2" num="0x5248">
+    <field name="Prim Storage Needed Count" start="0" end="63" type="uint"/>
+  </register>
+
+  <register name="SO_PRIM_STORAGE_NEEDED2" length="2" num="0x5250">
+    <field name="Prim Storage Needed Count" start="0" end="63" type="uint"/>
+  </register>
+
+  <register name="SO_PRIM_STORAGE_NEEDED3" length="2" num="0x5258">
+    <field name="Prim Storage Needed Count" start="0" end="63" type="uint"/>
+  </register>
+
   <register name="SO_WRITE_OFFSET0" length="1" num="0x5280">
     <field name="Write Offset" start="2" end="31" type="offset"/>
   </register>