genxml: Add APIMODE_D3D missing enum values and improve consistency.

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

diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
index 96eda7034536ce8f2b8e21e1a35861e266f0f93f..dfeda9462ea2e3a7e6eb4b8cb20b814c84502d4e 100644 (file)
--- a/src/intel/genxml/gen8.xml
+++ b/src/intel/genxml/gen8.xml
@@ -307,8 +307,8 @@
     <field name="Minimum Array Element" start="146" end="156" type="uint"/>
     <field name="Render Target View Extent" start="135" end="145" type="uint"/>
     <field name="Multisampled Surface Storage Format" start="134" end="134" type="uint">
-      <value name="MSS" value="0"/>
-      <value name="DEPTH_STENCIL" value="1"/>
+      <value name="MSFMT_MSS" value="0"/>
+      <value name="MSFMT_DEPTH_STENCIL" value="1"/>
     </field>
     <field name="Number of Multisamples" start="131" end="133" type="uint">
       <value name="MULTISAMPLECOUNT_1" value="0"/>
@@ -317,8 +317,8 @@
       <value name="MULTISAMPLECOUNT_8" value="3"/>
     </field>
     <field name="Multisample Position Palette Index" start="128" end="130" type="uint"/>
-    <field name="X Offset" start="185" end="191" type="offset"/>
-    <field name="Y Offset" start="181" end="183" type="offset"/>
+    <field name="X Offset" start="185" end="191" type="uint"/>
+    <field name="Y Offset" start="181" end="183" type="uint"/>
     <field name="EWA Disable For Cube" start="180" end="180" type="bool"/>
     <field name="Coherency Type" start="174" end="174" type="uint">
       <value name="GPU coherent" value="0"/>
@@ -1115,15 +1115,16 @@
     <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="API Mode" start="94" end="94" type="uint">
-      <value name="OGL" value="0"/>
+      <value name="APIMODE_OGL" value="0"/>
+      <value name="APIMODE_D3D" value="1"/>
     </field>
     <field name="Viewport XY Clip Test Enable" start="92" end="92" 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="NORMAL" value="0"/>
-      <value name="REJECT_ALL" value="3"/>
-      <value name="ACCEPT_ALL" value="4"/>
+      <value name="CLIPMODE_NORMAL" value="0"/>
+      <value name="CLIPMODE_REJECT_ALL" value="3"/>
+      <value name="CLIPMODE_ACCEPT_ALL" value="4"/>
     </field>
     <field name="Perspective Divide Disable" start="73" end="73" type="bool"/>
     <field name="Non-Perspective Barycentric Enable" start="72" end="72" type="bool"/>
@@ -1265,7 +1266,7 @@
     <field name="Accesses UAV" start="110" end="110" type="bool"/>
     <field name="Illegal Opcode Exception Enable" start="109" end="109" type="bool"/>
     <field name="Software Exception Enable" start="103" end="103" type="bool"/>
-    <field name="Scratch Space Base Pointer" start="138" end="191" type="offset"/>
+    <field name="Scratch Space Base Pointer" start="138" end="191" type="address"/>
     <field name="Per-Thread Scratch Space" start="128" end="131" type="uint"/>
     <field name="Dispatch GRF Start Register For URB Data" start="212" end="216" type="uint"/>
     <field name="Patch URB Entry Read Length" start="203" end="209" type="uint"/>
@@ -1405,7 +1406,7 @@
     <field name="Mask Stack Exception Enable" start="107" end="107" type="bool"/>
     <field name="Software  Exception Enable" start="103" end="103" type="bool"/>
     <field name="Expected Vertex Count" start="96" end="101" type="uint"/>
-    <field name="Scratch Space Base Pointer" start="138" end="191" type="offset"/>
+    <field name="Scratch Space Base Pointer" start="138" end="191" type="address"/>
     <field name="Per-Thread Scratch Space" start="128" end="131" type="uint"/>
     <field name="Output Vertex Size" start="215" end="220" type="uint"/>
     <field name="Output Topology" start="209" end="214" type="uint" prefix="OUTPUT"/>
