X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fintel%2Fgenxml%2Fgen7.xml;h=eabb244fe9366a0b94ba77532109136a854b19d4;hb=6ef5a44a43b0cd86fd9efc71a524de91b246baaa;hp=23d1738cc179a7870d835d8dca3ed16fea46621d;hpb=d8b85c96d13bee1b6f6276b4a1477b82415f94f7;p=mesa.git

diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index 23d1738cc17..eabb244fe93 100644
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -24,9 +24,10 @@
       <value name="INSTANCEDATA" value="1"/>
     </field>
     <field name="Vertex Buffer Memory Object Control State" start="16" end="19" type="MEMORY_OBJECT_CONTROL_STATE"/>
-    <field name="Address Modify Enable" start="14" end="14" type="uint"/>
+    <field name="Vertex Buffer MOCS" start="16" end="19" 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="Vertex Fetch Invalidate" start="12" end="12" type="uint" default="0"/>
+    <field name="Vertex Fetch Invalidate" start="12" end="12" type="bool" default="0"/>
     <field name="Buffer Pitch" start="0" end="11" type="uint"/>
     <field name="Buffer Starting Address" start="32" end="63" type="address"/>
     <field name="End Address" start="64" end="95" type="address"/>
@@ -35,7 +36,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="uint"/>
+    <field name="Valid" start="25" end="25" type="bool"/>
     <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"/>
@@ -102,7 +103,7 @@
     </group>
   </struct>
 
-  <struct name="BLEND_STATE" length="2">
+  <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">
@@ -192,6 +193,12 @@
     <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">
+      <field name="Entry" start="0" end="63" type="BLEND_STATE_ENTRY"/>
+    </group>
+  </struct>
+
   <struct name="CC_VIEWPORT" length="2">
     <field name="Minimum Depth" start="0" end="31" type="float"/>
     <field name="Maximum Depth" start="32" end="63" type="float"/>
@@ -199,7 +206,7 @@
 
   <struct name="COLOR_CALC_STATE" length="6">
     <field name="Stencil Reference Value" start="24" end="31" type="uint"/>
-    <field name="BackFace Stencil Reference Value" start="16" end="23" type="uint"/>
+    <field name="Backface Stencil Reference Value" start="16" end="23" type="uint"/>
     <field name="Round Disable Function Disable" start="15" end="15" type="bool"/>
     <field name="Alpha Test Format" start="0" end="0" type="uint">
       <value name="ALPHATEST_UNORM8" value="0"/>
@@ -239,7 +246,7 @@
     <field name="Stencil Pass Depth Pass Op" start="19" end="21" type="uint"/>
     <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="uint">
+    <field name="Backface Stencil Test Function" start="12" end="14" type="uint">
       <value name="COMPAREFUNCTION_ALWAYS" value="0"/>
       <value name="COMPAREFUNCTION_NEVER" value="1"/>
       <value name="COMPAREFUNCTION_LESS" value="2"/>
@@ -281,7 +288,7 @@
 
   <struct name="INTERFACE_DESCRIPTOR_DATA" length="8">
     <field name="Kernel Start Pointer" start="6" end="31" type="offset"/>
-    <field name="Single Program Flow" start="50" end="50" type="uint"/>
+    <field name="Single Program Flow" start="50" end="50" type="bool"/>
     <field name="Thread Priority" start="49" end="49" type="uint">
       <value name="Normal Priority" value="0"/>
       <value name="High Priority" value="1"/>
@@ -347,7 +354,7 @@
       <value name="HALIGN_4" value="0"/>
       <value name="HALIGN_8" value="1"/>
     </field>
-    <field name="Tiled Surface" start="14" end="14" type="uint"/>
+    <field name="Tiled Surface" start="14" end="14" type="bool"/>
     <field name="Tile Walk" start="13" end="13" type="uint">
       <value name="TILEWALK_XMAJOR" value="0"/>
       <value name="TILEWALK_YMAJOR" value="1"/>
@@ -388,16 +395,16 @@
     </field>
     <field name="Multisample Position Palette Index" start="128" end="130" type="uint"/>
     <field name="Strbuf Minimum Array Element" start="128" end="154" type="uint"/>
-    <field name="X Offset" start="185" end="191" type="offset"/>
-    <field name="Y Offset" start="180" end="183" type="offset"/>
+    <field name="X Offset" start="185" end="191" type="uint"/>
+    <field name="Y Offset" start="180" end="183" type="uint"/>
     <field name="Surface Object Control State" start="176" end="179" type="MEMORY_OBJECT_CONTROL_STATE"/>
     <field name="MOCS" start="176" end="179" type="uint"/>
     <field name="Surface Min LOD" start="164" end="167" type="uint"/>
     <field name="MIP Count / LOD" start="160" end="163" type="uint"/>
