diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2014-07-26 13:15:56 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2014-08-02 05:16:40 -0700 |
| commit | 2fe2fe1fcea5c41edbbf30b1424ad2ac4ffeef43 (patch) | |
| tree | 083a71d91ac43bce9a716ff479f94d2a7b3b7b77 /src/mesa/drivers/dri/i965/brw_sampler_state.c | |
| parent | 7679393f561ca4f0e9c9587d4b208b035b7b9098 (diff) | |
| download | external_mesa3d-2fe2fe1fcea5c41edbbf30b1424ad2ac4ffeef43.zip external_mesa3d-2fe2fe1fcea5c41edbbf30b1424ad2ac4ffeef43.tar.gz external_mesa3d-2fe2fe1fcea5c41edbbf30b1424ad2ac4ffeef43.tar.bz2 | |
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 <kenneth@whitecape.org>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_sampler_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_sampler_state.c | 11 |
1 files changed, 2 insertions, 9 deletions
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); } } |