genxml: Remove brackets from kernel start pointer names

Newer Gens' names don't have the brackets. Having common names will make
some later patches simpler.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Rafael Antognolli <rafael.antognolli@intel.com>

diff --git a/src/intel/genxml/gen5.xml b/src/intel/genxml/gen5.xml
index e834bdf..c601abe 100644 (file)
--- a/src/intel/genxml/gen5.xml
+++ b/src/intel/genxml/gen5.xml
@@ -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="offset"/>
+    <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="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[4]" start="321" end="323" 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">

diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
index 1294929..66b45ca 100644 (file)
--- a/src/intel/genxml/gen6.xml
+++ b/src/intel/genxml/gen6.xml
@@ -1401,7 +1401,7 @@
     <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"/>
@@ -1484,8 +1484,8 @@
       <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">