intel/genxml: Make a bunch of things offsets on gen4-5

Most things on gen4-5 are addresses because we don't have dynamic state
base address and we don't have instruction state base on gen4.  However,
whoever converted things to addresses got a little over-excited and
converted too much.

Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>

diff --git a/src/intel/genxml/gen4.xml b/src/intel/genxml/gen4.xml
index 4748e0b0d7a9b63574a7cbbe342384185c23416a..27dd8ffffc29cdfe93e5c6ed66f492b0cdbcfd56 100644 (file)
--- a/src/intel/genxml/gen4.xml
+++ b/src/intel/genxml/gen4.xml
@@ -838,11 +838,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_CONSTANT_COLOR" bias="2" length="5">

diff --git a/src/intel/genxml/gen45.xml b/src/intel/genxml/gen45.xml
index 04251e0ada0927a5c1182d8e18b36d37f4045abe..e63f3bdaf3f054a9effa847ac792592243a31a8d 100644 (file)
--- a/src/intel/genxml/gen45.xml
+++ b/src/intel/genxml/gen45.xml
@@ -803,11 +803,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_CONSTANT_COLOR" bias="2" length="5">

diff --git a/src/intel/genxml/gen5.xml b/src/intel/genxml/gen5.xml
index c601abeea5f9b2679f90f08fe03f47b2a7a89552..87377df106b9be38f74c4a4cc7fad5d9a867d709 100644 (file)
--- a/src/intel/genxml/gen5.xml
+++ b/src/intel/genxml/gen5.xml
@@ -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">