X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fintel%2Fgenxml%2Fgen6.xml;h=fff1e5a8411fc72d39829f9a30ebe6506131ffd4;hb=ecf62a967e37cb46cfcafc626a5f5cfb527e9541;hp=732a76c40e16f559f0dd2564a0d920be657b3698;hpb=193c1b72e04c131a4b9a9862aad42f5058a7c373;p=mesa.git

diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
index 732a76c40e1..fff1e5a8411 100644
--- a/src/intel/genxml/gen6.xml
+++ b/src/intel/genxml/gen6.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" ?>
 <genxml name="SNB" gen="6">
   <enum name="3D_Prim_Topo_Type" prefix="3DPRIM">
     <value name="POINTLIST" value="1"/>
@@ -34,6 +35,36 @@
     <value name="STORE_PID" value="7"/>
   </enum>
 
+  <enum name="3D_Color_Buffer_Blend_Function" prefix="BLENDFUNCTION">
+    <value name="ADD" value="0"/>
+    <value name="SUBTRACT" value="1"/>
+    <value name="REVERSE_SUBTRACT" value="2"/>
+    <value name="MIN" value="3"/>
+    <value name="MAX" value="4"/>
+  </enum>
+
+  <enum name="3D_Color_Buffer_Blend_Factor" prefix="BLENDFACTOR">
+    <value name="ONE" value="1"/>
+    <value name="SRC_COLOR" value="2"/>
+    <value name="SRC_ALPHA" value="3"/>
+    <value name="DST_ALPHA" value="4"/>
+    <value name="DST_COLOR" value="5"/>
+    <value name="SRC_ALPHA_SATURATE" value="6"/>
+    <value name="CONST_COLOR" value="7"/>
+    <value name="CONST_ALPHA" value="8"/>
+    <value name="SRC1_COLOR" value="9"/>
+    <value name="SRC1_ALPHA" value="10"/>
+    <value name="ZERO" value="17"/>
+    <value name="INV_SRC_COLOR" value="18"/>
+    <value name="INV_SRC_ALPHA" value="19"/>
+    <value name="INV_DST_ALPHA" value="20"/>
+    <value name="INV_DST_COLOR" value="21"/>
+    <value name="INV_CONST_COLOR" value="23"/>
+    <value name="INV_CONST_ALPHA" value="24"/>
+    <value name="INV_SRC1_COLOR" value="25"/>
+    <value name="INV_SRC1_ALPHA" value="26"/>
+  </enum>
+
   <enum name="3D_Compare_Function" prefix="COMPAREFUNCTION">
     <value name="ALWAYS" value="0"/>
     <value name="NEVER" value="1"/>
@@ -45,228 +76,34 @@
     <value name="GEQUAL" value="7"/>
   </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="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 name="3D_Stencil_Operation" prefix="STENCILOP">
+    <value name="KEEP" value="0"/>
+    <value name="ZERO" value="1"/>
+    <value name="REPLACE" value="2"/>
+    <value name="INCRSAT" value="3"/>
+    <value name="DECRSAT" value="4"/>
+    <value name="INCR" value="5"/>
+    <value name="DECR" value="6"/>
+    <value name="INVERT" value="7"/>
+  </enum>
+
+  <enum name="3D_Logic_Op_Function" prefix="LOGICOP">
+    <value name="CLEAR" value="0"/>
+    <value name="NOR" value="1"/>
+    <value name="AND_INVERTED" value="2"/>
+    <value name="COPY_INVERTED" value="3"/>
+    <value name="AND_REVERSE" value="4"/>
+    <value name="INVERT" value="5"/>
+    <value name="XOR" value="6"/>
+    <value name="NAND" value="7"/>
+    <value name="AND" value="8"/>
+    <value name="EQUIV" value="9"/>
+    <value name="NOOP" value="10"/>
+    <value name="OR_INVERTED" value="11"/>
+    <value name="COPY" value="12"/>
+    <value name="OR_REVERSE" value="13"/>
+    <value name="OR" value="14"/>
+    <value name="SET" value="15"/>
   </enum>
 
   <enum name="Texture Coordinate Mode" prefix="TCM">
@@ -302,13 +139,13 @@
   <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="uint"/>
-    <field name="Component 1 Control" start="56" end="58" type="uint"/>
-    <field name="Component 2 Control" start="52" end="54" type="uint"/>
-    <field name="Component 3 Control" start="48" end="50" type="uint"/>
+    <field name="Component 0 Control" start="60" end="62" type="3D_Vertex_Component_Control"/>
+    <field name="Component 1 Control" start="56" end="58" type="3D_Vertex_Component_Control"/>
+    <field name="Component 2 Control" start="52" end="54" type="3D_Vertex_Component_Control"/>
+    <field name="Component 3 Control" start="48" end="50" type="3D_Vertex_Component_Control"/>
   </struct>
 
   <struct name="SF_OUTPUT_ATTRIBUTE_DETAIL" length="1">
@@ -333,10 +170,10 @@
   </struct>
 
   <struct name="CLIP_VIEWPORT" length="4">
-    <field name="XMin Clip Guardband" start="0" end="31" type="uint"/>
-    <field name="XMax Clip Guardband" start="32" end="63" type="uint"/>
-    <field name="YMin Clip Guardband" start="64" end="95" type="uint"/>
-    <field name="YMax Clip Guardband" start="96" end="127" type="uint"/>
+    <field name="XMin Clip Guardband" start="0" end="31" type="float"/>
+    <field name="XMax Clip Guardband" start="32" end="63" type="float"/>
+    <field name="YMin Clip Guardband" start="64" end="95" type="float"/>
+    <field name="YMax Clip Guardband" start="96" end="127" type="float"/>
   </struct>
 
   <struct name="SCISSOR_RECT" length="2">
@@ -355,51 +192,17 @@
     <field name="Viewport Matrix Element m30" start="96" end="127" type="float"/>
     <field name="Viewport Matrix Element m31" start="128" end="159" type="float"/>
     <field name="Viewport Matrix Element m32" start="160" end="191" type="float"/>
-    <group count="2" start="192" size="32">
-    </group>
   </struct>
 
   <struct name="BLEND_STATE_ENTRY" length="2">
     <field name="Color Buffer Blend Enable" start="31" end="31" type="bool"/>
     <field name="Independent Alpha Blend Enable" start="30" end="30" type="bool"/>
