intel/genxml: Only handle instructions meant for render engine when generating

[mesa.git] / src / intel / genxml / gen10.xml

diff --git a/src/intel/genxml/gen10.xml b/src/intel/genxml/gen10.xml
index ebeb5da8fdd318c55c48c085a393233c9f9612ce..4cb1f05ae258eb3e70906fd024c02bcaf1bd20c3 100644 (file)
--- a/src/intel/genxml/gen10.xml
+++ b/src/intel/genxml/gen10.xml
@@ -180,231 +180,6 @@
     <value name="SET" value="15"/>
   </enum>
 
-  <enum name="SURFACE_FORMAT" prefix="SF">
-    <value name="R32G32B32A32_FLOAT" value="0"/>
-    <value name="R32G32B32A32_SINT" value="1"/>
-    <value name="R32G32B32A32_UINT" value="2"/>
-    <value name="R32G32B32A32_UNORM" value="3"/>
-    <value name="R32G32B32A32_SNORM" value="4"/>
-    <value name="R64G64_FLOAT" value="5"/>
-    <value name="R32G32B32X32_FLOAT" value="6"/>
-    <value name="R32G32B32A32_SSCALED" value="7"/>
-    <value name="R32G32B32A32_USCALED" value="8"/>
-    <value name="R32G32B32A32_SFIXED" value="32"/>
-    <value name="R64G64_PASSTHRU" value="33"/>
-    <value name="R32G32B32_FLOAT" value="64"/>
-    <value name="R32G32B32_SINT" value="65"/>
-    <value name="R32G32B32_UINT" value="66"/>
-    <value name="R32G32B32_UNORM" value="67"/>
-    <value name="R32G32B32_SNORM" value="68"/>
-    <value name="R32G32B32_SSCALED" value="69"/>
-    <value name="R32G32B32_USCALED" value="70"/>
-    <value name="R32G32B32_SFIXED" value="80"/>
-    <value name="R16G16B16A16_UNORM" value="128"/>
-    <value name="R16G16B16A16_SNORM" value="129"/>
-    <value name="R16G16B16A16_SINT" value="130"/>
-    <value name="R16G16B16A16_UINT" value="131"/>
-    <value name="R16G16B16A16_FLOAT" value="132"/>
-    <value name="R32G32_FLOAT" value="133"/>
-    <value name="R32G32_SINT" value="134"/>
-    <value name="R32G32_UINT" value="135"/>
-    <value name="R32_FLOAT_X8X24_TYPELESS" value="136"/>
-    <value name="X32_TYPELESS_G8X24_UINT" value="137"/>
-    <value name="L32A32_FLOAT" value="138"/>
-    <value name="R32G32_UNORM" value="139"/>
-    <value name="R32G32_SNORM" value="140"/>
-    <value name="R64_FLOAT" value="141"/>
-    <value name="R16G16B16X16_UNORM" value="142"/>
-    <value name="R16G16B16X16_FLOAT" value="143"/>
-    <value name="A32X32_FLOAT" value="144"/>
-    <value name="L32X32_FLOAT" value="145"/>
-    <value name="I32X32_FLOAT" value="146"/>
-    <value name="R16G16B16A16_SSCALED" value="147"/>
-    <value name="R16G16B16A16_USCALED" value="148"/>
-    <value name="R32G32_SSCALED" value="149"/>
-    <value name="R32G32_USCALED" value="150"/>
-    <value name="R32G32_SFIXED" value="160"/>
-    <value name="R64_PASSTHRU" value="161"/>
-    <value name="B8G8R8A8_UNORM" value="192"/>
-    <value name="B8G8R8A8_UNORM_SRGB" value="193"/>
-    <value name="R10G10B10A2_UNORM" value="194"/>
-    <value name="R10G10B10A2_UNORM_SRGB" value="195"/>
-    <value name="R10G10B10A2_UINT" value="196"/>
-    <value name="R10G10B10_SNORM_A2_UNORM" value="197"/>
-    <value name="R8G8B8A8_UNORM" value="199"/>
-    <value name="R8G8B8A8_UNORM_SRGB" value="200"/>
-    <value name="R8G8B8A8_SNORM" value="201"/>
-    <value name="R8G8B8A8_SINT" value="202"/>
-    <value name="R8G8B8A8_UINT" value="203"/>
-    <value name="R16G16_UNORM" value="204"/>
-    <value name="R16G16_SNORM" value="205"/>
-    <value name="R16G16_SINT" value="206"/>
-    <value name="R16G16_UINT" value="207"/>
-    <value name="R16G16_FLOAT" value="208"/>
-    <value name="B10G10R10A2_UNORM" value="209"/>
-    <value name="B10G10R10A2_UNORM_SRGB" value="210"/>
-    <value name="R11G11B10_FLOAT" value="211"/>
-    <value name="R32_SINT" value="214"/>
-    <value name="R32_UINT" value="215"/>
-    <value name="R32_FLOAT" value="216"/>
-    <value name="R24_UNORM_X8_TYPELESS" value="217"/>
-    <value name="X24_TYPELESS_G8_UINT" value="218"/>
-    <value name="L32_UNORM" value="221"/>
-    <value name="A32_UNORM" value="222"/>
-    <value name="L16A16_UNORM" value="223"/>
-    <value name="I24X8_UNORM" value="224"/>
-    <value name="L24X8_UNORM" value="225"/>
-    <value name="A24X8_UNORM" value="226"/>
-    <value name="I32_FLOAT" value="227"/>
-    <value name="L32_FLOAT" value="228"/>
-    <value name="A32_FLOAT" value="229"/>
-    <value name="X8B8_UNORM_G8R8_SNORM" value="230"/>
-    <value name="A8X8_UNORM_G8R8_SNORM" value="231"/>
-    <value name="B8X8_UNORM_G8R8_SNORM" value="232"/>
-    <value name="B8G8R8X8_UNORM" value="233"/>
-    <value name="B8G8R8X8_UNORM_SRGB" value="234"/>
-    <value name="R8G8B8X8_UNORM" value="235"/>
-    <value name="R8G8B8X8_UNORM_SRGB" value="236"/>
-    <value name="R9G9B9E5_SHAREDEXP" value="237"/>
-    <value name="B10G10R10X2_UNORM" value="238"/>
-    <value name="L16A16_FLOAT" value="240"/>
-    <value name="R32_UNORM" value="241"/>
-    <value name="R32_SNORM" value="242"/>
-    <value name="R10G10B10X2_USCALED" value="243"/>
-    <value name="R8G8B8A8_SSCALED" value="244"/>
-    <value name="R8G8B8A8_USCALED" value="245"/>
-    <value name="R16G16_SSCALED" value="246"/>
-    <value name="R16G16_USCALED" value="247"/>
-    <value name="R32_SSCALED" value="248"/>
-    <value name="R32_USCALED" value="249"/>
-    <value name="B5G6R5_UNORM" value="256"/>
-    <value name="B5G6R5_UNORM_SRGB" value="257"/>
-    <value name="B5G5R5A1_UNORM" value="258"/>
-    <value name="B5G5R5A1_UNORM_SRGB" value="259"/>
-    <value name="B4G4R4A4_UNORM" value="260"/>
-    <value name="B4G4R4A4_UNORM_SRGB" value="261"/>
-    <value name="R8G8_UNORM" value="262"/>
-    <value name="R8G8_SNORM" value="263"/>
-    <value name="R8G8_SINT" value="264"/>
-    <value name="R8G8_UINT" value="265"/>
-    <value name="R16_UNORM" value="266"/>
-    <value name="R16_SNORM" value="267"/>
-    <value name="R16_SINT" value="268"/>
-    <value name="R16_UINT" value="269"/>
-    <value name="R16_FLOAT" value="270"/>
-    <value name="A8P8_UNORM_PALETTE0" value="271"/>
-    <value name="A8P8_UNORM_PALETTE1" value="272"/>
-    <value name="I16_UNORM" value="273"/>
-    <value name="L16_UNORM" value="274"/>
-    <value name="A16_UNORM" value="275"/>
-    <value name="L8A8_UNORM" value="276"/>
-    <value name="I16_FLOAT" value="277"/>
-    <value name="L16_FLOAT" value="278"/>
-    <value name="A16_FLOAT" value="279"/>
-    <value name="L8A8_UNORM_SRGB" value="280"/>
-    <value name="R5G5_SNORM_B6_UNORM" value="281"/>
-    <value name="B5G5R5X1_UNORM" value="282"/>
-    <value name="B5G5R5X1_UNORM_SRGB" value="283"/>
-    <value name="R8G8_SSCALED" value="284"/>
-    <value name="R8G8_USCALED" value="285"/>
-    <value name="R16_SSCALED" value="286"/>
-    <value name="R16_USCALED" value="287"/>
-    <value name="P8A8_UNORM_PALETTE0" value="290"/>
-    <value name="P8A8_UNORM_PALETTE1" value="291"/>
-    <value name="A1B5G5R5_UNORM" value="292"/>
-    <value name="A4B4G4R4_UNORM" value="293"/>
-    <value name="L8A8_UINT" value="294"/>
-    <value name="L8A8_SINT" value="295"/>
-    <value name="R8_UNORM" value="320"/>
-    <value name="R8_SNORM" value="321"/>
-    <value name="R8_SINT" value="322"/>
-    <value name="R8_UINT" value="323"/>
-    <value name="A8_UNORM" value="324"/>
-    <value name="I8_UNORM" value="325"/>
-    <value name="L8_UNORM" value="326"/>
-    <value name="P4A4_UNORM_PALETTE0" value="327"/>
-    <value name="A4P4_UNORM_PALETTE0" value="328"/>
-    <value name="R8_SSCALED" value="329"/>
-    <value name="R8_USCALED" value="330"/>
-    <value name="P8_UNORM_PALETTE0" value="331"/>
-    <value name="L8_UNORM_SRGB" value="332"/>
-    <value name="P8_UNORM_PALETTE1" value="333"/>
-    <value name="P4A4_UNORM_PALETTE1" value="334"/>
-    <value name="A4P4_UNORM_PALETTE1" value="335"/>
-    <value name="Y8_UNORM" value="336"/>
-    <value name="L8_UINT" value="338"/>
-    <value name="L8_SINT" value="339"/>
-    <value name="I8_UINT" value="340"/>
-    <value name="I8_SINT" value="341"/>
-    <value name="DXT1_RGB_SRGB" value="384"/>
-    <value name="R1_UNORM" value="385"/>
-    <value name="YCRCB_NORMAL" value="386"/>
-    <value name="YCRCB_SWAPUVY" value="387"/>
-    <value name="P2_UNORM_PALETTE0" value="388"/>
-    <value name="P2_UNORM_PALETTE1" value="389"/>
-    <value name="BC1_UNORM" value="390"/>
-    <value name="BC2_UNORM" value="391"/>
-    <value name="BC3_UNORM" value="392"/>
-    <value name="BC4_UNORM" value="393"/>
-    <value name="BC5_UNORM" value="394"/>
-    <value name="BC1_UNORM_SRGB" value="395"/>
-    <value name="BC2_UNORM_SRGB" value="396"/>
-    <value name="BC3_UNORM_SRGB" value="397"/>
-    <value name="MONO8" value="398"/>
-    <value name="YCRCB_SWAPUV" value="399"/>
-    <value name="YCRCB_SWAPY" value="400"/>
-    <value name="DXT1_RGB" value="401"/>
-    <value name="FXT1" value="402"/>
-    <value name="R8G8B8_UNORM" value="403"/>
-    <value name="R8G8B8_SNORM" value="404"/>
-    <value name="R8G8B8_SSCALED" value="405"/>
-    <value name="R8G8B8_USCALED" value="406"/>
-    <value name="R64G64B64A64_FLOAT" value="407"/>
-    <value name="R64G64B64_FLOAT" value="408"/>
-    <value name="BC4_SNORM" value="409"/>
-    <value name="BC5_SNORM" value="410"/>
-    <value name="R16G16B16_FLOAT" value="411"/>
-    <value name="R16G16B16_UNORM" value="412"/>
-    <value name="R16G16B16_SNORM" value="413"/>
-    <value name="R16G16B16_SSCALED" value="414"/>
-    <value name="R16G16B16_USCALED" value="415"/>
-    <value name="BC6H_SF16" value="417"/>
-    <value name="BC7_UNORM" value="418"/>
-    <value name="BC7_UNORM_SRGB" value="419"/>
-    <value name="BC6H_UF16" value="420"/>
-    <value name="PLANAR_420_8" value="421"/>
-    <value name="PLANAR_420_16" value="422"/>
-    <value name="R8G8B8_UNORM_SRGB" value="424"/>
-    <value name="ETC1_RGB8" value="425"/>
-    <value name="ETC2_RGB8" value="426"/>
-    <value name="EAC_R11" value="427"/>
-    <value name="EAC_RG11" value="428"/>
-    <value name="EAC_SIGNED_R11" value="429"/>
-    <value name="EAC_SIGNED_RG11" value="430"/>
-    <value name="ETC2_SRGB8" value="431"/>
-    <value name="R16G16B16_UINT" value="432"/>
-    <value name="R16G16B16_SINT" value="433"/>
-    <value name="R32_SFIXED" value="434"/>
-    <value name="R10G10B10A2_SNORM" value="435"/>
-    <value name="R10G10B10A2_USCALED" value="436"/>
-    <value name="R10G10B10A2_SSCALED" value="437"/>
-    <value name="R10G10B10A2_SINT" value="438"/>
-    <value name="B10G10R10A2_SNORM" value="439"/>
-    <value name="B10G10R10A2_USCALED" value="440"/>
-    <value name="B10G10R10A2_SSCALED" value="441"/>
-    <value name="B10G10R10A2_UINT" value="442"/>
-    <value name="B10G10R10A2_SINT" value="443"/>
-    <value name="R64G64B64A64_PASSTHRU" value="444"/>
-    <value name="R64G64B64_PASSTHRU" value="445"/>
-    <value name="ETC2_RGB8_PTA" value="448"/>
-    <value name="ETC2_SRGB8_PTA" value="449"/>
-    <value name="ETC2_EAC_RGBA8" value="450"/>
-    <value name="ETC2_EAC_SRGB8_A8" value="451"/>
-    <value name="R8G8B8_UINT" value="456"/>
-    <value name="R8G8B8_SINT" value="457"/>
-    <value name="RAW" value="511"/>
-  </enum>
-
   <enum name="Shader Channel Select" prefix="SCS">
     <value name="ZERO" value="0"/>
     <value name="ONE" value="1"/>