-    <field name="MCS Base Address" start="204" end="223" type="address"/>
-    <field name="MCS Surface Pitch" start="195" end="203" type="uint"/>
     <field name="Append Counter Address" start="198" end="223" type="address"/>
     <field name="Append Counter Enable" start="193" end="193" type="bool"/>
+    <field name="MCS Base Address" start="204" end="223" type="address"/>
+    <field name="MCS Surface Pitch" start="195" end="203" type="uint"/>
     <field name="MCS Enable" start="192" end="192" type="bool"/>
     <field name="Reserved: MBZ" start="222" end="223" type="uint"/>
     <field name="X Offset for UV Plane" start="208" end="221" type="uint"/>
@@ -953,6 +960,7 @@
     <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"/>
@@ -1061,6 +1069,7 @@
     </field>
     <field name="Minimum Array Element" start="138" end="148" type="uint"/>
     <field name="Depth Buffer Object Control State" start="128" end="131" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="Depth Buffer MOCS" start="128" end="131" type="uint"/>
     <field name="Depth Coordinate Offset Y" start="176" end="191" type="int"/>
     <field name="Depth Coordinate Offset X" start="160" end="175" type="int"/>
     <field name="Render Target View Extent" start="213" end="223" type="uint"/>
@@ -1113,7 +1122,7 @@
     </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="Scratch Space Base Pointer" start="106" end="127" type="offset"/>
+    <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"/>
     <field name="Patch URB Entry Read Length" start="139" end="145" type="uint"/>
@@ -1132,8 +1141,8 @@
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="17"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="5"/>
     <field name="Kernel Start Pointer" start="38" end="63" type="offset"/>
-    <field name="Single Program Flow (SPF)" start="95" end="95" type="uint"/>
-    <field name="Vector Mask Enable (VME)" start="94" end="94" type="uint"/>
+    <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">
       <value name="No Samplers" value="0"/>
       <value name="1-4 Samplers" value="1"/>
@@ -1153,12 +1162,12 @@
     <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="Scratch Space Base Pointer" start="106" end="127" type="offset"/>
+    <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="Output Vertex Size" start="151" end="156" type="uint"/>
     <field name="Output Topology" start="145" end="150" type="uint" prefix="OUTPUT"/>
     <field name="Vertex URB Entry Read Length" start="139" end="144" type="uint"/>
-    <field name="Include Vertex Handles" start="138" end="138" type="uint"/>
+    <field name="Include Vertex Handles" start="138" end="138" type="bool"/>
     <field name="Vertex URB Entry Read Offset" start="132" end="137" type="uint"/>
     <field name="Dispatch GRF Start Register for URB Data" start="128" end="131" type="uint"/>
     <field name="Maximum Number of Threads" start="185" end="191" type="uint"/>
@@ -1176,7 +1185,7 @@
     </field>
     <field name="GS Statistics Enable" start="170" end="170" type="uint"/>
     <field name="GS Invocations Increment Value" start="165" end="169" type="uint"/>
-    <field name="Include Primitive ID" start="164" end="164" type="uint"/>
+    <field name="Include Primitive ID" start="164" end="164" type="bool"/>
     <field name="Hint" start="163" end="163" type="uint"/>
     <field name="Reorder Enable" start="162" end="162" type="bool"/>
     <field name="Discard Adjacency" start="161" end="161" type="bool"/>
@@ -1191,6 +1200,7 @@
     <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="1"/>
     <field name="Hierarchical Depth Buffer Object Control State" start="57" end="60" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="Hierarchical Depth Buffer MOCS" start="57" end="60" type="uint"/>
     <field name="Surface Pitch" start="32" end="48" type="uint"/>
     <field name="Surface Base Address" start="64" end="95" type="address"/>
   </instruction>
@@ -1220,11 +1230,11 @@
     <field name="Statistics Enable" start="93" end="93" type="bool"/>
     <field name="Instance Count" start="64" end="67" type="uint"/>
     <field name="Kernel Start Pointer" start="102" end="127" type="offset"/>
-    <field name="Scratch Space Base Pointer" start="138" end="159" type="offset"/>
+    <field name="Scratch Space Base Pointer" start="138" end="159" type="address"/>
     <field name="Per-Thread Scratch Space" start="128" end="131" type="uint"/>
