From ead7d73a5143ccfc55e6c00b8ab5ba0b893e5f33 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Tue, 17 May 2011 14:17:21 -0700 Subject: [PATCH] i965: Ivybridge uses the Gen4 SAMPLER_BORDER_COLOR_STATE. Volume 5c 1.13.7 lists it as [PreDevILK] and [DevIVB+]. Signed-off-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_wm_sampler_state.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c b/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c index 6f5057b7347..918c1d6243d 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c @@ -67,6 +67,9 @@ translate_wrap_mode(GLenum wrap) } } +/** + * Upload SAMPLER_BORDER_COLOR_STATE. + */ void upload_default_color(struct brw_context *brw, struct gl_sampler_object *sampler, int unit) @@ -94,7 +97,7 @@ upload_default_color(struct brw_context *brw, struct gl_sampler_object *sampler, color[3] = sampler->BorderColor.f[3]; } - if (intel->gen >= 5) { + if (intel->gen == 5 || intel->gen == 6) { struct gen5_sampler_default_color *sdc; sdc = brw_state_batch(brw, sizeof(*sdc), 32, &brw->wm.sdc_offset[unit]); -- 2.30.2