@@ -444,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"/>
@@ -462,7 +232,7 @@
   <struct name="VERTEX_ELEMENT_STATE" length="2">
     <field name="Vertex Buffer Index" start="26" end="31" type="uint"/>
     <field name="Valid" start="25" end="25" type="bool"/>
-    <field name="Source Element Format" start="16" end="24" type="SURFACE_FORMAT"/>
+    <field name="Source Element Format" start="16" end="24" type="uint"/>
     <field name="Edge Flag Enable" start="15" end="15" type="bool"/>
     <field name="Source Element Offset" start="0" end="11" type="uint"/>
     <field name="Component 0 Control" start="60" end="62" type="3D_Vertex_Component_Control"/>
@@ -554,7 +324,7 @@
     <field name="Write Disable Blue" start="0" end="0" type="bool"/>
   </struct>
 
-  <struct name="BLEND_STATE" length="17">
+  <struct name="BLEND_STATE" length="1">
     <field name="Alpha To Coverage Enable" start="31" end="31" type="bool"/>
     <field name="Independent Alpha Blend Enable" start="30" end="30" type="bool"/>
     <field name="Alpha To One Enable" start="29" end="29" type="bool"/>
@@ -564,7 +334,7 @@
     <field name="Color Dither Enable" start="23" end="23" type="bool"/>
     <field name="X Dither Offset" start="21" end="22" type="uint"/>
     <field name="Y Dither Offset" start="19" end="20" type="uint"/>
