intel/genxml: Rename the CC_VIEWPORT pointer on gen4-5

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

diff --git a/src/intel/genxml/gen5.xml b/src/intel/genxml/gen5.xml
index fc6f248d797f4974da033c61b13eb78743093c4f..62edbe1ba9c62812664b497bcc8fc340e1a69485 100644 (file)
--- a/src/intel/genxml/gen5.xml
+++ b/src/intel/genxml/gen5.xml
@@ -345,7 +345,7 @@
   </struct>
 
   <struct name="CLIP_STATE" length="11">
-    <field name="Kernel Start Pointer" start="6" end="31" type="address"/>
+    <field name="Kernel Start Pointer" start="6" end="31" type="offset"/>
     <field name="GRF Register Count" start="1" end="3" type="uint"/>
     <field name="Single Program Flow" start="63" end="63" type="bool"/>
     <field name="Binding Table Entry Count" start="50" end="57" type="uint"/>
@@ -430,7 +430,7 @@
     <field name="Color Buffer Blend Enable" start="108" end="108" type="bool"/>
     <field name="Alpha Test Enable" start="107" end="107" type="bool"/>
     <field name="Alpha Test Function" start="104" end="106" type="3D_Compare_Function"/>
-    <field name="Color Calc State Pointer" start="133" end="159" type="address"/>
+    <field name="CC Viewport State Pointer" start="133" end="159" type="address"/>
     <field name="Color Dither Enable" start="191" end="191" type="bool"/>
     <field name="Round Disable Function Disable" start="190" end="190" type="bool"/>
     <field name="Logic Op Function" start="176" end="179" type="3D_Logic_Op_Function"/>
@@ -455,7 +455,7 @@
   </struct>
 
   <struct name="GS_STATE" length="7">
-    <field name="Kernel Start Pointer" start="6" end="31" type="address"/>
+    <field name="Kernel Start Pointer" start="6" end="31" type="offset"/>
     <field name="GRF Register Count" start="1" end="3" type="uint"/>
     <field name="Single Program Flow" start="63" end="63" type="bool"/>
     <field name="Binding Table Entry Count" start="50" end="57" type="uint"/>
@@ -479,7 +479,7 @@
     <field name="GS Statistics Enable" start="138" end="138" type="bool"/>
     <field name="SO Statistics Enable" start="137" end="137" type="bool"/>
     <field name="Rendering Enable" start="136" end="136" type="bool"/>
-    <field name="Sampler State Offset" start="165" end="191" type="address"/>
+    <field name="Sampler State Pointer" start="165" end="191" type="address"/>
     <field name="Sampler Count" start="160" end="162" type="uint"/>
     <field name="Reorder Enable" start="222" end="222" type="bool"/>
     <field name="Maximum VPIndex" start="192" end="195" type="uint"/>
@@ -649,14 +649,14 @@
     <field name="Y Offset" start="180" end="183" type="uint"/>
   </struct>
 
-  <instruction name="3DSTATE_DEPTH_BUFFER" bias="2" length="5">
-    <!-- The hardware docs incorrectly say length is 6. The actual length is 5. -->
+  <instruction name="3DSTATE_DEPTH_BUFFER" bias="2" length="6">
+    <!-- The hardware docs incorrectly say length is 7. The actual length is 6. -->
     <!-- DWord 0 -->
     <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="5"/>
-    <field name="DWord Length" start="0" end="7" type="uint" default="3"/>
+    <field name="DWord Length" start="0" end="7" type="uint" default="4"/>
     <!-- DWord 1 -->
     <field name="Surface Type" start="61" end="63" type="uint">
       <value name="SURFTYPE_1D" value="0"/>
@@ -706,7 +706,7 @@
   </instruction>
 
   <struct name="SF_STATE" length="8">
-    <field name="Kernel Start Pointer" start="6" end="31" type="address"/>
+    <field name="Kernel Start Pointer" start="6" end="31" type="offset"/>
     <field name="GRF Register Count" start="1" end="3" type="uint"/>
     <field name="Single Program Flow" start="63" end="63" type="bool"/>
     <field name="Binding Table Entry Count" start="50" end="57" type="uint"/>
@@ -831,7 +831,7 @@
   </struct>
 
   <struct name="VS_STATE" length="7">
-    <field name="Kernel Start Pointer" start="6" end="31" type="address"/>
+    <field name="Kernel Start Pointer" start="6" end="31" type="offset"/>
     <field name="GRF Register Count" start="1" end="3" type="uint"/>
     <field name="Single Program Flow" start="63" end="63" type="bool"/>
     <field name="Binding Table Entry Count" start="50" end="57" type="uint"/>
@@ -857,15 +857,15 @@
     <field name="URB Entry Allocation Size" start="147" end="151" type="uint"/>
     <field name="Number of URB Entries" start="139" end="146" type="uint"/>
     <field name="Statistics Enable" start="138" end="138" type="bool"/>
