Merge branch 'mesa_7_5_branch'

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

diff --git a/src/mesa/drivers/dri/i965/brw_draw.h b/src/mesa/drivers/dri/i965/brw_draw.h
index b3547400d40bb14f4a309b0ad8c430addb07e4a2..9aebbdb1b86aa21deaa1b2114b6457b7f2be7f82 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_draw.h
+++ b/src/mesa/drivers/dri/i965/brw_draw.h
@@ -28,10 +28,9 @@
 #ifndef BRW_DRAW_H
 #define BRW_DRAW_H
 
-#include "mtypes.h"            /* for GLcontext... */
+#include "main/mtypes.h"               /* for GLcontext... */
 #include "vbo/vbo.h"
 
-#include "dri_bufmgr.h"
 struct brw_context;
 
 
@@ -51,27 +50,4 @@ void brw_draw_destroy( struct brw_context *brw );
 void brw_init_current_values(GLcontext *ctx,
                             struct gl_client_array *arrays);
 
-
-/* brw_draw_upload.c
- */
-int brw_prepare_indices( struct brw_context *brw,
-                        const struct _mesa_index_buffer *index_buffer,
-                        dri_bo **bo_return,
-                        GLuint *offset_return);
-
-void brw_emit_indices( struct brw_context *brw,
-                      const struct _mesa_index_buffer *index_buffer,
-                      dri_bo *bo,
-                      GLuint offset);
-
-int brw_prepare_vertices( struct brw_context *brw,
-                              GLuint min_index,
-                              GLuint max_index );
-
-void brw_emit_vertices( struct brw_context *brw,
-                              GLuint min_index,
-                              GLuint max_index );
-
-
-
 #endif