-    <group count="8" start="32" size="64">
+    <group count="0" start="32" size="64">
       <field name="Entry" start="0" end="63" type="BLEND_STATE_ENTRY"/>
     </group>
   </struct>
@@ -685,7 +455,7 @@
       <value name="SURFTYPE_NULL" value="7"/>
     </field>
     <field name="Surface Array" start="28" end="28" type="bool"/>
-    <field name="Surface Format" start="18" end="27" type="SURFACE_FORMAT"/>
+    <field name="Surface Format" start="18" end="27" type="uint"/>
     <field name="Surface Vertical Alignment" start="16" end="17" type="uint">
       <value name="VALIGN 4" value="1"/>
       <value name="VALIGN 8" value="2"/>
@@ -720,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"/>
@@ -787,10 +556,10 @@
       <value name="Vertical" value="1"/>
     </field>
     <field name="Memory Compression Enable" start="254" end="254" type="bool"/>
-    <field name="Shader Channel Select Red" start="249" end="251" type="uint"/>
-    <field name="Shader Channel Select Green" start="246" end="248" type="uint"/>
-    <field name="Shader Channel Select Blue" start="243" end="245" type="uint"/>
-    <field name="Shader Channel Select Alpha" start="240" end="242" type="uint"/>
+    <field name="Shader Channel Select Red" start="249" end="251" type="Shader Channel Select"/>
+    <field name="Shader Channel Select Green" start="246" end="248" type="Shader Channel Select"/>
+    <field name="Shader Channel Select Blue" start="243" end="245" type="Shader Channel Select"/>
+    <field name="Shader Channel Select Alpha" start="240" end="242" type="Shader Channel Select"/>
     <field name="Resource Min LOD" start="224" end="235" type="u4.8"/>
     <field name="Surface Base Address" start="256" end="319" type="address"/>
     <field name="X Offset for V Plane" start="368" end="381" type="uint"/>
