summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2011-05-17 14:17:21 -0700
committerKenneth Graunke <[email protected]>2011-05-17 23:47:52 -0700
commitead7d73a5143ccfc55e6c00b8ab5ba0b893e5f33 (patch)
tree3496e22b12b93181c21077086a90a886ecdb2887 /src
parentb2c1f8ff1d98f03be79892b7730372afdb94ba58 (diff)
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 <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/i965/brw_wm_sampler_state.c5
1 files changed, 4 insertions, 1 deletions
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]);