-    <field name="Alpha Blend Function" start="26" end="28" type="uint">
-      <value name="BLENDFUNCTION_ADD" value="0"/>
-      <value name="BLENDFUNCTION_SUBTRACT" value="1"/>
-      <value name="BLENDFUNCTION_REVERSE_SUBTRACT" value="2"/>
-      <value name="BLENDFUNCTION_MIN" value="3"/>
-      <value name="BLENDFUNCTION_MAX" value="4"/>
-    </field>
-    <field name="Source Alpha Blend Factor" start="20" end="24" type="uint">
-      <value name="BLENDFACTOR_ONE" value="1"/>
-      <value name="BLENDFACTOR_SRC_COLOR" value="2"/>
-      <value name="BLENDFACTOR_SRC_ALPHA" value="3"/>
-      <value name="BLENDFACTOR_DST_ALPHA" value="4"/>
-      <value name="BLENDFACTOR_DST_COLOR" value="5"/>
-      <value name="BLENDFACTOR_SRC_ALPHA_SATURATE" value="6"/>
-      <value name="BLENDFACTOR_CONST_COLOR" value="7"/>
-      <value name="BLENDFACTOR_CONST_ALPHA" value="8"/>
-      <value name="BLENDFACTOR_SRC1_COLOR" value="9"/>
-      <value name="BLENDFACTOR_SRC1_ALPHA" value="10"/>
-      <value name="BLENDFACTOR_ZERO" value="17"/>
-      <value name="BLENDFACTOR_INV_SRC_COLOR" value="18"/>
-      <value name="BLENDFACTOR_INV_SRC_ALPHA" value="19"/>
-      <value name="BLENDFACTOR_INV_DST_ALPHA" value="20"/>
-      <value name="BLENDFACTOR_INV_DST_COLOR" value="21"/>
-      <value name="BLENDFACTOR_INV_CONST_COLOR" value="23"/>
-      <value name="BLENDFACTOR_INV_CONST_ALPHA" value="24"/>
-      <value name="BLENDFACTOR_INV_SRC1_COLOR" value="25"/>
-      <value name="BLENDFACTOR_INV_SRC1_ALPHA" value="26"/>
-    </field>
-    <field name="Destination Alpha Blend Factor" start="15" end="19" type="uint"/>
-    <field name="Color Blend Function" start="11" end="13" type="uint">
-      <value name="BLENDFUNCTION_ADD" value="0"/>
-      <value name="BLENDFUNCTION_SUBTRACT" value="1"/>
-      <value name="BLENDFUNCTION_REVERSE_SUBTRACT" value="2"/>
-      <value name="BLENDFUNCTION_MIN  " value="3"/>
-      <value name="BLENDFUNCTION_MAX" value="4"/>
-    </field>
-    <field name="Source Blend Factor" start="5" end="9" type="uint"/>
-    <field name="Destination Blend Factor" start="0" end="4" type="uint"/>
+    <field name="Alpha Blend Function" start="26" end="28" type="3D_Color_Buffer_Blend_Function"/>
+    <field name="Source Alpha Blend Factor" start="20" end="24" type="3D_Color_Buffer_Blend_Factor"/>
+    <field name="Destination Alpha Blend Factor" start="15" end="19" type="3D_Color_Buffer_Blend_Factor"/>
+    <field name="Color Blend Function" start="11" end="13" type="3D_Color_Buffer_Blend_Function"/>
+    <field name="Source Blend Factor" start="5" end="9" type="3D_Color_Buffer_Blend_Factor"/>
+    <field name="Destination Blend Factor" start="0" end="4" type="3D_Color_Buffer_Blend_Factor"/>
     <field name="AlphaToCoverage Enable" start="63" end="63" type="bool"/>
     <field name="AlphaToOne Enable" start="62" end="62" type="bool"/>
     <field name="AlphaToCoverage Dither Enable" start="61" end="61" type="bool"/>
@@ -408,24 +211,7 @@
     <field name="Write Disable Green" start="57" end="57" type="bool"/>
     <field name="Write Disable Blue" start="56" end="56" type="bool"/>
     <field name="Logic Op Enable" start="54" end="54" type="bool"/>
-    <field name="Logic Op Function" start="50" end="53" type="uint">
-      <value name="LOGICOP_CLEAR" value="0"/>
-      <value name="LOGICOP_NOR" value="1"/>
-      <value name="LOGICOP_AND_INVERTED" value="2"/>
-      <value name="LOGICOP_COPY_INVERTED" value="3"/>
-      <value name="LOGICOP_AND_REVERSE" value="4"/>
-      <value name="LOGICOP_INVERT" value="5"/>
-      <value name="LOGICOP_XOR" value="6"/>
-      <value name="LOGICOP_NAND" value="7"/>
-      <value name="LOGICOP_AND" value="8"/>
-      <value name="LOGICOP_EQUIV" value="9"/>
-      <value name="LOGICOP_NOOP" value="10"/>
-      <value name="LOGICOP_OR_INVERTED" value="11"/>
-      <value name="LOGICOP_COPY" value="12"/>
-      <value name="LOGICOP_OR_REVERSE" value="13"/>
-      <value name="LOGICOP_OR" value="14"/>
-      <value name="LOGICOP_SET" value="15"/>
-    </field>
+    <field name="Logic Op Function" start="50" end="53" type="3D_Logic_Op_Function"/>
     <field name="Alpha Test Enable" start="48" end="48" type="bool"/>
     <field name="Alpha Test Function" start="45" end="47" type="3D_Compare_Function"/>
     <field name="Color Dither Enable" start="44" end="44" type="bool"/>
@@ -440,8 +226,8 @@
     <field name="Post-Blend Color Clamp Enable" start="32" end="32" type="bool"/>
   </struct>
 
-  <struct name="BLEND_STATE" length="16">
-    <group count="8" start="0" size="64">
+  <struct name="BLEND_STATE" length="0">
+    <group count="0" start="0" size="64">
       <field name="Entry" start="0" end="63" type="BLEND_STATE_ENTRY"/>
     </group>
   </struct>
@@ -470,33 +256,15 @@
   <struct name="DEPTH_STENCIL_STATE" length="3">
     <field name="Stencil Test Enable" start="31" end="31" type="bool"/>
     <field name="Stencil Test Function" start="28" end="30" type="3D_Compare_Function"/>
-    <field name="Stencil Fail Op" start="25" end="27" type="uint">
-      <value name="STENCILOP_KEEP" value="0"/>
-      <value name="STENCILOP_ZERO" value="1"/>
-      <value name="STENCILOP_REPLACE" value="2"/>
-      <value name="STENCILOP_INCRSAT" value="3"/>
-      <value name="STENCILOP_DECRSAT" value="4"/>
-      <value name="STENCILOP_INCR" value="5"/>
-      <value name="STENCILOP_DECR" value="6"/>
-      <value name="STENCILOP_INVERT" value="7"/>
-    </field>
-    <field name="Stencil Pass Depth Fail Op" start="22" end="24" type="uint"/>
-    <field name="Stencil Pass Depth Pass Op" start="19" end="21" type="uint"/>
+    <field name="Stencil Fail Op" start="25" end="27" type="3D_Stencil_Operation"/>
+    <field name="Stencil Pass Depth Fail Op" start="22" end="24" type="3D_Stencil_Operation"/>
+    <field name="Stencil Pass Depth Pass Op" start="19" end="21" type="3D_Stencil_Operation"/>
     <field name="Stencil Buffer Write Enable" start="18" end="18" type="bool"/>
     <field name="Double Sided Stencil Enable" start="15" end="15" type="bool"/>
     <field name="Backface Stencil Test Function" start="12" end="14" type="3D_Compare_Function"/>
