From e941fd84707d4ed04a683f8862d184956a60f9ad Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 1 Mar 2016 14:43:05 -0800 Subject: [PATCH] genxml: Make the border color pointer consistent across gens --- src/intel/genxml/gen8.xml | 2 +- src/intel/genxml/gen9.xml | 2 +- src/intel/vulkan/genX_state.c | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) 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 @@ - + 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 @@ - + 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, -- 2.30.2