Merge branch 'llvm-cliptest-viewport'

[mesa.git] / src / mesa / drivers / windows / gldirect / dx7 / gld_ext_dx7.c

diff --git a/src/mesa/drivers/windows/gldirect/dx7/gld_ext_dx7.c b/src/mesa/drivers/windows/gldirect/dx7/gld_ext_dx7.c
index ac99211089095d5d788c43dd98dc07681f72d6db..4ed3c3ca0523b6d9d15b914209e274dcfbf528de 100644 (file)
--- a/src/mesa/drivers/windows/gldirect/dx7/gld_ext_dx7.c
+++ b/src/mesa/drivers/windows/gldirect/dx7/gld_ext_dx7.c
@@ -54,11 +54,11 @@
 #include "macros.h"
 #include "matrix.h"
 // #include "mem.h"
-#include "mmath.h"
+//#include "mmath.h"
 #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"
@@ -69,7 +69,7 @@
 #include "extensions.h"
 
 // For some reason this is not defined in an above header...
-extern void _mesa_enable_imaging_extensions(GLcontext *ctx);
+extern void _mesa_enable_imaging_extensions(struct gl_context *ctx);
 
 //---------------------------------------------------------------------------
 // Hack for the SGIS_multitexture extension that was removed from Mesa
@@ -281,7 +281,7 @@ PROC gldGetProcAddress_DX(
 //---------------------------------------------------------------------------
 
 void gldEnableExtensions_DX7(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLuint i;