diff options
| author | Eric Anholt <[email protected]> | 2011-10-22 11:23:59 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2011-10-29 12:16:30 -0700 |
| commit | 9a5f8a98ed9eebec89f151d2b6df08c423b6ef34 (patch) | |
| tree | bb74518f3bb784bc4d0a514278c3350f934d3423 | |
| parent | c4aaf85285fc9484e95e9cda89db9cc6923259f4 (diff) | |
i965: Move sampler state to emit() time.
This is consumed by the WM unit, which is already at emit().
Reviewed-by: Kenneth Graunke <[email protected]>
Acked-by: Paul Berry <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_sampler_state.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_sampler_state.c | 4 |
2 files changed, 4 insertions, 4 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 8938561bf8f..6104afcf46e 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c @@ -329,7 +329,7 @@ static void brw_update_sampler_state(struct brw_context *brw, * FIXME: simplify all the different new texture state flags. */ static void -prepare_wm_samplers(struct brw_context *brw) +brw_upload_wm_samplers(struct brw_context *brw) { struct gl_context *ctx = &brw->intel.ctx; struct brw_sampler_state *samplers; @@ -363,7 +363,7 @@ const struct brw_tracked_state brw_wm_samplers = { .brw = BRW_NEW_BATCH, .cache = 0 }, - .prepare = prepare_wm_samplers, + .emit = brw_upload_wm_samplers, }; diff --git a/src/mesa/drivers/dri/i965/gen7_sampler_state.c b/src/mesa/drivers/dri/i965/gen7_sampler_state.c index f6f51c54ac0..9b52e8dfd39 100644 --- a/src/mesa/drivers/dri/i965/gen7_sampler_state.c +++ b/src/mesa/drivers/dri/i965/gen7_sampler_state.c @@ -184,7 +184,7 @@ gen7_update_sampler_state(struct brw_context *brw, int unit, * FIXME: simplify all the different new texture state flags. */ static void -gen7_prepare_samplers(struct brw_context *brw) +gen7_upload_samplers(struct brw_context *brw) { struct gl_context *ctx = &brw->intel.ctx; struct gen7_sampler_state *samplers; @@ -218,5 +218,5 @@ const struct brw_tracked_state gen7_samplers = { .brw = BRW_NEW_BATCH, .cache = 0 }, - .prepare = gen7_prepare_samplers, + .emit = gen7_upload_samplers, }; |