@@ -800,16 +569,23 @@
     <field name="Clear Value Address Enable" start="330" end="330" type="bool"/>
     <field name="Quilt Height" start="325" end="329" type="uint"/>
     <field name="Quilt Width" start="320" end="324" type="uint"/>
+    <!-- This address points to the address of a Clear Color in the case of
+         CCS_D and CCS_E surfaces, and Depth Color for HiZ surfaces -->
+    <field name="Clear Value Address" start="390" end="431" type="address"/>
     <field name="Red Clear Color" start="384" end="415" type="int"/>
-    <field name="Clear Color Address" start="390" end="415" type="address"/>
-    <field name="Clear Depth Address Low" start="390" end="415" type="address"/>
     <field name="Green Clear Color" start="416" end="447" type="int"/>
-    <field name="Clear Color Address High" start="416" end="431" type="address"/>
-    <field name="Clear Depth Address High" start="416" end="431" type="address"/>
     <field name="Blue Clear Color" start="448" end="479" type="int"/>
     <field name="Alpha Clear Color" start="480" end="511" type="int"/>
   </struct>
 
+  <struct name="CLEAR_COLOR" length="8">
+    <field name="Raw Clear Color Red" start="0" end="31" type="int"/>
+    <field name="Raw Clear Color Green" start="32" end="63" type="int"/>
+    <field name="Raw Clear Color Blue" start="64" end="95" type="int"/>
+    <field name="Raw Clear Color Alpha" start="96" end="127" type="int"/>
+    <!-- Reserved - MBZ -->
+  </struct>
+
   <struct name="SAMPLER_INDIRECT_STATE_BORDER_COLOR" length="4">
     <field name="Border Color Red As S31" start="0" end="31" type="int"/>
     <field name="Border Color Red As U32" start="0" end="31" type="uint"/>
@@ -900,7 +676,7 @@
       <value name="PROGRAMMED" value="0"/>
       <value name="OVERRIDE" value="1"/>
     </field>
-    <field name="Indirect State Pointer" start="70" end="87" type="offset"/>
+    <field name="Border Color Pointer" start="70" end="87" type="offset"/>
     <field name="Force gather4 Behavior" start="69" end="69" type="bool"/>
     <field name="LOD Clamp Magnification Mode" start="64" end="64" type="uint">
       <value name="MIPNONE" value="0"/>
@@ -936,9 +712,9 @@
     </field>
     <field name="Non-normalized Coordinate Enable" start="106" end="106" type="bool"/>
     <field name="Reduction Type Enable" start="105" end="105" type="bool"/>
-    <field name="TCX Address Control Mode" start="102" end="104" type="uint"/>
-    <field name="TCY Address Control Mode" start="99" end="101" type="uint"/>
-    <field name="TCZ Address Control Mode" start="96" end="98" type="uint"/>
+    <field name="TCX Address Control Mode" start="102" end="104" type="Texture Coordinate Mode"/>
+    <field name="TCY Address Control Mode" start="99" end="101" type="Texture Coordinate Mode"/>
+    <field name="TCZ Address Control Mode" start="96" end="98" type="Texture Coordinate Mode"/>
   </struct>
 
   <struct name="SAMPLER_STATE_8X8_AVS_COEFFICIENTS" length="8">
@@ -968,7 +744,70 @@
     <field name="Table 1Y Filter Coefficient[n,4]" start="224" end="231" type="s1.6"/>
   </struct>
 
