diff options
author | Ian Romanick <idr@us.ibm.com> | 2007-02-20 15:19:23 -0800 |
---|---|---|
committer | Ian Romanick <idr@us.ibm.com> | 2007-02-20 15:19:23 -0800 |
commit | a4b344baa2484c65a1618f3cce3a94c91dea8ef7 (patch) | |
tree | f2d3e6571c94378db5a87d882c039909d6a47d3f /src/mesa/drivers/windows/gldirect/dx8 | |
parent | f0bcee5db0523edaacbd1fb0eaa74b435ae7c188 (diff) | |
parent | 440759c2cdfdd9a7fbc6500fca2afa519126c1a7 (diff) |
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/mesa/drivers/windows/gldirect/dx8')
-rw-r--r-- | src/mesa/drivers/windows/gldirect/dx8/gld_driver_dx8.c | 4 | ||||
-rw-r--r-- | src/mesa/drivers/windows/gldirect/dx8/gld_ext_dx8.c | 2 | ||||
-rw-r--r-- | src/mesa/drivers/windows/gldirect/dx8/gld_primitive_dx8.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/windows/gldirect/dx8/gld_driver_dx8.c b/src/mesa/drivers/windows/gldirect/dx8/gld_driver_dx8.c index 0a6d9f8555..7afa9190cd 100644 --- a/src/mesa/drivers/windows/gldirect/dx8/gld_driver_dx8.c +++ b/src/mesa/drivers/windows/gldirect/dx8/gld_driver_dx8.c @@ -52,7 +52,7 @@ #include "texformat.h" #include "teximage.h" #include "texstore.h" -#include "array_cache/acache.h" +#include "vbo/vbo.h" #include "swrast_setup/swrast_setup.h" #include "swrast_setup/ss_context.h" #include "tnl/tnl.h" @@ -850,7 +850,7 @@ void gld_update_state_DX8( return; _swsetup_InvalidateState( ctx, new_state ); - _ac_InvalidateState( ctx, new_state ); + _vbo_InvalidateState( ctx, new_state ); _tnl_InvalidateState( ctx, new_state ); // SetupIndex will be used in the pipelines for choosing setup function diff --git a/src/mesa/drivers/windows/gldirect/dx8/gld_ext_dx8.c b/src/mesa/drivers/windows/gldirect/dx8/gld_ext_dx8.c index 108f12a9d1..b51bba9b3c 100644 --- a/src/mesa/drivers/windows/gldirect/dx8/gld_ext_dx8.c +++ b/src/mesa/drivers/windows/gldirect/dx8/gld_ext_dx8.c @@ -58,7 +58,7 @@ #include "mtypes.h" #include "texformat.h" #include "texstore.h" -#include "array_cache/acache.h" +#include "vbo/vbo.h" #include "swrast_setup/swrast_setup.h" #include "swrast_setup/ss_context.h" #include "tnl/tnl.h" diff --git a/src/mesa/drivers/windows/gldirect/dx8/gld_primitive_dx8.c b/src/mesa/drivers/windows/gldirect/dx8/gld_primitive_dx8.c index 700b520086..a5b5462f03 100644 --- a/src/mesa/drivers/windows/gldirect/dx8/gld_primitive_dx8.c +++ b/src/mesa/drivers/windows/gldirect/dx8/gld_primitive_dx8.c @@ -54,7 +54,7 @@ #include "mtypes.h" #include "texformat.h" #include "texstore.h" -#include "array_cache/acache.h" +#include "vbo/vbo.h" #include "swrast/swrast.h" #include "swrast_setup/swrast_setup.h" #include "swrast_setup/ss_context.h" |