-    <field name="Single Program Flow" start="187" end="187" type="uint"/>
+    <field name="Single Program Flow" start="187" end="187" type="bool"/>
     <field name="Vector Mask Enable" start="186" end="186" type="bool"/>
-    <field name="Include Vertex Handles" start="184" end="184" type="uint"/>
+    <field name="Include Vertex Handles" start="184" end="184" type="bool"/>
     <field name="Dispatch GRF Start Register For URB Data" start="179" end="183" type="uint"/>
     <field name="Vertex URB Entry Read Length" start="171" end="176" type="uint"/>
     <field name="Vertex URB Entry Read Offset" start="164" end="169" type="uint"/>
@@ -1333,8 +1343,8 @@
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="32"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="6"/>
     <field name="Kernel Start Pointer[0]" start="38" end="63" type="offset"/>
-    <field name="Single Program Flow (SPF)" start="95" end="95" type="uint"/>
-    <field name="Vector Mask Enable (VME)" start="94" end="94" type="uint"/>
+    <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"/>
     <field name="Denormal Mode" start="90" end="90" type="uint">
       <value name="FTZ" value="0"/>
@@ -1354,7 +1364,7 @@
     <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="Scratch Space Base Pointer" start="106" end="127" type="offset"/>
+    <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="Maximum Number of Threads" start="152" end="159" type="uint"/>
     <field name="Push Constant Enable" start="139" end="139" type="bool"/>
@@ -1605,7 +1615,7 @@
       <value name="WIREFRAME" value="1"/>
       <value name="POINT" value="2"/>
     </field>
-    <field name="View Transform Enable" start="33" end="33" type="bool"/>
+    <field name="Viewport Transform Enable" start="33" end="33" type="bool"/>
     <field name="Front Winding" start="32" end="32" type="uint"/>
     <field name="Anti-Aliasing Enable" start="95" end="95" type="bool"/>
     <field name="Cull Mode" start="93" end="94" type="uint" prefix="CULLMODE">
@@ -1634,7 +1644,10 @@
       <value name="AALINEDISTANCE_TRUE" value="1"/>
     </field>
     <field name="Vertex Sub Pixel Precision Select" start="108" end="108" type="uint"/>
-    <field name="Use Point Width State" start="107" end="107" type="uint"/>
+    <field name="Point Width Source" start="107" end="107" type="uint">
+      <value name="Vertex" value="0"/>
+      <value name="State" value="1"/>
+    </field>
     <field name="Point Width" start="96" end="106" type="u8.3"/>
     <field name="Global Depth Offset Constant" start="128" end="159" type="float"/>
     <field name="Global Depth Offset Scale" start="160" end="191" type="float"/>
@@ -1680,6 +1693,7 @@
     <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="1"/>
     <field name="Stencil Buffer Object Control State" start="57" end="60" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="Stencil Buffer MOCS" start="57" end="60" type="uint"/>
     <field name="Surface Pitch" start="32" end="48" type="uint"/>
     <field name="Surface Base Address" start="64" end="95" type="address"/>
   </instruction>
@@ -1690,18 +1704,18 @@
     <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="30"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
-    <field name="SO Function Enable" start="63" end="63" type="uint"/>
-    <field name="Rendering Disable" start="62" end="62" type="uint"/>
+    <field name="SO Function Enable" start="63" end="63" type="bool"/>
+    <field name="Rendering Disable" start="62" end="62" type="bool"/>
     <field name="Render Stream Select" start="59" end="60" type="uint"/>
     <field name="Reorder Mode" start="58" end="58" type="uint">
       <value name="LEADING" value="0"/>
       <value name="TRAILING" value="1"/>
     </field>
     <field name="SO Statistics Enable" start="57" end="57" type="bool"/>
-    <field name="SO Buffer Enable [3]" start="43" end="43" type="uint"/>
-    <field name="SO Buffer Enable [2]" start="42" end="42" type="uint"/>
-    <field name="SO Buffer Enable [1]" start="41" end="41" type="uint"/>
-    <field name="SO Buffer Enable [0]" start="40" end="40" type="uint"/>
+    <field name="SO Buffer Enable [3]" start="43" end="43" type="bool"/>
+    <field name="SO Buffer Enable [2]" start="42" end="42" type="bool"/>
+    <field name="SO Buffer Enable [1]" start="41" end="41" type="bool"/>
+    <field name="SO Buffer Enable [0]" start="40" end="40" type="bool"/>
     <field name="Stream 3 Vertex Read Offset" start="93" end="93" type="uint"/>
     <field name="Stream 3 Vertex Read Length" start="88" end="92" type="uint"/>
     <field name="Stream 2 Vertex Read Offset" start="85" end="85" type="uint"/>
