genxml: Make the border color pointer consistent across gens

diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
index 9a52fbaa33062bb342ef023c1bbc294f912b671d..96eda7034536ce8f2b8e21e1a35861e266f0f93f 100644 (file)
--- a/src/intel/genxml/gen8.xml
+++ b/src/intel/genxml/gen8.xml
@@ -412,7 +412,7 @@
       <value name="PROGRAMMED" value="0"/>
       <value name="OVERRIDE" value="1"/>
     </field>
-    <field name="Indirect State Pointer" start="70" end="87" type="uint"/>
+    <field name="Border Color Pointer" start="70" end="87" type="offset"/>
     <field name="LOD Clamp Magnification Mode" start="64" end="64" type="uint">
       <value name="MIPNONE" value="0"/>
       <value name="MIPFILTER" value="1"/>

diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index 2b73f5f2a39b131ca32aa231193e83782d22528c..79d3006d24b64d1df332506a3c7de9b099a249a0 100644 (file)
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -437,7 +437,7 @@
       <value name="PROGRAMMED" value="0"/>
       <value name="OVERRIDE" value="1"/>
     </field>
-    <field name="Indirect State Pointer" start="70" end="87" type="uint"/>
+    <field name="Border Color Pointer" start="70" end="87" type="offset"/>
     <field name="LOD Clamp Magnification Mode" start="64" end="64" type="uint">
       <value name="MIPNONE" value="0"/>
       <value name="MIPFILTER" value="1"/>

diff --git a/src/intel/vulkan/genX_state.c b/src/intel/vulkan/genX_state.c
index 866f1bfd337dcc9a3ab6a815365f6f1db03f6393..63ea26937e56ffcba5877e142f1b2b609dd6cf7f 100644 (file)
--- a/src/intel/vulkan/genX_state.c
+++ b/src/intel/vulkan/genX_state.c
@@ -231,11 +231,7 @@ VkResult genX(CreateSampler)(
       .ShadowFunction = vk_to_gen_compare_op[pCreateInfo->compareOp],
       .CubeSurfaceControlMode = OVERRIDE,
 
-#if GEN_GEN >= 8
-      .IndirectStatePointer = border_color_offset >> 6,
-#else
-      .BorderColorPointer = border_color_offset >> 5,
-#endif
+      .BorderColorPointer = border_color_offset,
 
 #if GEN_GEN >= 8
       .LODClampMagnificationMode = MIPNONE,