-    <field name="Backface Stencil Fail Op" start="9" end="11" type="uint">
-      <value name="STENCILOP_KEEP" value="0"/>
-      <value name="STENCILOP_ZERO" value="1"/>
-      <value name="STENCILOP_REPLACE" value="2"/>
-      <value name="STENCILOP_INCRSAT" value="3"/>
-      <value name="STENCILOP_DECRSAT" value="4"/>
-      <value name="STENCILOP_INCR" value="5"/>
-      <value name="STENCILOP_DECR" value="6"/>
-      <value name="STENCILOP_INVERT" value="7"/>
-    </field>
-    <field name="Backface Stencil Pass Depth Fail Op" start="6" end="8" type="uint"/>
-    <field name="Backface Stencil Pass Depth Pass Op" start="3" end="5" type="uint"/>
+    <field name="Backface Stencil Fail Op" start="9" end="11" type="3D_Stencil_Operation"/>
+    <field name="Backface Stencil Pass Depth Fail Op" start="6" end="8" type="3D_Stencil_Operation"/>
+    <field name="Backface Stencil Pass Depth Pass Op" start="3" end="5" type="3D_Stencil_Operation"/>
     <field name="Stencil Test Mask" start="56" end="63" type="uint"/>
     <field name="Stencil Write Mask" start="48" end="55" type="uint"/>
     <field name="Backface Stencil Test Mask" start="40" end="47" type="uint"/>
@@ -560,7 +328,7 @@
     <field name="Data Return Format" start="27" end="27" type="uint">
       <value name="DATA_RETURN_FLOAT32" value="0"/>
     </field>
-    <field name="Surface Format" start="18" end="26" type="SURFACE_FORMAT"/>
+    <field name="Surface Format" start="18" end="26" type="uint"/>
     <field name="Vertical Line Stride" start="12" end="12" type="uint"/>
     <field name="Vertical Line Stride Offset" start="11" end="11" type="uint"/>
     <field name="MIP Map Layout Mode" start="10" end="10" type="uint">
@@ -580,7 +348,12 @@
       <value name="PROGRESSIVE_FRAME" value="2"/>
       <value name="INTERLACED_FRAME" value="3"/>
     </field>
-    <field name="Cube Face Enables" start="0" end="5" type="uint"/>
+    <field name="Cube Face Enable - Positive Z" start="0" end="0" type="bool"/>
+    <field name="Cube Face Enable - Negative Z" start="1" end="1" type="bool"/>
+    <field name="Cube Face Enable - Positive Y" start="2" end="2" type="bool"/>
+    <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="Surface Base Address" start="32" end="63" type="address"/>
     <field name="Height" start="83" end="95" type="uint"/>
     <field name="Width" start="70" end="82" type="uint"/>
@@ -690,9 +463,9 @@
       <value name="CUBECTRLMODE_PROGRAMMED" value="0"/>
       <value name="CUBECTRLMODE_OVERRIDE" value="1"/>
     </field>
-    <field name="TCX Address Control Mode" start="38" end="40" type="uint"/>
-    <field name="TCY Address Control Mode" start="35" end="37" type="uint"/>
-    <field name="TCZ Address Control Mode" start="32" end="34" type="uint"/>
+    <field name="TCX Address Control Mode" start="38" end="40" type="Texture Coordinate Mode"/>
+    <field name="TCY Address Control Mode" start="35" end="37" type="Texture Coordinate Mode"/>
+    <field name="TCZ Address Control Mode" start="32" end="34" type="Texture Coordinate Mode"/>
     <field name="Border Color Pointer" start="69" end="95" type="offset"/>
     <field name="Monochrome Filter Height: Reserved" start="125" end="127" type="uint"/>
     <field name="Monochrome Filter Width" start="122" end="124" type="uint"/>
@@ -721,7 +494,7 @@
     <field name="Non-normalized Coordinate Enable" start="96" end="96" type="bool"/>
   </struct>
 
-  <instruction name="3DPRIMITIVE" bias="2" length="6">
+  <instruction name="3DPRIMITIVE" 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="3"/>
@@ -743,7 +516,7 @@
     <field name="Base Vertex Location" start="160" end="191" type="int"/>
   </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"/>
@@ -755,7 +528,7 @@
     <field name="AA Coverage EndCap Slope" start="64" end="71" type="u0.8"/>
   </instruction>
 
-  <instruction name="3DSTATE_BINDING_TABLE_POINTERS" bias="2" length="4">
+  <instruction name="3DSTATE_BINDING_TABLE_POINTERS" 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"/>
@@ -769,7 +542,7 @@
     <field name="Pointer to PS Binding Table" start="101" end="127" type="offset"/>
   </instruction>
 
-  <instruction name="3DSTATE_CC_STATE_POINTERS" bias="2" length="4">
+  <instruction name="3DSTATE_CC_STATE_POINTERS" 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"/>
@@ -779,11 +552,11 @@
     <field name="BLEND_STATE Change" start="32" end="32" type="bool"/>
     <field name="Pointer to DEPTH_STENCIL_STATE" start="70" end="95" type="offset"/>
     <field name="DEPTH_STENCIL_STATE Change" start="64" end="64" type="bool"/>
-    <field name="Pointer to COLOR_CALC_STATE" start="102" end="127" type="offset"/>
-    <field name="COLOR_CALC_STATE Change" start="96" end="96" type="bool"/>
+    <field name="Color Calc State Pointer" start="102" end="127" type="offset"/>
+    <field name="Color Calc State Pointer Valid" start="96" end="96" 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"/>
@@ -794,7 +567,7 @@
     <field name="ChromaKey High Value" start="96" end="127" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_CLEAR_PARAMS" bias="2" length="2">
+  <instruction name="3DSTATE_CLEAR_PARAMS" 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"/>
@@ -804,22 +577,22 @@
     <field name="Depth Clear Value" start="32" end="63" type="uint"/>
   </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"/>
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="18"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="2"/>
-    <field name="Clipper Statistics Enable" start="42" end="42" type="bool"/>
+    <field name="Statistics Enable" start="42" end="42" type="bool"/>
     <field name="User Clip Distance Cull Test Enable Bitmask" start="32" end="39" type="uint"/>
-    <field name="CLIP Enable" start="95" end="95" type="bool"/>
+    <field name="Clip Enable" start="95" end="95" type="bool"/>
     <field name="API Mode" start="94" end="94" type="uint">
       <value name="APIMODE_OGL" value="0"/>
       <value name="APIMODE_D3D" value="1"/>
     </field>
-    <field name="Viewport XY ClipTest Enable" start="92" end="92" type="bool"/>
-    <field name="Viewport Z ClipTest Enable" start="91" end="91" type="bool"/>
-    <field name="Guardband ClipTest Enable" start="90" end="90" type="bool"/>
+    <field name="Viewport XY Clip Test Enable" start="92" end="92" type="bool"/>
+    <field name="Viewport Z Clip Test Enable" start="91" end="91" type="bool"/>
+    <field name="Guardband Clip Test Enable" start="90" end="90" type="bool"/>
     <field name="User Clip Distance Clip Test Enable Bitmask" start="80" end="87" type="uint"/>
     <field name="Clip Mode" start="77" end="79" type="uint">
       <value name="CLIPMODE_NORMAL" value="0"/>
