i965: Move sampler state to emit() time.

This is consumed by the WM unit, which is already at emit().

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Paul Berry <stereotype441@gmail.com>

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 8938561bf8ff2432ad3bfaff9ca618827fd6bcf2..6104afcf46ebe7d1360ca35605ea2a62bb1e4dfd 100644 (file)
--- 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 f6f51c54ac00396a3286a7b35fc5303a9cabe091..9b52e8dfd393fe670563aa71bdef2bb3cc4cf923 100644 (file)
--- 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,
 };