From 23b7c7a630aafb2102d3292556eecd84d2739ed5 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 31 Aug 2017 15:45:57 -0700 Subject: [PATCH] genxml: Make Border Color Pointer an address on Gen4-5, not an offset. Reviewed-by: Jason Ekstrand --- src/intel/genxml/gen4.xml | 2 +- src/intel/genxml/gen45.xml | 2 +- src/intel/genxml/gen5.xml | 2 +- src/mesa/drivers/dri/i965/genX_state_upload.c | 10 ++++------ 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/intel/genxml/gen4.xml b/src/intel/genxml/gen4.xml index 6f6f1bfeb09..6499346c999 100644 --- a/src/intel/genxml/gen4.xml +++ b/src/intel/genxml/gen4.xml @@ -586,7 +586,7 @@ - + diff --git a/src/intel/genxml/gen45.xml b/src/intel/genxml/gen45.xml index 7b2f7698274..0f905754071 100644 --- a/src/intel/genxml/gen45.xml +++ b/src/intel/genxml/gen45.xml @@ -593,7 +593,7 @@ - + diff --git a/src/intel/genxml/gen5.xml b/src/intel/genxml/gen5.xml index 36081875ea4..70f50076abf 100644 --- a/src/intel/genxml/gen5.xml +++ b/src/intel/genxml/gen5.xml @@ -571,7 +571,7 @@ - + diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c b/src/mesa/drivers/dri/i965/genX_state_upload.c index 4eb1a79bcd4..7083e7b2d6b 100644 --- a/src/mesa/drivers/dri/i965/genX_state_upload.c +++ b/src/mesa/drivers/dri/i965/genX_state_upload.c @@ -5008,13 +5008,11 @@ genX(update_sampler_state)(struct brw_context *brw, texObj->StencilSampling, &border_color_offset); } - if (GEN_GEN < 6) { - samp_st.BorderColorPointer = - brw_emit_reloc(&brw->batch, batch_offset_for_sampler_state + 8, - brw->batch.bo, border_color_offset, 0); - } else { +#if GEN_GEN < 6 + samp_st.BorderColorPointer = ro_bo(brw->batch.bo, border_color_offset); +#else samp_st.BorderColorPointer = border_color_offset; - } +#endif #if GEN_GEN >= 8 samp_st.LODPreClampMode = CLAMP_MODE_OGL; -- 2.30.2