-  <instruction name="3DPRIMITIVE" bias="2" length="7">
+  <struct name="MI_MATH_ALU_INSTRUCTION" length="1">
+    <field name="ALU Opcode" start="20" end="31" type="uint" prefix="MI_ALU">
+      <value name="NOOP" value="0x000"/>
+      <value name="LOAD" value="0x080"/>
+      <value name="LOADINV" value="0x480"/>
+      <value name="LOAD0" value="0x081"/>
+      <value name="LOAD1" value="0x481"/>
+      <value name="ADD" value="0x100"/>
+      <value name="SUB" value="0x101"/>
+      <value name="AND" value="0x102"/>
+      <value name="OR" value="0x103"/>
+      <value name="XOR" value="0x104"/>
+      <value name="STORE" value="0x180"/>
+      <value name="STOREINV" value="0x580"/>
+    </field>
+    <field name="Operand 1" start="10" end="19" type="uint" prefix="MI_ALU">
+      <value name="REG0" value="0x00"/>
+      <value name="REG1" value="0x01"/>
+      <value name="REG2" value="0x02"/>
+      <value name="REG3" value="0x03"/>
+      <value name="REG4" value="0x04"/>
+      <value name="REG5" value="0x05"/>
+      <value name="REG6" value="0x06"/>
+      <value name="REG7" value="0x07"/>
+      <value name="REG8" value="0x08"/>
+      <value name="REG9" value="0x09"/>
+      <value name="REG10" value="0x0a"/>
+      <value name="REG11" value="0x0b"/>
+      <value name="REG12" value="0x0c"/>
+      <value name="REG13" value="0x0d"/>
+      <value name="REG14" value="0x0e"/>
+      <value name="REG15" value="0x0f"/>
+      <value name="SRCA" value="0x20"/>
+      <value name="SRCB" value="0x21"/>
+      <value name="ACCU" value="0x31"/>
+      <value name="ZF" value="0x32"/>
+      <value name="CF" value="0x33"/>
+    </field>
+    <field name="Operand 2" start="0" end="9" type="uint" prefix="MI_ALU">
+      <value name="REG0" value="0x00"/>
+      <value name="REG1" value="0x01"/>
+      <value name="REG2" value="0x02"/>
+      <value name="REG3" value="0x03"/>
+      <value name="REG4" value="0x04"/>
+      <value name="REG5" value="0x05"/>
+      <value name="REG6" value="0x06"/>
+      <value name="REG7" value="0x07"/>
+      <value name="REG8" value="0x08"/>
+      <value name="REG9" value="0x09"/>
+      <value name="REG10" value="0x0a"/>
+      <value name="REG11" value="0x0b"/>
+      <value name="REG12" value="0x0c"/>
+      <value name="REG13" value="0x0d"/>
+      <value name="REG14" value="0x0e"/>
+      <value name="REG15" value="0x0f"/>
+      <value name="SRCA" value="0x20"/>
+      <value name="SRCB" value="0x21"/>
+      <value name="ACCU" value="0x31"/>
+      <value name="ZF" value="0x32"/>
+      <value name="CF" value="0x33"/>
+    </field>
+  </struct>
+
+  <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"/>
@@ -994,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"/>
@@ -1010,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"/>
@@ -1027,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"/>
@@ -1044,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"/>
@@ -1061,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"/>
@@ -1078,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"/>
@@ -1095,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"/>
@@ -1104,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"/>
@@ -1113,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"/>
@@ -1122,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"/>
@@ -1131,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"/>
@@ -1140,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"/>
@@ -1148,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"/>
@@ -1164,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"/>
@@ -1174,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"/>
@@ -1185,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"/>
@@ -1195,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"/>
@@ -1235,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"/>
@@ -1312,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"/>
@@ -1324,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"/>
@@ -1343,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"/>
@@ -1391,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"/>
@@ -1415,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"/>
@@ -1439,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"/>
@@ -1463,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"/>
@@ -1489,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"/>
@@ -1515,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"/>
@@ -1523,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"/>
@@ -1596,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"/>
@@ -1655,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"/>
@@ -1666,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"/>
@@ -1686,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"/>
@@ -1696,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"/>
@@ -1710,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"/>
@@ -1720,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"/>
@@ -1731,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"/>
@@ -1794,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"/>
@@ -1811,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"/>
@@ -1849,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"/>
@@ -1859,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"/>
@@ -1869,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"/>
@@ -1879,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"/>
@@ -1889,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"/>
@@ -1899,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"/>
@@ -1960,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"/>
@@ -1978,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"/>
@@ -1989,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"/>
@@ -2003,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"/>
@@ -2012,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"/>
@@ -2021,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"/>
@@ -2030,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"/>
@@ -2039,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"/>
@@ -2048,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"/>
@@ -2057,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"/>
@@ -2127,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"/>
@@ -2160,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"/>
@@ -2174,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"/>
@@ -2183,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"/>
@@ -2207,7 +2043,10 @@
       <value name="AALINEDISTANCE_TRUE" value="1"/>
     </field>
     <field name="Smooth Point Enable" start="109" end="109" type="bool"/>
-    <field name="Vertex Sub Pixel Precision Select" start="108" end="108" type="uint"/>
+    <field name="Vertex Sub Pixel Precision Select" start="108" end="108" type="uint">
+      <value name="8 Bit" value="0"/>
+      <value name="4 Bit" value="1"/>
+    </field>
     <field name="Point Width Source" start="107" end="107" type="uint">
       <value name="Vertex" value="0"/>
       <value name="State" value="1"/>
@@ -2215,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"/>
@@ -2223,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"/>
@@ -2233,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"/>
@@ -2252,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"/>
@@ -2299,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"/>
@@ -2329,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"/>
@@ -2339,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"/>
@@ -2350,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"/>
@@ -2361,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"/>
@@ -2372,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"/>
@@ -2383,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"/>
@@ -2394,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"/>
@@ -2405,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"/>
@@ -2418,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"/>
@@ -2458,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"/>
@@ -2469,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"/>
@@ -2493,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"/>
@@ -2507,7 +2344,7 @@
       <value name="COMP_3" value="3"/>
     </field>
     <field name="XP1 Source Select" start="60" end="60" type="uint">
-      <value name="Start Instance Location" value="1"/>
+      <value name="Starting Instance Location" value="1"/>
       <value name="XP1_PARAMETER" value="0"/>
     </field>
     <field name="XP1 Element Offset" start="48" end="53" type="uint"/>
@@ -2533,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"/>
@@ -2541,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"/>
@@ -2550,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"/>
@@ -2559,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"/>
@@ -2568,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"/>
@@ -2612,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"/>
@@ -2669,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"/>
@@ -2678,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"/>
@@ -2706,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"/>
@@ -2728,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"/>
@@ -2757,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"/>
@@ -2767,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"/>
@@ -2777,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"/>
@@ -2817,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"/>
@@ -2841,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"/>
@@ -2859,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"/>
@@ -2913,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"/>
@@ -2924,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"/>
@@ -2986,6 +2823,13 @@
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="5"/>
   </instruction>
 
+  <instruction name="MI_ARB_ON_OFF" bias="1" length="1">
+    <field name="Command Type" start="29" end="31" type="uint" default="0"/>
+    <field name="MI Command Opcode" start="23" end="28" type="uint" default="8"/>
+    <field name="Allow Lite Restore" start="1" end="1" type="bool"/>
+    <field name="Arbitration Enable" start="0" end="0" type="bool" default="1"/>
+  </instruction>
+
   <instruction name="MI_ATOMIC" bias="2" length="3">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="47"/>
@@ -3040,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"/>
@@ -3076,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"/>
@@ -3097,7 +2941,7 @@
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Stereoscopic 3D Mode" start="63" end="63" type="bool"/>
     <field name="Display Buffer Pitch" start="38" end="47" type="uint"/>
-    <field name="Tile Parameter" start="32" end="34" type="bool"/>
+    <field name="Tile Parameter" start="32" end="34" type="uint"/>
     <field name="Display Buffer Base Address" start="76" end="95" type="address"/>
     <field name="VRR Master Flip" start="75" end="75" type="uint"/>
     <field name="Flip Type" start="64" end="65" type="uint">