@@ -845,11 +618,22 @@
     </field>
     <field name="Minimum Point Width" start="113" end="123" type="u8.3"/>
     <field name="Maximum Point Width" start="102" end="112" type="u8.3"/>
-    <field name="Force Zero RTAIndex Enable" start="101" end="101" type="bool"/>
-    <field name="Maximum VPIndex" start="96" end="99" type="uint"/>
-  </instruction>
+    <field name="Force Zero RTA Index Enable" start="101" end="101" type="bool"/>
+    <field name="Maximum VP Index" start="96" end="99" type="uint"/>
+  </instruction>
+
+  <struct name="3DSTATE_CONSTANT_BODY" length="4">
+    <field name="Pointer to Constant Buffer 0" start="5" end="31" type="offset"/>
+    <field name="Constant Buffer 0 Read Length" start="0" end="4" type="uint"/>
+    <field name="Pointer to Constant Buffer 1" start="37" end="63" type="address"/>
+    <field name="Constant Buffer 1 Read Length" start="32" end="36" type="uint"/>
+    <field name="Pointer to Constant Buffer 2" start="69" end="95" type="address"/>
+    <field name="Constant Buffer 2 Read Length" start="64" end="68" type="uint"/>
+    <field name="Pointer to Constant Buffer 3" start="101" end="127" type="address"/>
+    <field name="Constant Buffer 3 Read Length" start="96" end="100" type="uint"/>
+  </struct>
 
-  <instruction name="3DSTATE_CONSTANT_GS" bias="2" length="5">
+  <instruction name="3DSTATE_CONSTANT_GS" 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"/>
@@ -860,17 +644,10 @@
     <field name="Buffer 0 Valid" start="12" end="12" type="bool"/>
     <field name="Constant Buffer Object Control State" start="8" end="11" type="MEMORY_OBJECT_CONTROL_STATE"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="3"/>
-    <field name="Pointer to GS Constant Buffer 0" start="37" end="63" type="offset"/>
-    <field name="GS Constant Buffer 0 Read Length" start="32" end="36" type="uint"/>
-    <field name="Pointer to GS Constant Buffer 1" start="69" end="95" type="address"/>
-    <field name="GS Constant Buffer 1 Read Length" start="64" end="68" type="uint"/>
-    <field name="Pointer to GS Constant Buffer 2" start="101" end="127" type="address"/>
-    <field name="GS Constant Buffer 2 Read Length" start="96" end="100" type="uint"/>
-    <field name="Pointer to GS Constant Buffer 3" start="133" end="159" type="address"/>
-    <field name="GS Constant Buffer 3 Read Length" start="128" end="132" type="uint"/>
+    <field name="Constant Body" start="32" end="159" type="3DSTATE_CONSTANT_BODY"/>
   </instruction>
 
-  <instruction name="3DSTATE_CONSTANT_PS" bias="2" length="5">
+  <instruction name="3DSTATE_CONSTANT_PS" 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"/>
@@ -881,17 +658,10 @@
     <field name="Buffer 0 Valid" start="12" end="12" type="bool"/>
     <field name="Constant Buffer Object Control State" start="8" end="11" type="MEMORY_OBJECT_CONTROL_STATE"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="3"/>
-    <field name="Pointer to PS Constant Buffer 0" start="37" end="63" type="offset"/>
-    <field name="PS Constant Buffer 0 Read Length" start="32" end="36" type="uint"/>
-    <field name="Pointer to PS Constant Buffer 1" start="69" end="95" type="address"/>
-    <field name="PS Constant Buffer 1 Read Length" start="64" end="68" type="uint"/>
-    <field name="Pointer to PS Constant Buffer 2" start="101" end="127" type="address"/>
-    <field name="PS Constant Buffer 2 Read Length" start="96" end="100" type="uint"/>
-    <field name="Pointer to PS Constant Buffer 3" start="133" end="159" type="address"/>
-    <field name="PS Constant Buffer 3 Read Length" start="128" end="132" type="uint"/>
+    <field name="Constant Body" start="32" end="159" type="3DSTATE_CONSTANT_BODY"/>
   </instruction>
 
-  <instruction name="3DSTATE_CONSTANT_VS" bias="2" length="5">
+  <instruction name="3DSTATE_CONSTANT_VS" 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"/>
@@ -902,17 +672,10 @@
     <field name="Buffer 0 Valid" start="12" end="12" type="bool"/>
     <field name="Constant Buffer Object Control State" start="8" end="11" type="MEMORY_OBJECT_CONTROL_STATE"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="3"/>
-    <field name="Pointer to VS Constant Buffer 0" start="37" end="63" type="offset"/>
-    <field name="VS Constant Buffer 0 Read Length" start="32" end="36" type="uint"/>
-    <field name="Pointer to VS Constant Buffer 1" start="69" end="95" type="address"/>
-    <field name="VS Constant Buffer 1 Read Length" start="64" end="68" type="uint"/>
-    <field name="Pointer to VS Constant Buffer 2" start="101" end="127" type="address"/>
-    <field name="VS Constant Buffer 2 Read Length" start="96" end="100" type="uint"/>
-    <field name="Pointer to VS Constant Buffer 3" start="133" end="159" type="address"/>
-    <field name="VS Constant Buffer 3 Read Length" start="128" end="132" type="uint"/>
+    <field name="Constant Body" start="32" end="159" type="3DSTATE_CONSTANT_BODY"/>
   </instruction>
 
-  <instruction name="3DSTATE_DEPTH_BUFFER" bias="2" length="7">
+  <instruction name="3DSTATE_DEPTH_BUFFER" 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="1"/>
@@ -945,18 +708,14 @@
     </field>
     <field name="Surface Pitch" start="32" end="48" type="uint"/>
     <field name="Surface Base Address" start="64" end="95" type="address"/>
-    <field name="Height" start="115" end="127" type="uint">
-      <value name="SURFTYPE_1D:  must be zero" value="0"/>
-    </field>
+    <field name="Height" start="115" end="127" type="uint"/>
     <field name="Width" start="102" end="114" type="uint"/>
     <field name="LOD" start="98" end="101" type="uint"/>
     <field name="MIP Map Layout Mode" start="97" end="97" type="uint">
       <value name="MIPLAYOUT_BELOW" value="0"/>
       <value name="MIPLAYOUT_RIGHT" value="1"/>
     </field>
-    <field name="Depth" start="149" end="159" type="uint">
-      <value name="SURFTYPE_CUBE:  must be zero" value="0"/>
-    </field>
+    <field name="Depth" start="149" end="159" type="uint"/>
     <field name="Minimum Array Element" start="138" end="148" type="uint"/>
     <field name="Render Target View Extent" start="129" end="137" type="uint"/>
     <field name="Depth Coordinate Offset Y" start="176" end="191" type="int"/>
@@ -965,7 +724,7 @@
     <field name="Depth Buffer MOCS" start="219" end="223" 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"/>
