Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into r600_state_predict

[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 0f7b738310284184637fd1f444cc76c700a662c9..2a14db217fc7d2b50cee628b1268bc00d3f9ca40 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_draw.h
+++ b/src/mesa/drivers/dri/i965/brw_draw.h
@@ -28,7 +28,7 @@
 #ifndef BRW_DRAW_H
 #define BRW_DRAW_H
 
-#include "mtypes.h"            /* for GLcontext... */
+#include "main/mtypes.h"               /* for GLcontext... */
 #include "vbo/vbo.h"
 
 struct brw_context;
@@ -39,6 +39,7 @@ void brw_draw_prims( GLcontext *ctx,
                     const struct _mesa_prim *prims,
                     GLuint nr_prims,
                     const struct _mesa_index_buffer *ib,
+                    GLboolean index_bounds_valid,
                     GLuint min_index,
                     GLuint max_index );
 
@@ -50,16 +51,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
- */
-void brw_upload_indices( struct brw_context *brw,
-                        const struct _mesa_index_buffer *index_buffer);
-
-GLboolean brw_upload_vertices( struct brw_context *brw,
-                              GLuint min_index,
-                              GLuint max_index );
-
-
-
 #endif