@@ -3124,6 +2968,10 @@
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Register Offset" start="34" end="54" type="offset"/>
     <field name="Data DWord" start="64" end="95" type="uint"/>
+    <group count="0" start="96" size="64">
+      <field name="Register Offset" start="2" end="22" type="offset"/>
+      <field name="Data DWord" start="32" end="63" type="uint"/>
+    </group>
   </instruction>
 
   <instruction name="MI_LOAD_REGISTER_MEM" bias="2" length="4">
@@ -3144,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">
@@ -3157,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">
@@ -3165,7 +3013,7 @@
       <value name="Display Plane 1 B" value="1"/>
       <value name="Display Plane 1 C" value="4"/>
     </field>
-    <field name="Scan Line Event Done Forward" start="17" end="18" type="bool"/>
+    <field name="Scan Line Event Done Forward" start="17" end="18" type="uint"/>
     <field name="DWord Length" start="0" end="5" type="uint" default="0"/>
     <field name="Start Scan Line Number" start="48" end="60" type="uint"/>
     <field name="End Scan Line Number" start="32" end="44" type="uint"/>
@@ -3175,10 +3023,8 @@
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="26"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="0"/>
-    <field name="ALU INSTRUCTION 1" start="32" end="63" type="uint"/>
-    <field name="ALU INSTRUCTION 2" start="64" end="95" type="uint"/>
-    <group count="0" start="96" size="32">
-      <field name="ALU INSTRUCTION n" start="0" end="31" type="uint"/>
+    <group count="0" start="32" size="32">
+      <field name="Instruction" start="0" end="31" type="MI_MATH_ALU_INSTRUCTION"/>
     </group>
   </instruction>
 
@@ -3204,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>
@@ -3214,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"/>
@@ -3224,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">
@@ -3233,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">
@@ -3242,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"/>
@@ -3325,8 +3173,7 @@
     <field name="DWord Length" start="0" end="9" type="uint" default="2"/>
     <field name="Address" start="34" end="79" type="address"/>
     <field name="Core Mode Enable" start="32" end="32" type="uint"/>
-    <field name="Data DWord 0" start="96" end="127" type="uint"/>
-    <field name="Data DWord 1" start="128" end="159" type="uint"/>
+    <field name="Immediate Data" start="96" end="159" type="uint"/>
   </instruction>
 
   <instruction name="MI_STORE_DATA_INDEX" bias="2" length="3">
@@ -3355,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"/>
@@ -3376,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"/>
@@ -3399,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"/>
@@ -3414,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"/>
@@ -3458,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"/>
@@ -3489,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"/>
@@ -3507,14 +3354,239 @@
     <field name="System Instruction Pointer" start="36" end="95" type="offset"/>
   </instruction>
 
