r600: merge alu_instruction/alu_instruction2

[mesa.git] / src / mesa / drivers / dri / i810 / i810tex.h

diff --git a/src/mesa/drivers/dri/i810/i810tex.h b/src/mesa/drivers/dri/i810/i810tex.h
index f0b4b88128fe481364f4074b0fb4961d53d0c805..d9809270308dde19e44b21baeb6b7a218e975a3f 100644 (file)
--- a/src/mesa/drivers/dri/i810/i810tex.h
+++ b/src/mesa/drivers/dri/i810/i810tex.h
@@ -26,8 +26,8 @@
 #ifndef I810TEX_INC
 #define I810TEX_INC
 
-#include "mtypes.h"
-#include "mm.h"
+#include "main/mtypes.h"
+#include "main/mm.h"
 
 #include "i810context.h"
 #include "i810_3d_reg.h"
@@ -70,7 +70,7 @@ struct i810_texture_object_t {
 };             
 
 void i810UpdateTextureState( GLcontext *ctx );
-void i810InitTextureFuncs( GLcontext *ctx );
+void i810InitTextureFuncs( struct dd_function_table *functions );
 
 void i810DestroyTexObj( i810ContextPtr imesa, i810TextureObjectPtr t );
 int i810UploadTexImagesLocked( i810ContextPtr imesa, i810TextureObjectPtr t );