diff options
| author | Eric Anholt <eric@anholt.net> | 2011-10-22 10:43:05 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2011-10-29 12:16:18 -0700 |
| commit | 9015969e6e9ce38d183e77a633f1d55117e07b26 (patch) | |
| tree | 14289fa2ee733cf57cbb81fa4cb56c9be26d278f | |
| parent | f84f3322b44e9828dcbee4791909025369c96f74 (diff) | |
i965: Move push constants setup to emit() time.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Paul Berry <stereotype441@gmail.com>
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_vs_state.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_wm_state.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_vs_state.c b/src/mesa/drivers/dri/i965/gen6_vs_state.c index 202c10942d6..e06c7b452a0 100644 --- a/src/mesa/drivers/dri/i965/gen6_vs_state.c +++ b/src/mesa/drivers/dri/i965/gen6_vs_state.c @@ -34,7 +34,7 @@ #include "intel_batchbuffer.h" static void -gen6_prepare_vs_push_constants(struct brw_context *brw) +gen6_upload_vs_push_constants(struct brw_context *brw) { struct intel_context *intel = &brw->intel; struct gl_context *ctx = &intel->ctx; @@ -124,7 +124,7 @@ const struct brw_tracked_state gen6_vs_constants = { BRW_NEW_VERTEX_PROGRAM), .cache = CACHE_NEW_VS_PROG, }, - .prepare = gen6_prepare_vs_push_constants, + .emit = gen6_upload_vs_push_constants, }; static void @@ -147,7 +147,7 @@ upload_vs_state(struct brw_context *brw) GEN6_CONSTANT_BUFFER_0_ENABLE | (5 - 2)); /* Pointer to the VS constant buffer. Covered by the set of - * state flags from gen6_prepare_wm_constants + * state flags from gen6_upload_vs_constants */ OUT_BATCH(brw->vs.push_const_offset + brw->vs.push_const_size - 1); diff --git a/src/mesa/drivers/dri/i965/gen6_wm_state.c b/src/mesa/drivers/dri/i965/gen6_wm_state.c index ac1b1a3cc5e..25e0fa2909e 100644 --- a/src/mesa/drivers/dri/i965/gen6_wm_state.c +++ b/src/mesa/drivers/dri/i965/gen6_wm_state.c @@ -35,7 +35,7 @@ #include "intel_batchbuffer.h" static void -gen6_prepare_wm_push_constants(struct brw_context *brw) +gen6_upload_wm_push_constants(struct brw_context *brw) { struct intel_context *intel = &brw->intel; struct gl_context *ctx = &intel->ctx; @@ -87,7 +87,7 @@ const struct brw_tracked_state gen6_wm_constants = { BRW_NEW_FRAGMENT_PROGRAM), .cache = CACHE_NEW_WM_PROG, }, - .prepare = gen6_prepare_wm_push_constants, + .emit = gen6_upload_wm_push_constants, }; static void @@ -118,7 +118,7 @@ upload_wm_state(struct brw_context *brw) GEN6_CONSTANT_BUFFER_0_ENABLE | (5 - 2)); /* Pointer to the WM constant buffer. Covered by the set of - * state flags from gen6_prepare_wm_constants + * state flags from gen6_upload_wm_constants */ OUT_BATCH(brw->wm.push_const_offset + ALIGN(brw->wm.prog_data->nr_params, |