From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 1 Mar 2016 22:43:05 +0000 (-0800)
Subject: genxml: Make the border color pointer consistent across gens
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e941fd84707d4ed04a683f8862d184956a60f9ad;p=mesa.git

genxml: Make the border color pointer consistent across gens
---

diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
index 9a52fbaa330..96eda703453 100644
--- 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 2b73f5f2a39..79d3006d24b 100644
--- 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 866f1bfd337..63ea26937e5 100644
--- 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,