fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 20:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

i965/gen6: Move setup of CC state batches to emit time.

Browse source 
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>
This commit is contained in:
Eric Anholt 2011-10-22 10:37:14 -07:00
parent 78188bc537
commit f84f3322b4
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/drivers/dri/i965/gen6_cc.c
View file

@ -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)

4
src/mesa/drivers/dri/i965/gen6_depthstencil.c
View file

@ -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,
};