diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-12-08 14:29:50 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-12-08 14:29:50 +0000 |
| commit | 33a1f495d4bb19288680b9812c6ec1235302d215 (patch) | |
| tree | d47067fe24d530c660b75ee80cdcec72f10d9ed0 /src/mesa/drivers/dri/i965/brw_wm_state.c | |
| parent | bcd5dda4358a5e47551278477bd00d2c63415c44 (diff) | |
| parent | bdc8ac4426f00eaafbe8ca0d356563efe390294d (diff) | |
| download | external_mesa3d-33a1f495d4bb19288680b9812c6ec1235302d215.zip external_mesa3d-33a1f495d4bb19288680b9812c6ec1235302d215.tar.gz external_mesa3d-33a1f495d4bb19288680b9812c6ec1235302d215.tar.bz2 | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
progs/glsl/Makefile
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_wm_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_state.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm_state.c b/src/mesa/drivers/dri/i965/brw_wm_state.c index fd46161..5302405 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_state.c @@ -88,7 +88,7 @@ wm_unit_populate_key(struct brw_context *brw, struct brw_wm_unit_key *key) /* BRW_NEW_CURBE_OFFSETS */ key->curbe_offset = brw->curbe.wm_start; - /* CACHE_NEW_SURFACE */ + /* BRW_NEW_NR_SURFACEs */ key->nr_surfaces = brw->wm.nr_surfaces; /* CACHE_NEW_SAMPLER */ @@ -281,10 +281,9 @@ const struct brw_tracked_state brw_wm_unit = { .brw = (BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_CURBE_OFFSETS | - BRW_NEW_LOCK), + BRW_NEW_NR_SURFACES), - .cache = (CACHE_NEW_SURFACE | - CACHE_NEW_WM_PROG | + .cache = (CACHE_NEW_WM_PROG | CACHE_NEW_SAMPLER) }, .prepare = upload_wm_unit, |