@@ -979,7 +738,7 @@
     <field name="Drawing Rectangle Origin X" start="96" end="111" type="int"/>
   </instruction>
 
-  <instruction name="3DSTATE_GS" bias="2" length="7">
+  <instruction name="3DSTATE_GS" 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="0"/>
@@ -1006,7 +765,7 @@
     </field>
     <field name="Illegal Opcode Exception Enable" start="77" end="77" type="bool"/>
     <field name="Mask Stack Exception Enable" start="75" end="75" type="bool"/>
-    <field name="Software  Exception Enable" start="71" end="71" type="bool"/>
+    <field name="Software Exception Enable" start="71" end="71" type="bool"/>
     <field name="Scratch Space Base Pointer" start="106" end="127" type="address"/>
     <field name="Per-Thread Scratch Space" start="96" end="99" type="uint"/>
     <field name="Vertex URB Entry Read Length" start="139" end="144" type="uint"/>
@@ -1016,15 +775,18 @@
     <field name="Statistics Enable" start="170" end="170" type="bool"/>
     <field name="SO Statistics Enable" start="169" end="169" type="bool"/>
     <field name="Rendering Enabled" start="168" end="168" type="uint"/>
-    <field name="Reorder Enable" start="222" end="222" type="bool"/>
+    <field name="Reorder Mode" start="222" end="222" type="uint">
+      <value name="LEADING" value="0"/>
+      <value name="TRAILING" value="1"/>
+    </field>
     <field name="Discard Adjacency" start="221" end="221" type="bool"/>
     <field name="SVBI Payload Enable" start="220" end="220" type="bool"/>
     <field name="SVBI Post-Increment Enable" start="219" end="219" type="bool"/>
     <field name="SVBI Post-Increment Value" start="208" end="217" type="uint"/>
-    <field name="Function Enable" start="207" end="207" type="bool"/>
+    <field name="Enable" start="207" end="207" type="bool"/>
   </instruction>
 
-  <instruction name="3DSTATE_GS_SVB_INDEX" bias="2" length="7">
+  <instruction name="3DSTATE_GS_SVB_INDEX" 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="1"/>
@@ -1036,7 +798,7 @@
     <field name="Maximum Index" start="96" end="127" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_HIER_DEPTH_BUFFER" bias="2" length="3">
+  <instruction name="3DSTATE_HIER_DEPTH_BUFFER" 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"/>
@@ -1048,12 +810,13 @@
     <field name="Surface Base Address" start="64" end="95" type="address"/>
   </instruction>
 
-  <instruction name="3DSTATE_INDEX_BUFFER" bias="2" length="3">
+  <instruction name="3DSTATE_INDEX_BUFFER" 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"/>
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="10"/>
     <field name="Memory Object Control State" start="12" end="15" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="IndexBufferMOCS" start="12" end="15" type="uint"/>
     <field name="Cut Index Enable" start="10" end="10" type="bool"/>
     <field name="Index Format" start="8" end="9" type="uint" prefix="INDEX">
       <value name="BYTE" value="0"/>
@@ -1065,7 +828,7 @@
     <field name="Buffer Ending Address" start="64" end="95" type="address"/>
   </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"/>
@@ -1075,11 +838,11 @@
     <field name="Current Repeat Counter" start="53" end="61" type="uint"/>
     <field name="Current Stipple Index" start="48" end="51" type="uint"/>
     <field name="Line Stipple Pattern" start="32" end="47" type="uint"/>
-    <field name="Line Stipple Inverse Repeat Count" start="79" end="95" type="u1.16"/>
+    <field name="Line Stipple Inverse Repeat Count" start="80" end="95" type="u1.13"/>
     <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"/>
@@ -1089,15 +852,15 @@
     <field name="Monochrome Filter Height" start="32" end="34" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_MULTISAMPLE" bias="2" length="3">
+  <instruction name="3DSTATE_MULTISAMPLE" 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"/>
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="13"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Pixel Location" start="36" end="36" type="uint">
-      <value name="PIXLOC_CENTER" value="0"/>
-      <value name="PIXLOC_UL_CORNER" value="1"/>
+      <value name="CENTER" value="0"/>
+      <value name="UL_CORNER" value="1"/>
     </field>
     <field name="Number of Multisamples" start="33" end="35" type="uint">
       <value name="NUMSAMPLES_1" value="0"/>
@@ -1113,7 +876,7 @@
     <field name="Sample0 Y Offset" start="64" end="67" type="u0.4"/>
   </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"/>
@@ -1123,7 +886,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"/>
@@ -1134,7 +897,7 @@
     </group>
   </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"/>
@@ -1145,7 +908,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"/>
@@ -1159,7 +922,7 @@
     </group>
   </instruction>
 
-  <instruction name="3DSTATE_SAMPLER_STATE_POINTERS" bias="2" length="4">
+  <instruction name="3DSTATE_SAMPLER_STATE_POINTERS" 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"/>
@@ -1173,7 +936,7 @@
     <field name="Pointer to PS Sampler State" start="101" end="127" 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"/>
@@ -1182,7 +945,7 @@
     <field name="Sample Mask" start="32" end="35" type="uint"/>
   </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"/>
@@ -1191,7 +954,7 @@
     <field name="Scissor Rect Pointer" start="37" end="63" type="offset"/>
   </instruction>
 
-  <instruction name="3DSTATE_SF" bias="2" length="20">
+  <instruction name="3DSTATE_SF" bias="2" length="20" 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"/>
@@ -1225,7 +988,7 @@
       <value name="FRONTWINDING_CW" value="0"/>
       <value name="FRONTWINDING_CCW" value="1"/>
     </field>
-    <field name="Anti-aliasing Enable" start="127" end="127" type="bool"/>
+    <field name="Anti-Aliasing Enable" start="127" end="127" type="bool"/>
     <field name="Cull Mode" start="125" end="126" type="uint" prefix="CULLMODE">
       <value name="BOTH" value="0"/>
       <value name="NONE" value="1"/>
@@ -1240,7 +1003,12 @@
       <value name="4.0 pixels" value="3"/>
     </field>
     <field name="Scissor Rectangle Enable" start="107" end="107" type="bool"/>
-    <field name="Multisample Rasterization  Mode" start="104" end="105" type="uint"/>
+    <field name="Multisample Rasterization Mode" start="104" end="105" type="uint">
+      <value name="MSRASTMODE_OFF_PIXEL" value="0"/>
+      <value name="MSRASTMODE_OFF_PATTERN" value="1"/>
+      <value name="MSRASTMODE_ON_PIXEL" value="2"/>
+      <value name="MSRASTMODE_ON_PATTERN" value="3"/>
+    </field>
     <field name="Last Pixel Enable" start="159" end="159" type="bool"/>
     <field name="Triangle Strip/List Provoking Vertex Select" start="157" end="158" type="uint">
       <value name="Vertex 0" value="0"/>
@@ -1263,9 +1031,9 @@
       <value name="8 Sub-Pixel Precision Bits" value="0"/>
       <value name="4 Sub-Pixel Precision Bits" value="1"/>
     </field>