@@ -1843,7 +1857,7 @@
     <field name="DWord Length" start="0" end="7" type="uint" default="4"/>
     <field name="Kernel Start Pointer" start="38" end="63" type="offset"/>
     <field name="Single Vertex Dispatch" start="95" end="95" type="bool"/>
-    <field name="Vector Mask Enable (VME)" start="94" end="94" type="uint"/>
+    <field name="Vector Mask Enable" start="94" end="94" type="bool"/>
     <field name="Sampler Count" start="91" end="93" type="uint">
       <value name="No Samplers" value="0"/>
       <value name="1-4 Samplers" value="1"/>
@@ -1858,7 +1872,7 @@
     </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="Scratch Space Base Offset" start="106" end="127" type="offset"/>
+    <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"/>
     <field name="Vertex URB Entry Read Length" start="139" end="144" type="uint"/>
@@ -2109,7 +2123,7 @@
     <field name="Media Command Opcode" start="24" end="26" type="uint" default="0"/>
     <field name="SubOpcode" start="16" end="23" type="uint" default="0"/>
     <field name="DWord Length" start="0" end="15" type="uint" default="6"/>
-    <field name="Scratch Space Base Pointer" start="42" end="63" type="offset"/>
+    <field name="Scratch Space Base Pointer" start="42" end="63" type="address"/>
     <field name="Per Thread Scratch Space" start="32" end="35" type="uint"/>
     <field name="Maximum Number of Threads" start="80" end="95" type="uint"/>
     <field name="Number of URB Entries" start="72" end="79" type="uint"/>
@@ -2186,10 +2200,7 @@
   <instruction name="MI_CLFLUSH" bias="2">
     <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="uint">
-      <value name="Per Process Graphics Address" value="0"/>
-      <value name="Global Graphics Address" value="1"/>
-    </field>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="DWord Length" start="0" end="9" type="uint" default="1"/>
     <field name="Page Base Address" start="44" end="63" type="address"/>
     <field name="Starting Cacheline Offset" start="38" end="43" type="uint"/>
@@ -2202,7 +2213,7 @@
   <instruction name="MI_CONDITIONAL_BATCH_BUFFER_END" bias="2" length="2">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="54"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint" default="0"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="Compare Semaphore" start="21" end="21" type="uint" default="0"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="0"/>
     <field name="Compare Data Dword" start="32" end="63" type="uint"/>
@@ -2240,7 +2251,7 @@
   <instruction name="MI_LOAD_REGISTER_MEM" 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="41"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="Async Mode Enable" start="21" end="21" type="bool"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Register Address" start="34" end="54" type="offset"/>
@@ -2284,7 +2295,7 @@
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="40"/>
     <field name="DWord Length" start="0" end="5" type="uint" default="1"/>
     <field name="Memory Address" start="38" end="63" type="address"/>
-    <field name="Use Global GTT" start="32" end="32" type="uint"/>
+    <field name="Use Global GTT" start="32" end="32" type="bool"/>
     <field name="Report ID" start="64" end="95" type="uint"/>
   </instruction>
 
@@ -2315,7 +2326,7 @@
   <instruction name="MI_STORE_DATA_IMM" bias="2" length="4">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="32"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint"/>
+    <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="Core Mode Enable" start="64" end="64" type="uint"/>
@@ -2335,7 +2346,7 @@
   <instruction name="MI_STORE_REGISTER_MEM" 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="36"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Register Address" start="34" end="54" type="offset"/>
     <field name="Memory Address" start="66" end="95" type="address"/>
@@ -2416,12 +2427,9 @@
       <value name="MMIO Write Immediate Data" value="1"/>
     </field>
     <field name="Store Data Index" start="53" end="53" type="uint"/>
-    <field name="Command Streamer Stall Enable" start="52" end="52" type="uint"/>
-    <field name="Global Snapshot Count Reset" start="51" end="51" type="uint">
-      <value name="Don't Reset" value="0"/>
-      <value name="Reset" value="1"/>
-    </field>
-    <field name="TLB Invalidate" start="50" end="50" type="uint"/>
+    <field name="Command Streamer Stall Enable" start="52" end="52" type="bool"/>
+    <field name="Global Snapshot Count Reset" start="51" end="51" type="bool"/>
+    <field name="TLB Invalidate" start="50" end="50" type="bool"/>
     <field name="Generic Media State Clear" start="48" end="48" type="bool"/>
     <field name="Post Sync Operation" start="46" end="47" type="uint">
       <value name="No Write" value="0"/>