-    <field name="Sampler State Offset" start="165" end="191" type="address"/>
+    <field name="Sampler State Pointer" start="165" end="191" type="address"/>
     <field name="Sampler Count" start="160" end="162" type="uint"/>
     <field name="Vertex Cache Disable" start="193" end="193" type="bool"/>
-    <field name="Function Enable" start="192" end="192" type="bool"/>
+    <field name="Enable" start="192" end="192" type="bool"/>
   </struct>
 
   <struct name="WM_STATE" length="11">
-    <field name="Kernel Start Pointer" start="6" end="31" type="address"/>
-    <field name="GRF Register Count" start="1" end="3" type="uint"/>
+    <field name="Kernel Start Pointer 0" start="6" end="31" type="offset"/>
+    <field name="GRF Register Count 0" start="1" end="3" type="uint"/>
     <field name="Single Program Flow" start="63" end="63" type="bool"/>
     <field name="Binding Table Entry Count" start="50" end="57" type="uint"/>
     <field name="Thread Priority" start="49" end="49" type="uint">
@@ -886,7 +886,7 @@
     <field name="Setup URB Entry Read Length" start="107" end="112" type="uint"/>
     <field name="Setup URB Entry Read Offset" start="100" end="105" type="uint"/>
     <field name="Dispatch GRF Start Register For URB Data" start="96" end="99" type="uint"/>
-    <field name="Sampler State Offset" start="133" end="159" type="address"/>
+    <field name="Sampler State Pointer" start="133" end="159" type="address"/>
     <field name="Sampler Count" start="130" end="132" type="uint"/>
     <field name="Statistics Enable" start="128" end="128" type="bool"/>
     <field name="Maximum Number of Threads" start="185" end="191" type="uint"/>
@@ -923,12 +923,12 @@
     <field name="8 Pixel Dispatch Enable" start="160" end="160" type="bool"/>
     <field name="Global Depth Offset Constant" start="192" end="223" type="float"/>
     <field name="Global Depth Offset Scale" start="224" end="255" type="float"/>
-    <field name="Kernel Start Pointer[1]" start="262" end="287" type="address"/>
-    <field name="GRF Register Count[1]" start="257" end="259" type="uint"/>
-    <field name="Kernel Start Pointer[2]" start="294" end="319" type="address"/>
-    <field name="GRF Register Count[2]" start="289" end="291" type="uint"/>
-    <field name="Kernel Start Pointer[3]" start="326" end="351" type="address"/>
-    <field name="GRF Register Count[4]" start="321" end="323" type="uint"/>
+    <field name="Kernel Start Pointer 1" start="262" end="287" type="offset"/>
+    <field name="GRF Register Count 1" start="257" end="259" type="uint"/>
+    <field name="Kernel Start Pointer 2" start="294" end="319" type="offset"/>
+    <field name="GRF Register Count 2" start="289" end="291" type="uint"/>
+    <field name="Kernel Start Pointer 3" start="326" end="351" type="offset"/>
+    <field name="GRF Register Count 3" start="321" end="323" type="uint"/>
   </struct>
 
   <instruction name="3DPRIMITIVE" bias="2" length="6">
@@ -968,11 +968,11 @@
     <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="1"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="4"/>
-    <field name="Pointer to VS Binding Table" start="37" end="63" type="address"/>
-    <field name="Pointer to GS Binding Table" start="69" end="95" type="address"/>
-    <field name="Pointer to CLIP Binding Table" start="101" end="127" type="address"/>
-    <field name="Pointer to SF Binding Table" start="133" end="159" type="address"/>
-    <field name="Pointer to PS Binding Table" start="165" end="191" type="address"/>
+    <field name="Pointer to VS Binding Table" start="37" end="63" type="offset"/>
+    <field name="Pointer to GS Binding Table" start="69" end="95" type="offset"/>
+    <field name="Pointer to CLIP Binding Table" start="101" end="127" type="offset"/>
+    <field name="Pointer to SF Binding Table" start="133" end="159" type="offset"/>
+    <field name="Pointer to PS Binding Table" start="165" end="191" type="offset"/>
   </instruction>
 
   <instruction name="3DSTATE_CLEAR_PARAMS" bias="2" length="2">
@@ -1091,7 +1091,7 @@
     <field name="Pointer to GS State" start="69" end="95" type="address"/>
     <field name="GS Enable" start="64" end="64" type="bool"/>
     <field name="Pointer to CLIP State" start="101" end="127" type="address"/>
-    <field name="CLIP Enable" start="96" end="96" type="bool"/>
+    <field name="Clip Enable" start="96" end="96" type="bool"/>
     <field name="Pointer to SF State" start="133" end="159" type="address"/>
     <field name="Pointer to WM State" start="165" end="191" type="address"/>
     <field name="Pointer to Color Calc State" start="197" end="223" type="address"/>