diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2007-02-02 12:26:10 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2007-02-02 12:26:10 +0000 |
| commit | b59657ad965f9471574e914b861bb1d2a17d772e (patch) | |
| tree | 99a4fe6dc933472516de91773da04034626a84b5 /src/mesa/drivers/dri/nouveau/nouveau_state.c | |
| parent | 325196f548f8e46aa8fcc7b030e81ba939e7f6b7 (diff) | |
| parent | 2ddc8799a8e243cb10cd69ea9424f72b6c4de534 (diff) | |
Merge branch 'vbo-0.2'
Conflicts:
src/mesa/main/texcompress_s3tc.c
src/mesa/tnl/t_array_api.c
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nouveau_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_state.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_state.c b/src/mesa/drivers/dri/nouveau/nouveau_state.c index 18f6ffb2ad..aef1f63494 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_state.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_state.c @@ -30,7 +30,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "nouveau_fifo.h" #include "swrast/swrast.h" -#include "array_cache/acache.h" #include "tnl/tnl.h" #include "swrast_setup/swrast_setup.h" @@ -144,7 +143,7 @@ static void nouveauDDInvalidateState(GLcontext *ctx, GLuint new_state) { _swrast_InvalidateState( ctx, new_state ); _swsetup_InvalidateState( ctx, new_state ); - _ac_InvalidateState( ctx, new_state ); + _vbo_InvalidateState( ctx, new_state ); _tnl_InvalidateState( ctx, new_state ); NOUVEAU_CONTEXT(ctx)->new_render_state |= new_state; } |