-    <field name="Use Point Width State" start="139" end="139" type="uint">
-      <value name="Use Point Width on Vertex" value="0"/>
-      <value name="Use Point Width from State" value="1"/>
+    <field name="Point Width Source" start="139" end="139" type="uint">
+      <value name="Vertex" value="0"/>
+      <value name="State" value="1"/>
     </field>
     <field name="Point Width" start="128" end="138" type="u8.3"/>
     <field name="Global Depth Offset Constant" start="160" end="191" type="float"/>
@@ -1294,7 +1062,7 @@
     <field name="Attribute 8 WrapShortest Enables" start="608" end="611" type="uint"/>
   </instruction>
 
-  <instruction name="3DSTATE_STENCIL_BUFFER" bias="2" length="3">
+  <instruction name="3DSTATE_STENCIL_BUFFER" 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"/>
@@ -1306,7 +1074,7 @@
     <field name="Surface Base Address" start="64" end="95" type="address"/>
   </instruction>
 
-  <instruction name="3DSTATE_URB" bias="2" length="3">
+  <instruction name="3DSTATE_URB" 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"/>
@@ -1318,7 +1086,7 @@
     <field name="GS URB Entry Allocation Size" start="64" end="66" 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"/>
@@ -1329,7 +1097,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"/>
@@ -1340,7 +1108,7 @@
     </group>
   </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"/>
@@ -1348,7 +1116,7 @@
     <field name="Statistics Enable" start="0" end="0" type="bool"/>
   </instruction>
 
-  <instruction name="3DSTATE_VIEWPORT_STATE_POINTERS" bias="2" length="4">
+  <instruction name="3DSTATE_VIEWPORT_STATE_POINTERS" 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"/>
@@ -1362,7 +1130,7 @@
     <field name="Pointer to CC_VIEWPORT" start="101" end="127" type="offset"/>
   </instruction>
 
-  <instruction name="3DSTATE_VS" bias="2" length="6">
+  <instruction name="3DSTATE_VS" 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"/>
@@ -1384,7 +1152,7 @@
       <value name="Alternate" value="1"/>
     </field>
     <field name="Illegal Opcode Exception Enable" start="77" end="77" type="bool"/>
-    <field name="Software  Exception Enable" start="71" end="71" type="bool"/>
+    <field name="Software Exception Enable" start="71" end="71" type="bool"/>
     <field name="Scratch Space Base Pointer" start="106" end="127" type="address"/>
     <field name="Per-Thread Scratch Space" start="96" end="99" type="uint"/>
     <field name="Dispatch GRF Start Register For URB Data" start="148" end="152" type="uint"/>
@@ -1393,16 +1161,16 @@
     <field name="Maximum Number of Threads" start="185" end="191" type="uint"/>
     <field name="Statistics Enable" start="170" end="170" type="bool"/>
     <field name="Vertex Cache Disable" start="161" end="161" type="bool"/>
-    <field name="Function Enable" start="160" end="160" type="bool"/>
+    <field name="Enable" start="160" end="160" type="bool"/>
   </instruction>
 
-  <instruction name="3DSTATE_WM" bias="2" length="9">
+  <instruction name="3DSTATE_WM" 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"/>
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="20"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="7"/>
-    <field name="Kernel Start Pointer[0]" start="38" end="63" type="offset"/>
+    <field name="Kernel Start Pointer 0" start="38" end="63" type="offset"/>
     <field name="Single Program Flow" start="95" end="95" type="bool"/>
     <field name="Vector Mask Enable" start="94" end="94" type="bool"/>
     <field name="Sampler Count" start="91" end="93" type="uint"/>
@@ -1410,9 +1178,9 @@
     <field name="Thread Priority" start="81" end="81" type="uint">
       <value name="High" value="1"/>
     </field>
-    <field name="Floating Point Mode" start="80" end="80" type="uint">
+    <field name="Floating Point Mode" start="80" end="80" type="uint" prefix="FLOATING_POINT_MODE">
       <value name="IEEE-745" value="0"/>
-      <value name="Alt" value="1"/>
+      <value name="Alternate" value="1"/>
     </field>
     <field name="Illegal Opcode Exception Enable" start="77" end="77" type="bool"/>
     <field name="MaskStack Exception Enable" start="75" end="75" type="bool"/>
@@ -1423,9 +1191,9 @@
     <field name="Depth Buffer Clear" start="158" end="158" type="bool"/>
     <field name="Depth Buffer Resolve Enable" start="156" end="156" type="bool"/>
     <field name="Hierarchical Depth Buffer Resolve Enable" start="155" end="155" type="bool"/>
-    <field name="Dispatch GRF Start Register For Constant/Setup Data [0]" start="144" end="150" type="uint"/>
-    <field name="Dispatch GRF Start Register For Constant/Setup Data [1]" start="136" end="142" type="uint"/>
-    <field name="Dispatch GRF Start Register For Constant/Setup Data [2]" start="128" end="134" type="uint"/>
+    <field name="Dispatch GRF Start Register For Constant/Setup Data 0" start="144" end="150" type="uint"/>
+    <field name="Dispatch GRF Start Register For Constant/Setup Data 1" start="136" end="142" type="uint"/>
+    <field name="Dispatch GRF Start Register For Constant/Setup Data 2" start="128" end="134" type="uint"/>
     <field name="Maximum Number of Threads" start="185" end="191" type="uint"/>
     <field name="Legacy Diamond Line Rasterization" start="183" end="183" type="bool"/>
     <field name="Pixel Shader Kills Pixel" start="182" end="182" type="bool"/>
@@ -1485,11 +1253,11 @@
       <value name="MSDISPMODE_PERSAMPLE" value="0"/>
       <value name="MSDISPMODE_PERPIXEL" value="1"/>
     </field>
-    <field name="Kernel Start Pointer[1]" start="230" end="255" type="offset"/>
-    <field name="Kernel Start Pointer[2]" start="262" end="287" type="offset"/>
+    <field name="Kernel Start Pointer 1" start="230" end="255" type="offset"/>
+    <field name="Kernel Start Pointer 2" start="262" end="287" type="offset"/>
   </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"/>
@@ -1499,7 +1267,7 @@
     <field name="CURBE Data Start Address" start="96" end="127" type="uint"/>
   </instruction>
 
-  <instruction name="MEDIA_GATEWAY_STATE" bias="2" length="2">
+  <instruction name="MEDIA_GATEWAY_STATE" 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"/>
@@ -1510,7 +1278,7 @@
     <field name="Barrier.ThreadCount" start="32" end="39" 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"/>
@@ -1520,7 +1288,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"/>
@@ -1547,7 +1315,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"/>
@@ -1565,7 +1333,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"/>
@@ -1615,7 +1383,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"/>
@@ -1628,7 +1396,7 @@
     </field>
   </instruction>
 
-  <instruction name="MEDIA_VFE_STATE" bias="2" length="8">
+  <instruction name="MEDIA_VFE_STATE" bias="2" length="8" 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"/>
@@ -1705,7 +1473,7 @@
     <field name="Batch Buffer Start Address" start="34" end="63" 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"/>