+  <register name="IA_VERTICES_COUNT" length="2" num="0x2310">
+    <field name="IA Vertices Count Report" start="0" end="63" type="uint"/>
+  </register>
+
+  <register name="IA_PRIMITIVES_COUNT" length="2" num="0x2318">
+    <field name="IA Primitives Count Report" start="0" end="63" type="uint"/>
+  </register>
+
+  <register name="VS_INVOCATION_COUNT" length="2" num="0x2320">
+    <field name="VS Invocation Count Report" start="0" end="63" type="uint"/>
+  </register>
+
+  <register name="HS_INVOCATION_COUNT" length="2" num="0x2300">
+    <field name="HS Invocation Count Report" start="0" end="63" type="uint"/>
+  </register>
+
+  <register name="DS_INVOCATION_COUNT" length="2" num="0x2308">
+    <field name="DS Invocation Count Report" start="0" end="63" type="uint"/>
+  </register>
+
+  <register name="GS_INVOCATION_COUNT" length="2" num="0x2328">
+    <field name="GS Invocation Count Report" start="0" end="63" type="uint"/>
+  </register>
+
+  <register name="GS_PRIMITIVES_COUNT" length="2" num="0x2330">
+    <field name="GS Primitives Count Report" start="0" end="63" type="uint"/>
+  </register>
+
+  <register name="CL_INVOCATION_COUNT" length="2" num="0x2338">
+    <field name="CL Invocation Count Report" start="0" end="63" type="uint"/>
+  </register>
+
+  <register name="CL_PRIMITIVES_COUNT" length="2" num="0x2340">
+    <field name="CL Primitives Count Report" start="0" end="63" type="uint"/>
+  </register>
+
+  <register name="PS_INVOCATION_COUNT" length="2" num="0x2348">
+    <field name="PS Invocation Count Report" start="0" end="63" type="uint"/>
+  </register>
+
+  <register name="CS_INVOCATION_COUNT" length="2" num="0x2290">
+    <field name="CS Invocation Count Report" start="0" end="63" type="uint"/>
+  </register>
+
+  <register name="BCS_INSTDONE" length="1" num="0x2206c">
+    <field name="Ring Enable" start="0" end="0" type="bool"/>
+    <field name="Blitter IDLE" start="1" end="1" type="bool" default="1"/>
+    <field name="GAB IDLE" start="2" end="2" type="bool" default="1"/>
+    <field name="BCS Done" start="3" end="3" type="bool" default="1"/>
+  </register>
+
+  <register name="INSTDONE_1" length="1" num="0x206c">
+    <field name="PRB0 Ring Enable" start="0" end="0" type="bool"/>
+    <field name="VFG Done" start="1" end="1" type="bool"/>
+    <field name="VS Done" start="2" end="2" type="bool"/>
+    <field name="HS Done" start="3" end="3" type="bool"/>
+    <field name="TE Done" start="4" end="4" type="bool"/>
+    <field name="DS Done" start="5" end="5" type="bool"/>
+    <field name="GS Done" start="6" end="6" type="bool"/>
+    <field name="SOL Done" start="7" end="7" type="bool"/>
+    <field name="CL Done" start="8" end="8" type="bool"/>
+    <field name="SF Done" start="9" end="9" type="bool"/>
+    <field name="TDG Done" start="12" end="12" type="bool"/>
+    <field name="URBM Done" start="13" end="13" type="bool"/>
+    <field name="SVG Done" start="14" end="14" type="bool"/>
+    <field name="GAFS Done" start="15" end="15" type="bool"/>
+    <field name="VFE Done" start="16" end="16" type="bool"/>
+    <field name="TSG Done" start="17" end="17" type="bool"/>
+    <field name="GAFM Done" start="18" end="18" type="bool"/>
+    <field name="GAM Done" start="19" end="19" type="bool"/>
+    <field name="RS Done" start="20" end="20" type="bool"/>
+    <field name="CS Done" start="21" end="21" type="bool"/>
+    <field name="SDE Done" start="22" end="22" type="bool"/>
+    <field name="RCCFBC CS Done" start="23" end="23" type="bool"/>
+  </register>
+
+  <register name="VCS_INSTDONE" length="1" num="0x1206c">
+    <field name="Ring Enable" start="0" end="0" type="bool"/>
+    <field name="USB Done" start="1" end="1" type="bool"/>
+    <field name="QRC Done" start="2" end="2" type="bool"/>
+    <field name="SEC Done" start="3" end="3" type="bool"/>
+    <field name="MPC Done" start="4" end="4" type="bool"/>
+    <field name="VFT Done" start="5" end="5" type="bool"/>
+    <field name="BSP Done" start="6" end="6" type="bool"/>
+    <field name="VLF Done" start="7" end="7" type="bool"/>
+    <field name="VOP Done" start="8" end="8" type="bool"/>
+    <field name="VMC Done" start="9" end="9" type="bool"/>
+    <field name="VIP Done" start="10" end="10" type="bool"/>
+    <field name="VIT Done" start="11" end="11" type="bool"/>
+    <field name="VDS Done" start="12" end="12" type="bool"/>
+    <field name="VMX Done" start="13" end="13" type="bool"/>
+    <field name="VCP Done" start="14" end="14" type="bool"/>
+    <field name="VCD Done" start="15" end="15" type="bool"/>
+    <field name="VAD Done" start="16" end="16" type="bool"/>
+    <field name="VMD Done" start="17" end="17" type="bool"/>
+    <field name="VIS Done" start="18" end="18" type="bool"/>
+    <field name="VAC Done" start="19" end="19" type="bool"/>
+    <field name="VAM Done" start="20" end="20" type="bool"/>
+    <field name="JPG Done" start="21" end="21" type="bool"/>
+    <field name="VBP Done" start="22" end="22" type="bool"/>
+    <field name="VHR Done" start="23" end="23" type="bool"/>
+    <field name="VCI Done" start="24" end="24" type="bool"/>
+    <field name="VCR Done" start="25" end="25" type="bool"/>
+    <field name="VIN Done" start="26" end="26" type="bool"/>
+    <field name="VPR Done" start="27" end="27" type="bool"/>
+    <field name="VTQ Done" start="28" end="28" type="bool"/>
+    <field name="Reserved" start="29" end="29" type="bool"/>
+    <field name="VCS Done" start="30" end="30" type="bool"/>
+    <field name="GAC Done" start="31" end="31" type="bool"/>
+  </register>
+
+  <register name="VECS_INSTDONE" length="1" num="0x1a06c">
+    <field name="Ring Enable" start="0" end="0" type="bool"/>
+    <field name="VECS Done" start="30" end="30" type="bool"/>
+    <field name="GAM Done" start="31" end="31" type="bool"/>
+  </register>
+
+  <register name="SC_INSTDONE" length="1" num="0x7100">
+    <field name="SVL Done" start="0" end="0" type="bool"/>
+    <field name="WMFE Done" start="1" end="1" type="bool"/>
+    <field name="WMBE Done" start="2" end="2" type="bool"/>
+    <field name="HIZ Done" start="3" end="3" type="bool"/>
+    <field name="STC Done" start="4" end="4" type="bool"/>
+    <field name="IZ Done" start="5" end="5" type="bool"/>
+    <field name="SBE Done" start="6" end="6" type="bool"/>
+    <field name="RCZ Done" start="8" end="8" type="bool"/>
+    <field name="RCC Done" start="9" end="9" type="bool"/>
+    <field name="RCPBE Done" start="10" end="10" type="bool"/>
+    <field name="RCPFE Done" start="11" end="11" type="bool"/>
+    <field name="DAPB Done" start="12" end="12" type="bool"/>
+    <field name="DAPRBE Done" start="13" end="13" type="bool"/>
+    <field name="SARB Done" start="15" end="15" type="bool"/>
+    <field name="DC0 Done" start="16" end="16" type="bool"/>
+    <field name="DC1 Done" start="17" end="17" type="bool"/>
+    <field name="DC2 Done" start="18" end="18" type="bool"/>
+    <field name="DC3 Done" start="19" end="19" type="bool"/>
+    <field name="GW0 Done" start="20" end="20" type="bool"/>
+    <field name="GW1 Done" start="21" end="21" type="bool"/>
+    <field name="GW2 Done" start="22" end="22" type="bool"/>
+    <field name="GW3 Done" start="23" end="23" type="bool"/>
+    <field name="TDC Done" start="24" end="24" type="bool"/>
+    <field name="SFBE Done" start="25" end="25" type="bool"/>
+  </register>
+
+  <register name="ROW_INSTDONE" length="1" num="0xe164">
+    <field name="BC Done" start="0" end="0" type="bool"/>
+    <field name="PSD Done" start="1" end="1" type="bool"/>
+    <field name="DAPR Done" start="3" end="3" type="bool"/>
+    <field name="TDL Done" start="6" end="6" type="bool"/>
+    <field name="IC Done" start="12" end="12" type="bool"/>
+    <field name="MA0 Done" start="15" end="15" type="bool"/>
+    <field name="EU00 Done SS0" start="16" end="16" type="bool"/>
+    <field name="EU01 Done SS0" start="17" end="17" type="bool"/>
+    <field name="EU02 Done SS0" start="18" end="18" type="bool"/>
+    <field name="EU03 Done SS0" start="19" end="19" type="bool"/>
+    <field name="EU10 Done SS0" start="21" end="21" type="bool"/>
+    <field name="EU11 Done SS0" start="22" end="22" type="bool"/>
+    <field name="EU12 Done SS0" start="23" end="23" type="bool"/>
+    <field name="EU13 Done SS0" start="24" end="24" type="bool"/>
+    <field name="MA1 Done SS0" start="26" end="26" type="bool"/>
+  </register>
+
+  <register name="SAMPLER_INSTDONE" length="1" num="0xe160">
+    <field name="IME Done" start="0" end="0" type="bool"/>
+    <field name="PL0 Done" start="1" end="1" type="bool"/>
+    <field name="SO0 Done" start="2" end="2" type="bool"/>
+    <field name="DG0 Done" start="3" end="3" type="bool"/>
+    <field name="FT0 Done" start="4" end="4" type="bool"/>
+    <field name="DM0 Done" start="5" end="5" type="bool"/>
+    <field name="SC Done" start="6" end="6" type="bool"/>
+    <field name="FL0 Done" start="7" end="7" type="bool"/>
+    <field name="QC Done" start="8" end="8" type="bool"/>
+    <field name="SVSM Done" start="9" end="9" type="bool"/>
+    <field name="SI0 Done" start="10" end="10" type="bool"/>
+    <field name="MT0 Done" start="11" end="11" type="bool"/>
+    <field name="AVS Done" start="12" end="12" type="bool"/>
+    <field name="IEF Done" start="13" end="13" type="bool"/>
+    <field name="CRE Done" start="14" end="14" type="bool"/>
+    <field name="SVSM_ARB_SIFM" start="15" end="15" type="bool"/>
+    <field name="SVSM ARB2" start="16" end="16" type="bool"/>
+    <field name="SVSM ARB1" start="17" end="17" type="bool"/>
+    <field name="SVSM Adapter" start="18" end="18" type="bool"/>
+    <field name="BDM Done" start="19" end="19" type="bool"/>
+  </register>
+
   <register name="L3CNTLREG" length="1" num="0x7034">
