summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2017-08-31 15:45:57 -0700
committerKenneth Graunke <[email protected]>2017-09-02 12:56:18 -0700
commit23b7c7a630aafb2102d3292556eecd84d2739ed5 (patch)
tree122791c87b308ecc92fa4c69af98cb61ee3c2a50 /src/mesa
parentb8cd8a75452b76db5a0b0e7cb70b1f6149255a18 (diff)
genxml: Make Border Color Pointer an address on Gen4-5, not an offset.
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/genX_state_upload.c10
1 files changed, 4 insertions, 6 deletions
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;