@@ -1727,7 +1495,7 @@
     <field name="Compare Address" start="67" end="95" type="address"/>
   </instruction>
 
-  <instruction name="MI_FLUSH" bias="1" length="1">
+  <instruction name="MI_FLUSH" 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="4"/>
     <field name="Indirect State Pointers Disable" start="5" end="5" type="bool"/>
@@ -1753,9 +1521,13 @@
     <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_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">
@@ -1792,7 +1564,7 @@
     <field name="Semaphore Data Dword" start="32" end="63" type="uint"/>
   </instruction>
 
-  <instruction name="MI_SET_CONTEXT" bias="2" length="2">
+  <instruction name="MI_SET_CONTEXT" 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="24"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="0"/>
@@ -1810,10 +1582,9 @@
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="32"/>
     <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="DWord Length" start="0" end="5" type="uint" default="2"/>
-    <field name="Address" start="66" end="95" type="uint"/>
+    <field name="Address" start="66" end="95" type="address"/>
     <field name="Core Mode Enable" start="64" end="64" 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">
@@ -1840,7 +1611,7 @@
     <field name="Suspend Flush" start="0" end="0" type="bool"/>
   </instruction>
 
-  <instruction name="MI_URB_CLEAR" bias="2" length="2">
+  <instruction name="MI_URB_CLEAR" 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="25"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="0"/>
@@ -1853,7 +1624,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">
     <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="Condition Code Wait Select" start="16" end="19" type="uint">
@@ -1871,7 +1642,7 @@
     <field name="Display Pipe 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"/>
@@ -1882,7 +1653,7 @@
     </field>
   </instruction>
 
-  <instruction name="PIPE_CONTROL" bias="2" length="5">
+  <instruction name="PIPE_CONTROL" 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="2"/>
@@ -1918,7 +1689,7 @@
     <field name="Immediate Data" start="96" end="159" type="uint"/>
   </instruction>
 
-  <instruction name="STATE_BASE_ADDRESS" bias="2" length="10">
+  <instruction name="STATE_BASE_ADDRESS" 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="0"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -1957,7 +1728,7 @@
     <field name="Instruction Access Upper Bound Modify Enable" start="288" end="288" type="bool"/>
   </instruction>
 
-  <instruction name="STATE_PREFETCH" bias="2" length="2">
+  <instruction name="STATE_PREFETCH" 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="0"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="0"/>
@@ -1967,7 +1738,7 @@
     <field name="Prefetch Count" start="32" end="34" type="uint"/>
   </instruction>
 
-  <instruction name="STATE_SIP" bias="2" length="2">
+  <instruction name="STATE_SIP" 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="0"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
@@ -1976,4 +1747,226 @@
     <field name="System Instruction Pointer" start="36" end="63" type="offset"/>
   </instruction>
 
