diff --git a/src/intel/genxml/gen5.xml b/src/intel/genxml/gen5.xml
index 44dd0d10aa3..36081875ea4 100644
--- a/src/intel/genxml/gen5.xml
+++ b/src/intel/genxml/gen5.xml
@@ -509,30 +509,30 @@
     <field name="Border Color Unorm Blue" start="16" end="23" type="uint"/>
     <field name="Border Color Unorm Alpha" start="24" end="31" type="uint"/>
 
-    <field name="Border Color Float Red" start="32" end="39" type="int"/>
-    <field name="Border Color Float Green" start="40" end="47" type="int"/>
-    <field name="Border Color Float Blue" start="48" end="55" type="int"/>
-    <field name="Border Color Float Alpha" start="56" end="63" type="int"/>
+    <field name="Border Color Float Red" start="32" end="63" type="float"/>
+    <field name="Border Color Float Green" start="64" end="95" type="float"/>
+    <field name="Border Color Float Blue" start="96" end="127" type="float"/>
+    <field name="Border Color Float Alpha" start="128" end="159" type="float"/>
 
-    <field name="Border Color Float16 Red" start="64" end="95" type="float"/>
-    <field name="Border Color Float16 Green" start="96" end="127" type="float"/>
-    <field name="Border Color Float16 Blue" start="128" end="159" type="float"/>
-    <field name="Border Color Float16 Alpha" start="160" end="191" type="float"/>
+    <field name="Border Color Float16 Red" start="160" end="175" type="uint"/>
+    <field name="Border Color Float16 Green" start="176" end="191" type="uint"/>
+    <field name="Border Color Float16 Blue" start="192" end="207" type="uint"/>
+    <field name="Border Color Float16 Alpha" start="208" end="223" type="uint"/>
 
-    <field name="Border Color Unorm16 Red" start="192" end="207" type="uint"/>
-    <field name="Border Color Unorm16 Green" start="208" end="223" type="uint"/>
-    <field name="Border Color Unorm16 Blue" start="224" end="239" type="uint"/>
-    <field name="Border Color Unorm16 Alpha" start="240" end="255" type="uint"/>
+    <field name="Border Color Unorm16 Red" start="224" end="239" type="uint"/>
+    <field name="Border Color Unorm16 Green" start="240" end="255" type="uint"/>
+    <field name="Border Color Unorm16 Blue" start="256" end="271" type="uint"/>
+    <field name="Border Color Unorm16 Alpha" start="272" end="287" type="uint"/>
 
-    <field name="Border Color Snorm16 Red" start="256" end="271" type="uint"/>
-    <field name="Border Color Snorm16 Green" start="272" end="287" type="uint"/>
-    <field name="Border Color Snorm16 Blue" start="288" end="303" type="uint"/>
-    <field name="Border Color Snorm16 Alpha" start="304" end="319" type="uint"/>
+    <field name="Border Color Snorm16 Red" start="288" end="303" type="int"/>
+    <field name="Border Color Snorm16 Green" start="304" end="319" type="int"/>
+    <field name="Border Color Snorm16 Blue" start="320" end="335" type="int"/>
+    <field name="Border Color Snorm16 Alpha" start="336" end="351" type="int"/>
 
-    <field name="Border Color Snorm8 Red" start="320" end="335" type="int"/>
-    <field name="Border Color Snorm8 Green" start="336" end="351" type="int"/>
-    <field name="Border Color Snorm8 Blue" start="352" end="367" type="int"/>
-    <field name="Border Color Snorm8 Alpha" start="368" end="383" type="int"/>
+    <field name="Border Color Snorm8 Red" start="352" end="359" type="int"/>
+    <field name="Border Color Snorm8 Green" start="360" end="367" type="int"/>
+    <field name="Border Color Snorm8 Blue" start="368" end="375" type="int"/>
+    <field name="Border Color Snorm8 Alpha" start="376" end="383" type="int"/>
   </struct>
 
   <struct name="SAMPLER_STATE" length="4">