summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2011-10-22 11:07:40 -0700
committerEric Anholt <eric@anholt.net>2011-10-29 12:16:39 -0700
commit2b730c1f19ac1e15fa1b70c6cb3a3bd158e18ea1 (patch)
tree3b272d2cde1ab0f1a1cf7f5674b6cb7fd2d682b2
parent4de2cfc3a08819b869ac3326f171d0a9f0fecf65 (diff)
i965: Move WM pull constant setup to emit() time.
It's needed by the WM surface state setup, which is now emit(). Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Paul Berry <stereotype441@gmail.com>
-rw-r--r--src/mesa/drivers/dri/i965/brw_wm_surface_state.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index 782efd52662..04dc3899a91 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -321,7 +321,7 @@ brw_create_constant_surface(struct brw_context *brw,
* state atom.
*/
static void
-prepare_wm_pull_constants(struct brw_context *brw)
+brw_upload_wm_pull_constants(struct brw_context *brw)
{
struct gl_context *ctx = &brw->intel.ctx;
struct intel_context *intel = &brw->intel;
@@ -365,7 +365,7 @@ const struct brw_tracked_state brw_wm_constants = {
.brw = (BRW_NEW_FRAGMENT_PROGRAM),
.cache = 0
},
- .prepare = prepare_wm_pull_constants,
+ .emit = brw_upload_wm_pull_constants,
};
/**