+  <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="AVS Done" start="1" end="1" type="bool"/>
+    <field name="HIZ Done" start="2" end="2" type="bool"/>
+    <field name="GW Done" start="3" end="3" type="bool"/>
+    <field name="TS Done" start="4" end="4" type="bool"/>
+    <field name="TD Done" start="6" end="6" type="bool"/>
+    <field name="VFE Done" start="7" end="7" type="bool"/>
+    <field name="IEF Done" start="8" end="8" type="bool"/>
+    <field name="VSC Done" start="9" end="9" type="bool"/>
+    <field name="ISC2/3 Done" start="10" end="10" type="bool"/>
+    <field name="ISC1/0 Done" start="11" end="11" type="bool"/>
+    <field name="IC0 Done" start="12" end="12" type="bool"/>
+    <field name="IC1 Done" start="13" end="13" type="bool"/>
+    <field name="IC2 Done" start="14" end="14" type="bool"/>
+    <field name="IC3 Done" start="15" end="15" type="bool"/>
+    <field name="EU00 Done" start="16" end="16" type="bool"/>
+    <field name="EU01 Done" start="17" end="17" type="bool"/>
+    <field name="EU02 Done" start="18" end="18" type="bool"/>
+    <field name="MA0 Done" start="19" end="19" type="bool"/>
+    <field name="EU10 Done" start="20" end="20" type="bool"/>
+    <field name="EU11 Done" start="21" end="21" type="bool"/>
+    <field name="EU12 Done" start="22" end="22" type="bool"/>
+    <field name="MA1 Done" start="23" end="23" type="bool"/>
+    <field name="EU20 Done" start="24" end="24" type="bool"/>
+    <field name="EU21 Done" start="25" end="25" type="bool"/>
+    <field name="EU22 Done" start="26" end="26" type="bool"/>
+    <field name="MA2 Done" start="27" end="27" type="bool"/>
+    <field name="EU30 Done" start="28" end="28" type="bool"/>
+    <field name="EU31 Done" start="29" end="29" type="bool"/>
+    <field name="EU32 Done" start="30" end="30" type="bool"/>
+    <field name="MA3 Done" start="31" end="31" type="bool"/>
+  </register>
+
+  <register name="INSTDONE_2" length="1" num="0x207c">
+    <field name="VF Done" start="0" end="0" type="bool"/>
+    <field name="VS0 Done" start="1" end="1" type="bool"/>
+    <field name="GS Done" start="2" end="2" type="bool"/>
+    <field name="CL Done" start="3" end="3" type="bool"/>
+    <field name="SF Done" start="4" end="4" type="bool"/>
+    <field name="VME Done" start="5" end="5" type="bool"/>
+    <field name="PL Done" start="6" end="6" type="bool"/>
+    <field name="SO Done" start="7" end="7" type="bool"/>
+    <field name="SI Done" start="8" end="8" type="bool"/>
+    <field name="DG Done" start="9" end="9" type="bool"/>
+    <field name="FT Done" start="10" end="10" type="bool"/>
+    <field name="DM Done" start="11" end="11" type="bool"/>
+    <field name="SC Done" start="12" end="12" type="bool"/>
+    <field name="FL Done" start="13" end="13" type="bool"/>
+    <field name="QC Done" start="14" end="14" type="bool"/>
+    <field name="SVSM Done" start="15" end="15" type="bool"/>
+    <field name="WMFE Done" start="16" end="16" type="bool"/>
+    <field name="IZ Done" start="17" end="17" type="bool"/>
+    <field name="PSD Done" start="18" end="18" type="bool"/>
+    <field name="DAP Done" start="19" end="19" type="bool"/>
+    <field name="RCZ Done" start="20" end="20" type="bool"/>
+    <field name="VDI Done" start="21" end="21" type="bool"/>
+    <field name="RCPBE Done" start="22" end="22" type="bool"/>
+    <field name="RCPFE Done" start="23" end="23" type="bool"/>
+    <field name="MT Done" start="24" end="24" type="bool"/>
+    <field name="ISC Done" start="25" end="25" type="bool"/>
+    <field name="SVG Done" start="26" end="26" type="bool"/>
+    <field name="RCC Done" start="27" end="27" type="bool"/>
+    <field name="SVRW Done" start="28" end="28" type="bool"/>
+    <field name="WMBE Done" start="29" end="29" type="bool"/>
+    <field name="CS Done" start="30" end="30" type="bool"/>
+    <field name="GAM Done" start="31" end="31" 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="VCS Done" start="30" end="30" type="bool"/>
+    <field name="GAC Done" start="31" end="31" type="bool"/>
+  </register>
+
+  <register name="GFX_ARB_ERROR_RPT" length="1" num="0x40a0">
+    <field name="TLB Page Fault Error" start="0" end="0" type="bool"/>
+    <field name="Context Page Fault Error" start="1" end="1" type="bool"/>
+    <field name="Invalid Page Directory entry error" start="2" end="2" type="bool"/>
+    <field name="Hardware Status Page Fault Error" start="3" end="3" type="bool"/>
+    <field name="TLB Page VTD Translation Error" start="4" end="4" type="bool"/>
+    <field name="Context Page VTD Translation Error" start="5" end="5" type="bool"/>
+    <field name="Page Directory Entry VTD Translation Error" start="6" end="6" type="bool"/>
+    <field name="Hardware Status Page VTD Translation Error" start="7" end="7" type="bool"/>
+    <field name="Unloaded PD Error" start="8" end="8" type="bool"/>
+  </register>
+
+  <register name="BCS_FAULT_REG" length="1" num="0x4294">
+    <field name="Valid Bit" start="0" end="0" type="bool"/>
+    <field name="Fault Type" start="1" end="2" type="uint">
+      <value name="Page Fault" value="0"/>
+      <value name="Invalid PD Fault" value="1"/>
+      <value name="Unloaded PD Fault" value="2"/>
+      <value name="Invalid and Unloaded PD fault" value="3"/>
+    </field>
+    <field name= "SRCID of Fault" start="3" end="10" type="uint"/>
+    <field name="GTTSEL" start="11" end="11" type="uint">
+      <value name="PPGTT" value="0"/>
+      <value name="GGTT" value="1"/>
+    </field>
+    <field name="Virtual Address of Fault" start="12" end="31" type="address"/>
+  </register>
+
+  <register name="RCS_FAULT_REG" length="1" num="0x4094">
+    <field name="Valid Bit" start="0" end="0" type="bool"/>
+    <field name="Fault Type" start="1" end="2" type="uint">
+      <value name="Page Fault" value="0"/>
+      <value name="Invalid PD Fault" value="1"/>
+      <value name="Unloaded PD Fault" value="2"/>
+      <value name="Invalid and Unloaded PD fault" value="3"/>
+    </field>
+    <field name= "SRCID of Fault" start="3" end="10" type="uint"/>
+    <field name="GTTSEL" start="11" end="11" type="uint">
+      <value name="PPGTT" value="0"/>
+      <value name="GGTT" value="1"/>
+    </field>
+    <field name="Virtual Address of Fault" start="12" end="31" type="address"/>
+  </register>
+
+  <register name="VCS_FAULT_REG" length="1" num="0x4194">
+    <field name="Valid Bit" start="0" end="0" type="bool"/>
+    <field name="Fault Type" start="1" end="2" type="uint">
+      <value name="Page Fault" value="0"/>
+      <value name="Invalid PD Fault" value="1"/>
+      <value name="Unloaded PD Fault" value="2"/>
+      <value name="Invalid and Unloaded PD fault" value="3"/>
+    </field>
+    <field name= "SRCID of Fault" start="3" end="10" type="uint"/>
+    <field name="GTTSEL" start="11" end="11" type="uint">
+      <value name="PPGTT" value="0"/>
+      <value name="GGTT" value="1"/>
+    </field>
+    <field name="Virtual Address of Fault" start="12" end="31" type="address"/>
+  </register>
+
+  <register name="BCS_RING_BUFFER_CTL" length="1" num="0x2203c">
+    <field name="Ring Buffer Enable" start="0" end="0" type="bool"/>
+    <field name="Automatic Report Head Pointer" start="1" end="2" type="uint">
+      <value name="MI_AUTOREPORT_OFF" value="0"/>
+      <value name="MI_AUTOREPORT_64KB" value="1"/>
+      <value name="MI_AUTOREPORT_4KB" value="2"/>
+      <value name="MI_AUTOREPORT_128KB" value="3"/>
+    </field>
+    <field name="Disable Register Accesses" start="8" end="8" type="bool"/>
+    <field name="Semaphore Wait" start="10" end="10" type="bool"/>
+    <field name="RBWait" start="11" end="11" type="bool"/>
+    <field name="Buffer Length (in pages - 1)" start="12" end="20" type="uint"/>
+  </register>
+
+  <register name="RCS_RING_BUFFER_CTL" length="1" num="0x203c">
+    <field name="Ring Buffer Enable" start="0" end="0" type="bool"/>
+    <field name="Automatic Report Head Pointer" start="1" end="2" type="uint">
+      <value name="MI_AUTOREPORT_OFF" value="0"/>
+      <value name="MI_AUTOREPORT_64KBMI_AUTOREPORT_4KB" value="1"/>
+      <value name="MI_AUTOREPORT_128KB" value="3"/>
+    </field>
+    <field name="Semaphore Wait" start="10" end="10" type="bool"/>
+    <field name="RBWait" start="11" end="11" type="bool"/>
+    <field name="Buffer Length (in pages - 1)" start="12" end="20" type="uint"/>
+  </register>
+
+  <register name="VCS_RING_BUFFER_CTL" length="1" num="0x1203c">
+    <field name="Ring Buffer Enable" start="0" end="0" type="bool"/>
+    <field name="Automatic Report Head Pointer" start="1" end="2" type="uint">
+      <value name="MI_AUTOREPORT_OFF" value="0"/>
+      <value name="MI_AUTOREPORT_64KB" value="1"/>
+      <value name="MI_AUTOREPORT_4KB" value="2"/>
+      <value name="MI_AUTOREPORT_128KB" value="3"/>
+    </field>
+    <field name="Disable Register Accesses" start="8" end="8" type="bool"/>
+    <field name="Semaphore Wait" start="10" end="10" type="bool"/>
+    <field name="RBWait" start="11" end="11" type="bool"/>
+    <field name="Buffer Length (in pages - 1)" start="12" end="20" type="uint"/>
+  </register>
+
+  <register name="INSTPM" length="1" num="0x20c0">
+    <field name="3D State Instruction Disable" start="1" end="1" type="bool"/>
+    <field name="3D Rendering Instruction Disable" start="2" end="2" type="bool"/>
+    <field name="Media Instruction Disable" start="3" end="3" type="bool"/>
+    <field name="CONSTANT_BUFFER Address Offset Disable" start="6" end="6" type="bool"/>
+
+    <field name="3D State Instruction Disable Mask" start="17" end="17" type="bool"/>
+    <field name="3D Rendering Instruction Disable Mask" start="18" end="18" type="bool"/>
+    <field name="Media Instruction Disable Mask" start="19" end="19" type="bool"/>
+    <field name="CONSTANT_BUFFER Address Offset Disable Mask" start="22" end="22" type="bool"/>
+  </register>
+
 </genxml>