From 2fe2fe1fcea5c41edbbf30b1424ad2ac4ffeef43 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sat, 26 Jul 2014 13:15:56 -0700 Subject: i965: Stop using gen7_update_sampler_state; rm gen7_sampler_state.c. The code in brw_sampler_state.c now handles all generations; we don't need the extra Gen7+ only code anymore. Signed-off-by: Kenneth Graunke Reviewed-by: Topi Pohjolainen --- src/mesa/drivers/dri/i965/brw_sampler_state.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/mesa/drivers/dri/i965/brw_sampler_state.c') diff --git a/src/mesa/drivers/dri/i965/brw_sampler_state.c b/src/mesa/drivers/dri/i965/brw_sampler_state.c index fbdb40e..795865e 100644 --- a/src/mesa/drivers/dri/i965/brw_sampler_state.c +++ b/src/mesa/drivers/dri/i965/brw_sampler_state.c @@ -478,15 +478,8 @@ brw_upload_sampler_state_table(struct brw_context *brw, if (SamplersUsed & (1 << s)) { const unsigned unit = prog->SamplerUnits[s]; if (ctx->Texture.Unit[unit]._Current) { - if (brw->gen >= 7) { - gen7_update_sampler_state(brw, unit, - (struct gen7_sampler_state *) - sampler_state); - } else { - brw_update_sampler_state(brw, unit, - sampler_state, - batch_offset_for_sampler_state); - } + brw_update_sampler_state(brw, unit, sampler_state, + batch_offset_for_sampler_state); } } -- cgit v1.1