Start breaking the #include dependencies between pipe drivers and mesa.

Pipe drivers shouldn't really know much about mesa and certainly shouldn't
be #including files from src/mesa/main and the like.

I've also (in i915simple especially) moved over from GL types to
more conventional int/unsigned usage.  This probably isn't really the
ultimate desired set of types to use - possibly C99 would be better.  It
may even be that a subset of the GL types is preferable.

1 files changed, 13 insertions, 13 deletions

diff --git a/src/mesa/pipe/i915simple/i915_blit.h b/src/mesa/pipe/i915simple/i915_blit.h
index b1131a005c..7ea4e979ec 100644
--- a/src/mesa/pipe/i915simple/i915_blit.h
+++ b/src/mesa/pipe/i915simple/i915_blit.h
@@ -31,24 +31,24 @@
 #include "i915_context.h"
 
 extern void i915_copy_blit(struct i915_context *i915,
-			   GLuint cpp,
-			   GLshort src_pitch,
+			   unsigned cpp,
+			   short src_pitch,
 			   struct pipe_buffer_handle *src_buffer,
-			   GLuint src_offset,
-			   GLshort dst_pitch,
+			   unsigned src_offset,
+			   short dst_pitch,
 			   struct pipe_buffer_handle *dst_buffer,
-			   GLuint dst_offset,
-			   GLshort srcx, GLshort srcy,
-			   GLshort dstx, GLshort dsty,
-			   GLshort w, GLshort h );
+			   unsigned dst_offset,
+			   short srcx, short srcy,
+			   short dstx, short dsty,
+			   short w, short h );
 
 extern void i915_fill_blit(struct i915_context *i915,
-			   GLuint cpp,
-			   GLshort dst_pitch,
+			   unsigned cpp,
+			   short dst_pitch,
 			   struct pipe_buffer_handle *dst_buffer,
-			   GLuint dst_offset,
-			   GLshort x, GLshort y,
-			   GLshort w, GLshort h, GLuint color);
+			   unsigned dst_offset,
+			   short x, short y,
+			   short w, short h, unsigned color);
 
 
 #endif