diff options
| author | Eric Anholt <eric@anholt.net> | 2011-10-22 10:37:14 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2011-10-29 12:16:15 -0700 |
| commit | f84f3322b44e9828dcbee4791909025369c96f74 (patch) | |
| tree | 42a9c2a35897a1a491f6b14ea75b84c96e42df92 | |
| parent | 78188bc53769384fdeb8d7618af882c86530a4d5 (diff) | |
i965/gen6: Move setup of CC state batches to emit time.
This is part of a series trying to eliminate the separate prepare()
hook in state upload. The prepare() hook existed to support the
check_aperture in between calculating state updates and setting up the
batch, but there should be no reason for that any more.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Paul Berry <stereotype441@gmail.com>
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_cc.c | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_depthstencil.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_cc.c b/src/mesa/drivers/dri/i965/gen6_cc.c index b3ad157d032..916ec7d0456 100644 --- a/src/mesa/drivers/dri/i965/gen6_cc.c +++ b/src/mesa/drivers/dri/i965/gen6_cc.c @@ -33,7 +33,7 @@ #include "main/macros.h" static void -prepare_blend_state(struct brw_context *brw) +gen6_upload_blend_state(struct brw_context *brw) { struct gl_context *ctx = &brw->intel.ctx; struct gen6_blend_state *blend; @@ -151,11 +151,11 @@ const struct brw_tracked_state gen6_blend_state = { .brw = BRW_NEW_BATCH, .cache = 0, }, - .prepare = prepare_blend_state, + .emit = gen6_upload_blend_state, }; static void -gen6_prepare_color_calc_state(struct brw_context *brw) +gen6_upload_color_calc_state(struct brw_context *brw) { struct gl_context *ctx = &brw->intel.ctx; struct gen6_color_calc_state *cc; @@ -187,7 +187,7 @@ const struct brw_tracked_state gen6_color_calc_state = { .brw = BRW_NEW_BATCH, .cache = 0, }, - .prepare = gen6_prepare_color_calc_state, + .emit = gen6_upload_color_calc_state, }; static void upload_cc_state_pointers(struct brw_context *brw) diff --git a/src/mesa/drivers/dri/i965/gen6_depthstencil.c b/src/mesa/drivers/dri/i965/gen6_depthstencil.c index 5d14147db3d..72e86879b2b 100644 --- a/src/mesa/drivers/dri/i965/gen6_depthstencil.c +++ b/src/mesa/drivers/dri/i965/gen6_depthstencil.c @@ -29,7 +29,7 @@ #include "brw_state.h" static void -gen6_prepare_depth_stencil_state(struct brw_context *brw) +gen6_upload_depth_stencil_state(struct brw_context *brw) { struct gl_context *ctx = &brw->intel.ctx; struct gen6_depth_stencil_state *ds; @@ -92,5 +92,5 @@ const struct brw_tracked_state gen6_depth_stencil_state = { .brw = BRW_NEW_BATCH, .cache = 0, }, - .prepare = gen6_prepare_depth_stencil_state, + .emit = gen6_upload_depth_stencil_state, }; |