Merge remote branch 'origin/7.8'

[mesa.git] / src / mesa / drivers / dri / i965 / brw_fallback.h

diff --git a/src/mesa/drivers/dri/i965/brw_fallback.h b/src/mesa/drivers/dri/i965/brw_fallback.h
index 81a2d344b818b090d0e5992e90cb6c9e645ef185..50dcdacd17a4780740d4435ff32b7e071e047003 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_fallback.h
+++ b/src/mesa/drivers/dri/i965/brw_fallback.h
@@ -28,10 +28,10 @@
 #ifndef BRW_FALLBACK_H
 #define BRW_FALLBACK_H
 
-#include "mtypes.h"            /* for GLcontext... */
+#include "main/mtypes.h"               /* for GLcontext... */
 
 struct brw_context;
-struct brw_draw_prim;
+struct vbo_prim;
 
 void brw_fallback( GLcontext *ctx );
 void brw_unfallback( GLcontext *ctx );
@@ -39,7 +39,7 @@ void brw_unfallback( GLcontext *ctx );
 void brw_loopback_vertex_list( GLcontext *ctx,
                               const GLfloat *buffer,
                               const GLubyte *attrsz,
-                              const struct brw_draw_prim *prim,
+                              const struct vbo_prim *prim,
                               GLuint prim_count,
                               GLuint wrap_count,
                               GLuint vertex_size);