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, 32 insertions, 32 deletions

diff --git a/src/mesa/pipe/i915simple/i915_regions.c b/src/mesa/pipe/i915simple/i915_regions.c
index e27443a58c0..aad4a6a5375 100644
--- a/src/mesa/pipe/i915simple/i915_regions.c
+++ b/src/mesa/pipe/i915simple/i915_regions.c
@@ -44,7 +44,7 @@ i915_region_idle(struct pipe_context *pipe, struct pipe_region *region)
 }
 
 
-static GLubyte *
+static ubyte *
 i915_region_map(struct pipe_context *pipe, struct pipe_region *region)
 {
    struct i915_context *i915 = i915_context( pipe );
@@ -73,7 +73,7 @@ i915_region_unmap(struct pipe_context *pipe, struct pipe_region *region)
 
 static struct pipe_region *
 i915_region_alloc(struct pipe_context *pipe,
-		  GLuint cpp, GLuint width, GLuint height, GLbitfield flags)
+		  unsigned cpp, unsigned width, unsigned height, unsigned flags)
 {
    struct i915_context *i915 = i915_context( pipe );
    struct pipe_region *region = calloc(sizeof(*region), 1);
@@ -117,7 +117,7 @@ i915_region_release(struct pipe_context *pipe, struct pipe_region **region)
    if (!*region)
       return;
 
-   ASSERT((*region)->refcount > 0);
+   assert((*region)->refcount > 0);
    (*region)->refcount--;
 
    if ((*region)->refcount == 0) {
@@ -135,19 +135,19 @@ i915_region_release(struct pipe_context *pipe, struct pipe_region **region)
  * XXX Move this into core Mesa?
  */
 static void
-_mesa_copy_rect(GLubyte * dst,
-                GLuint cpp,
-                GLuint dst_pitch,
-                GLuint dst_x,
-                GLuint dst_y,
-                GLuint width,
-                GLuint height,
-                const GLubyte * src,
-                GLuint src_pitch,
-		GLuint src_x, 
-		GLuint src_y)
+_mesa_copy_rect(ubyte * dst,
+                unsigned cpp,
+                unsigned dst_pitch,
+                unsigned dst_x,
+                unsigned dst_y,
+                unsigned width,
+                unsigned height,
+                const ubyte * src,
+                unsigned src_pitch,
+		unsigned src_x, 
+		unsigned src_y)
 {
-   GLuint i;
+   unsigned i;
 
    dst_pitch *= cpp;
    src_pitch *= cpp;
@@ -179,10 +179,10 @@ _mesa_copy_rect(GLubyte * dst,
 static void
 i915_region_data(struct pipe_context *pipe,
 	       struct pipe_region *dst,
-	       GLuint dst_offset,
-	       GLuint dstx, GLuint dsty,
-	       const void *src, GLuint src_pitch,
-	       GLuint srcx, GLuint srcy, GLuint width, GLuint height)
+	       unsigned dst_offset,
+	       unsigned dstx, unsigned dsty,
+	       const void *src, unsigned src_pitch,
+	       unsigned srcx, unsigned srcy, unsigned width, unsigned height)
 {
    _mesa_copy_rect(pipe->region_map(pipe, dst) + dst_offset,
                    dst->cpp,
@@ -199,11 +199,11 @@ i915_region_data(struct pipe_context *pipe,
 static void
 i915_region_copy(struct pipe_context *pipe,
 	       struct pipe_region *dst,
-	       GLuint dst_offset,
-	       GLuint dstx, GLuint dsty,
+	       unsigned dst_offset,
+	       unsigned dstx, unsigned dsty,
 	       struct pipe_region *src,
-	       GLuint src_offset,
-	       GLuint srcx, GLuint srcy, GLuint width, GLuint height)
+	       unsigned src_offset,
+	       unsigned srcx, unsigned srcy, unsigned width, unsigned height)
 {
    assert( dst != src );
    assert( dst->cpp == src->cpp );
@@ -233,8 +233,8 @@ i915_region_copy(struct pipe_context *pipe,
 /* Fill a rectangular sub-region.  Need better logic about when to
  * push buffers into AGP - will currently do so whenever possible.
  */
-static GLubyte *
-get_pointer(struct pipe_region *dst, GLuint x, GLuint y)
+static ubyte *
+get_pointer(struct pipe_region *dst, unsigned x, unsigned y)
 {
    return dst->map + (y * dst->pitch + x) * dst->cpp;
 }
@@ -243,18 +243,18 @@ get_pointer(struct pipe_region *dst, GLuint x, GLuint y)
 static void
 i915_region_fill(struct pipe_context *pipe,
                struct pipe_region *dst,
-               GLuint dst_offset,
-               GLuint dstx, GLuint dsty,
-               GLuint width, GLuint height, GLuint value)
+               unsigned dst_offset,
+               unsigned dstx, unsigned dsty,
+               unsigned width, unsigned height, unsigned value)
 {
    if (0) {
-      GLuint i, j;
+      unsigned i, j;
 
       (void)pipe->region_map(pipe, dst);
 
       switch (dst->cpp) {
       case 1: {
-	 GLubyte *row = get_pointer(dst, dstx, dsty);
+	 ubyte *row = get_pointer(dst, dstx, dsty);
 	 for (i = 0; i < height; i++) {
 	    memset(row, value, width);
 	    row += dst->pitch;
@@ -262,7 +262,7 @@ i915_region_fill(struct pipe_context *pipe,
       }
 	 break;
       case 2: {
-	 GLushort *row = (GLushort *) get_pointer(dst, dstx, dsty);
+	 ushort *row = (ushort *) get_pointer(dst, dstx, dsty);
 	 for (i = 0; i < height; i++) {
 	    for (j = 0; j < width; j++)
 	       row[j] = value;
@@ -271,7 +271,7 @@ i915_region_fill(struct pipe_context *pipe,
       }
 	 break;
       case 4: {
-	 GLuint *row = (GLuint *) get_pointer(dst, dstx, dsty);
+	 unsigned *row = (unsigned *) get_pointer(dst, dstx, dsty);
 	 for (i = 0; i < height; i++) {
 	    for (j = 0; j < width; j++)
 	       row[j] = value;