@@ -1484,7 +1485,7 @@
     <field name="Maximum Number of Threads" start="72" end="80" type="uint"/>
     <field name="Instance Count" start="64" end="67" type="uint"/>
     <field name="Kernel Start Pointer" start="102" end="159" type="offset"/>
-    <field name="Scratch Space Base Pointer" start="170" end="223" type="offset"/>
+    <field name="Scratch Space Base Pointer" start="170" end="223" type="address"/>
     <field name="Per-Thread Scratch Space" start="160" end="163" type="uint"/>
     <field name="Single Program Flow" start="251" end="251" type="bool"/>
     <field name="Vector Mask Enable" start="250" end="250" type="bool"/>
@@ -1607,7 +1608,7 @@
     <field name="Illegal Opcode Exception Enable" start="109" end="109" type="bool"/>
     <field name="Mask Stack Exception Enable" start="107" end="107" type="bool"/>
     <field name="Software  Exception Enable" start="103" end="103" type="bool"/>
-    <field name="Scratch Space Base Pointer" start="138" end="191" type="offset"/>
+    <field name="Scratch Space Base Pointer" start="138" end="191" type="address"/>
     <field name="Per Thread Scratch Space" start="128" end="131" type="uint"/>
     <field name="Maximum Number of Threads Per PSD" start="215" end="223" type="uint"/>
     <field name="Push Constant Enable" start="203" end="203" type="bool"/>
@@ -2265,7 +2266,7 @@
     <field name="Illegal Opcode Exception Enable" start="109" end="109" type="bool"/>
     <field name="Accesses UAV" start="108" end="108" type="bool"/>
     <field name="Software Exception Enable" start="103" end="103" type="bool"/>
-    <field name="Scratch Space Base Pointer" start="138" end="191" type="offset"/>
+    <field name="Scratch Space Base Pointer" start="138" end="191" type="address"/>
     <field name="Per-Thread Scratch Space " start="128" end="131" type="uint"/>
     <field name="Dispatch GRF Start Register For URB Data" start="212" end="216" type="uint"/>
     <field name="Vertex URB Entry Read Length" start="203" end="208" type="uint"/>
@@ -2601,10 +2602,9 @@
     <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="7"/>
-    <field name="Scratch Space Base Pointer" start="42" end="63" type="offset"/>
+    <field name="Scratch Space Base Pointer" start="42" end="79" type="address"/>
     <field name="Stack Size" start="36" end="39" type="uint"/>
     <field name="Per Thread Scratch Space" start="32" end="35" type="uint"/>
-    <field name="Scratch Space Base Pointer High" start="64" end="79" type="offset"/>
     <field name="Maximum Number of Threads" start="112" end="127" type="uint"/>
     <field name="Number of URB Entries" start="104" end="111" type="uint"/>
     <field name="Reset Gateway Timer" start="103" end="103" type="uint">
@@ -3072,7 +3072,7 @@
       <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="Command Streamer Stall Enable" start="52" end="52" type="bool"/>
     <field name="Global Snapshot Count Reset" start="51" end="51" type="uint">
       <value name="Don't Reset" value="0"/>
       <value name="Reset" value="1"/>
@@ -3163,4 +3163,12 @@
     <field name="SW Tessellation Memory Object Control State" start="40" end="43" type="MEMORY_OBJECT_CONTROL_STATE"/>
   </instruction>
 
+  <register name="L3CNTLREG" length="1" num="0x7034">
+    <field name="SLM Enable" start="0" end="0" type="uint"/>
+    <field name="URB Allocation" start="1" end="7" type="uint"/>
+    <field name="RO Allocation" start="11" end="17" type="uint"/>
+    <field name="DC Allocation" start="18" end="24" type="uint"/>
+    <field name="All Allocation" start="25" end="31" type="uint"/>
+  </register>
+
 </genxml>