-    <field name="SLM Enable" start="0" end="0" type="uint"/>
+    <field name="SLM Enable" start="0" end="0" type="bool"/>
     <field name="URB Allocation" start="1" end="7" type="uint"/>
     <field name="RO Allocation" start="11" end="17" type="uint"/>
     <field name="DC Allocation" start="18" end="24" type="uint"/>
     <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>
@@ -3559,4 +3631,44 @@
     <field name="Sampler L2 Disable Mask" start="31" end="31" type="bool"/>
   </register>
 
+  <register name="CACHE_MODE_1" length="1" num="0x7004">
+    <field name="Partial Resolve Disable In VC" start="1" end="1" type="bool"/>
+    <field name="RCZ PMA Promoted 2 Not-Promoted Allocation stall optimization Disable" start="3" end="3" type="bool"/>
+    <field name="MCS Cache Disable" start="5" end="5" type="bool"/>
+    <field name="MSC RAW Hazard Avoidance Bit" start="9" end="9" type="bool"/>
+    <field name="NP Early Z Fails Disable" start="13" end="13" type="uint"/>
+    <field name="Blend Optimization Fix Disable" start="14" end="14" type="bool"/>
+    <field name="Color Compression Disable" start="15" end="15" type="bool"/>
+
+    <field name="Partial Resolve Disable In VC Mask" start="17" end="17" type="bool"/>
+    <field name="RCZ PMA Promoted 2 Not-Promoted Allocation stall optimization Disable Mask" start="19" end="19" type="bool"/>
+    <field name="MCS Cache Disable Mask" start="21" end="21" type="bool"/>
+    <field name="MSC RAW Hazard Avoidance Bit Mask" start="25" end="25" type="bool"/>
+    <field name="NP Early Z Fails Disable Mask" start="29" end="29" type="bool"/>
+    <field name="Blend Optimization Fix Disable Mask" start="30" end="30" type="bool"/>
+    <field name="Color Compression Disable Mask" start="31" end="31" type="bool"/>
+  </register>
+
+  <register name="CACHE_MODE_SS" length="1" num="0x0e420">
+    <field name="Instruction Level 1 Cache Disable" start="0" end="0" type="bool"/>
+    <field name="Instruction Level 1 Cache and In-Flight Queue Disable " start="1" end="1" type="bool"/>
+    <field name="Float Blend Optimization Enable" start="4" end="4" type="bool"/>
+    <field name="Per Sample Blend Opt Disable"  start="11" end="11" type="bool"/>
+
+    <field name="Instruction Level 1 Cache Disable Mask" start="16" end="16" type="bool"/>
+    <field name="Instruction Level 1 Cache and In-Flight Queue Disable Mask" start="17" end="17" type="bool"/>
+    <field name="Float Blend Optimization Enable Mask" start="20" end="20" type="bool"/>
+    <field name="Per Sample Blend Opt Disable Mask"  start="27" end="27" type="bool"/>
+  </register>
+
+  <register name="CS_DEBUG_MODE2" length="1" num="0x20d8">
+    <field name="3D Rendering Instruction Disable" start="0" end="0" type="bool"/>
+    <field name="Media Instruction Disable" start="1" end="1" type="bool"/>
+    <field name="CONSTANT_BUFFER Address Offset Disable" start="4" end="4" type="bool"/>
+
+    <field name="3D Rendering Instruction Disable Mask" start="16" end="16" type="bool"/>
+    <field name="Media Instruction Disable Mask" start="17" end="17" type="bool"/>
+    <field name="CONSTANT_BUFFER Address Offset Disable Mask" start="20" end="20" type="bool"/>
+  </register>
+
 </genxml>